dtk_crd_parser 0.0.23 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fd752de0c179287773c6096f4cf771eda2d6b6ddcdc41489e44e8c039852576
-  data.tar.gz: 5c322b20904b4ec6b5bfc4db684efd7be384982018051575e7bf5c831a8d3608
+  metadata.gz: 07165f1846624edc95156486af01baacf9296ce003f1882f07ed9ff2368599ae
+  data.tar.gz: 67637040432e0bc78c9ec429acb7476d14e5d86bc2e7e45ba06a53a1b7d140cd
 SHA512:
-  metadata.gz: 493934f54bb889e46a4ed6a6b198b8cb9acba2fc91fd6448787c027127414b3e0d6d4a37a0fa1380c7cd4db7269acde4168302dddae2cbebe5e7c7c256a59d78
-  data.tar.gz: 35da808c078b7018780672f04fdf3ad0d6754d23359edee21d55130d6a59125b5e10f4e30d867e5712e66ef7ca55f3f9c89a46c8ebc66f8e3c7bbc9fa1bde32e
+  metadata.gz: 804abf6b8dcab1e8e5da70220f6021a021396ea5db18166317fc59f19070938a40830519e2d317ee163deeb92bd425e6c2d597433c86bfdd39c426b404f4d4ac
+  data.tar.gz: d49f5da93f8e43b1a9a1332bc3838b5c99625c8df72ed7fb3884ad8277e34d6a22014e04a506db2473a1210871ad0d20b2b51738189342ebc8a07b9803275223

data/lib/crd_parser.rb

@@ -6,7 +6,7 @@ module DTK
       require_relative('crd_parser/component_def')
     
       def self.parse_crd_to_component(client, component_instance, component_name) 
-        #component instance has a name and a namespace
+        #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)

data/lib/crd_parser/base_class/helper_mixins.rb

@@ -21,30 +21,6 @@ module DTK::CrdParser
           end
           fail "#{the_method} is not defined in the concrete class #{klass}"
         end
-
-        def isOnSpecificNode(actionComponent)
-        	actionComponent.include? "/"
-        end
-        
-        def self.destructureActionComponent(actionComponent)
-          # regex to match component: module::name[attrName].action
-          regex = /(.*)::(.*)\[(.*)\].?(.*)/
-          # if component on node group node, get full name first
-          # i.e ec2::node[ng-1]/(node-utility::ssh-access[ubuntu])
-          nodeName, actionComponent = actionComponent.match(/(.*)\/(.*)/).captures if isOnSpecificNode(actionComponent)
-          compModule, compName, attributeName, action = actionComponent.match(regex).captures if actionComponent.match(regex)
-          action = (action && !action.empty?) ? action.to_sym : :create
-          if(compModule.nil? || compName.nil? || attributeName.nil?)
-              raise "Could not resolve component module, name or attribute name for component: #{actionComponent}"
-          end
-          {
-            moduleName: compModule,
-            componentName: compName,
-            attributeName: attributeName,
-            action: action
-          }
-        end
-
       end
     end
   end

data/lib/crd_parser/component.rb

@@ -13,16 +13,10 @@ module DTK::CrdParser
       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])
-      Logger.new('/proc/1/fd/1').info "COMPONENT ATTRIBUTES"
-      Logger.new('/proc/1/fd/1').info  component_attributes.to_hash
       attributes = []
       component_attributes.to_hash.each do |attribute_name, attribute_value|
-        Logger.new('/proc/1/fd/1').info "ATTRIBUTE"
-        Logger.new('/proc/1/fd/1').info attribute_name
         attributes.push Attribute.create_from_kube(attribute_name, attribute_value)
       end
-      Logger.new('/proc/1/fd/1').info "ATTRIBUTES"
-      Logger.new('/proc/1/fd/1').info  attributes
 			Component.new(component_name, component_def, attributes)
     end
 

data/lib/crd_parser/component_def.rb

@@ -5,9 +5,9 @@ module DTK::CrdParser
       MODE_DEFAULT = :component_instance
 
       def initialize(metadata, componentDefAction, componentDefAttributes)
-        @name = metadata[:name]
-        @namespace = metadata[:namespace]
-        @resourceVersion = metadata[:resourceVersion]
+        @name             = metadata[:name]
+        @namespace        = metadata[:namespace]
+        @resource_version = metadata[:resourceVersion]
 
         @bash_script = componentDefAction[:bash_script]
         @entrypoint  = componentDefAction[:entrypoint]
@@ -17,16 +17,14 @@ module DTK::CrdParser
       end
 
       def self.create_from_kube(client, component_instance, component_def_name)
-        module_name  = destructureActionComponent(component_def_name)[:moduleName]
-        component_name = destructureActionComponent(component_def_name)[:componentName]
-        action = destructureActionComponent(component_def_name)[:action]
-        module_ref   = resolveModuleReference(component_instance[:references][:module_refs], component_def_name, module_name)
-
+        { module_name, component_name, attribute_name, action } = destructureActionComponent(component_def_name)[:moduleName]
+        module_ref     = resolveModuleReference(component_instance[:references][:module_refs], component_def_name, module_name)
+        
         componentDef = client.get_componentdef("#{module_name}-#{component_name}", module_ref[:namespace])
 
         name            = componentDef[:metadata][:name]
         namespace       = componentDef[:metadata][:namespace]
-        resourceVersion = componentDef[:metadata][:namespace]
+        resource_version = componentDef[:metadata][:resourceVersion]
 
         componentDefSpec       = componentDef[:spec]
         componentDefAction     = componentDefSpec[:actions][action.to_sym]
@@ -39,7 +37,7 @@ module DTK::CrdParser
         metadata = {
           name: name, 
           namespace: namespace, 
-          resourceVersion: resourceVersion
+          resource_version: resource_version
         }
 
         ComponentDef.new(metadata, componentDefAction, componentDefAttributes)  
@@ -83,7 +81,7 @@ module DTK::CrdParser
 
       protected
 
-      attr_reader :name, :namespace, :attribute_type_info, :bash_script, :entrypoint, :type
+      attr_reader :name, :namespace, :resource_version, :attribute_type_info, :bash_script, :entrypoint, :type
     
   end
 end

metadata

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