rubysdk 0.0.1.pre4 → 0.0.1.pre5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c5b85676563dc95d387185bb11fd5bd0fc5163b0e949b12c8b78a29d2f2898c
-  data.tar.gz: 8619a87faf820cb985ff248d4e7193a98b5e35f5665e5671c99acef27130898a
+  metadata.gz: 8a1f3ca13463948e53df0160b0564d0e94db8cdce16b49a9d0981f4c8f7b40b4
+  data.tar.gz: bcd44d408657979cb8124d73b0d08abe5b13d7c684ff76f43676c43fc630262c
 SHA512:
-  metadata.gz: 1f0e97d3f0941169e631303f5a1cb8f694af62052ef1aba3c757a6ff1ebe030e9bed78a775471fb9326d05471d4921a2708bd10afa7ba5f1521bcf78e0ac9838
-  data.tar.gz: 26fc56efd112c540c0452d015b91f12007d92f8290ca72aea588c1a9f0ad70ae566a6d941bf36cb73e059e88d33831e0fcaff3811605eb8b1ab75d1b5d288884
+  metadata.gz: d66e79ad9faadac21dcc94eee9955e24049bbb9cee038c0f926cbc7441533f6fa73778c24e1da6df16d476ab373030f52cc229e8d225a0bff227ba71f339aff6
+  data.tar.gz: a6dc88a4a699520f455b2b10b3a5a3cb3781679d385ebe9ec0e38eb9f89bdef619d5a0fcbd240b11522ad808c6c8517c4c2663410b7450088123f56f5e6aaf42

data/lib/interface/interface.rb

@@ -4,43 +4,40 @@ module Interface
   class Job
     attr_accessor :handler, :title, :desc, :dependson, :args, :interaction
     
-    def initialize(handler=nil, title="", desc="", dependson=[], args=[], interaction=nil)
-      @handler = handler
-      @title = title
-      @desc = desc
-      @dependson = dependson
-      @args = args
-      @interaction = interaction
+    def initialize(params)
+      params.each do |key, value|
+        instance_variable_set("@#{key}", value)
+      end
     end
   end
 
   class Argument
     attr_accessor :desc, :type, :key, :value
     
-    def initialize(desc="", type=nil, key="", value="")
-      @desc = desc
-      @type = type
-      @key = key
-      @value = value
+    def initialize(params)
+      params.each do |key, value|
+        instance_variable_set("@#{key}", value)
+      end
     end
   end
 
   class ManualInteraction
     attr_accessor :desc, :type, :value
     
-    def initialize(desc="", type=nil, value="")
-      @desc = desc
-      @type = type
-      @value = value
+    def initialize(params)
+      params.each do |key, value|
+        instance_variable_set("@#{key}", value)
+      end
     end
   end
 
   class JobsWrapper 
     attr_accessor :handler, :job
     
-    def initialize(handler=nil, job=nil)
-      @handler = handler
-      @job = job
+    def initialize(params)
+      params.each do |key, value|
+        instance_variable_set("@#{key}", value)
+      end
     end
   end
 

data/lib/rubysdk.rb

@@ -5,6 +5,7 @@ $LOAD_PATH.unshift(proto_dir) unless $LOAD_PATH.include?(proto_dir)
 $LOAD_PATH.unshift(interface_dir) unless $LOAD_PATH.include?(interface_dir)
 
 require 'grpc'
+require 'grpc/health/checker'
 require 'fnv'
 require 'plugin_services_pb'
 require 'interface'
@@ -16,13 +17,15 @@ module RubySDK
       @cached_jobs = cached_jobs
     end
 
-    # GetJobs returns all registered jobs.
-    def GetJobs(empty)
-      @cached_jobs.each { |job| yield job.job }
+    # get_jobs returns all registered jobs.
+    def get_jobs(empty, _call)
+      jobs = []
+      @cached_jobs.each { |job| jobs.push job.job }
+      jobs.each
     end
 
-    # ExecuteJob executes the given job and returns a result.
-    def ExecuteJob(job)
+    # execute_job executes the given job and returns a result.
+    def execute_job(job, _call)
       cjob = nil
       @cached_jobs.each do |cached_job|
         cjob = cached_job unless cached_job.unique_id == job.unique_id
@@ -112,15 +115,14 @@ module RubySDK
       end
 
       # Create wrapper object
-      wrapper_job = Interface::JobsWrapper.new(handler: job.handler,
-                                    job: proto_job)
+      wrapper_job = Interface::JobsWrapper.new(handler: job.handler, job: proto_job)
       cached_jobs.push wrapper_job
     end
 
     # Check if two jobs have the same title which is restricted.
-    #dup_map = {}
+    dup_map = {}
     cached_jobs.each do |job|
-      dup_map[job.job.unique_id] = (map[job.job.unique_id] || 0) + 1
+      dup_map[job.job.unique_id] = (dup_map[job.job.unique_id] || 0) + 1
 
       if dup_map[job.job.unique_id] > 1
         raise "duplicate job with the title #{job.title} found which is not allowed"
@@ -132,14 +134,19 @@ module RubySDK
     key_path = ENV["GAIA_PLUGIN_KEY"]
     root_ca_path = ENV["GAIA_PLUGIN_CA_CERT"]
 
+    # Check if variable is empty.
+    raise "GAIA_PLUGIN_CERT not set" unless cert_path
+    raise "GAIA_PLUGIN_KEY not set" unless key_path
+    raise "GAIA_PLUGIN_CA_CERT not set" unless root_ca_path
+
     # Check if all certs are available.
     raise "cannot find path to certificate" unless File.file?(cert_path)
     raise "cannot find path to key" unless File.file?(key_path)
     raise "cannot find path to root CA certificate" unless File.file?(root_ca_path)
 
     # Implement health service.
-    #health_svc = GRPC::Health::Checker.new
-    #health_svc.add_status("plugin", GRPC::Core::StatusCodes::SERVING)
+    health_svc = Grpc::Health::Checker.new
+    health_svc.add_status("plugin", Grpc::Health::V1::HealthCheckResponse::ServingStatus::SERVING)
 
     # Load certificates and create credentials.
     credentials = GRPC::Core::ServerCredentials.new(
@@ -156,10 +163,12 @@ module RubySDK
     s = GRPC::RpcServer.new
     port = s.add_http2_port(host+':0', credentials)
     s.handle(GRPCServer.new(cached_jobs))
+    s.handle(health_svc)
 
     # Output the address and service name to stdout.
     # hashicorp go-plugin will use that to establish a connection.
     puts "1|2|tcp|#{host}:#{port}|grpc"
+    GRPC.logger.info("1|2|tcp|#{host}:#{port}|grpc")
     STDOUT.sync = true
 
     s.run_till_terminated

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubysdk
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre4
+  version: 0.0.1.pre5
 platform: ruby
 authors:
 - Michel Vocks