diff options
author | Tim Smith <tsmith84@gmail.com> | 2020-11-25 19:58:38 -0800 |
---|---|---|
committer | Tim Smith <tsmith84@gmail.com> | 2020-11-25 19:58:38 -0800 |
commit | 2c877f79fc38d111c555d7b661486019bb787e35 (patch) | |
tree | 30f57e9fa1d14de22be46f67d1d0f6ba3d098c11 | |
parent | 1bc59a695993556ba70f2ee1289adafc174e0d3e (diff) | |
download | chef-2c877f79fc38d111c555d7b661486019bb787e35.tar.gz |
Chefstyle fixes for RuboCop 1.4.x
There are some new spaces changes in RuboCop 1.4.2
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r-- | lib/chef/cookbook_manifest.rb | 1 | ||||
-rw-r--r-- | lib/chef/encrypted_data_bag_item/assertions.rb | 2 | ||||
-rw-r--r-- | lib/chef/exceptions.rb | 4 | ||||
-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-- | lib/chef/win32/api/file.rb | 4 | ||||
-rw-r--r-- | spec/integration/recipes/recipe_dsl_spec.rb | 1 | ||||
-rw-r--r-- | spec/unit/knife/core/node_editor_spec.rb | 2 | ||||
-rw-r--r-- | spec/unit/provider/mount/windows_spec.rb | 1 |
10 files changed, 21 insertions, 10 deletions
diff --git a/lib/chef/cookbook_manifest.rb b/lib/chef/cookbook_manifest.rb index 6e79a880e9..84b0c0d58c 100644 --- a/lib/chef/cookbook_manifest.rb +++ b/lib/chef/cookbook_manifest.rb @@ -317,6 +317,7 @@ class Chef end end + class CookbookManifestVersions extend Chef::Mixin::VersionedAPIFactory diff --git a/lib/chef/encrypted_data_bag_item/assertions.rb b/lib/chef/encrypted_data_bag_item/assertions.rb index 02baad2a2d..13ed0de050 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/exceptions.rb b/lib/chef/exceptions.rb index e0b534c3d3..a0afd25208 100644 --- a/lib/chef/exceptions.rb +++ b/lib/chef/exceptions.rb @@ -84,11 +84,13 @@ class Chef class InvalidPrivateKey < ArgumentError; end class MissingKeyAttribute < ArgumentError; end class KeyCommandInputError < ArgumentError; end + class BootstrapCommandInputError < ArgumentError def initialize super "You cannot pass both --json-attributes and --json-attribute-file. Please pass one or none." end end + class InvalidKeyArgument < ArgumentError; end class InvalidKeyAttribute < ArgumentError; end class InvalidUserAttribute < ArgumentError; end @@ -195,6 +197,7 @@ class Chef class IllegalVersionConstraint < NotImplementedError; end # rubocop:disable Lint/InheritException class MetadataNotValid < StandardError; end + class MetadataNotFound < StandardError attr_reader :install_path attr_reader :cookbook_name @@ -283,6 +286,7 @@ class Chef end end + # Exception class for collecting multiple failures. Used when running # delayed notifications so that chef can process each delayed # notification even if chef client or other notifications fail. diff --git a/lib/chef/provider/git.rb b/lib/chef/provider/git.rb index f1c8380307..c0f6f01c59 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 88fde45a25..e3f266740d 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 db298afb63..26521010bd 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/lib/chef/win32/api/file.rb b/lib/chef/win32/api/file.rb index eb83e2487d..c18bc08e8b 100644 --- a/lib/chef/win32/api/file.rb +++ b/lib/chef/win32/api/file.rb @@ -316,6 +316,7 @@ typedef struct _REPARSE_DATA_BUFFER { string_pointer.read_wstring(self[:PrintNameLength] / 2) end end + class REPARSE_DATA_BUFFER_MOUNT_POINT < FFI::Struct layout :SubstituteNameOffset, :ushort, :SubstituteNameLength, :ushort, @@ -333,14 +334,17 @@ typedef struct _REPARSE_DATA_BUFFER { string_pointer.read_wstring(self[:PrintNameLength] / 2) end end + class REPARSE_DATA_BUFFER_GENERIC < FFI::Struct layout :DataBuffer, :uchar end + class REPARSE_DATA_BUFFER_UNION < FFI::Union layout :SymbolicLinkReparseBuffer, REPARSE_DATA_BUFFER_SYMBOLIC_LINK, :MountPointReparseBuffer, REPARSE_DATA_BUFFER_MOUNT_POINT, :GenericReparseBuffer, REPARSE_DATA_BUFFER_GENERIC end + class REPARSE_DATA_BUFFER < FFI::Struct layout :ReparseTag, :uint32, :ReparseDataLength, :ushort, diff --git a/spec/integration/recipes/recipe_dsl_spec.rb b/spec/integration/recipes/recipe_dsl_spec.rb index 797e9ecb70..e714465a17 100644 --- a/spec/integration/recipes/recipe_dsl_spec.rb +++ b/spec/integration/recipes/recipe_dsl_spec.rb @@ -28,6 +28,7 @@ describe "Recipe DSL methods" do def provider Provider end + class Provider < Chef::Provider def load_current_resource; end diff --git a/spec/unit/knife/core/node_editor_spec.rb b/spec/unit/knife/core/node_editor_spec.rb index 4eac07c313..d8e5c86d2c 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") diff --git a/spec/unit/provider/mount/windows_spec.rb b/spec/unit/provider/mount/windows_spec.rb index aeff294347..3c2999e07e 100644 --- a/spec/unit/provider/mount/windows_spec.rb +++ b/spec/unit/provider/mount/windows_spec.rb @@ -23,6 +23,7 @@ class Chef class Windows class NetUse end + class Volume end end |