dtk_crd_parser 0.0.66 → 0.0.67

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14cb8b6840a9bb45fdec7260dba197da1f9f226db3e0cb62a2a530b3ea5afd35
-  data.tar.gz: e6cc5b1e1022a41d861457ec53c2d5ea6b1290e25f8a5a033951962a39e543a3
+  metadata.gz: 44c9c34cc93408e2bd39b9f98cde56fec64eef1f596a47efabbc692b9608a86a
+  data.tar.gz: 2f4acb8053c767b161833244a4bb057e0d1a7d6922d00cb985af49f33a0531ca
 SHA512:
-  metadata.gz: ff3a504f02fabefbff2cb8481426fe262efdcb3e4ad86097957483067e3c656cfe53b0b261396ae34227893727bcfc0c4461b842ddd4d5cd00f43846f4ba1a48
-  data.tar.gz: db828df65b4f1731655341107d4aa9ce50efe3e2e1266baf096bac69f0155c69dc035ff4eb6ca3984bd40b1ad26fc4aa3d909b8866c665395d5cf4eccdc989cf
+  metadata.gz: bad65cd3743b2b6e66e220a2ad69620368ec7000eb56d7c7587c8d246aaa806c7fed7f76cc82f99e19720798afdf89ffb10e30306cbde8946154508bcd032249
+  data.tar.gz: 77fe983b615d17f25e748378c7edc4a715803e2a6dc71248b6948bd344215a416040872b7690f12b7f7d99ef9d5915b91053d2180a1dc24f17a869a93f05435a

data/lib/crd_parser/action/executable_action.rb

@@ -1,14 +1,14 @@
 module DTK::CrdParser
   class ExecutableAction < BaseClass
 
+    attr_reader :entrypoint, :bash_script, :name, :type
+
     def initialize(params)
       @name = params[:name]
       @entrypoint = params[:entrypoint]
       @type = params[:type]
       @bash_script = params[:bash_script]
     end
-
-    attr_reader :entrypoint, :bash_script, :name, :type
     
     private
 

data/lib/crd_parser/component/attribute.rb

@@ -1,6 +1,9 @@
 module DTK::CrdParser
   class Component 
     class Attribute < BaseClass
+
+      attr_reader :name, :value
+
       def initialize(name, value)
         @name      = fail_if_nil(name, 'Attribute.name')
         @value     = fail_if_nil(value, 'Attribute.value')
@@ -10,10 +13,6 @@ module DTK::CrdParser
         Attribute.new(attribute_name, attribute_value)
       end
 
-      protected
-
-      attr_reader :name, :value
-
     end
   end
 end

data/lib/crd_parser/component.rb

@@ -3,6 +3,8 @@ module DTK::CrdParser
     require_relative('component/attribute')
     require_relative('error')
 
+    attr_reader :name, :component_def, :attributes
+
     MODE_DEFAULT = :component_instance
     attr_reader :name, :component_def, :attributes
 
@@ -13,21 +15,23 @@ module DTK::CrdParser
     end
 
     def self.create_from_kube(client, component_instance, component_name)
+      component_name.gsub!('_', '-')
       component_instance_obj = client.get_component(component_instance[:name], component_instance[:namespace])
       component_def = ComponentDef.create_from_kube(client, component_instance_obj, component_name)
       component_attributes = getComponentAttributes(component_name, component_instance_obj[:spec][:components])
       attributes = []
-      (component_attributes || []).to_hash.each do |attribute_name, attribute_value|
-        attributes.push Attribute.create_from_kube(attribute_name, attribute_value)
+      if component_attributes
+        component_attributes.to_hash.each do |attribute_name, attribute_value|
+          attributes.push Attribute.create_from_kube(attribute_name, attribute_value)
+        end
       end
-			Component.new(component_name, component_def, attributes)
+      Component.new(component_name, component_def, attributes)
     end
 
 
     protected
 
     def self.getComponentAttributes(fullComponentName, components)
-      fullComponentName.gsub!('_', '-')
       component = components.each do |component|
         componentObj = component[fullComponentName]
         if(componentObj && componentObj.is_a?(Kubeclient::Resource))

data/lib/crd_parser/component_def/attribute_type_info.rb

@@ -1,8 +1,10 @@
 module DTK::CrdParser
   class ComponentDef 
     class AttributeTypeInfo < BaseClass
-      def initialize(params)
 
+      attr_reader :name, :type, :required, :dynamic
+
+      def initialize(params)
         @name      = params[:name]
         @type      = params[:type]
         @required  = params[:required] || false
@@ -13,9 +15,6 @@ module DTK::CrdParser
         AttributeTypeInfo.new(attribute)
       end
 
-      protected
-
-      attr_reader :name
     end
   end
 end

data/lib/crd_parser/component_def.rb

@@ -4,7 +4,8 @@ module DTK::CrdParser
       require_relative('error')
 
       MODE_DEFAULT = :component_instance
-      attr_reader :name, :namespace, :executable_actions, :attribute_type_info
+      attr_reader :name, :namespace, :executable_actions, :attribute_type_info, :resource_version
+
       def initialize(metadata, componentDefActions, componentDefAttributes)
         @name             = fail_if_nil(metadata[:name], 'metadata[:name]')
         @namespace        = fail_if_nil(metadata[:namespace], 'metadata[:namespace]')
@@ -82,11 +83,7 @@ module DTK::CrdParser
           action: action
         }
       end
-
       protected
-
-      attr_reader :resource_version, :attribute_type_info, :bash_script, :entrypoint, :type
-
       def self.metadata(componentDef)
         componentDef[:metadata]
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dtk_crd_parser
 version: !ruby/object:Gem::Version
-  version: 0.0.66
+  version: 0.0.67
 platform: ruby
 authors:
 - DTK