Refactor ConfigurationScriptSource#sync

ManageIQ · Nov 14, 2023 · ce29cbd · ce29cbd
1 parent fc8709e
commit ce29cbd
Showing 1 changed file with 33 additions and 27 deletions.
diff --git a/app/models/manageiq/providers/workflows/automation_manager/configuration_script_source.rb b/app/models/manageiq/providers/workflows/automation_manager/configuration_script_source.rb
@@ -11,35 +11,28 @@ def sync
     transaction do
       current = configuration_script_payloads.index_by(&:name)
 
-      git_repository.update_repo
-      git_repository.with_worktree do |worktree|
-        worktree.ref = scm_branch
-        worktree.blob_list.each do |filename|
-          next if filename.start_with?(".") || !filename.end_with?(".asl")
-
-          payload = worktree.read_file(filename)
-          payload_valid, payload_error =
-            begin
-              Floe::Workflow.new(payload)
-              true
-            rescue Floe::InvalidWorkflowError => err
-              [false, err.message]
-            end
-
-          found = current.delete(filename) || self.class.module_parent::Workflow.new(:configuration_script_source_id => id)
-
-          found.update!(
-            :name          => filename,
-            :manager_id    => manager_id,
-            :payload       => payload,
-            :payload_type  => "json",
-            :payload_valid => payload_valid,
-            :payload_error => payload_error
-          )
-        end
+      each_file do |filename, payload|
+        payload_valid, payload_error =
+          begin
+            Floe::Workflow.new(payload)
+            true
+          rescue Floe::InvalidWorkflowError => err
+            [false, err.message]
+          end
+
+        found = current.delete(filename) || self.class.module_parent::Workflow.new(:configuration_script_source_id => id)
+
+        found.update!(
+          :name          => filename,
+          :manager_id    => manager_id,
+          :payload       => payload,
+          :payload_type  => "json",
+          :payload_valid => payload_valid,
+          :payload_error => payload_error
+        )
       end
 
-      current.values.each(&:destroy)
+      current.each_value(&:destroy)
       configuration_script_payloads.reload
     end
 
@@ -48,4 +41,17 @@ def sync
     update!(:status => "error", :last_updated_on => Time.zone.now, :last_update_error => error)
     raise error
   end
+
+  def each_file
+    git_repository.update_repo
+    git_repository.with_worktree do |worktree|
+      worktree.ref = scm_branch
+      worktree.blob_list.each do |filename|
+        next if filename.start_with?(".") || !filename.end_with?(".asl")
+
+        payload = worktree.read_file(filename)
+        yield filename, payload
+      end
+    end
+  end
 end