dtk_crd_parser 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e69f417b48d667384312f79a580f591788d3e677
-  data.tar.gz: e77320a777a0c480e2defc94db3c3660796215bf
+SHA256:
+  metadata.gz: 0b316954698aad33c94166b5b09753eab5cf18e7dcae410dcd44e01238438283
+  data.tar.gz: 77bcb6650089a88cb5b807095727307a3d407d90a1b9cbc16a1cc5f84e0d7e26
 SHA512:
-  metadata.gz: 7009538c93dc66dcaa01df238cef75eeea2b0d057582c24a6dff709c48cfac148dea0bb11f7f2503c08f7ac4a85b7137a76fc761cbe3f1a99c12b31a9b8ebe11
-  data.tar.gz: c19e34dad7e41474b19460ad95efba219b4ba4c9d952605460209f0afc6bfbb25c0e94bbe85e94452d6f03606b98710ef7f7ec379b180b11f66c830dfa059ff3
+  metadata.gz: 35870fce2c10a834ca1607e44a5162f68009d4799bb185872daa867a24098fd50f8f9d564af1995685bb33210f0349964c399e0dd6e4c1eb673800ba1f30d0a6
+  data.tar.gz: 8cfa8662fac82c19972a5b1748deb4513fb23ed76659dc6cc3050a228c7ba13e33e8fafd344a1ed6882f29833b76612920fc30a81703c161421e8f5e6aee2a9f

data/lib/crd_parser/base_class/helper_mixins.rb

@@ -21,18 +21,19 @@ module DTK::CrdParser
           end
           fail "#{the_method} is not defined in the concrete class #{klass}"
         end
-        
+
         def isOnSpecificNode(actionComponent)
         	actionComponent.include? "/"
-      	end
-
-        def destructureActionComponent(actionComponent)
+        end
+        
+        def self.destructureActionComponent(actionComponent)
+          puts 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
+          compModule, compName, attributeName, action = actionComponent.match(regex).captures if actionComponent
           action = !action.empty? ? action.to_sym : :create
       
           if(compModule.nil? || compName.nil? || attributeName.nil?)
@@ -49,4 +50,4 @@ module DTK::CrdParser
       end
     end
   end
-end
+end

data/lib/crd_parser/component_def.rb

@@ -18,7 +18,8 @@ module DTK::CrdParser
 
       def self.create_from_kube(client, component_instance, component_def_name)
         puts 'COMPONENT DEF'
-        module_ref   = resolveModuleReference(component_instance.module_refs, component_def_name, destructureActionComponent(component_def_name)[:moduleName])
+        module_name  = destructureActionComponent(component_def_name)[:moduleName]
+        module_ref   = resolveModuleReference(component_instance.module_refs, component_def_name, module_name)
         componentDef = client.get_componentdef(component_def_name, module_ref[:namespace])
         
         name            = componentDef[:metadata][:name]
@@ -52,6 +53,32 @@ module DTK::CrdParser
         module_ref
       end
 
+
+      def self.isOnSpecificNode(actionComponent)
+        actionComponent.include? "/"
+      end
+      
+      def self.destructureActionComponent(actionComponent)
+        puts 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
+        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
+
       protected
 
       attr_reader :name, :namespace, :attribute_type_info, :bash_script, :entrypoint, :type

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dtk_crd_parser
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - DTK
@@ -42,8 +42,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Parse kubernetes DTK crd to ruby in memory object!