dtk_crd_parser 0.0.43 → 0.0.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d562bbe941b66feb7526d0ec6addac43fcb098ef66b8f462abcf079a82dacb6
-  data.tar.gz: d204a7f8c6c3e0f8c42c435ef5df81f06e6b870c0e05f9b15357da9dd75b5727
+  metadata.gz: bbb23a6509a68409dfa65e2f1b3be3ec1398d9eb52bf140dba8351741728e9e5
+  data.tar.gz: 480c95c6f9db91bc00774c1176798e51b2cb3aaf7d367391df5632e8507209e0
 SHA512:
-  metadata.gz: 6598e39a8eb3313b6f66d4847220525e139d274953305ee61d421298390557bfe91e8573765d26fa58336f2c7822221962ed2b0d5517d02c42572f65d228ad99
-  data.tar.gz: b6107d0bb70bdaa1e466d767603dca007edb6381afee373c4231794aa32d50eb2341ec4368e9c2d59166fbcfc06b38fcf60e0ab397746f8f00c9235ab63b7f5b
+  metadata.gz: 84d24834a49e1e716e12b9210c53b4b9172f3ebe606005636e12b7b80d7c0eafd376e5f22cf8c56d321e91a8ec81558458475ad9ec81974277c8eea9a2f8d52b
+  data.tar.gz: 56edb7a125fdf3c5c8ddeb882c664c26ffd49d74b3f23e138d394241cb1c1262d97065e4345ef3542551e9f854b8b04b4b8969fd3f1c202ade998919ce7c43c5

data/lib/crd_parser/action/executable_action.rb

@@ -0,0 +1,40 @@
+module DTK::CrdParser
+  class ExecutableAction < BaseClass
+
+    def initialize(name, id, component)
+      @name = name #action name, for example: create node group members
+      @component = component #this will point to the corresponding component object, example: ec2::node-group[ng]
+      @id    = id #action subtask id
+    end
+
+    def self.create_from_kube(client, component_instance, action_instance)
+      action_obj = client.get_action(action_instance[:name], action_instance[:namespace])
+      @actionExists = false
+      action = find_action(action_instance[:id], action_obj[:spec][:action])
+      component_name = action[:component]
+      component = Component.create_from_kube(client, component_instance, component_name)
+			Action.new(action[:name], action[:id], component)
+    end
+
+    protected
+
+    @action = nil
+    @actionExists = false
+    def self.find_action(id, actionObject)
+      return @action if @actionExists 
+      iterator = 0
+      while (!@actionExists && iterator < actionObject[:subtasks].length)
+        @action = actionObject[:subtasks][iterator]
+        if @action.id.to_s == id.to_s
+          @actionExists = true
+          return @action
+        elsif @action[:subtasks]
+          return self.find_action(id, @action)
+        end
+        iterator+=1
+      end
+    end
+    attr_reader :name, :component, :id
+
+  end
+end

data/lib/crd_parser/action.rb

@@ -1,5 +1,6 @@
 module DTK::CrdParser
   class Action < BaseClass
+    require_relative('action/executable_action')
 
     def initialize(name, id, component)
       @name = name #action name, for example: create node group members
@@ -7,13 +8,21 @@ module DTK::CrdParser
       @id    = id #action subtask id
     end
 
-    def self.create_from_kube(client, component_instance, action_instance)
-      action_obj = client.get_action(action_instance[:name], action_instance[:namespace])
-      @actionExists = false
-      action = find_action(action_instance[:id], action_obj[:spec][:action])
-      component_name = action[:component]
-      component = Component.create_from_kube(client, component_instance, component_name)
-			Action.new(action[:name], action[:id], component)
+    def self.create_from_kube(client, component_instance, component_name)
+      Logger.new('/proc/1/fd/1').info 'Action.create_from-kube'
+      component_obj = Component.create_from_kube(client, component_instance, component_name)
+      Logger.new('/proc/1/fd/1').info "Component object is: #{component_obj}"
+      actions = component_obj[:component_def][:executable_actions]
+      Logger.new('/proc/1/fd/1').info "actions are: #{actions}"
+      actions_hash = Hash.new
+      actions.each do |action|
+        Logger.new('/proc/1/fd/1').info action
+        actions_hash[action] = action
+      end
+      # component_name = action[:component]
+      # component = Component.create_from_kube(client, component_instance, component_name)
+      # Action.new(action[:name], action[:id], component)
+      actions
     end
 
     protected

data/lib/crd_parser/component_def.rb

@@ -21,13 +21,17 @@ module DTK::CrdParser
         componentDef = client.get_componentdef("#{destructured_component[:moduleName]}-#{destructured_component[:componentName]}", module_ref[:namespace])
 
         componentMetadata = self.metadata(componentDef)
-        
+
         name            = componentMetadata[:name]
         namespace       = componentMetadata[:namespace]
         resourceVersion = componentMetadata[:resourceVersion]
 
         componentDefSpec       = componentDef[:spec] || {}
-        componentDefAction     = componentDefSpec[:actions][destructured_component[:action].to_sym] if componentDefSpec[:actions]
+        if componentDefSpec[:actions]
+          componentDefAction     = componentDefSpec[:actions][destructured_component[:action].to_sym] 
+        else
+          componentDefAction     = componentDefSpec[:actions]
+        end
         componentDefAttributes = []
     
         (componentDefSpec[:attributes] || []).each do |attribute| 

data/lib/crd_parser.rb

@@ -14,15 +14,10 @@ module DTK
         Component.create_from_kube(client, component_instance, component_name)
       end
 
-      def self.parse_crd_to_action(client, component_instance, action_instance)
-        #component instance has a name and a namespace {name: xxx, namespace: yyy}
-        #client is kube client
-        #action instance, for example, {name: xxx, namespace: xxx, id: xxx}
-        Action.create_from_kube(client, component_instance, action_instance)
+      def self.parse_crd_to_actions(client, component_instance, component_name)
+        Action.create_from_kube(client, component_instance, component_name)
       end
 
-      def self.parse_crd_to_executable_action(client, component_instance, component_name)
-        Component.create_from_kube(client, component_instance, component_name)
-      end
+      private
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dtk_crd_parser
 version: !ruby/object:Gem::Version
-  version: 0.0.43
+  version: 0.0.44
 platform: ruby
 authors:
 - DTK
@@ -18,6 +18,7 @@ extra_rdoc_files: []
 files:
 - lib/crd_parser.rb
 - lib/crd_parser/action.rb
+- lib/crd_parser/action/executable_action.rb
 - lib/crd_parser/base_class.rb
 - lib/crd_parser/base_class/helper_mixins.rb
 - lib/crd_parser/component.rb