dtk_crd_parser 0.0.155 → 0.0.156

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aff9402bfe8223f3a551e79137e097e2248040603cd2c22d57a59768deac63b7
-  data.tar.gz: 10b0282003ae2af0b69af3e902fbbe23b5ca9dbd8b7a120e5fb56efbc428bad2
+  metadata.gz: 467f780a2297cfee69677b17950a64dea62f028d12fbadcdcd4385d0e40f6def
+  data.tar.gz: a1e1755f4a78d542db97fb36c9ba94f77b877018e9288437373293d49384fbe1
 SHA512:
-  metadata.gz: 364dd70b869f42ada7d4cab6fd8922f4798c25d2b522f9cd53222ee443c68d6c743357ad5b8582bee9da456c11c6e93d568fee5f3c6a274e7999ccc85d542d9f
-  data.tar.gz: 7fff179807c6d8dbc6b21559250abf9f5322a54fe01ab2db446be922edd24632b6fd0197e52033e5d3217000697a62f5ead072cc1764bac782794d1baff096ba
+  metadata.gz: 5661d32ed68b8d71aaf2d210362c74f98ec8d569636e09834ecceae2304c39ab45cc7f1a80d51afa0f3a1a3db9a472e23bd7229ceee5c45af270ff3b3b88641f
+  data.tar.gz: a7a0861b2b33222b5d78f7513ed806f507e0788bb140bf594d165114cda8b8469683c178aaad9e41e33ec510ee5f66b58a8828f1cfc1b6ffda2dd732ca05a050

data/lib/crd_parser.rb

@@ -11,17 +11,11 @@ module DTK
         #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 = Component.create_from_kube(client, component_instance, component_name)
-        Logger.new('/proc/1/fd/1').error "IN PARSER #{component}"
-        component
+        Component.create_from_kube(client, component_instance, component_name)
       end
 
       def self.parse_crd_to_actions(client, component_instance, component_name)
-        Logger.new('/proc/1/fd/1').error "actions IN PARSER "
-
-        action = Action.ndxExecutableActions(client, component_instance, component_name)
-        Logger.new('/proc/1/fd/1').error "action is IN PARSER #{action}"
-        action
+        Action.ndxExecutableActions(client, component_instance, component_name)
       end
 
       private

data/lib/crd_parser/action/executable_action.rb

@@ -14,10 +14,7 @@ module DTK::CrdParser
 
     def self.create_from_kube(client, component_instance, component_name)
       component_obj = Component.create_from_kube(client, component_instance, component_name)
-      Logger.new('/proc/1/fd/1').info "INITIALIZED COMPONENT iN PARSER ACTIONS "
-      Logger.new('/proc/1/fd/1').info component_obj
       actions = component_obj.component_def.executable_actions
-      Logger.new('/proc/1/fd/1').info "Actions IN PARSER: #{actions}"
       executable_actions = Hash.new
       if actions
         actions.to_hash.each do |name, action|
@@ -30,8 +27,6 @@ module DTK::CrdParser
           executable_actions[name.to_sym] = ExecutableAction.new(params)
         end
       end
-      Logger.new('/proc/1/fd/1').info "exec act IN PARSER: #{executable_actions}"
-
       executable_actions
     end
 

data/lib/crd_parser/base_class/helper_mixins.rb

@@ -15,7 +15,7 @@ module DTK::CrdParser
           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

data/lib/crd_parser/component.rb

@@ -29,6 +29,14 @@ module DTK::CrdParser
           attributes.push Attribute.create_from_kube(attribute_name, attribute_value, {encrypted: encrypted || false})
         end
       end
+      Logger.new('/proc/1/fd/1').error "PARSER: Mapping.."
+
+      other_attrs = component_def.attribute_type_info.map {|attribute| attributes.any? {|h| h.name == attribute.name } }
+      Logger.new('/proc/1/fd/1').error other_attrs
+      other_attrs.each do |attribute|
+        attributes.push Attribute.create_from_kube(attribute.name, "", {encrypted: attribute.encrypted  || false})
+      end
+      Logger.new('/proc/1/fd/1').error attributes
       Component.new(component_name, component_def, attributes)
     end
 

data/lib/crd_parser/component_def.rb

@@ -28,12 +28,7 @@ module DTK::CrdParser
         resourceVersion = componentMetadata[:resourceVersion]
 
         componentDefSpec       = componentDef[:spec] || {}
-        # if destructured_component[:action] && componentDefSpec[:actions]
-        #   componentDefAction     = componentDefSpec[:actions].to_h[destructured_component[:action].to_sym] 
-        #   componentDefAction     = Hash.new 
-        # else
-          componentDefAction     = componentDefSpec[:actions]
-        # end
+        componentDefAction     = componentDefSpec[:actions]
         componentDefAttributes = []
         (componentDefSpec[:attributes] || []).each do |attribute|
           componentDefAttributes.push AttributeTypeInfo.resolveAttr(attribute)
@@ -44,7 +39,7 @@ module DTK::CrdParser
           namespace: namespace, 
           resourceVersion: resourceVersion
         }
-        
+
         ComponentDef.new(metadata, componentDefAction, componentDefAttributes)  
       end
 

metadata

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