chef-dk 3.9.0 → 3.10.1

data/spec/unit/policyfile/lock_fetcher_mixin_spec.rb

@@ -0,0 +1,60 @@
+#
+# Copyright:: Copyright (c) 2014-2018 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/lock_fetcher_mixin"
+
+describe ChefDK::Policyfile::LockFetcherMixin do
+  include ChefDK::Policyfile::LockFetcherMixin
+
+  context "validate_revision_id" do
+    let(:included_id) { "6d707130ea67bf5e475ddb40b1de7b799a15a665187b12b0c3e41a517d0fc5fd" }
+
+    context "when included_id is valid" do
+      let(:source_options) { { policy_revision_id: included_id } }
+
+      it "returns nil" do
+        expect(validate_revision_id(included_id, source_options)).to eq(nil)
+      end
+    end
+
+    context "when included_id is a valid short revision id" do
+      let(:source_options) { { policy_revision_id: "6d707130ea" } }
+
+      it "returns nil" do
+        expect(validate_revision_id(included_id, source_options)).to eq(nil)
+      end
+    end
+
+    context "when source data does not include revision id" do
+      let(:source_options) { {} }
+
+      it "returns nil" do
+        expect(validate_revision_id(included_id, source_options)).to eq(nil)
+      end
+    end
+
+    context "when source data includes an invalid revision id" do
+      let(:invalid_id) { "invalid_id" }
+      let(:source_options) { { policy_revision_id: invalid_id } }
+
+      it "raises ChefDK::InvalidLockfile" do
+        expect { validate_revision_id(included_id, source_options) }.to raise_error(ChefDK::InvalidLockfile, /Expected policy_revision_id/)
+      end
+    end
+  end
+end

data/spec/unit/policyfile/null_cookbook_source_spec.rb

@@ -1,34 +1,34 @@
-#
-# Copyright:: Copyright (c) 2014-2018 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/null_cookbook_source"
-
-describe ChefDK::Policyfile::NullCookbookSource do
-
-  let(:cookbook_source) { ChefDK::Policyfile::NullCookbookSource.new }
-
-  it "emits an empty graph" do
-    expect(cookbook_source.universe_graph).to eq({})
-  end
-
-  it "emits a not supported error when attempting to get source options for a cookbook" do
-    expect { cookbook_source.source_options_for("foo", "1.2.3") }.to raise_error(ChefDK::UnsupportedFeature)
-  end
-
-end
+#
+# Copyright:: Copyright (c) 2014-2018 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/null_cookbook_source"
+
+describe ChefDK::Policyfile::NullCookbookSource do
+
+  let(:cookbook_source) { ChefDK::Policyfile::NullCookbookSource.new }
+
+  it "emits an empty graph" do
+    expect(cookbook_source.universe_graph).to eq({})
+  end
+
+  it "emits a not supported error when attempting to get source options for a cookbook" do
+    expect { cookbook_source.source_options_for("foo", "1.2.3") }.to raise_error(ChefDK::UnsupportedFeature)
+  end
+
+end

data/spec/unit/policyfile/read_cookbook_for_compat_mode_upload_spec.rb

@@ -1,92 +1,92 @@
-#
-# Copyright:: Copyright (c) 2014-2018 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/read_cookbook_for_compat_mode_upload"
-require "chef-dk/helpers"
-
-describe ChefDK::Policyfile::ReadCookbookForCompatModeUpload do
-
-  include ChefDK::Helpers
-
-  let(:cookbook_name) { "noignore" }
-
-  let(:version_override) { "123.456.789" }
-
-  let(:directory_path) { File.join(fixtures_path, "local_path_cookbooks/noignore-f59ee7a5bca6a4e606b67f7f856b768d847c39bb") }
-
-  let(:reader) { described_class.new(cookbook_name, version_override, directory_path) }
-
-  it "has a cookbook_name" do
-    expect(reader.cookbook_name).to eq(cookbook_name)
-  end
-
-  it "has a version number override" do
-    expect(reader.version_override).to eq(version_override)
-  end
-
-  it "has a directory path" do
-    expect(reader.directory_path).to eq(directory_path)
-  end
-
-  it "has an empty chefignore when the cookbook doesn't include one" do
-    expect(reader.chefignore.ignores).to eq([])
-  end
-
-  it "loads the cookbook with the correct name" do
-    expect(reader.cookbook_version.name).to eq(:noignore)
-  end
-
-  it "loads the cookbook with the correct version" do
-    expect(reader.cookbook_version.version).to eq(version_override)
-  end
-
-  it "freezes the cookbook version" do
-    expect(reader.cookbook_version.frozen_version?).to be true
-  end
-
-  it "fixes up the cookbook manifest name" do
-    expect(reader.cookbook_version.manifest["name"]).to eq("noignore-#{version_override}")
-  end
-
-  context "when a cookbook has a chefignore file" do
-
-    let(:directory_path) { File.join(fixtures_path, "cookbook_cache/baz-f59ee7a5bca6a4e606b67f7f856b768d847c39bb") }
-
-    let(:copied_cookbook_path) { File.join(tempdir, "baz-f59ee7a5bca6a4e606b67f7f856b768d847c39bb") }
-
-    let(:chefignored_file) { File.join(copied_cookbook_path, "Guardfile") }
-
-    let(:reader_with_ignored_files) do
-      described_class.new(cookbook_name, version_override, copied_cookbook_path)
-    end
-
-    before do
-      FileUtils.cp_r(directory_path, copied_cookbook_path)
-      with_file(chefignored_file) { |f| f.puts "This file should not affect the cookbooks checksum" }
-    end
-
-    after do
-      clear_tempdir
-    end
-
-    it "excludes ignored files from the list of cookbook files" do
-      expect(reader_with_ignored_files.cookbook_version.files_for("root_files")).to_not include(chefignored_file)
-    end
-
-  end
-end
+#
+# Copyright:: Copyright (c) 2014-2018 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/read_cookbook_for_compat_mode_upload"
+require "chef-dk/helpers"
+
+describe ChefDK::Policyfile::ReadCookbookForCompatModeUpload do
+
+  include ChefDK::Helpers
+
+  let(:cookbook_name) { "noignore" }
+
+  let(:version_override) { "123.456.789" }
+
+  let(:directory_path) { File.join(fixtures_path, "local_path_cookbooks/noignore-f59ee7a5bca6a4e606b67f7f856b768d847c39bb") }
+
+  let(:reader) { described_class.new(cookbook_name, version_override, directory_path) }
+
+  it "has a cookbook_name" do
+    expect(reader.cookbook_name).to eq(cookbook_name)
+  end
+
+  it "has a version number override" do
+    expect(reader.version_override).to eq(version_override)
+  end
+
+  it "has a directory path" do
+    expect(reader.directory_path).to eq(directory_path)
+  end
+
+  it "has an empty chefignore when the cookbook doesn't include one" do
+    expect(reader.chefignore.ignores).to eq([])
+  end
+
+  it "loads the cookbook with the correct name" do
+    expect(reader.cookbook_version.name).to eq(:noignore)
+  end
+
+  it "loads the cookbook with the correct version" do
+    expect(reader.cookbook_version.version).to eq(version_override)
+  end
+
+  it "freezes the cookbook version" do
+    expect(reader.cookbook_version.frozen_version?).to be true
+  end
+
+  it "fixes up the cookbook manifest name" do
+    expect(reader.cookbook_version.manifest["name"]).to eq("noignore-#{version_override}")
+  end
+
+  context "when a cookbook has a chefignore file" do
+
+    let(:directory_path) { File.join(fixtures_path, "cookbook_cache/baz-f59ee7a5bca6a4e606b67f7f856b768d847c39bb") }
+
+    let(:copied_cookbook_path) { File.join(tempdir, "baz-f59ee7a5bca6a4e606b67f7f856b768d847c39bb") }
+
+    let(:chefignored_file) { File.join(copied_cookbook_path, "Guardfile") }
+
+    let(:reader_with_ignored_files) do
+      described_class.new(cookbook_name, version_override, copied_cookbook_path)
+    end
+
+    before do
+      FileUtils.cp_r(directory_path, copied_cookbook_path)
+      with_file(chefignored_file) { |f| f.puts "This file should not affect the cookbooks checksum" }
+    end
+
+    after do
+      clear_tempdir
+    end
+
+    it "excludes ignored files from the list of cookbook files" do
+      expect(reader_with_ignored_files.cookbook_version.files_for("root_files")).to_not include(chefignored_file)
+    end
+
+  end
+end

data/spec/unit/policyfile/remote_lock_fetcher_spec.rb

@@ -0,0 +1,129 @@
+#
+# 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/remote_lock_fetcher"
+
+describe ChefDK::Policyfile::RemoteLockFetcher do
+
+  let(:minimal_lockfile_json) do
+    <<~E
+      {
+        "revision_id": "6fe753184c8946052d3231bb4212116df28d89a3a5f7ae52832ad408419dd5eb",
+        "name": "install-example",
+        "run_list": [
+          "recipe[remote-cookbook::default]"
+        ],
+        "cookbook_locks": {
+          "remote-cookbook": {
+            "version": "2.3.4",
+            "identifier": "fab501cfaf747901bd82c1bc706beae7dc3a350c",
+            "dotted_decimal_identifier": "70567763561641081.489844270461035.258281553147148",
+            "cache_key": null,
+            "origin": "http://my.chef.server/remote-cookbook/download",
+            "source_options": {
+              "artifactserver": "http://my.chef.server/remote-cookbook/download",
+              "version": "2.3.4"
+            }
+          }
+        },
+        "default_attributes": {},
+        "override_attributes": {},
+        "solution_dependencies": {
+          "Policyfile": [
+            [
+              "remote-cookbook",
+              ">= 0.0.0"
+            ]
+          ],
+          "dependencies": {
+            "remote-cookbook (2.3.4)": [
+
+            ]
+          }
+        }
+      }
+    E
+  end
+
+  let(:minimal_lockfile) do
+    FFI_Yajl::Parser.parse(minimal_lockfile_json)
+  end
+
+  describe "#lock_data" do
+    let(:http) { instance_double(Chef::HTTP, url: "http://my.chef.server/policy.lock.json") }
+    let(:storage_config) { ChefDK::Policyfile::StorageConfig.new.use_policyfile("#{tempdir}/Policyfile.rb") }
+    let(:source_options) { { remote: "http://my.chef.server/policy.lock.json" } }
+
+    before do
+      expect(Chef::HTTP).to receive(:new).with(source_options[:remote]).and_return(http)
+    end
+
+    subject(:fetcher) { described_class.new("foo", source_options) }
+
+    context "when the http.get returns valid json" do
+      context "source_options does not include 'path'" do
+        it "returns the parsed json" do
+          expect(http).to receive(:get).with("").and_return(minimal_lockfile_json)
+          expect(fetcher.lock_data).to eq(minimal_lockfile)
+        end
+      end
+
+      context "source_options includes 'path'" do
+        let(:minimal_lockfile_json_w_path) do
+          FFI_Yajl::Encoder.encode(
+            minimal_lockfile.tap do |lockfile|
+              lockfile["cookbook_locks"]["remote-cookbook"]["source_options"] = {
+                "path" => "../remote-cookbook",
+              }
+            end
+          )
+        end
+
+        it "raises ChefDK::InvalidLockfile" do
+          expect(http).to receive(:get).with("").and_return(minimal_lockfile_json_w_path)
+          expect { fetcher.lock_data } .to raise_error(ChefDK::InvalidLockfile, /Invalid cookbook path/)
+        end
+      end
+    end
+
+    context "when the http.get returns a 404" do
+      let(:err) { Net::HTTPNotFound.new(1, 404, "msg") }
+      let(:err_re) { /No remote policyfile lock/ }
+      it "raises a PolicyfileLockDownloadError" do
+        expect(http).to receive(:get).with("").and_raise(Net::HTTPError.new("msg", err))
+        expect { fetcher.lock_data }.to raise_error(ChefDK::PolicyfileLockDownloadError, err_re)
+      end
+    end
+
+    context "when the http.get returns a non-404" do
+      let(:err) { Net::HTTPServerError.new(1, 500, "msg") }
+      let(:err_re) { /HTTP error attempting to fetch policyfile lock/ }
+      it "raises a PolicyfileLockDownloadError" do
+        expect(http).to receive(:get).with("").and_raise(Net::HTTPError.new("msg", err))
+        expect { fetcher.lock_data }.to raise_error(ChefDK::PolicyfileLockDownloadError, err_re)
+      end
+    end
+
+    context "when the http.get returns a RuntimeError" do
+      it "reraises" do
+        expect(http).to receive(:get).with("").and_raise("foo")
+        expect { fetcher.lock_data }.to raise_error("foo")
+      end
+    end
+  end
+end

data/spec/unit/policyfile/reports/install_spec.rb

@@ -1,114 +1,114 @@
-#
-# Copyright:: Copyright (c) 2014-2018 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/reports/install"
-
-# Used for verifying doubles
-require "chef-dk/policyfile_compiler"
-require "chef-dk/policyfile/cookbook_location_specification"
-
-describe ChefDK::Policyfile::Reports::Install do
-
-  let(:ui) { TestHelpers::TestUI.new }
-
-  let(:policyfile_compiler) { instance_double("ChefDK::PolicyfileCompiler") }
-
-  subject(:install_report) { described_class.new(ui: ui, policyfile_compiler: policyfile_compiler ) }
-
-  it "has a UI object" do
-    expect(install_report.ui).to eq(ui)
-  end
-
-  it "has a policyfile compiler" do
-    expect(install_report.policyfile_compiler).to eq(policyfile_compiler)
-  end
-
-  describe "when printing an installation report for fixed version cookbooks" do
-
-    let(:fixed_version_cookbook_one) do
-      instance_double("ChefDK::Policyfile::CookbookLocationSpecification",
-                      installed?: false,
-                      name: "short-name",
-                      version_constraint: ">= 0.0.0",
-                      source_type: :git)
-    end
-
-    let(:fixed_version_cookbook_two) do
-      instance_double("ChefDK::Policyfile::CookbookLocationSpecification",
-                      installed?: true,
-                      name: "this-name-is-longer",
-                      version_constraint: "~> 10.0.0",
-                      source_type: :path)
-    end
-
-    let(:fixed_version_cookbooks) do
-      { "short-name" => fixed_version_cookbook_one, "this-name-is-longer" => fixed_version_cookbook_two }
-    end
-
-    before do
-      allow(policyfile_compiler).to receive(:fixed_version_cookbooks_specs).and_return(fixed_version_cookbooks)
-    end
-
-    it "prints a table-ized message for cookbooks being installed" do
-      install_report.installing_fixed_version_cookbook(fixed_version_cookbook_one)
-      expect(ui.output).to eq("Installing short-name          >= 0.0.0 from git\n")
-    end
-
-    it "prints a table-ized message for cookbooks in the cache that are reused" do
-      install_report.installing_fixed_version_cookbook(fixed_version_cookbook_two)
-      expect(ui.output).to eq("Using      this-name-is-longer ~> 10.0.0 from path\n")
-    end
-
-  end
-
-  describe "when printing an installation report for normal dependencies" do
-
-    let(:cookbook_one) do
-      instance_double("ChefDK::Policyfile::CookbookLocationSpecification",
-                      installed?: false,
-                      name: "short-name",
-                      version_constraint: Semverse::Constraint.new("= 10.0.4"))
-    end
-
-    let(:cookbook_two) do
-      instance_double("ChefDK::Policyfile::CookbookLocationSpecification",
-                      installed?: true,
-                      name: "this-name-is-longer",
-                      version_constraint: Semverse::Constraint.new("= 1.2.3"))
-    end
-
-    let(:graph_solution_cookbooks) do
-      { "short-name" => "10.0.4", "this-name-is-longer" => "1.2.3" }
-    end
-
-    before do
-      allow(policyfile_compiler).to receive(:graph_solution).and_return(graph_solution_cookbooks)
-    end
-
-    it "prints a table-ized message for cookbooks being installed" do
-      install_report.installing_cookbook(cookbook_one)
-      expect(ui.output).to eq("Installing short-name          10.0.4\n")
-    end
-
-    it "prints a table-ized message for cookbooks in the cache that are reused" do
-      install_report.installing_cookbook(cookbook_two)
-      expect(ui.output).to eq("Using      this-name-is-longer 1.2.3\n")
-    end
-
-  end
-end
+#
+# Copyright:: Copyright (c) 2014-2018 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/reports/install"
+
+# Used for verifying doubles
+require "chef-dk/policyfile_compiler"
+require "chef-dk/policyfile/cookbook_location_specification"
+
+describe ChefDK::Policyfile::Reports::Install do
+
+  let(:ui) { TestHelpers::TestUI.new }
+
+  let(:policyfile_compiler) { instance_double("ChefDK::PolicyfileCompiler") }
+
+  subject(:install_report) { described_class.new(ui: ui, policyfile_compiler: policyfile_compiler ) }
+
+  it "has a UI object" do
+    expect(install_report.ui).to eq(ui)
+  end
+
+  it "has a policyfile compiler" do
+    expect(install_report.policyfile_compiler).to eq(policyfile_compiler)
+  end
+
+  describe "when printing an installation report for fixed version cookbooks" do
+
+    let(:fixed_version_cookbook_one) do
+      instance_double("ChefDK::Policyfile::CookbookLocationSpecification",
+                      installed?: false,
+                      name: "short-name",
+                      version_constraint: ">= 0.0.0",
+                      source_type: :git)
+    end
+
+    let(:fixed_version_cookbook_two) do
+      instance_double("ChefDK::Policyfile::CookbookLocationSpecification",
+                      installed?: true,
+                      name: "this-name-is-longer",
+                      version_constraint: "~> 10.0.0",
+                      source_type: :path)
+    end
+
+    let(:fixed_version_cookbooks) do
+      { "short-name" => fixed_version_cookbook_one, "this-name-is-longer" => fixed_version_cookbook_two }
+    end
+
+    before do
+      allow(policyfile_compiler).to receive(:fixed_version_cookbooks_specs).and_return(fixed_version_cookbooks)
+    end
+
+    it "prints a table-ized message for cookbooks being installed" do
+      install_report.installing_fixed_version_cookbook(fixed_version_cookbook_one)
+      expect(ui.output).to eq("Installing short-name          >= 0.0.0 from git\n")
+    end
+
+    it "prints a table-ized message for cookbooks in the cache that are reused" do
+      install_report.installing_fixed_version_cookbook(fixed_version_cookbook_two)
+      expect(ui.output).to eq("Using      this-name-is-longer ~> 10.0.0 from path\n")
+    end
+
+  end
+
+  describe "when printing an installation report for normal dependencies" do
+
+    let(:cookbook_one) do
+      instance_double("ChefDK::Policyfile::CookbookLocationSpecification",
+                      installed?: false,
+                      name: "short-name",
+                      version_constraint: Semverse::Constraint.new("= 10.0.4"))
+    end
+
+    let(:cookbook_two) do
+      instance_double("ChefDK::Policyfile::CookbookLocationSpecification",
+                      installed?: true,
+                      name: "this-name-is-longer",
+                      version_constraint: Semverse::Constraint.new("= 1.2.3"))
+    end
+
+    let(:graph_solution_cookbooks) do
+      { "short-name" => "10.0.4", "this-name-is-longer" => "1.2.3" }
+    end
+
+    before do
+      allow(policyfile_compiler).to receive(:graph_solution).and_return(graph_solution_cookbooks)
+    end
+
+    it "prints a table-ized message for cookbooks being installed" do
+      install_report.installing_cookbook(cookbook_one)
+      expect(ui.output).to eq("Installing short-name          10.0.4\n")
+    end
+
+    it "prints a table-ized message for cookbooks in the cache that are reused" do
+      install_report.installing_cookbook(cookbook_two)
+      expect(ui.output).to eq("Using      this-name-is-longer 1.2.3\n")
+    end
+
+  end
+end