dtk_crd_parser 0.0.49 → 0.0.50

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87986b80bc66541aa0486d02219457ce068d62a9aba4fa17fbe6d3ab6bcd3867
-  data.tar.gz: 2207dbe81ce58ccf344d3e42cd002d2dc032f77226c9af59a06c7d4788b476a0
+  metadata.gz: b17930d07113d4c72a5ade72bfde5d5ada0c23fe203972c186562347480a2bf4
+  data.tar.gz: '06249af234ebd0b082b88a29c67866207ed7933c7a7ee601e994101380530545'
 SHA512:
-  metadata.gz: 4df5920359db552d2a70f22b20339f73f87f9f7ba4c743c04a8ea40ef21e67be520a8618dd1f554a25f8d9f743ed1b13b1f7aa3142cfd5cf13d27e1bdb88de82
-  data.tar.gz: 5403231b980e18f763d04f05a6e3c4e4eb554d21bb5d6e7237220e0910a0631060f5214d98b2befcb3037d5fd7dbdc94b5f1cbf82eac4836c7f190b49bc43c2d
+  metadata.gz: 72efb5e8a133bede4f57eb5ce2b6404016087ecf3ed00b99a347023a7ec7fde8fa49a26112fac742df1f5506b3bc9bfebafddf698ecd0e7885308b3e53f96bf9
+  data.tar.gz: 15d7e401296342051f6f9ab7738417110c6e39ac9954484324bfb10fba091a3694837087620ae259cdc2fb5cc654070058b6c48e4ccc71be96308fc136546c06

data/lib/crd_parser/action/executable_action.rb

@@ -1,40 +1,30 @@
 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
+    def initialize(params)
+      @name = params[:name] || 'create'
+      @entrypoint = params[:entrypoint]
+      @type = params[:type]
+      @bash_script = params[:bash_script]
     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
+    private
 
-    @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
+    def self.create_from_kube(client, component_instance, component_name)
+      component_obj = Component.create_from_kube(client, component_instance, component_name)
+      actions = component_obj.component_def.executable_actions
+      executable_actions = Hash.new
+      actions.to_hash.each do |action|
+        params = {
+          :name = action.key,
+          :entrypoint = action[:entrypoint],
+          :type = action[:type],
+          :bash_script = action[:bash_script]
+        }
+        executable_actions[action.key] = ExecutableAction.new params
       end
+      executable_actions
     end
-    attr_reader :name, :component, :id
 
   end
 end

data/lib/crd_parser/action.rb

@@ -1,49 +1,10 @@
 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
-      @component = component #this will point to the corresponding component object, example: ec2::node-group[ng]
-      @id    = id #action subtask id
+    
+    def self.ndxExecutableActions(client, component_instance, component_name)
+      ExecutableAction.create_from_kube(client, component_instance, component_name)
     end
-
-    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.methods-Object.methods}"
-      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
-
-    @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.rb

@@ -15,7 +15,7 @@ module DTK
       end
 
       def self.parse_crd_to_actions(client, component_instance, component_name)
-        Action.create_from_kube(client, component_instance, component_name)
+        Action.ndxExecutableActions(client, component_instance, component_name)
       end
 
       private

metadata

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