Merge pull request #337 from treydock/task-env

(#336) Ensure tasks from non-production environments actually work
choria-io · Jan 5, 2024 · f426c22 · f426c22
2 parents 8289e03 + 44ebf35
commit f426c22
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/lib/puppet/functions/choria/tasks/metadata.rb b/lib/puppet/functions/choria/tasks/metadata.rb
@@ -6,6 +6,7 @@
 Puppet::Functions.create_function(:"choria::tasks::metadata") do
   dispatch :fetch do
     param "String", :task
+    optional_param "String", :tasks_environment
   end
 
   def init
@@ -23,7 +24,7 @@ def tasks_support
     @__tasks ||= choria.tasks_support
   end
 
-  def fetch(task)
-    tasks_support.task_metadata(task, "production")
+  def fetch(task, tasks_environment = "production")
+    tasks_support.task_metadata(task, tasks_environment)
   end
 end
diff --git a/plans/tasks/run.pp b/plans/tasks/run.pp
@@ -27,15 +27,15 @@
   Optional[String[1]] $run_as = undef,
   String[1] $tasks_environment = "production",
 ) {
-  $metadata = choria::tasks::metadata($task)
+  $metadata = choria::tasks::metadata($task, $tasks_environment)
 
   choria::tasks::validate_input($inputs, $metadata)
 
   choria::run_playbook("choria::tasks::download_files",
-    "nodes"       => $nodes,
-    "task"        => $task,
-    "files"       => $metadata["files"],
-    "environment" => $tasks_environment,
+    "nodes"             => $nodes,
+    "task"              => $task,
+    "files"             => $metadata["files"],
+    "tasks_environment" => $tasks_environment,
   )
 
   if $background {