dtk_crd_parser 0.0.141 → 0.0.142

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99b49a025dd321de393fc028ff69692f492fed6e
-  data.tar.gz: ebdfbc850c67b77296bd9d348a11cda658091f64
+  metadata.gz: 6e4d795c7de81003022f7d6b4e1c0d43bdb793bc
+  data.tar.gz: a39d3475452c38ce2cc3910fc664c90849c26446
 SHA512:
-  metadata.gz: 484ed3104e6d45c4f0cc94378fa6cb4bda9b3636b2682f0b354129120548d206b08cb3d4843d49d772ae65466aac066644afcc799a184a3e6ae984884a405430
-  data.tar.gz: 1cb529cca089d09bd2b3b5fb56c2702e4064c1719baad486ee15ef704edd0f52af2b2831d369b624f1aafee3046bd93e0155ec359a5379f934dc5768b226c130
+  metadata.gz: 26e8d08f78a0d7a8ba75dddb5ade164de797d5b242fcfb37c7d1e39d531a598cc68cc7d834bd7444c32c3743ae31bd5bf1c6c4f5108c2e5ccf31c2ae70dd1f17
+  data.tar.gz: 4842b329890b511743c2f1de75b75020af9e3bbc83730314d05b8bfd9f3af92fcd470a11b57255cc8a04247710bfdc41f50b39b438500d6a1c4bfa9bfe551b80

data/lib/crd_parser/action/executable_action.rb

@@ -16,16 +16,14 @@ module DTK::CrdParser
       component_obj = Component.create_from_kube(client, component_instance, component_name)
       actions = component_obj.component_def.executable_actions
       executable_actions = Hash.new
-      if actions
-        actions.to_hash.each do |name, action|
-          params = {
-            name: name.to_s,
-            entrypoint: action[:entrypoint] || "",
-            type: action[:type] || "",
-            bash_script: action[:bash_script] || ""
-          }
-          executable_actions[name.to_sym] = ExecutableAction.new(params)
-        end
+      actions.to_hash.each do |name, action|
+        params = {
+          name: name.to_s,
+          entrypoint: action[:entrypoint] || "",
+          type: action[:type] || "",
+          bash_script: action[:bash_script] || ""
+        }
+        executable_actions[name.to_sym] = ExecutableAction.new(params)
       end
       executable_actions
     end

data/lib/crd_parser/base_class/helper_mixins.rb

@@ -3,32 +3,9 @@ module DTK::CrdParser
     module Helper
       module ClassAndInstanceMixin
         # Helper functions want to have available in all classes
-        def self.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 : 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" if value.nil?
+          fail Error::Usage, "Property #{property_name} should not be nil" unless value
           value
         end
 
@@ -49,36 +26,6 @@ module DTK::CrdParser
           end
           fail "#{the_method} is not defined in the concrete class #{klass}"
         end
-
-        def decrypt_if_encrypted(data_to_decrypt, encrypted)
-          return nil             if data_to_decrypt.nil?
-          return data_to_decrypt unless encrypted
-          #get secret to get the key
-          secret = secret()
-          decipher = OpenSSL::Cipher::AES256.new :CBC
-          decipher.decrypt
-          begin
-            decoded = Base64.decode64(data_to_decrypt)
-            # iv is 16byte string prepended to the encrypted value
-            iv, encrypted = [decoded[0,16], decoded[16..-1]]
-            decipher.key = secret[:key]
-            decipher.iv  = iv
-            plain_text = decipher.update(encrypted) + decipher.final
-            plain_text
-          rescue => exception
-            Logger.new('/proc/1/fd/1').error exception.message
-          end
-        end   
-
-        def secret
-          encrypt_key = ENV["ENCRYPTION_KEY"]
-          iv = ENV["ENCRYPTION_IV"]
-          {
-            key: encrypt_key,
-            iv: iv
-          }
-        end
-
       end
     end
   end

data/lib/crd_parser/component.rb

@@ -15,19 +15,13 @@ module DTK::CrdParser
     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])
-      attribute_name_value = BaseClass::Helper::ClassAndInstanceMixin.destructureActionComponent(component_name)[:attributeName]
       attributes = []
-      attributes.push(Attribute.create_from_kube("name", attribute_name_value, {}))
       if component_attributes
-        (component_attributes.to_hash || []).each do |attribute_name, attribute_value|
-          attribute_type_info = (component_def.attribute_type_info
-          .select {|attribute| attribute.name == attribute_name.to_s} || []).first
-          encrypted = attribute_type_info.encrypted if attribute_type_info
-          attributes.push Attribute.create_from_kube(attribute_name, attribute_value, {encrypted: encrypted || false})
+        component_attributes.to_hash.each do |attribute_name, attribute_value|
+          attributes.push Attribute.create_from_kube(attribute_name, attribute_value)
         end
       end
       Component.new(component_name, component_def, attributes)
@@ -37,9 +31,8 @@ module DTK::CrdParser
     protected
 
     def self.getComponentAttributes(fullComponentName, components)
-      component = (components || []).each do |component|
-        name = (component.to_h).keys.first.to_s.gsub!('_', '-')
-        componentObj = component[(component.to_h).keys.first.to_s] if (fullComponentName == name)
+      component = components.each do |component|
+        componentObj = component[fullComponentName]
         if(componentObj && componentObj.is_a?(Kubeclient::Resource))
           return componentObj[:attributes]
         end

data/lib/crd_parser/component/attribute.rb

@@ -4,13 +4,13 @@ module DTK::CrdParser
 
       attr_reader :name, :value
 
-      def initialize(name, value, params = {})
+      def initialize(name, value)
         @name      = fail_if_nil(name, 'Attribute.name')
-        @value     = fail_if_nil(decrypt_if_encrypted(value, params[:encrypted]), 'Attribute.value')
+        @value     = fail_if_nil(value, 'Attribute.value')
       end
 
-      def self.create_from_kube(attribute_name, attribute_value, params)
-        Attribute.new(attribute_name, attribute_value, params)
+      def self.create_from_kube(attribute_name, attribute_value)
+        Attribute.new(attribute_name, attribute_value)
       end
 
     end

data/lib/crd_parser/component_def.rb

@@ -16,7 +16,7 @@ module DTK::CrdParser
       end
 
       def self.create_from_kube(client, component_instance, component_def_name)
-        destructured_component = BaseClass::Helper::ClassAndInstanceMixin.destructureActionComponent(component_def_name)
+        destructured_component = destructureActionComponent(component_def_name)
         module_ref             = resolveModuleReference(component_instance[:references][:module_refs], component_def_name, destructured_component[:moduleName])
         
         componentDef = client.get_componentdef("#{destructured_component[:moduleName]}-#{destructured_component[:componentName]}", module_ref[:namespace])
@@ -34,8 +34,8 @@ module DTK::CrdParser
           componentDefAction     = componentDefSpec[:actions]
         end
         componentDefAttributes = []
-
-        (componentDefSpec[:attributes] || []).each do |attribute|
+    
+        (componentDefSpec[:attributes] || []).each do |attribute| 
           componentDefAttributes.push AttributeTypeInfo.resolveAttr(attribute)
         end
 
@@ -52,7 +52,7 @@ module DTK::CrdParser
 
       def self.resolveModuleReference(module_refs, component_full_name, module_name)
         raise "There are no module refs for component #{component_full_name} in component instance." if module_refs.nil? 
-        module_ref = module_refs.find { |module_ref| module_ref[:name].gsub!('_', '-') == module_name.gsub!('_', '-') }
+        module_ref = module_refs.find { |module_ref| module_ref[:name] == module_name }
         if(module_ref.nil?)
           raise "Could not resolve module reference for component #{component_full_name} in component instance. Expected to find: #{module_name}"
         end
@@ -64,6 +64,25 @@ 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]

data/lib/crd_parser/component_def/attribute_type_info.rb

@@ -2,14 +2,13 @@ module DTK::CrdParser
   class ComponentDef 
     class AttributeTypeInfo < BaseClass
 
-      attr_reader :name, :type, :required, :dynamic, :encrypted
+      attr_reader :name, :type, :required, :dynamic
 
       def initialize(params)
         @name      = params[:name]
         @type      = params[:type]
-        @required  = params[:required]  || false
-        @dynamic   = params[:dynamic]   || false
-        @encrypted = params[:encrypted] || false
+        @required  = params[:required] || false
+        @dynamic   = params[:dynamic]  || false
       end
 
       def self.resolveAttr(attribute)

metadata

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