persistence-providers 0.0.3.1 → 0.0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ac2828e10383c9590347d210c09ffd97640c80794cc0078290de10d8010685c
-  data.tar.gz: ef1e7376786ed2c13d7e2457351185285f385c1d99818ead0c5171d921d094e7
+  metadata.gz: 30043309dd4928f64a7577e8045035f0208b9fd8bde9c9a4f378ddc1f6cadc2d
+  data.tar.gz: 46e990e3aa194698a9a8930a3529a4068ba3f9d9dae836bc6353e22504fd3e2a
 SHA512:
-  metadata.gz: d13cb086750ea5407ad6c9e932672031adbb9aee66c85d15043bd0af770ddeb6e605acf721d3bea50f534198cdd6ac58d95ff6313bf796e75751b3616b4f55ae
-  data.tar.gz: 61c45ed7d35a5f68beab292ee7f4830298b58060b83dc29e145340352195cb82095812c778a9df36c51f20356f1a0b6ce767f26168ff5138cd9ff20c389875d0
+  metadata.gz: 61edcdffbc29dd611e1874e1f8b4d422f5cf3183b675d11aedb446c7c78932946b76086e367f7ce1c1f2447f6bbba86341ae191f7071b1c4a2c0456ed6c0fa41
+  data.tar.gz: 635650ee5cba06e3d5cb46cd953dba7bc6349d3a90c96f877c23087f12848b718d9a0b782beed7fffbc60117f8d47355e7332a6b13221e8af779ee5c3367e7e7

data/lib/persistence_providers.rb

@@ -1,7 +1,7 @@
 module DTK
   module State
     require_relative 'crd_client'
-    require_relative 'state/crd_component'
+    require_relative 'state/crd_assembly'
     require_relative 'state/component'
     require_relative 'state/component_def'
     require_relative 'state/executable_action'

data/lib/state/component/attribute.rb

@@ -31,21 +31,21 @@ module DTK::State
         # @encrypted = attribute_content[:encrypted] || false
       end
 
-      def self.get(namespace, crd_component_name, component_instance_name, attribute_name, opts = {})
+      def self.get(namespace, assembly_name, component_name, attribute_name, opts = {})
         # getting attribute here because we can reuse it if it's stored in crd
-        # when we decide to not store attribute value as part of component_instance crd we can overwrite this
-        component_instance = Component.get(namespace, crd_component_name, component_instance_name, opts)
-        attribute_content  = component_instance.attributes.find{ |attribute| attribute.name == attribute_name }
+        # when we decide to not store attribute value as part of assembly crd we can overwrite this
+        assembly = Component.get(namespace, assembly_name, component_name, opts)
+        attribute_content  = assembly.attributes.find{ |attribute| attribute.name == attribute_name }
         
-        fail Error.new("Unable to find attribute '#{attribute_name}' in provided component instance") if attribute_content.nil? || attribute_content.empty?
+        fail Error.new("Unable to find attribute '#{attribute_name}' in provided assembly") if attribute_content.nil? || attribute_content.empty?
 
-        attribute      = self.new(attribute_name, attribute_content, component_instance)
+        attribute      = self.new(attribute_name, attribute_content, assembly)
         provider_class = provider_class_name(attribute, opts)
         # return already fetched attribute value if provider is KubeCrd
         return attribute if provider_class == 'KubeCrd'
 
         # for KubeCrd this will do the same work we did in provider_class_name method to find temporal param
-        self.class.const_get(provider_class).get(component_instance_name, attribute_name, opts)
+        self.class.const_get(provider_class).get(component_name, attribute_name, opts)
       end
 
       def to_hash

data/lib/state/component/providers/influxdb/measurement/attribute_measurement.rb

@@ -11,7 +11,7 @@ module DTK::State
         protected
 
         def required_params
-          [:namespace, :crd_component_name, :component_instance_name, :attribute_name, :task_id]
+          [:namespace, :component_name, :assembly_name, :attribute_name, :task_id]
         end
 
       end                       

data/lib/state/component/providers/influxdb/measurement/errors.rb

@@ -11,7 +11,7 @@ module DTK::State
         protected
 
         def required_params
-          [:namespace, :crd_component_name, :component_instance_name, :task_id, :attribute_name, :task_id, :correlator_type]
+          [:namespace, :component_name, :assembly_name, :task_id, :attribute_name, :task_id, :correlator_type]
         end
 
       end                       

data/lib/state/component/providers/influxdb/measurement.rb

@@ -22,7 +22,7 @@ module DTK::State
       def get_last_point(params_hash = {})
         begin
           check_params_hash(params_hash)
-          flux_query = 'from(bucket:"' + client.connection_parameters[:bucket] + '") |> range(start:-5) |> filter(fn: (r) => r._measurement == "' + name.to_s + '")' + flux_filter(params_hash) + ' |> last()'  +   '|> drop(columns: ["_start", "_stop", "_field", "_measurement", "attribute_name", "component_instance_name", "task_id", "crd_component_name", "namespace"])'
+          flux_query = 'from(bucket:"' + client.connection_parameters[:bucket] + '") |> range(start:-5) |> filter(fn: (r) => r._measurement == "' + name.to_s + '")' + flux_filter(params_hash) + ' |> last()'  +   '|> drop(columns: ["_start", "_stop", "_field", "_measurement", "attribute_name", "assembly_name", "task_id", "component_name", "namespace"])'
           result  = self.client.query(flux_query)
           result.values.map(&:records).flatten.map(&:values)
         rescue => error

data/lib/state/component/providers/influxdb.rb

@@ -11,8 +11,8 @@ module DTK::State
         @measurement = @client.measurement_helper(measurement_name)
       end
 
-      def get(namespace, crd_component_name, component_instance_name, attribute_name, opts = {})
-        required_tags = get_required_tags(namespace, crd_component_name, component_instance_name, attribute_name)
+      def get(namespace, component_name, assembly_name, attribute_name, opts = {})
+        required_tags = get_required_tags(namespace, component_name, assembly_name, attribute_name)
         if opts[:provider] == "correlation"
           errors = client.measurement_helper(:errors)
           required_tags.merge!({ correlator_type: opts[:entrypoint].split("/").last.split(".")[0] })
@@ -23,14 +23,14 @@ module DTK::State
         end
       end
 
-      def write(namespace, crd_component_name, component_instance_name, attribute_name, value, opts = {}, timestamp = nil)
+      def write(namespace, component_name, assembly_name, attribute_name, value, opts = {}, timestamp = nil)
         if opts[:provider] == "correlation"
           errors = client.measurement_helper(:errors)
-          required_tags = get_required_tags(namespace, crd_component_name, component_instance_name, attribute_name)
+          required_tags = get_required_tags(namespace, component_name, assembly_name, attribute_name)
           required_tags.merge!({ correlator_type: opts[:entrypoint].split("/").last.split(".")[0] })
           errors.write(value.to_s, required_tags, timestamp)
         elsif
-          required_tags = get_required_tags(namespace, crd_component_name, component_instance_name, attribute_name)
+          required_tags = get_required_tags(namespace, component_name, assembly_name, attribute_name)
           measurement.write(value, required_tags, timestamp)
         end
       end
@@ -86,11 +86,11 @@ module DTK::State
       
       private 
 
-      def get_required_tags(namespace, crd_component_name, component_instance_name, attribute_name)
+      def get_required_tags(namespace, component_name, assembly_name, attribute_name)
         required_tags = {
           namespace: namespace,
-          crd_component_name: crd_component_name,
-          component_instance_name: component_instance_name,
+          component_name: component_name,
+          assembly_name: assembly_name,
           attribute_name: attribute_name,
           task_id: "1"
         }

data/lib/state/component/providers/kube_crd.rb

@@ -1,10 +1,10 @@
 module DTK::State
   class Component::Attribute
     class KubeCrd < self
-      def get(namespace, crd_component_name, component_instance_name, attribute_name, opts = {})
-        component_instance = Component.get(namespace, crd_component_name, component_instance_name, opts)
-        attribute = component_instance.attributes.find{ |attribute| attribute.name == attribute_name }
-        Attribute.new(attribute_name, attribute, component_instance)
+      def get(namespace, assembly_name, component_name, attribute_name, opts = {})
+        assembly = Component.get(namespace, assembly_name, component_name, opts)
+        attribute = assembly.attributes.find{ |attribute| attribute.name == attribute_name }
+        Attribute.new(attribute_name, attribute, assembly)
       end
     end
   end

data/lib/state/component.rb

@@ -15,10 +15,10 @@ module DTK::State
 
     # opts can have keys
     #   task_id
-    def self.get(namespace, crd_component_name, component_name, opts = {})
-      crd_component = CrdComponent.get(namespace, crd_component_name, opts)
-      if matching_component = crd_component.components.find{ |cmp| cmp.to_hash.keys.first.to_s == component_name }
-        Component.new(component_name, matching_component[component_name], crd_component, opts)
+    def self.get(crd_assembly_namespace, crd_assembly_name, component_name, opts = {})
+      crd_assembly = CrdAssembly.get(crd_assembly_namespace, crd_assembly_name, opts)
+      if matching_component = crd_assembly.components.find{ |cmp| cmp.to_hash.keys.first.to_s == component_name }
+        Component.new(component_name, matching_component[component_name], crd_assembly, opts)
       end
     end
 
@@ -27,8 +27,8 @@ module DTK::State
     # format:
     #   hash
     #   kubernetes - return attributes in raw format from kubeclient
-    def self.get_attributes(namespace, crd_component_name, component_name, opts = {})
-      component = get(namespace, crd_component_name, component_name, opts)
+    def self.get_attributes(crd_assembly_namespace, crd_assembly_name, component_name, opts = {})
+      component = get(crd_assembly_namespace, crd_assembly_name, component_name, opts)
       component.attributes(opts)
     end
 

data/lib/state/{crd_component.rb → crd_assembly.rb}

@@ -1,5 +1,5 @@
 module DTK::State
-  class CrdComponent
+  class CrdAssembly
     attr_reader :name, :namespace, :crd_content, :components, :references
 
     def initialize(namespace, name, crd_content)
@@ -12,8 +12,8 @@ module DTK::State
 
     def self.get(namespace, name, opts = {})
       # crd_component = ::DTK::CrdClient.instance.kubeclient.get_component(name, namespace)
-      crd_component = ::DTK::CrdClient.get_kubeclient(opts).get_assembly(name, namespace)
-      CrdComponent.new(namespace, name, crd_component)
+      crd_assembly = ::DTK::CrdClient.get_kubeclient(opts).get_assembly(name, namespace)
+      CrdAssembly.new(namespace, name, crd_assembly)
     end
 
     # components can be:

data/lib/state/executable_action.rb

@@ -9,8 +9,8 @@ module DTK::State
       @bash_script = params[:bash_script]
     end
 
-    def self.get(namespace, crd_component_name, component_name, action_name, opts = {})
-      component_obj = Component.get(namespace, crd_component_name, component_name, opts)
+    def self.get(crd_assembly_namespace, crd_assembly_name, component_name, action_name, opts = {})
+      component_obj = Component.get(crd_assembly_namespace, crd_assembly_name, component_name, opts)
       actions = component_obj.component_def.executable_actions
       action  = actions[action_name]
 

data/persistence-providers.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name        = 'persistence-providers'
-  spec.version     = '0.0.3.1'
+  spec.version     = '0.0.3.2'
   spec.author      = 'Reactor8'
   spec.email       = 'support@reactor8.com'
   spec.description = %q{Persistence providers plugin}

data/test.rb

@@ -1,5 +1,5 @@
 require_relative 'lib/persistence_providers'
 require 'byebug'
 byebug
-DTK::State::CrdComponent.get('aldin', 'aldin', {kubeclient: 'test'})
-DTK::State::CrdComponent.new('aaa', 'bbb', { spec: { components: 'some_components'}}, {kubernetes_client: 'test'})
+DTK::State::CrdAssembly.get('aldin', 'aldin', {kubeclient: 'test'})
+DTK::State::CrdAssembly.new('aaa', 'bbb', { spec: { components: 'some_components'}}, {kubernetes_client: 'test'})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: persistence-providers
 version: !ruby/object:Gem::Version
-  version: 0.0.3.1
+  version: 0.0.3.2
 platform: ruby
 authors:
 - Reactor8
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-22 00:00:00.000000000 Z
+date: 2020-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kubeclient
@@ -73,7 +73,7 @@ files:
 - lib/state/component/providers/kube_crd.rb
 - lib/state/component_def.rb
 - lib/state/component_def/attribute_type_info.rb
-- lib/state/crd_component.rb
+- lib/state/crd_assembly.rb
 - lib/state/executable_action.rb
 - lib/state/workflow_instance.rb
 - lib/state/workflow_instance/attribute_type_info.rb