dtk_crd_parser 0.0.39 → 0.0.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c8ceb73c7c7afa1da34bde108bf15f50935e219e
-  data.tar.gz: 3f96f18f547b482fc57ea9367b37d949632112bb
+SHA256:
+  metadata.gz: 7db0223829bb7c53f309e52c808582992490abed7964a65facdc70339e60cb79
+  data.tar.gz: a492d85e80d9fd68a1680961d6482356b5d882d5caf18e58e76066ecd78f25f5
 SHA512:
-  metadata.gz: 42c0636f99184b6e3630f7cfd511268674cb00adec2d6ab96d2937a4332a707ee840b5eb25f58fe0bd7e96009917c18d93e81fbe871190e2285d180aa553fae6
-  data.tar.gz: d99c3a00a40dd812abd733dd1cad49357a6b0855e0765cd4b89eb637b720b5f066f7836b73d4317284db313a7ec137551f25943137cd74240231846d86438659
+  metadata.gz: 30e17286423da409bbedc746db71e2ca00d34145d29596fdedc9247ee1e19d463115b0d3050634b59bda304b1c642c30f8cac6a053caf99159a701fdc5ec4e2b
+  data.tar.gz: 771b3eaf135045ddb093221eef64664933967464d708fce73886fe5d418fb5adcc7df4e64d38edc1813d764b660116872f4ff4c2d9b4ef21fd5ad7c027eed241

data/lib/crd_parser.rb

@@ -4,12 +4,25 @@ module DTK
     
       require_relative('crd_parser/component')
       require_relative('crd_parser/component_def')
-    
+      require_relative('crd_parser/action')
+      require_relative('crd_parser/error')
+
       def self.parse_crd_to_component(client, component_instance, component_name) 
         #component instance has a name and a namespace {name: xxx, namespace: yyy}
         #client is kube client
         #component name is, for example, network-aws::vpc[vpc1]
         Component.create_from_kube(client, component_instance, component_name)
       end
+
+      def self.parse_crd_to_action(client, component_instance, action_instance)
+        #component instance has a name and a namespace {name: xxx, namespace: yyy}
+        #client is kube client
+        #action instance, for example, {name: xxx, namespace: xxx, id: xxx}
+        Action.create_from_kube(client, component_instance, action_instance)
+      end
+
+      def self.parse_crd_to_executable_action(client, component_instance, component_name)
+        Component.create_from_kube(client, component_instance, component_name)
+      end
     end
   end

data/lib/crd_parser/action.rb

@@ -0,0 +1,40 @@
+module DTK::CrdParser
+  class Action < BaseClass
+
+    def initialize(name, id, component)
+      @name = name #action name, for example: create node group members
+      @component = component #this will point to the corresponding component object, example: ec2::node-group[ng]
+      @id    = id #action subtask id
+    end
+
+    def self.create_from_kube(client, component_instance, action_instance)
+      action_obj = client.get_action(action_instance[:name], action_instance[:namespace])
+      @actionExists = false
+      action = find_action(action_instance[:id], action_obj[:spec][:action])
+      component_name = action[:component]
+      component = Component.create_from_kube(client, component_instance, component_name)
+			Action.new(action[:name], action[:id], component)
+    end
+
+    protected
+
+    @action = nil
+    @actionExists = false
+    def self.find_action(id, actionObject)
+      return @action if @actionExists 
+      iterator = 0
+      while (!@actionExists && iterator < actionObject[:subtasks].length)
+        @action = actionObject[:subtasks][iterator]
+        if @action.id.to_s == id.to_s
+          @actionExists = true
+          return @action
+        elsif @action[:subtasks]
+          return self.find_action(id, @action)
+        end
+        iterator+=1
+      end
+    end
+    attr_reader :name, :component, :id
+
+  end
+end

data/lib/crd_parser/base_class/helper_mixins.rb

@@ -4,6 +4,11 @@ module DTK::CrdParser
       module ClassAndInstanceMixin
         # Helper functions want to have available in all classes
 
+        def fail_if_nil(value, property_name)
+          fail Error::Usage, "Property #{property_name} should not be nil") unless value
+          value
+        end
+
         def fail_if_not_type(object, type)
           if object.kind_of?(type)
             object

data/lib/crd_parser/component.rb

@@ -1,26 +1,22 @@
 module DTK::CrdParser
   class Component < BaseClass
     require_relative('component/attribute')
-
-    attr_reader :name, :component_def, :attributes
+    require_relative('error')
 
     MODE_DEFAULT = :component_instance
     def initialize(name, component_def, attributes)
-      @name          = name
-      @component_def = component_def # this wil point to the corresponding component def
-      @attributes    = attributes # array that has an Attribute object for each attribute; these are name-value pairs
+      @name          = fail_if_nil(name, 'name')
+      @component_def = fail_if_nil(component_def, 'component_def') # this wil point to the corresponding component def
+      @attributes    = attributes || [] # array that has an Attribute object for each attribute; these are name-value pairs
     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 = []
-      if component_attributes
-        component_attributes.to_hash.each do |attribute_name, attribute_value|
-          attributes.push Attribute.create_from_kube(attribute_name, attribute_value)
-        end
+      (component_attributes || []).to_hash.each do |attribute_name, attribute_value|
+        attributes.push Attribute.create_from_kube(attribute_name, attribute_value)
       end
 			Component.new(component_name, component_def, attributes)
     end
@@ -28,6 +24,7 @@ module DTK::CrdParser
     protected
 
     def self.getComponentAttributes(fullComponentName, components)
+      fullComponentName.gsub!('_', '-')
       component = components.each do |component|
         componentObj = component[fullComponentName]
         if(componentObj && componentObj.is_a?(Kubeclient::Resource))
@@ -37,6 +34,6 @@ module DTK::CrdParser
       return nil
     end
 
-
+    attr_reader :name, :component_def, :attributes
   end
 end

data/lib/crd_parser/component/attribute.rb

@@ -1,18 +1,19 @@
 module DTK::CrdParser
   class Component 
     class Attribute < BaseClass
-
-      attr_reader :name, :value
-
       def initialize(name, value)
-        @name      = name
-        @value     = value
+        @name      = fail_if_nil(name, 'Attribute.name')
+        @value     = fail_if_nil(value, 'Attribute.value')
       end
 
       def self.create_from_kube(attribute_name, attribute_value)
         Attribute.new(attribute_name, attribute_value)
       end
 
+      protected
+
+      attr_reader :name, :value
+
     end
   end
 end

data/lib/crd_parser/component_def.rb

@@ -1,21 +1,17 @@
 module DTK::CrdParser
   class ComponentDef < BaseClass
       require_relative('component_def/attribute_type_info')
-
-      attr_reader :name, :namespace, :resource_version, :attribute_type_info, :bash_script, :entrypoint, :type
+      require_relative('error')
 
       MODE_DEFAULT = :component_instance
 
-      def initialize(metadata, componentDefAction, componentDefAttributes)
-        @name             = metadata[:name]
-        @namespace        = metadata[:namespace]
-        @resource_version = metadata[:resourceVersion]
-
-        @bash_script = componentDefAction[:bash_script]
-        @entrypoint  = componentDefAction[:entrypoint]
-        @type        = componentDefAction[:type]
+      def initialize(metadata, componentDefActions, componentDefAttributes)
+        @name             = fail_if_nil(metadata[:name], 'metadata[:name]')
+        @namespace        = fail_if_nil(metadata[:namespace], 'metadata[:namespace]')
+        @resource_version = fail_if_nil(metadata[:resourceVersion], 'metadata[:resourceVersion]')
 
-        @attribute_type_info  = componentDefAttributes
+        @executable_actions  = componentDefActions || []
+        @attribute_type_info  = componentDefAttributes || []
       end
 
       def self.create_from_kube(client, component_instance, component_def_name)
@@ -24,15 +20,17 @@ module DTK::CrdParser
         
         componentDef = client.get_componentdef("#{destructured_component[:moduleName]}-#{destructured_component[:componentName]}", module_ref[:namespace])
 
-        name            = componentDef[:metadata][:name]
-        namespace       = componentDef[:metadata][:namespace]
-        resourceVersion = componentDef[:metadata][:resourceVersion]
+        componentMetadata = self.metadata(componentDef)
+        
+        name            = componentMetadata[:name]
+        namespace       = componentMetadata[:namespace]
+        resourceVersion = componentMetadata[:resourceVersion]
 
-        componentDefSpec       = componentDef[:spec]
-        componentDefAction     = componentDefSpec[:actions][destructured_component[:action].to_sym]
+        componentDefSpec       = componentDef[:spec] || {}
+        componentDefAction     = componentDefSpec[:actions][destructured_component[:action].to_sym] if componentDefSpec[:actions]
         componentDefAttributes = []
     
-        componentDefSpec[:attributes].each do |attribute| 
+        (componentDefSpec[:attributes] || []).each do |attribute| 
           componentDefAttributes.push AttributeTypeInfo.resolveAttr(attribute)
         end
 
@@ -80,5 +78,13 @@ module DTK::CrdParser
           action: action
         }
       end
+
+      protected
+
+      attr_reader :name, :namespace, :resource_version, :attribute_type_info, :bash_script, :entrypoint, :type
+
+      def self.metadata(componentDef)
+        componentDef[:metadata]
+      end
   end
 end

data/lib/crd_parser/component_def/attribute_type_info.rb

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

data/lib/crd_parser/error.rb

@@ -0,0 +1,5 @@
+module DTK::CrdParser
+  class Error < ::StandardError
+    require_relative('error/usage')
+  end
+end

data/lib/crd_parser/error/usage.rb

@@ -0,0 +1,6 @@
+module DTK::CrdParser
+  class Error 
+    class Usage < self
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dtk_crd_parser
 version: !ruby/object:Gem::Version
-  version: 0.0.39
+  version: 0.0.40
 platform: ruby
 authors:
 - DTK
@@ -17,12 +17,15 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/crd_parser.rb
+- lib/crd_parser/action.rb
 - lib/crd_parser/base_class.rb
 - lib/crd_parser/base_class/helper_mixins.rb
 - lib/crd_parser/component.rb
 - lib/crd_parser/component/attribute.rb
 - lib/crd_parser/component_def.rb
 - lib/crd_parser/component_def/attribute_type_info.rb
+- lib/crd_parser/error.rb
+- lib/crd_parser/error/usage.rb
 homepage: https://rubygems.org/gems/dtk_crd_parser
 licenses:
 - MIT
@@ -42,8 +45,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Parse kubernetes DTK crd to ruby in memory object!