puppet 6.29.0-x64-mingw32 → 7.0.0-x64-mingw32

data/spec/unit/application/facts_spec.rb

@@ -3,7 +3,7 @@ require 'puppet/application/facts'
 
 describe Puppet::Application::Facts do
   let(:app) { Puppet::Application[:facts] }
-  let(:values) { {"filesystems" => "apfs,autofs,devfs", "macaddress" => "64:52:11:22:03:2e"} }
+  let(:values) { {"filesystems" => "apfs,autofs,devfs", "macaddress" => "64:52:11:22:03:25"} }
 
   before :each do
     Puppet::Node::Facts.indirection.terminus_class = :memory
@@ -21,7 +21,7 @@ describe Puppet::Application::Facts do
       name: whatever
       values:
         filesystems: apfs,autofs,devfs
-        macaddress: "64:52:11:22:03:2e"
+        macaddress: "64:52:11:22:03:25"
     END
 
     expect {
@@ -42,7 +42,7 @@ describe Puppet::Application::Facts do
       name: #{Puppet[:certname]}
       values:
         filesystems: apfs,autofs,devfs
-        macaddress: "64:52:11:22:03:2e"
+        macaddress: "64:52:11:22:03:25"
     END
 
     expect {
@@ -52,12 +52,7 @@ describe Puppet::Application::Facts do
   end
 
   context 'when show action is called' do
-    let(:expected) { <<~END }
-      {
-        "filesystems": "apfs,autofs,devfs",
-        "macaddress": "64:52:11:22:03:2e"
-      }
-    END
+    let(:expected) { "{\n  \"filesystems\": \"apfs,autofs,devfs\",\n  \"macaddress\": \"64:52:11:22:03:25\"\n}\n" }
 
     before :each do
       Puppet::Node::Facts.indirection.terminus_class = :facter
@@ -69,464 +64,25 @@ describe Puppet::Application::Facts do
       expect {
         app.run
       }.to exit_with(0)
-       .and output(expected).to_stdout
-    end
-
-    it 'displays a single fact value' do
-      app.command_line.args << 'filesystems' << '--value-only'
-      expect {
-        app.run
-      }.to exit_with(0)
-       .and output("apfs,autofs,devfs\n").to_stdout
-    end
-
-    it "warns and ignores value-only when multiple fact names are specified" do
-      app.command_line.args << 'filesystems' << 'macaddress' << '--value-only'
-      expect {
-        app.run
-      }.to exit_with(0)
-       .and output(expected).to_stdout
-       .and output(/it can only be used when querying for a single fact/).to_stderr
-    end
-
-    {
-      "type_hash" => [{'a' => 2}, "{\n  \"a\": 2\n}"],
-      "type_array" => [[], "[\n\n]"],
-      "type_string" => ["str", "str"],
-      "type_int" => [1, "1"],
-      "type_float" => [1.0, "1.0"],
-      "type_true" => [true, "true"],
-      "type_false" => [false, "false"],
-      "type_nil" => [nil, ""],
-      "type_sym" => [:sym, "sym"]
-    }.each_pair do |name, values|
-      it "renders '#{name}' as '#{values.last}'" do
-        fact_value = values.first
-        fact_output = values.last
-
-        allow(Facter).to receive(:resolve).and_return({name => fact_value})
-
-        app.command_line.args << name << '--value-only'
-        expect {
-          app.run
-        }.to exit_with(0)
-         .and output("#{fact_output}\n").to_stdout
-      end
+               .and output(expected).to_stdout
     end
   end
 
-  context 'when diff action is called' do
-    let(:facter3_facts) { <<~END }
-{
-  "hypervisors": {
-    "vmware": {
-      "version": ""
-    }
-  },
-  "networking": {
-    "interfaces": {
-      "lo": {
-        "bindings6": [
-          {
-            "network": "::1"
-          }
-        ]
-      },
-      "em0.1": {
-        "ip": "0.0.0.0"
-      }
-    }
-  },
-  "macaddress": "64:52:11:22:03:2e",
-  "obsolete_fact": "true",
-  "mountpoints": {
-    "/var": {
-      "options": [
-        "noatime",
-        "journaled",
-        "nobrowse"
-      ]
-    }
-  }
-}
-END
-
-    let(:facter4_facts) { <<~END }
-{
-  "hypervisors": {
-    "vmware": {
-      "version": "ESXi 6.7"
-    }
-  },
-  "networking": {
-    "interfaces": {
-      "lo": {
-        "bindings6": [
-          {
-            "network": "::1",
-            "scope6": "host"
-          }
-        ]
-      },
-      "em0.1": {
-        "ip": "127.0.0.1"
-      }
-    }
-  },
-  "macaddress": "64:52:11:22:03:2e",
-  "mountpoints": {
-    "/var": {
-      "options": [
-        "noatime",
-        "nobrowse",
-        "journaled"
-      ]
-    }
-  }
-}
-END
+  context 'when default action is called' do
+    let(:expected) { "---\nfilesystems: apfs,autofs,devfs\nmacaddress: 64:52:11:22:03:25\n" }
 
     before :each do
       Puppet::Node::Facts.indirection.terminus_class = :facter
-      app.command_line.args = %w{diff}
-
-      allow(Facter).to receive(:value).with('facterversion').and_return('3.99.0')
-      allow(Puppet::Util::Execution).to receive(:execute).with(/puppet facts show --no-facterng/, combine:false).and_return(facter3_facts)
-      allow(Puppet::Util::Execution).to receive(:execute).with(/puppet facts show --facterng/, combine:false).and_return(facter4_facts)
-    end
-
-    # Workaround for YAML issue on Ubuntu where null values get space as key
-    let(:regex) { false }
-    shared_examples_for 'correctly rendering output' do |render_format|
-      it 'correctly displays output' do
-        app.command_line.args << '--structured' if structured
-        app.command_line.args << '--exclude' << exclude if exclude
-        app.command_line.args << '--render-as' << render_format if render_format
-        expect {
-          app.run
-        }.to exit_with(0)
-         .and output(regex ? /#{expected_output}/ : expected_output).to_stdout
-      end
-    end
-
-    context 'when no exclude regex is provided via CLI' do
-      let(:exclude) { nil }
-      context 'when structured is requested' do
-        let(:structured) { true }
-        context 'when rendering is set to default' do
-          let(:expected_output) { <<~END }
-{
-  "hypervisors": {
-    "vmware": {
-      "version": {
-        "new_value": "ESXi 6.7",
-        "old_value": ""
-      }
-    }
-  },
-  "mountpoints": {
-    "/var": {
-      "options": {
-        "1": {
-          "new_value": "nobrowse",
-          "old_value": "journaled"
-        },
-        "2": {
-          "new_value": "journaled",
-          "old_value": "nobrowse"
-        }
-      }
-    }
-  },
-  "networking": {
-    "interfaces": {
-      "em0.1": {
-        "ip": {
-          "new_value": "127.0.0.1",
-          "old_value": "0.0.0.0"
-        }
-      },
-      "lo": {
-        "bindings6": {
-          "0": {
-            "scope6": {
-              "new_value": "host",
-              "old_value": null
-            }
-          }
-        }
-      }
-    }
-  },
-  "obsolete_fact": {
-    "new_value": null,
-    "old_value": "true"
-  }
-}
-END
-
-          it_behaves_like 'correctly rendering output'
-        end
-
-        context 'when rendering is set to yaml' do
-          # Workaround for YAML issue on Ubuntu where null values get space as key
-          let(:regex) { true }
-          let(:expected_output) { <<~END }
----
-hypervisors:
-  vmware:
-    version:
-      :new_value: ESXi 6\.7
-      :old_value: ''
-mountpoints:
-  "/var":
-    options:
-      1:
-        :new_value: nobrowse
-        :old_value: journaled
-      2:
-        :new_value: journaled
-        :old_value: nobrowse
-networking:
-  interfaces:
-    em0\.1:
-      ip:
-        :new_value: 127\.0\.0\.1
-        :old_value: 0\.0\.0\.0
-    lo:
-      bindings6:
-        0:
-          scope6:
-            :new_value: host
-            :old_value:\s?
-obsolete_fact:
-  :new_value:\s?
-  :old_value: 'true'
-END
-
-          it_behaves_like 'correctly rendering output', 'yaml'
-        end
-
-        context 'when rendering is set to json' do
-          let(:expected_output) { <<~END }
-{"hypervisors":{"vmware":{"version":{"new_value":"ESXi 6.7","old_value":""}}},\
-"mountpoints":{"/var":{"options":{"1":{"new_value":"nobrowse","old_value":"journaled"},\
-"2":{"new_value":"journaled","old_value":"nobrowse"}}}},"networking":{"interfaces":\
-{"em0.1":{"ip":{"new_value":"127.0.0.1","old_value":"0.0.0.0"}},"lo":{"bindings6":\
-{"0":{"scope6":{"new_value":"host","old_value":null}}}}}},"obsolete_fact":\
-{"new_value":null,"old_value":"true"}}
-END
-
-          it_behaves_like 'correctly rendering output', 'json'
-        end
-      end
-
-      context 'when structured is not requested' do
-        let(:structured) { false }
-        context 'when rendering is set to default' do
-          let(:expected_output) { <<~END }
-{
-  "hypervisors.vmware.version": {
-    "new_value": "ESXi 6.7",
-    "old_value": ""
-  },
-  "mountpoints./var.options.1": {
-    "new_value": "nobrowse",
-    "old_value": "journaled"
-  },
-  "mountpoints./var.options.2": {
-    "new_value": "journaled",
-    "old_value": "nobrowse"
-  },
-  "networking.interfaces.\\"em0.1\\".ip": {
-    "new_value": "127.0.0.1",
-    "old_value": "0.0.0.0"
-  },
-  "networking.interfaces.lo.bindings6.0.scope6": {
-    "new_value": "host",
-    "old_value": null
-  },
-  "obsolete_fact": {
-    "new_value": null,
-    "old_value": "true"
-  }
-}
-END
-
-          it_behaves_like 'correctly rendering output'
-        end
-
-        context 'when rendering is set to yaml' do
-          # Workaround for YAML issue on Ubuntu where null values get space as key
-          let(:regex) { true }
-          let(:expected_output) { <<~END }
----
-hypervisors\.vmware\.version:
-  :new_value: ESXi 6\.7
-  :old_value: ''
-mountpoints\./var\.options\.1:
-  :new_value: nobrowse
-  :old_value: journaled
-mountpoints\./var\.options\.2:
-  :new_value: journaled
-  :old_value: nobrowse
-networking\.interfaces\."em0\.1"\.ip:
-  :new_value: 127\.0\.0\.1
-  :old_value: 0\.0\.0\.0
-networking\.interfaces\.lo\.bindings6\.0\.scope6:
-  :new_value: host
-  :old_value:\s?
-obsolete_fact:
-  :new_value:\s?
-  :old_value: 'true'
-END
-
-          it_behaves_like 'correctly rendering output', 'yaml'
-        end
-
-        context 'when rendering is set to json' do
-          let(:expected_output) { <<~END }
-{"hypervisors.vmware.version":{"new_value":"ESXi 6.7","old_value":""},\
-"mountpoints./var.options.1":{"new_value":"nobrowse","old_value":"journaled"},\
-"mountpoints./var.options.2":{"new_value":"journaled","old_value":"nobrowse"},\
-"networking.interfaces.\\"em0.1\\".ip":{"new_value":"127.0.0.1",\
-"old_value":"0.0.0.0"},"networking.interfaces.lo.bindings6.0.scope6":\
-{"new_value":"host","old_value":null},"obsolete_fact":{"new_value":null,\
-"old_value":"true"}}
-END
-
-          it_behaves_like 'correctly rendering output', 'json'
-        end
-      end
-    end
-
-    context 'when unwanted facts are excluded from diff via CLI option' do
-      let(:exclude) { '^mountpoints\./var\.options.*$|^obsolete_fact$|^hypervisors' }
-      context 'when structured is requested' do
-        let(:structured) { true }
-        context 'when rendering is set to default' do
-          let(:expected_output) { <<~END }
-{
-  "networking": {
-    "interfaces": {
-      "em0.1": {
-        "ip": {
-          "new_value": "127.0.0.1",
-          "old_value": "0.0.0.0"
-        }
-      },
-      "lo": {
-        "bindings6": {
-          "0": {
-            "scope6": {
-              "new_value": "host",
-              "old_value": null
-            }
-          }
-        }
-      }
-    }
-  }
-}
-END
-
-          it_behaves_like 'correctly rendering output'
-        end
-
-        context 'when rendering is set to yaml' do
-          # Workaround for YAML issue on Ubuntu where null values get space as key
-          let(:regex) { true }
-          let(:expected_output) { <<~END }
----
-networking:
-  interfaces:
-    em0\.1:
-      ip:
-        :new_value: 127\.0\.0\.1
-        :old_value: 0\.0\.0\.0
-    lo:
-      bindings6:
-        0:
-          scope6:
-            :new_value: host
-            :old_value:\s?
-END
-
-          it_behaves_like 'correctly rendering output', 'yaml'
-        end
-
-        context 'when rendering is set to json' do
-          let(:expected_output) { <<~END }
-{"networking":{"interfaces":{"em0.1":{"ip":{"new_value":"127.0.0.1",\
-"old_value":"0.0.0.0"}},"lo":{"bindings6":{"0":{"scope6":{"new_value":\
-"host","old_value":null}}}}}}}
-END
-
-          it_behaves_like 'correctly rendering output', 'json'
-        end
-      end
-
-      context 'when structured is not requested' do
-        let(:structured) { false }
-        context 'when rendering is set to default' do
-          let(:expected_output) { <<~END }
-{
-  "networking.interfaces.\\"em0.1\\".ip": {
-    "new_value": "127.0.0.1",
-    "old_value": "0.0.0.0"
-  },
-  "networking.interfaces.lo.bindings6.0.scope6": {
-    "new_value": "host",
-    "old_value": null
-  }
-}
-END
-
-          it_behaves_like 'correctly rendering output'
-        end
-
-        context 'when rendering is set to yaml' do
-          # Workaround for YAML issue on Ubuntu where null values get space as key
-          let(:regex) { true }
-          let(:expected_output) { <<~END }
----
-networking\.interfaces\."em0\.1"\.ip:
-  :new_value: 127\.0\.0\.1
-  :old_value: 0\.0\.0\.0
-networking\.interfaces\.lo\.bindings6\.0\.scope6:
-  :new_value: host
-  :old_value:\s?
-END
-
-          it_behaves_like 'correctly rendering output', 'yaml'
-        end
-
-        context 'when rendering is set to json' do
-          let(:expected_output) { <<~END }
-{"networking.interfaces.\\"em0.1\\".ip":{"new_value":"127.0.0.1",\
-"old_value":"0.0.0.0"},"networking.interfaces.lo.bindings6.0.scope6":\
-{"new_value":"host","old_value":null}}
-END
-
-          it_behaves_like 'correctly rendering output', 'json'
-        end
-      end
-    end
-  end
-
-  context 'when default action is called' do
-    before :each do
-      Puppet::Node::Facts.indirection.terminus_class = :memory
-      facts = Puppet::Node::Facts.new('whatever', values)
-      Puppet::Node::Facts.indirection.save(facts)
+      allow(Facter).to receive(:resolve).and_return(values)
+      app.command_line.args = %w{--render-as yaml}
     end
 
-    it 'calls find action' do
+    it 'calls show action' do
       expect {
         app.run
       }.to exit_with(0)
-       .and output(anything).to_stdout
-      expect(app.action.name).to eq(:find)
+               .and output(expected).to_stdout
+      expect(app.action.name).to eq(:show)
     end
   end
 end

data/spec/unit/application/filebucket_spec.rb

@@ -42,6 +42,7 @@ describe Puppet::Application::Filebucket do
   describe "during setup" do
     before :each do
       allow(Puppet::Log).to receive(:newdestination)
+      allow(Puppet).to receive(:settraps)
       allow(Puppet::FileBucket::Dipper).to receive(:new)
       allow(@filebucket.options).to receive(:[])
     end
@@ -114,15 +115,15 @@ describe Puppet::Application::Filebucket do
       end
 
       it "should default to the first good server_list entry if server_list is set" do
-        stub_request(:get, "https://foo:8140/status/v1/simple/master").to_return(status: 200)
+        stub_request(:get, "https://foo:8140/status/v1/simple/server").to_return(status: 200)
         Puppet[:server_list] = "foo,bar,baz"
         expect(Puppet::FileBucket::Dipper).to receive(:new).with(hash_including(Server: "foo"))
         @filebucket.setup
       end
 
       it "should walk server_list until it finds a good entry" do
-        stub_request(:get, "https://foo:8140/status/v1/simple/master").to_return(status: 502)
-        stub_request(:get, "https://bar:8140/status/v1/simple/master").to_return(status: 200)
+        stub_request(:get, "https://foo:8140/status/v1/simple/server").to_return(status: 502)
+        stub_request(:get, "https://bar:8140/status/v1/simple/server").to_return(status: 200)
         Puppet[:server_list] = "foo,bar,baz"
         expect(Puppet::FileBucket::Dipper).to receive(:new).with(hash_including(Server: "bar"))
         @filebucket.setup
@@ -130,6 +131,8 @@ describe Puppet::Application::Filebucket do
 
       # FileBucket catches any exceptions raised, logs them, then just exits
       it "raises an error if there are no functional servers in server_list" do
+        stub_request(:get, "https://foo:8140/status/v1/simple/server").to_return(status: 404)
+        stub_request(:get, "https://bar:8140/status/v1/simple/server").to_return(status: 404)
         stub_request(:get, "https://foo:8140/status/v1/simple/master").to_return(status: 404)
         stub_request(:get, "https://bar:8140/status/v1/simple/master").to_return(status: 404)
         Puppet[:server] = 'horacio'
@@ -145,7 +148,7 @@ describe Puppet::Application::Filebucket do
       end
 
       it "should take both the server and port specified in server_list" do
-        stub_request(:get, "https://foo:632/status/v1/simple/master").to_return(status: 200)
+        stub_request(:get, "https://foo:632/status/v1/simple/server").to_return(status: 200)
         Puppet[:server_list] = "foo:632,bar:6215,baz:351"
         expect(Puppet::FileBucket::Dipper).to receive(:new).with({ :Server => "foo", :Port => 632 })
         @filebucket.setup
@@ -156,6 +159,7 @@ describe Puppet::Application::Filebucket do
   describe "when running" do
     before :each do
       allow(Puppet::Log).to receive(:newdestination)
+      allow(Puppet).to receive(:settraps)
       allow(Puppet::FileBucket::Dipper).to receive(:new)
       allow(@filebucket.options).to receive(:[])
 
@@ -185,11 +189,11 @@ describe Puppet::Application::Filebucket do
         @filebucket.get
       end
 
-      it "should call the client getfile method with the given md5" do
-        md5="DEADBEEF"
-        allow(@filebucket).to receive(:args).and_return([md5])
+      it "should call the client getfile method with the given digest" do
+        digest = 'DEADBEEF'
+        allow(@filebucket).to receive(:args).and_return([digest])
 
-        expect(@client).to receive(:getfile).with(md5)
+        expect(@client).to receive(:getfile).with(digest)
 
         @filebucket.get
       end
@@ -223,12 +227,12 @@ describe Puppet::Application::Filebucket do
     end
 
     describe "the command restore" do
-      it "should call the client getfile method with the given md5" do
-        md5="DEADBEEF"
-        file="testfile"
-        allow(@filebucket).to receive(:args).and_return([file, md5])
+      it "should call the client getfile method with the given digest" do
+        digest = 'DEADBEEF'
+        file = 'testfile'
+        allow(@filebucket).to receive(:args).and_return([file, digest])
 
-        expect(@client).to receive(:restore).with(file,md5)
+        expect(@client).to receive(:restore).with(file, digest)
 
         @filebucket.restore
       end
@@ -236,55 +240,55 @@ describe Puppet::Application::Filebucket do
 
     describe "the command diff" do
       it "should call the client diff method with 2 given checksums" do
-        md5a="DEADBEEF"
-        md5b="BEEF"
+        digest_a = 'DEADBEEF'
+        digest_b = 'BEEF'
         allow(Puppet::FileSystem).to receive(:exist?).and_return(false)
-        allow(@filebucket).to receive(:args).and_return([md5a, md5b])
+        allow(@filebucket).to receive(:args).and_return([digest_a, digest_b])
 
-        expect(@client).to receive(:diff).with(md5a,md5b, nil, nil)
+        expect(@client).to receive(:diff).with(digest_a, digest_b, nil, nil)
 
         @filebucket.diff
       end
 
-      it "should call the clien diff with a path if the second argument is a file" do
-        md5a="DEADBEEF"
-        md5b="BEEF"
-        allow(Puppet::FileSystem).to receive(:exist?).with(md5a).and_return(false)
-        allow(Puppet::FileSystem).to receive(:exist?).with(md5b).and_return(true)
-        allow(@filebucket).to receive(:args).and_return([md5a, md5b])
+      it "should call the client diff with a path if the second argument is a file" do
+        digest_a = 'DEADBEEF'
+        digest_b = 'BEEF'
+        allow(Puppet::FileSystem).to receive(:exist?).with(digest_a).and_return(false)
+        allow(Puppet::FileSystem).to receive(:exist?).with(digest_b).and_return(true)
+        allow(@filebucket).to receive(:args).and_return([digest_a, digest_b])
 
-        expect(@client).to receive(:diff).with(md5a, nil, nil, md5b)
+        expect(@client).to receive(:diff).with(digest_a, nil, nil, digest_b)
 
         @filebucket.diff
       end
 
-      it "should call the clien diff with a path if the first argument is a file" do
-        md5a="DEADBEEF"
-        md5b="BEEF"
-        allow(Puppet::FileSystem).to receive(:exist?).with(md5a).and_return(true)
-        allow(Puppet::FileSystem).to receive(:exist?).with(md5b).and_return(false)
-        allow(@filebucket).to receive(:args).and_return([md5a, md5b])
+      it "should call the client diff with a path if the first argument is a file" do
+        digest_a = 'DEADBEEF'
+        digest_b = 'BEEF'
+        allow(Puppet::FileSystem).to receive(:exist?).with(digest_a).and_return(true)
+        allow(Puppet::FileSystem).to receive(:exist?).with(digest_b).and_return(false)
+        allow(@filebucket).to receive(:args).and_return([digest_a, digest_b])
 
-        expect(@client).to receive(:diff).with(nil, md5b, md5a, nil)
+        expect(@client).to receive(:diff).with(nil, digest_b, digest_a, nil)
 
         @filebucket.diff
       end
 
       it "should call the clien diff with paths if the both arguments are files" do
-        md5a="DEADBEEF"
-        md5b="BEEF"
-        allow(Puppet::FileSystem).to receive(:exist?).with(md5a).and_return(true)
-        allow(Puppet::FileSystem).to receive(:exist?).with(md5b).and_return(true)
-        allow(@filebucket).to receive(:args).and_return([md5a, md5b])
+        digest_a = 'DEADBEEF'
+        digest_b = 'BEEF'
+        allow(Puppet::FileSystem).to receive(:exist?).with(digest_a).and_return(true)
+        allow(Puppet::FileSystem).to receive(:exist?).with(digest_b).and_return(true)
+        allow(@filebucket).to receive(:args).and_return([digest_a, digest_b])
 
-        expect(@client).to receive(:diff).with(nil, nil, md5a, md5b)
+        expect(@client).to receive(:diff).with(nil, nil, digest_a, digest_b)
 
         @filebucket.diff
       end
 
       it "should fail if only one checksum is given" do
-        md5a="DEADBEEF"
-        allow(@filebucket).to receive(:args).and_return([md5a])
+        digest_a = 'DEADBEEF'
+        allow(@filebucket).to receive(:args).and_return([digest_a])
 
         expect { @filebucket.diff }.to raise_error Puppet::Error
       end