Merge pull request #615 from ExalDraen/bolt-supp-facts-update

(#616) Extract playbook name correcly from facts
choria-legacy · Dec 5, 2019 · 44ce823 · 44ce823
2 parents ff398cf + ff51895
commit 44ce823
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/mcollective/util/bolt_support.rb b/lib/mcollective/util/bolt_support.rb
@@ -171,9 +171,9 @@ def run_task(scope, type, properties)
       def assign_playbook_name(scope)
         return unless scope
         return unless scope["facts"]["choria"]
-        return unless scope["facts"]["choria"]["plan"]
+        return unless scope["facts"]["choria"]["playbook"]
 
-        playbook.metadata["name"] = scope["facts"]["choria"]["plan"]
+        playbook.metadata["name"] = scope["facts"]["choria"]["playbook"]
       end
     end
   end

diff --git a/spec/unit/mcollective/util/bolt_support_spec.rb b/spec/unit/mcollective/util/bolt_support_spec.rb
@@ -17,7 +17,7 @@ module Util
       describe "#assign_playbook_name" do
         it "should assign the playbook name from scope" do
           expect(playbook.name).to be_nil
-          support.assign_playbook_name("facts" => {"choria" => {"plan" => "rspec"}})
+          support.assign_playbook_name("facts" => {"choria" => {"playbook" => "rspec"}})
           expect(playbook.name).to eq("rspec")
         end