dtk_crd_parser 0.0.119 → 0.0.120

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09f76186279f724068a8af9cc40ea26911f9ec21f2693e6d4832f182054826c3'
-  data.tar.gz: 02b20b98f5e8fba5896a0340d9a11d30e7238f7100eb599cb5714b4901c7c5d5
+  metadata.gz: 3e640e4368d77e243f6ac3a6708bd973ee577ee776c6b696463eedab261c7a58
+  data.tar.gz: bfcc94d9e7109279d9cf9bdd36c0e33630ae0dfd26c08e327312ed4f161e1974
 SHA512:
-  metadata.gz: 235167ca40dc072d872e186b97abdd339845d538e33616cac5dddd1f0890d5758f6f6bec3ae1a3e77c795494f3489f593e074f150dd933c632501ac351c442f2
-  data.tar.gz: 4f1275153aeff5045bba2dbe8d7f6324cd59e7ed7f26ad330f525c799dcc6f9f27e5587f38fbd6c670daaff835f3a0195a22ff209b5cdb73a0dfc613d66f7609
+  metadata.gz: 6fb83a5e7fc5a0b4ddc85d0a47273f299a5894327734ef9e61e5d7bbe0ce63ab810668bd8c82c8342facbe4dfc21e1b5d1fc61ea3325adbb5921f0227145634e
+  data.tar.gz: 5d7a6885f15dd4776d51dcfd6fdf11319d2ae00db076b9dc8ddb982b08bc0b8cbf58ddafa73df261c299c904347dbe7781ec9056b8d33237aa3feb385d9c97c3

data/lib/crd_parser/base_class/helper_mixins.rb

@@ -3,6 +3,26 @@ module DTK::CrdParser
     module Helper
       module ClassAndInstanceMixin
         # Helper functions want to have available in all classes
+        
+        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 : nil
+      
+          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
 
         def fail_if_nil(value, property_name)
           fail Error::Usage, "Property #{property_name} should not be nil" unless value

data/lib/crd_parser/component.rb

@@ -19,8 +19,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])
-      component_attributes
+      name_value = self.destructureActionComponent(component_name)[:attributeName]
+      Logger.new('/proc/1/fd/1').info "Name value: #{name_value}"
       attributes = []
+      attributes.push(Attribute.create_from_kube("name", name_value))
       if component_attributes
         (component_attributes.to_hash || []).each do |attribute_name, attribute_value|
           attribute_type_info = (component_def.attribute_type_info

data/lib/crd_parser/component_def.rb

@@ -64,25 +64,6 @@ module DTK::CrdParser
         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 : nil
-    
-        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
       protected
       def self.metadata(componentDef)
         componentDef[:metadata]

metadata

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