small improvements

Author: Michel Vocks

Diff for: Makefile

@@ -36,7 +36,7 @@ PROTOS_PATH = ./
 
 vpath %.proto $(PROTOS_PATH)
 
-all: system-check run
+all: system-check compile
 
 %.grpc.pb.cc: %.proto
 	$(PROTOC) -I $(PROTOS_PATH) --grpc_out=. --plugin=protoc-gen-grpc=$(GRPC_CPP_PLUGIN_PATH) $<
@@ -47,10 +47,8 @@ all: system-check run
 clean:
 	rm -f *.out *.pb.cc *.pb.h 
 
-run:
-	 $(CXX) sdk.cc plugin.grpc.pb.cc plugin.pb.cc $(LDFLAGS) $(CXXFLAGS) -o sdk.out
-	./sdk.out
-
+compile:
+	$(CXX) -c sdk.cc plugin.grpc.pb.cc plugin.pb.cc $(LDFLAGS) $(CXXFLAGS) 
 
 # The following is to test your system and ensure a smoother experience.
 # They are by no means necessary to actually compile a grpc-enabled software.

Diff for: sdk.cc

@@ -1,9 +1,9 @@
 #include <string>
+#include <iostream>
 #include <memory>
 #include <algorithm>
 #include <cstdlib>
 #include <fstream>
-#include <fstream>
 #include <sstream>
 #include <grpcpp/grpcpp.h>
 #include <grpcpp/health_check_service_interface.h>
@@ -54,15 +54,15 @@ class GRPCPluginImpl final : public Plugin::Service {
         }
 
         Status ExecuteJob(ServerContext* context, const Job* request, JobResult* response) {
-            job_wrapper * job = GetJob((*request));
+            gaia::job_wrapper * job = GetJob((*request));
             if (job == nullptr) {
                 return Status(grpc::StatusCode::CANCELLED, ERR_JOB_NOT_FOUND);
             }
 
             // Transform arguments.
-            list<argument> args;
+            list<gaia::argument> args;
             for (int i = 0; i < (*request).args_size(); ++i) {
-                argument arg = {};
+                gaia::argument arg = {};
                 arg.key = (*request).args(i).key();
                 arg.value = (*request).args(i).value();
                 args.push_back(arg);
@@ -87,11 +87,11 @@ class GRPCPluginImpl final : public Plugin::Service {
             return Status::OK;
         }
 
-        void PushCachedJobs(job_wrapper* job) {
+        void PushCachedJobs(gaia::job_wrapper* job) {
             cached_jobs.push_back(*job);
         }
 
-        static bool compare(job_wrapper a, job_wrapper b) {
+        static bool compare(gaia::job_wrapper a, gaia::job_wrapper b) {
             return (a.job.unique_id() == b.job.unique_id());
         }
 
@@ -104,10 +104,10 @@ class GRPCPluginImpl final : public Plugin::Service {
         }
 
     private:
-        list<job_wrapper> cached_jobs;
+        list<gaia::job_wrapper> cached_jobs;
 
         // GetJob finds the right job in the cache and returns it.
-        job_wrapper * GetJob(const Job job) {
+        gaia::job_wrapper * GetJob(const Job job) {
             for (auto & cached_job : cached_jobs) {
                 if (cached_job.job.unique_id() == job.unique_id()) {
                     return &cached_job;
@@ -139,7 +139,7 @@ static bool read_file(const string& filename, string& data) {
 	return false;
 }
 
-static void Serve(list<job> jobs) throw(string) {
+void Serve(list<gaia::job> jobs) throw(string) {
     // Allocate space for objects.
     GRPCPluginImpl service;
     ServerBuilder builder;
@@ -195,7 +195,7 @@ static void Serve(list<job> jobs) throw(string) {
         }
 
         // Create the jobs wrapper object.
-        job_wrapper w = {
+        gaia::job_wrapper w = {
             job.handler,
             (*proto_job),
         };

Diff for: sdk.h

@@ -10,51 +10,55 @@ using std::string;
 using std::list;
 using proto::Job;
 
-struct InputType {
-    enum class input_type {
-        textfield,
-        textarea,
-        boolean,
-        vault
+namespace gaia {
+    struct InputType {
+        enum class input_type {
+            textfield,
+            textarea,
+            boolean,
+            vault
+        };
     };
-};
-
-const string ToString (InputType::input_type es) {
-    const std::map<InputType::input_type,const string> EnumStrings {
-        { InputType::input_type::textfield, "textfield" },
-        { InputType::input_type::textarea, "textarea" },
-        { InputType::input_type::boolean, "boolean" },
-        { InputType::input_type::vault, "vault" }
+
+    const string ToString (InputType::input_type es) {
+        const std::map<InputType::input_type,const string> EnumStrings {
+            { InputType::input_type::textfield, "textfield" },
+            { InputType::input_type::textarea, "textarea" },
+            { InputType::input_type::boolean, "boolean" },
+            { InputType::input_type::vault, "vault" }
+        };
+        auto it = EnumStrings.find(es);
+        return it == EnumStrings.end() ? "Out of range" : it->second;
+    }
+
+    struct argument {
+        string description;
+        InputType::input_type type;
+        string key;
+        string value;
+    };
+
+    struct manual_interaction {
+        string description;
+        InputType::input_type type;
+        string value;
     };
-    auto it = EnumStrings.find(es);
-    return it == EnumStrings.end() ? "Out of range" : it->second;
-}
 
-struct argument {
-    string description;
-    InputType::input_type type;
-    string key;
-    string value;
-};
-
-struct manual_interaction {
-    string description;
-    InputType::input_type type;
-    string value;
-};
-
-struct job {
-    void (*handler)(list<argument>) throw(string);
-    string title;
-    string description;
-    list<string> depends_on;
-    list<argument> args;
-    manual_interaction * interaction;
-};
-
-struct job_wrapper {
-    void (*handler)(list<argument>) throw(string);
-    Job job;
-};
+    struct job {
+        void (*handler)(list<argument>) throw(string);
+        string title;
+        string description;
+        list<string> depends_on;
+        list<argument> args;
+        manual_interaction * interaction;
+    };
+
+    struct job_wrapper {
+        void (*handler)(list<argument>) throw(string);
+        Job job;
+    };
+
+    void Serve(list<job>) throw(string);
+}
 
 #endif