chef-dk 3.3.23 → 3.4.38

data/spec/unit/policyfile_services/clean_policies_spec.rb

@@ -177,9 +177,9 @@ describe ChefDK::PolicyfileServices::CleanPolicies do
 
           it "deletes the orphaned policies" do
             clean_policies_service.run
-            expected_message = <<-MESSAGE
-DELETE appserver 4444444444444444444444444444444444444444444444444444444444444444
-DELETE load-balancer 7777777777777777777777777777777777777777777777777777777777777777
+            expected_message = <<~MESSAGE
+              DELETE appserver 4444444444444444444444444444444444444444444444444444444444444444
+              DELETE load-balancer 7777777777777777777777777777777777777777777777777777777777777777
 MESSAGE
             expect(ui.output).to eq(expected_message)
           end
@@ -204,24 +204,24 @@ MESSAGE
           end
 
           before do
-            expect(http_client).to receive(:delete).
-              with("/policies/appserver/revisions/4444444444444444444444444444444444444444444444444444444444444444").
-              and_raise(http_exception)
+            expect(http_client).to receive(:delete)
+              .with("/policies/appserver/revisions/4444444444444444444444444444444444444444444444444444444444444444")
+              .and_raise(http_exception)
             expect(http_client).to receive(:delete).with("/policies/load-balancer/revisions/7777777777777777777777777777777777777777777777777777777777777777")
           end
 
           it "deletes what it can, then raises an error" do
-            expected_message = <<-ERROR
-Failed to delete some policy revisions:
-- appserver (4444444444444444444444444444444444444444444444444444444444444444): Net::HTTPServerException 403 \"Unauthorized\"
+            expected_message = <<~ERROR
+              Failed to delete some policy revisions:
+              - appserver (4444444444444444444444444444444444444444444444444444444444444444): Net::HTTPServerException 403 \"Unauthorized\"
 ERROR
 
             expect { clean_policies_service.run }.to raise_error do |error|
               expect(error.message).to eq(expected_message)
             end
-            expected_message = <<-MESSAGE
-DELETE appserver 4444444444444444444444444444444444444444444444444444444444444444
-DELETE load-balancer 7777777777777777777777777777777777777777777777777777777777777777
+            expected_message = <<~MESSAGE
+              DELETE appserver 4444444444444444444444444444444444444444444444444444444444444444
+              DELETE load-balancer 7777777777777777777777777777777777777777777777777777777777777777
 MESSAGE
             expect(ui.output).to eq(expected_message)
           end

data/spec/unit/policyfile_services/clean_policy_cookbooks_spec.rb

@@ -183,15 +183,15 @@ describe ChefDK::PolicyfileServices::CleanPolicyCookbooks do
       end
 
       before do
-        allow(http_client).to receive(:get).
-          with("/policies/aar/revisions/37f9b658cdd1d9319bac8920581723efcc2014304b5f3827ee0779e10ffbdcc9").
-          and_return(policy_aar_37f9b65)
-        allow(http_client).to receive(:get).
-          with("/policies/jenkins/revisions/613f803bdd035d574df7fa6da525b38df45a74ca82b38b79655efed8a189e073").
-          and_return(policy_jenkins_613f803)
-        allow(http_client).to receive(:get).
-          with("/policies/jenkins/revisions/6fe753184c8946052d3231bb4212116df28d89a3a5f7ae52832ad408419dd5eb").
-          and_return(policy_jenkins_6fe7531)
+        allow(http_client).to receive(:get)
+          .with("/policies/aar/revisions/37f9b658cdd1d9319bac8920581723efcc2014304b5f3827ee0779e10ffbdcc9")
+          .and_return(policy_aar_37f9b65)
+        allow(http_client).to receive(:get)
+          .with("/policies/jenkins/revisions/613f803bdd035d574df7fa6da525b38df45a74ca82b38b79655efed8a189e073")
+          .and_return(policy_jenkins_613f803)
+        allow(http_client).to receive(:get)
+          .with("/policies/jenkins/revisions/6fe753184c8946052d3231bb4212116df28d89a3a5f7ae52832ad408419dd5eb")
+          .and_return(policy_jenkins_6fe7531)
       end
 
       context "and all cookbooks are active" do

data/spec/unit/policyfile_services/export_repo_spec.rb

@@ -109,42 +109,42 @@ describe ChefDK::PolicyfileServices::ExportRepo do
       let(:revision_id) { "7da81d2c7bb97f904637f97e7f8b487fa4bb1ed682edea7087743dec84c254ec" }
 
       let(:lockfile_content) do
-        <<-E
-{
-  "revision_id": "#{revision_id}",
-  "name": "install-example",
-  "run_list": [
-    "recipe[local-cookbook::default]"
-  ],
-  "cookbook_locks": {
-    "local-cookbook": {
-      "version": "2.3.4",
-      "identifier": "1e9dfd1134735385b425c056cb5decef9081b92c",
-      "dotted_decimal_identifier": "42704157235437826.6970356709321892.63549625984142",
-      "source": "#{local_cookbook_path}",
-      "cache_key": null,
-      "scm_info": null,
-      "source_options": {
-        "path": "#{local_cookbook_path}"
-      }
-    }
-  },
-  "default_attributes": {},
-  "override_attributes": {},
-  "solution_dependencies": {
-    "Policyfile": [
-      [
-        "local-cookbook",
-        ">= 0.0.0"
-      ]
-    ],
-    "dependencies": {
-      "local-cookbook (2.3.4)": [
-
-      ]
-    }
-  }
-}
+        <<~E
+          {
+            "revision_id": "#{revision_id}",
+            "name": "install-example",
+            "run_list": [
+              "recipe[local-cookbook::default]"
+            ],
+            "cookbook_locks": {
+              "local-cookbook": {
+                "version": "2.3.4",
+                "identifier": "1e9dfd1134735385b425c056cb5decef9081b92c",
+                "dotted_decimal_identifier": "42704157235437826.6970356709321892.63549625984142",
+                "source": "#{local_cookbook_path}",
+                "cache_key": null,
+                "scm_info": null,
+                "source_options": {
+                  "path": "#{local_cookbook_path}"
+                }
+              }
+            },
+            "default_attributes": {},
+            "override_attributes": {},
+            "solution_dependencies": {
+              "Policyfile": [
+                [
+                  "local-cookbook",
+                  ">= 0.0.0"
+                ]
+              ],
+              "dependencies": {
+                "local-cookbook (2.3.4)": [
+
+                ]
+              }
+            }
+          }
 E
       end
 
@@ -268,32 +268,32 @@ E
           end
 
           it "creates a working local mode configuration file" do
-            expected_config_text = <<-CONFIG
-### Chef Client Configuration ###
-# The settings in this file will configure chef to apply the exported policy in
-# this directory. To use it, run:
-#
-# chef-client -z
-#
-
-policy_name 'install-example'
-policy_group 'local'
-
-use_policyfile true
-policy_document_native_api true
-
-# In order to use this repo, you need a version of Chef Client and Chef Zero
-# that supports policyfile "native mode" APIs:
-current_version = Gem::Version.new(Chef::VERSION)
-unless Gem::Requirement.new(">= 12.7").satisfied_by?(current_version)
-  puts("!" * 80)
-  puts(<<-MESSAGE)
-This Chef Repo requires features introduced in Chef 12.7, but you are using
-Chef \#{Chef::VERSION}. Please upgrade to Chef 12.7 or later.
-MESSAGE
-  puts("!" * 80)
-  exit!(1)
-end
+            expected_config_text = <<~CONFIG
+              ### Chef Client Configuration ###
+              # The settings in this file will configure chef to apply the exported policy in
+              # this directory. To use it, run:
+              #
+              # chef-client -z
+              #
+
+              policy_name 'install-example'
+              policy_group 'local'
+
+              use_policyfile true
+              policy_document_native_api true
+
+              # In order to use this repo, you need a version of Chef Client and Chef Zero
+              # that supports policyfile "native mode" APIs:
+              current_version = Gem::Version.new(Chef::VERSION)
+              unless Gem::Requirement.new(">= 12.7").satisfied_by?(current_version)
+                puts("!" * 80)
+                puts(<<-MESSAGE)
+              This Chef Repo requires features introduced in Chef 12.7, but you are using
+              Chef \#{Chef::VERSION}. Please upgrade to Chef 12.7 or later.
+              MESSAGE
+                puts("!" * 80)
+                exit!(1)
+              end
 
 CONFIG
             config_path = File.join(export_dir, ".chef", "config.rb")
@@ -317,8 +317,8 @@ CONFIG
 
           before do
             allow(export_service.policyfile_lock).to receive(:validate_cookbooks!).and_return(true)
-            expect(export_service).to receive(:create_repo_structure).
-              and_raise(Errno::EACCES.new("Permission denied @ rb_sysopen - /etc/foobarbaz.txt"))
+            expect(export_service).to receive(:create_repo_structure)
+              .and_raise(Errno::EACCES.new("Permission denied @ rb_sysopen - /etc/foobarbaz.txt"))
           end
 
           it "wraps the error in a custom error class" do

data/spec/unit/policyfile_services/install_spec.rb

@@ -43,12 +43,12 @@ describe ChefDK::PolicyfileServices::Install do
   end
 
   let(:policyfile_content) do
-    <<-E
-name 'install-example'
+    <<~E
+      name 'install-example'
 
-run_list 'local-cookbook'
+      run_list 'local-cookbook'
 
-cookbook 'local-cookbook', path: '#{local_cookbooks_root}/local-cookbook'
+      cookbook 'local-cookbook', path: '#{local_cookbooks_root}/local-cookbook'
 E
   end
 

data/spec/unit/policyfile_services/push_archive_spec.rb

@@ -42,41 +42,41 @@ describe ChefDK::PolicyfileServices::PushArchive do
   end
 
   let(:valid_lockfile) do
-    <<-E
-{
-  "name": "install-example",
-  "run_list": [
-    "recipe[local-cookbook::default]"
-  ],
-  "cookbook_locks": {
-    "local-cookbook": {
-      "version": "2.3.4",
-      "identifier": "fab501cfaf747901bd82c1bc706beae7dc3a350c",
-      "dotted_decimal_identifier": "70567763561641081.489844270461035.258281553147148",
-      "source": "project-cookbooks/local-cookbook",
-      "cache_key": null,
-      "scm_info": null,
-      "source_options": {
-        "path": "project-cookbooks/local-cookbook"
-      }
-    }
-  },
-  "default_attributes": {},
-  "override_attributes": {},
-  "solution_dependencies": {
-    "Policyfile": [
-      [
-        "local-cookbook",
-        ">= 0.0.0"
-      ]
-    ],
-    "dependencies": {
-      "local-cookbook (2.3.4)": [
+    <<~E
+      {
+        "name": "install-example",
+        "run_list": [
+          "recipe[local-cookbook::default]"
+        ],
+        "cookbook_locks": {
+          "local-cookbook": {
+            "version": "2.3.4",
+            "identifier": "fab501cfaf747901bd82c1bc706beae7dc3a350c",
+            "dotted_decimal_identifier": "70567763561641081.489844270461035.258281553147148",
+            "source": "project-cookbooks/local-cookbook",
+            "cache_key": null,
+            "scm_info": null,
+            "source_options": {
+              "path": "project-cookbooks/local-cookbook"
+            }
+          }
+        },
+        "default_attributes": {},
+        "override_attributes": {},
+        "solution_dependencies": {
+          "Policyfile": [
+            [
+              "local-cookbook",
+              ">= 0.0.0"
+            ]
+          ],
+          "dependencies": {
+            "local-cookbook (2.3.4)": [
 
-      ]
-    }
-  }
-}
+            ]
+          }
+        }
+      }
 E
   end
 
@@ -283,12 +283,12 @@ E
             expect(exception.message).to eq("Failed to publish archived policy")
             expect(exception_cause).to be_a(ChefDK::InvalidPolicyArchive)
 
-            msg = <<-MESSAGE
-This archive is in an unsupported format.
+            msg = <<~MESSAGE
+              This archive is in an unsupported format.
 
-This archive was created with an older version of ChefDK. This version of
-ChefDK does not support archives in the older format. Re-create the archive
-with a newer version of ChefDK or downgrade ChefDK.
+              This archive was created with an older version of ChefDK. This version of
+              ChefDK does not support archives in the older format. Re-create the archive
+              with a newer version of ChefDK or downgrade ChefDK.
 MESSAGE
             expect(exception_cause.message).to eq(msg)
           end
@@ -330,8 +330,8 @@ MESSAGE
 
       expect(ChefDK::Policyfile::Uploader).to receive(:new).
         # TODO: need more verification that the policyfile.lock is right (?)
-        with(an_instance_of(ChefDK::PolicyfileLock), policy_group, http_client: http_client, ui: ui, policy_document_native_api: true).
-        and_return(uploader)
+        with(an_instance_of(ChefDK::PolicyfileLock), policy_group, http_client: http_client, ui: ui, policy_document_native_api: true)
+        .and_return(uploader)
 
       create_archive
     end

data/spec/unit/policyfile_services/push_spec.rb

@@ -142,41 +142,41 @@ describe ChefDK::PolicyfileServices::Push do
       let(:local_cookbook_path) { File.join(fixtures_path, "local_path_cookbooks/local-cookbook") }
 
       let(:lockfile_content) do
-        <<-E
-{
-  "name": "install-example",
-  "run_list": [
-    "recipe[local-cookbook::default]"
-  ],
-  "cookbook_locks": {
-    "local-cookbook": {
-      "version": "2.3.4",
-      "identifier": "fab501cfaf747901bd82c1bc706beae7dc3a350c",
-      "dotted_decimal_identifier": "70567763561641081.489844270461035.258281553147148",
-      "source": "#{local_cookbook_path}",
-      "cache_key": null,
-      "scm_info": null,
-      "source_options": {
-        "path": "#{local_cookbook_path}"
-      }
-    }
-  },
-  "default_attributes": {},
-  "override_attributes": {},
-  "solution_dependencies": {
-    "Policyfile": [
-      [
-        "local-cookbook",
-        ">= 0.0.0"
-      ]
-    ],
-    "dependencies": {
-      "local-cookbook (2.3.4)": [
-
-      ]
-    }
-  }
-}
+        <<~E
+          {
+            "name": "install-example",
+            "run_list": [
+              "recipe[local-cookbook::default]"
+            ],
+            "cookbook_locks": {
+              "local-cookbook": {
+                "version": "2.3.4",
+                "identifier": "fab501cfaf747901bd82c1bc706beae7dc3a350c",
+                "dotted_decimal_identifier": "70567763561641081.489844270461035.258281553147148",
+                "source": "#{local_cookbook_path}",
+                "cache_key": null,
+                "scm_info": null,
+                "source_options": {
+                  "path": "#{local_cookbook_path}"
+                }
+              }
+            },
+            "default_attributes": {},
+            "override_attributes": {},
+            "solution_dependencies": {
+              "Policyfile": [
+                [
+                  "local-cookbook",
+                  ">= 0.0.0"
+                ]
+              ],
+              "dependencies": {
+                "local-cookbook (2.3.4)": [
+
+                ]
+              }
+            }
+          }
 E
       end
 
@@ -189,9 +189,9 @@ E
       before do
         expect(push_service).to receive(:http_client).and_return(http_client)
 
-        expect(ChefDK::Policyfile::Uploader).to receive(:new).
-               with(push_service.policyfile_lock, policy_group, http_client: http_client, ui: ui, policy_document_native_api: policy_document_native_api).
-               and_return(uploader)
+        expect(ChefDK::Policyfile::Uploader).to receive(:new)
+               .with(push_service.policyfile_lock, policy_group, http_client: http_client, ui: ui, policy_document_native_api: policy_document_native_api)
+               .and_return(uploader)
       end
 
       context "when the policy document native API is disabled" do

data/spec/unit/policyfile_services/rm_policy_group_spec.rb

@@ -120,9 +120,9 @@ describe ChefDK::PolicyfileServices::RmPolicyGroup do
 
       before do
         expect(http_client).to receive(:get).with("/policy_groups").and_return(non_empty_policy_groups)
-        expect(http_client).to receive(:get).
-          with("/policies/appserver/revisions/2222222222222222222222222222222222222222222222222222222222222222").
-          and_raise(http_exception)
+        expect(http_client).to receive(:get)
+          .with("/policies/appserver/revisions/2222222222222222222222222222222222222222222222222222222222222222")
+          .and_raise(http_exception)
       end
 
       it "re-raises the error with a standardized exception class" do
@@ -198,15 +198,15 @@ describe ChefDK::PolicyfileServices::RmPolicyGroup do
     before do
       allow(rm_policy_group_service).to receive(:http_client).and_return(http_client)
       expect(http_client).to receive(:get).with("/policy_groups").and_return(non_empty_policy_groups)
-      expect(http_client).to receive(:get).
-        with("/policies/appserver/revisions/2222222222222222222222222222222222222222222222222222222222222222").
-        and_return(policy_appserver_2)
-      expect(http_client).to receive(:get).
-        with("/policies/load-balancer/revisions/5555555555555555555555555555555555555555555555555555555555555555").
-        and_return(policy_load_balancer_5)
-      expect(http_client).to receive(:get).
-        with("/policies/db/revisions/9999999999999999999999999999999999999999999999999999999999999999").
-        and_return(policy_db_9)
+      expect(http_client).to receive(:get)
+        .with("/policies/appserver/revisions/2222222222222222222222222222222222222222222222222222222222222222")
+        .and_return(policy_appserver_2)
+      expect(http_client).to receive(:get)
+        .with("/policies/load-balancer/revisions/5555555555555555555555555555555555555555555555555555555555555555")
+        .and_return(policy_load_balancer_5)
+      expect(http_client).to receive(:get)
+        .with("/policies/db/revisions/9999999999999999999999999999999999999999999999999999999999999999")
+        .and_return(policy_db_9)
 
       expect(http_client).to receive(:delete).with("/policy_groups/preprod")
       expect(undo_stack).to receive(:push).with(undo_record)