chef-dk 2.4.17 → 2.5.3

data/spec/unit/policyfile/chef_repo_cookbook_source_spec.rb

@@ -1,93 +1,93 @@
-#
-# Copyright:: Copyright (c) 2014 Chef Software Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require "spec_helper"
-require "chef-dk/policyfile/chef_repo_cookbook_source"
-
-describe ChefDK::Policyfile::ChefRepoCookbookSource do
-
-  let(:repo_path) do
-    File.expand_path("spec/unit/fixtures/local_path_cookbooks", project_root)
-  end
-
-  let(:cookbook_source) { ChefDK::Policyfile::ChefRepoCookbookSource.new(repo_path) }
-
-  let(:local_repo_universe) do
-    {
-      "another-local-cookbook" => {
-        "0.1.0" => [],
-      },
-      "local-cookbook" => {
-        "2.3.4" => [],
-      },
-      "cookbook-with-a-dep" => {
-        "9.9.9" => [["another-local-cookbook", "~> 0.1"]],
-      },
-      "noignore" => {
-        "0.1.0" => [],
-      },
-    }
-  end
-
-  it "gives the set of arguments to `default_source` used to create it" do
-    expect(cookbook_source.default_source_args).to eq([:chef_repo, repo_path])
-  end
-
-  it "fetches the universe graph" do
-    actual_universe = cookbook_source.universe_graph
-    expect(actual_universe).to eql(local_repo_universe)
-  end
-
-  it "generates location options for a cookbook from the given graph" do
-    expected_opts = { path: File.join(repo_path, "local-cookbook"), version: "2.3.4" }
-    expect(cookbook_source.source_options_for("local-cookbook", "2.3.4")).to eq(expected_opts)
-  end
-
-  it "will append a cookbooks directory to the path if it finds it" do
-    expect(Dir).to receive(:exist?).with("#{repo_path}/cookbooks").and_return(true)
-    expect(cookbook_source.path).to eql("#{repo_path}/cookbooks")
-  end
-
-  it "the private setter will append a cookbooks directory to the path if finds it" do
-    expect(cookbook_source.path).to eql(repo_path)
-    expect(Dir).to receive(:exist?).with("#{repo_path}/cookbooks").and_return(true)
-    cookbook_source.send(:path=, repo_path)
-    expect(cookbook_source.path).to eql("#{repo_path}/cookbooks")
-  end
-
-  context "when created with a block to set source preferences" do
-
-    subject(:cookbook_source) do
-      described_class.new(repo_path) do |s|
-        s.preferred_for "foo", "bar", "baz"
-      end
-    end
-
-    it "sets the source preferences as given" do
-      expect(cookbook_source.preferred_cookbooks).to eq( %w{ foo bar baz } )
-    end
-
-    it "is the preferred source for the requested cookbooks" do
-      expect(cookbook_source.preferred_source_for?("foo")).to be(true)
-      expect(cookbook_source.preferred_source_for?("bar")).to be(true)
-      expect(cookbook_source.preferred_source_for?("baz")).to be(true)
-      expect(cookbook_source.preferred_source_for?("razzledazzle")).to be(false)
-    end
-
-  end
-
-end
+#
+# Copyright:: Copyright (c) 2014 Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "spec_helper"
+require "chef-dk/policyfile/chef_repo_cookbook_source"
+
+describe ChefDK::Policyfile::ChefRepoCookbookSource do
+
+  let(:repo_path) do
+    File.expand_path("spec/unit/fixtures/local_path_cookbooks", project_root)
+  end
+
+  let(:cookbook_source) { ChefDK::Policyfile::ChefRepoCookbookSource.new(repo_path) }
+
+  let(:local_repo_universe) do
+    {
+      "another-local-cookbook" => {
+        "0.1.0" => [],
+      },
+      "local-cookbook" => {
+        "2.3.4" => [],
+      },
+      "cookbook-with-a-dep" => {
+        "9.9.9" => [["another-local-cookbook", "~> 0.1"]],
+      },
+      "noignore" => {
+        "0.1.0" => [],
+      },
+    }
+  end
+
+  it "gives the set of arguments to `default_source` used to create it" do
+    expect(cookbook_source.default_source_args).to eq([:chef_repo, repo_path])
+  end
+
+  it "fetches the universe graph" do
+    actual_universe = cookbook_source.universe_graph
+    expect(actual_universe).to eql(local_repo_universe)
+  end
+
+  it "generates location options for a cookbook from the given graph" do
+    expected_opts = { path: File.join(repo_path, "local-cookbook"), version: "2.3.4" }
+    expect(cookbook_source.source_options_for("local-cookbook", "2.3.4")).to eq(expected_opts)
+  end
+
+  it "will append a cookbooks directory to the path if it finds it" do
+    expect(Dir).to receive(:exist?).with("#{repo_path}/cookbooks").and_return(true)
+    expect(cookbook_source.path).to eql("#{repo_path}/cookbooks")
+  end
+
+  it "the private setter will append a cookbooks directory to the path if finds it" do
+    expect(cookbook_source.path).to eql(repo_path)
+    expect(Dir).to receive(:exist?).with("#{repo_path}/cookbooks").and_return(true)
+    cookbook_source.send(:path=, repo_path)
+    expect(cookbook_source.path).to eql("#{repo_path}/cookbooks")
+  end
+
+  context "when created with a block to set source preferences" do
+
+    subject(:cookbook_source) do
+      described_class.new(repo_path) do |s|
+        s.preferred_for "foo", "bar", "baz"
+      end
+    end
+
+    it "sets the source preferences as given" do
+      expect(cookbook_source.preferred_cookbooks).to eq( %w{ foo bar baz } )
+    end
+
+    it "is the preferred source for the requested cookbooks" do
+      expect(cookbook_source.preferred_source_for?("foo")).to be(true)
+      expect(cookbook_source.preferred_source_for?("bar")).to be(true)
+      expect(cookbook_source.preferred_source_for?("baz")).to be(true)
+      expect(cookbook_source.preferred_source_for?("razzledazzle")).to be(false)
+    end
+
+  end
+
+end

data/spec/unit/policyfile/chef_server_cookbook_source_spec.rb

@@ -1,55 +1,55 @@
-#
-# Copyright:: Copyright (c) 2014 Chef Software Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require "spec_helper"
-require "chef-dk/policyfile/chef_server_cookbook_source"
-
-describe ChefDK::Policyfile::ChefServerCookbookSource do
-  subject { described_class.new(cookbook_source) }
-
-  let(:cookbook_source) { "https://chef.example.com/organizations/example" }
-
-  let(:http_connection) { double("Chef::ServerAPI") }
-
-  let(:universe_response_encoded) { JSON.parse(IO.read(File.join(fixtures_path, "cookbooks_api/chef_server_universe.json"))) }
-
-  let(:pruned_universe) { JSON.parse(IO.read(File.join(fixtures_path, "cookbooks_api/pruned_chef_server_universe.json"))) }
-
-  describe "fetching the Universe graph" do
-
-    before do
-      expect(subject).to receive(:http_connection_for).with(cookbook_source).and_return(http_connection)
-    end
-
-    it "fetches the universe graph" do
-      expect(http_connection).to receive(:get).with("/universe").and_return(universe_response_encoded)
-      actual_universe = subject.universe_graph
-      expect(actual_universe).to have_key("apt")
-      expect(actual_universe["apt"]).to eq(pruned_universe["apt"])
-      expect(subject.universe_graph).to eq(pruned_universe)
-    end
-
-    it "generates location options for a cookbook from the given graph" do
-      expected_opts = {
-        chef_server: "https://chef.example.com/organizations/example",
-        http_client: http_connection,
-        version: "4.2.3",
-      }
-      expect(subject.source_options_for("ohai", "4.2.3")).to eq(expected_opts)
-    end
-  end
-end
+#
+# Copyright:: Copyright (c) 2014 Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "spec_helper"
+require "chef-dk/policyfile/chef_server_cookbook_source"
+
+describe ChefDK::Policyfile::ChefServerCookbookSource do
+  subject { described_class.new(cookbook_source) }
+
+  let(:cookbook_source) { "https://chef.example.com/organizations/example" }
+
+  let(:http_connection) { double("Chef::ServerAPI") }
+
+  let(:universe_response_encoded) { JSON.parse(IO.read(File.join(fixtures_path, "cookbooks_api/chef_server_universe.json"))) }
+
+  let(:pruned_universe) { JSON.parse(IO.read(File.join(fixtures_path, "cookbooks_api/pruned_chef_server_universe.json"))) }
+
+  describe "fetching the Universe graph" do
+
+    before do
+      expect(subject).to receive(:http_connection_for).with(cookbook_source).and_return(http_connection)
+    end
+
+    it "fetches the universe graph" do
+      expect(http_connection).to receive(:get).with("/universe").and_return(universe_response_encoded)
+      actual_universe = subject.universe_graph
+      expect(actual_universe).to have_key("apt")
+      expect(actual_universe["apt"]).to eq(pruned_universe["apt"])
+      expect(subject.universe_graph).to eq(pruned_universe)
+    end
+
+    it "generates location options for a cookbook from the given graph" do
+      expected_opts = {
+        chef_server: "https://chef.example.com/organizations/example",
+        http_client: http_connection,
+        version: "4.2.3",
+      }
+      expect(subject.source_options_for("ohai", "4.2.3")).to eq(expected_opts)
+    end
+  end
+end

data/spec/unit/policyfile/chef_server_lock_fetcher_spec.rb

@@ -1,161 +1,161 @@
-#
-# Copyright:: Copyright (c) 2017 Chef Software Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require "spec_helper"
-require "chef-dk/policyfile/chef_server_lock_fetcher"
-
-describe ChefDK::Policyfile::ChefServerLockFetcher do
-
-  let(:revision_id) { "6fe753184c8946052d3231bb4212116df28d89a3a5f7ae52832ad408419dd5eb" }
-  let(:identifier) { "fab501cfaf747901bd82c1bc706beae7dc3a350c" }
-  let(:minimal_lockfile_json) do
-    <<-E
-{
-  "revision_id": "#{revision_id}",
-  "name": "install-example",
-  "run_list": [
-    "recipe[local-cookbook::default]"
-  ],
-  "cookbook_locks": {
-    "local-cookbook": {
-      "version": "2.3.4",
-      "identifier": "#{identifier}",
-      "dotted_decimal_identifier": "70567763561641081.489844270461035.258281553147148",
-      "source": "cookbooks/local-cookbook",
-      "cache_key": null,
-      "scm_info": null,
-      "source_options": {
-        "path": "cookbooks/local-cookbook"
-      }
-    }
-  },
-  "default_attributes": {},
-  "override_attributes": {},
-  "solution_dependencies": {
-    "Policyfile": [
-      [
-        "local-cookbook",
-        ">= 0.0.0"
-      ]
-    ],
-    "dependencies": {
-      "local-cookbook (2.3.4)": [
-
-      ]
-    }
-  }
-}
-E
-  end
-
-  def minimal_lockfile
-    FFI_Yajl::Parser.parse(minimal_lockfile_json)
-  end
-
-  let(:policy_name) { "chatserver" }
-  let(:policy_revision_id) { "somerevisionid" }
-  let(:policy_group) { "somegroup" }
-  let(:url) { "https://chef.example/organizations/monkeynews" }
-
-  let(:chef_config) do
-    double("ChefConfig").tap do |double|
-      allow(double).to receive(:client_key).and_return("key")
-      allow(double).to receive(:node_name).and_return("node_name")
-    end
-  end
-  let(:http_client) { instance_double("Chef::ServerAPI", url: url ) }
-
-  let(:minimal_lockfile_modified) do
-    minimal_lockfile.tap do |lockfile|
-      lockfile["cookbook_locks"]["local-cookbook"]["source_options"] = {
-        "chef_server_artifact" => url,
-        "identifier" => identifier,
-      }
-    end
-  end
-
-  subject(:fetcher) { described_class.new(policy_name, source_options, chef_config) }
-
-  before do
-    allow(Chef::ServerAPI).to receive(:new).with(url, anything).and_return(http_client)
-  end
-
-  context "when using revision id" do
-    let(:source_options) do
-      {
-        server: url,
-        policy_name: policy_name,
-        policy_revision_id: policy_revision_id,
-      }
-    end
-
-    it "calls the chef server to get the policy" do
-      expect(http_client).to receive(:get).with("policies/#{policy_name}/revisions/#{policy_revision_id}").
-        and_return(minimal_lockfile)
-      expect(fetcher.lock_data).to eq(minimal_lockfile_modified)
-    end
-
-    context "and policy_name is not provided" do
-      let(:source_options) do
-        {
-          server: url,
-          policy_revision_id: policy_revision_id,
-        }
-      end
-
-      it "calls the chef server to get the policy with the dsl name" do
-        expect(http_client).to receive(:get).with("policies/#{policy_name}/revisions/#{policy_revision_id}").
-          and_return(minimal_lockfile)
-        expect(fetcher.lock_data).to eq(minimal_lockfile_modified)
-      end
-    end
-  end
-
-  context "when using policy group" do
-    let(:source_options) do
-      {
-        server: url,
-        policy_name: policy_name,
-        policy_group: policy_group,
-      }
-    end
-
-    let(:source_options_for_lock) do
-      source_options.merge({ policy_revision_id: revision_id })
-    end
-
-    it "calls the chef server to get the policy" do
-      expect(http_client).to receive(:get).with("policy_groups/#{policy_group}/policies/#{policy_name}").
-        and_return(minimal_lockfile)
-      expect(fetcher.lock_data).to eq(minimal_lockfile_modified)
-    end
-
-    it "includes the revision id in the source_options_for_lock" do
-      allow(http_client).to receive(:get).with(
-        "policy_groups/#{policy_group}/policies/#{policy_name}").and_return(minimal_lockfile)
-
-      expect(fetcher.source_options_for_lock).to eq(source_options_for_lock)
-    end
-
-    it "correctly applies source_options that were included in the lock" do
-      fetcher.apply_locked_source_options(source_options_for_lock)
-      expect(http_client).to receive(:get).with(
-        "policies/#{policy_name}/revisions/#{revision_id}").and_return(minimal_lockfile)
-      fetcher.lock_data
-    end
-  end
-end
+#
+# Copyright:: Copyright (c) 2017 Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "spec_helper"
+require "chef-dk/policyfile/chef_server_lock_fetcher"
+
+describe ChefDK::Policyfile::ChefServerLockFetcher do
+
+  let(:revision_id) { "6fe753184c8946052d3231bb4212116df28d89a3a5f7ae52832ad408419dd5eb" }
+  let(:identifier) { "fab501cfaf747901bd82c1bc706beae7dc3a350c" }
+  let(:minimal_lockfile_json) do
+    <<-E
+{
+  "revision_id": "#{revision_id}",
+  "name": "install-example",
+  "run_list": [
+    "recipe[local-cookbook::default]"
+  ],
+  "cookbook_locks": {
+    "local-cookbook": {
+      "version": "2.3.4",
+      "identifier": "#{identifier}",
+      "dotted_decimal_identifier": "70567763561641081.489844270461035.258281553147148",
+      "source": "cookbooks/local-cookbook",
+      "cache_key": null,
+      "scm_info": null,
+      "source_options": {
+        "path": "cookbooks/local-cookbook"
+      }
+    }
+  },
+  "default_attributes": {},
+  "override_attributes": {},
+  "solution_dependencies": {
+    "Policyfile": [
+      [
+        "local-cookbook",
+        ">= 0.0.0"
+      ]
+    ],
+    "dependencies": {
+      "local-cookbook (2.3.4)": [
+
+      ]
+    }
+  }
+}
+E
+  end
+
+  def minimal_lockfile
+    FFI_Yajl::Parser.parse(minimal_lockfile_json)
+  end
+
+  let(:policy_name) { "chatserver" }
+  let(:policy_revision_id) { "somerevisionid" }
+  let(:policy_group) { "somegroup" }
+  let(:url) { "https://chef.example/organizations/monkeynews" }
+
+  let(:chef_config) do
+    double("ChefConfig").tap do |double|
+      allow(double).to receive(:client_key).and_return("key")
+      allow(double).to receive(:node_name).and_return("node_name")
+    end
+  end
+  let(:http_client) { instance_double("Chef::ServerAPI", url: url ) }
+
+  let(:minimal_lockfile_modified) do
+    minimal_lockfile.tap do |lockfile|
+      lockfile["cookbook_locks"]["local-cookbook"]["source_options"] = {
+        "chef_server_artifact" => url,
+        "identifier" => identifier,
+      }
+    end
+  end
+
+  subject(:fetcher) { described_class.new(policy_name, source_options, chef_config) }
+
+  before do
+    allow(Chef::ServerAPI).to receive(:new).with(url, anything).and_return(http_client)
+  end
+
+  context "when using revision id" do
+    let(:source_options) do
+      {
+        server: url,
+        policy_name: policy_name,
+        policy_revision_id: policy_revision_id,
+      }
+    end
+
+    it "calls the chef server to get the policy" do
+      expect(http_client).to receive(:get).with("policies/#{policy_name}/revisions/#{policy_revision_id}").
+        and_return(minimal_lockfile)
+      expect(fetcher.lock_data).to eq(minimal_lockfile_modified)
+    end
+
+    context "and policy_name is not provided" do
+      let(:source_options) do
+        {
+          server: url,
+          policy_revision_id: policy_revision_id,
+        }
+      end
+
+      it "calls the chef server to get the policy with the dsl name" do
+        expect(http_client).to receive(:get).with("policies/#{policy_name}/revisions/#{policy_revision_id}").
+          and_return(minimal_lockfile)
+        expect(fetcher.lock_data).to eq(minimal_lockfile_modified)
+      end
+    end
+  end
+
+  context "when using policy group" do
+    let(:source_options) do
+      {
+        server: url,
+        policy_name: policy_name,
+        policy_group: policy_group,
+      }
+    end
+
+    let(:source_options_for_lock) do
+      source_options.merge({ policy_revision_id: revision_id })
+    end
+
+    it "calls the chef server to get the policy" do
+      expect(http_client).to receive(:get).with("policy_groups/#{policy_group}/policies/#{policy_name}").
+        and_return(minimal_lockfile)
+      expect(fetcher.lock_data).to eq(minimal_lockfile_modified)
+    end
+
+    it "includes the revision id in the source_options_for_lock" do
+      allow(http_client).to receive(:get).with(
+        "policy_groups/#{policy_group}/policies/#{policy_name}").and_return(minimal_lockfile)
+
+      expect(fetcher.source_options_for_lock).to eq(source_options_for_lock)
+    end
+
+    it "correctly applies source_options that were included in the lock" do
+      fetcher.apply_locked_source_options(source_options_for_lock)
+      expect(http_client).to receive(:get).with(
+        "policies/#{policy_name}/revisions/#{revision_id}").and_return(minimal_lockfile)
+      fetcher.lock_data
+    end
+  end
+end