diff options
author | snehaldwivedi <sdwivedi@msystechnologies.com> | 2021-03-25 21:49:36 -0700 |
---|---|---|
committer | snehaldwivedi <sdwivedi@msystechnologies.com> | 2021-04-04 23:00:00 -0700 |
commit | 83991032fa664f672ea50c0065970e0a7e36c9e1 (patch) | |
tree | 59928698b04ab5474d90032d9d62823915ac22ca | |
parent | 5e6c79761f55468022c2c39cc23d1cf97c0cb2c7 (diff) | |
download | chef-83991032fa664f672ea50c0065970e0a7e36c9e1.tar.gz |
Fix chefstyle
Signed-off-by: snehaldwivedi <sdwivedi@msystechnologies.com>
-rw-r--r-- | lib/chef/encrypted_data_bag_item/assertions.rb | 2 | ||||
-rw-r--r-- | lib/chef/provider/git.rb | 10 | ||||
-rw-r--r-- | lib/chef/resource/template.rb | 4 | ||||
-rw-r--r-- | lib/chef/resource_collection/resource_set.rb | 2 | ||||
-rw-r--r-- | spec/unit/knife/client_create_spec.rb | 2 | ||||
-rw-r--r-- | spec/unit/knife/core/node_editor_spec.rb | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/lib/chef/encrypted_data_bag_item/assertions.rb b/lib/chef/encrypted_data_bag_item/assertions.rb index 13ed0de050..02baad2a2d 100644 --- a/lib/chef/encrypted_data_bag_item/assertions.rb +++ b/lib/chef/encrypted_data_bag_item/assertions.rb @@ -30,7 +30,7 @@ class Chef::EncryptedDataBagItem unless format_version.is_a?(Integer) && format_version >= Chef::Config[:data_bag_decrypt_minimum_version] raise UnacceptableEncryptedDataBagItemFormat, "The encrypted data bag item has format version `#{format_version}', " + - "but the config setting 'data_bag_decrypt_minimum_version' requires version `#{Chef::Config[:data_bag_decrypt_minimum_version]}'" + "but the config setting 'data_bag_decrypt_minimum_version' requires version `#{Chef::Config[:data_bag_decrypt_minimum_version]}'" end end diff --git a/lib/chef/provider/git.rb b/lib/chef/provider/git.rb index 1c0b9f562e..23f50ca2ad 100644 --- a/lib/chef/provider/git.rb +++ b/lib/chef/provider/git.rb @@ -68,9 +68,9 @@ class Chef a.assertion { !(new_resource.revision =~ %r{^origin/}) } a.failure_message Chef::Exceptions::InvalidRemoteGitReference, "Deploying remote branches is not supported. " + - "Specify the remote branch as a local branch for " + - "the git repository you're deploying from " + - "(ie: '#{new_resource.revision.gsub("origin/", "")}' rather than '#{new_resource.revision}')." + "Specify the remote branch as a local branch for " + + "the git repository you're deploying from " + + "(ie: '#{new_resource.revision.gsub("origin/", "")}' rather than '#{new_resource.revision}')." end requirements.assert(:all_actions) do |a| @@ -80,8 +80,8 @@ class Chef a.assertion { !target_revision.nil? } a.failure_message Chef::Exceptions::UnresolvableGitReference, "Unable to parse SHA reference for '#{new_resource.revision}' in repository '#{new_resource.repository}'. " + - "Verify your (case-sensitive) repository URL and revision.\n" + - "`git ls-remote '#{new_resource.repository}' '#{rev_search_pattern}'` output: #{@resolved_reference}" + "Verify your (case-sensitive) repository URL and revision.\n" + + "`git ls-remote '#{new_resource.repository}' '#{rev_search_pattern}'` output: #{@resolved_reference}" end end diff --git a/lib/chef/resource/template.rb b/lib/chef/resource/template.rb index 60b431ab8e..efd83a1cb4 100644 --- a/lib/chef/resource/template.rb +++ b/lib/chef/resource/template.rb @@ -169,8 +169,8 @@ class Chef elsif module_name.nil? raise Exceptions::ValidationFailed, "#helpers requires either a module name or inline module code as a block.\n" + - "e.g.: helpers do; helper_code; end;\n" + - "OR: helpers(MyHelpersModule)" + "e.g.: helpers do; helper_code; end;\n" + + "OR: helpers(MyHelpersModule)" else raise Exceptions::ValidationFailed, "Argument to #helpers must be a module. You gave #{module_name.inspect} (#{module_name.class})" diff --git a/lib/chef/resource_collection/resource_set.rb b/lib/chef/resource_collection/resource_set.rb index 26521010bd..db298afb63 100644 --- a/lib/chef/resource_collection/resource_set.rb +++ b/lib/chef/resource_collection/resource_set.rb @@ -131,7 +131,7 @@ class Chef else raise Chef::Exceptions::InvalidResourceSpecification, "The object `#{query_object.inspect}' is not valid for resource collection lookup. " + - "Use a String like `resource_type[resource_name]' or a Chef::Resource object" + "Use a String like `resource_type[resource_name]' or a Chef::Resource object" end end diff --git a/spec/unit/knife/client_create_spec.rb b/spec/unit/knife/client_create_spec.rb index 3401072d6e..d7d108658e 100644 --- a/spec/unit/knife/client_create_spec.rb +++ b/spec/unit/knife/client_create_spec.rb @@ -123,7 +123,7 @@ describe Chef::Knife::ClientCreate do it "should write the private key to a file" do file = Tempfile.new - file_path = file.path + file_path = file.path knife.config[:file] = file_path filehandle = double("Filehandle") expect(filehandle).to receive(:print).with("woot") diff --git a/spec/unit/knife/core/node_editor_spec.rb b/spec/unit/knife/core/node_editor_spec.rb index f4fbe76695..70f8e00c35 100644 --- a/spec/unit/knife/core/node_editor_spec.rb +++ b/spec/unit/knife/core/node_editor_spec.rb @@ -74,7 +74,7 @@ describe Chef::Knife::NodeEditor do expect(ui).to have_received(:warn) .with "Changing the name of a node results in a new node being " + - "created, test_node will not be modified or removed." + "created, test_node will not be modified or removed." expect(ui).to have_received(:confirm) .with("Proceed with creation of new node") |