chef 12.6.0 → 12.7.2

data/lib/chef/dsl/resources.rb

@@ -1,6 +1,6 @@
 #
 # Author:: John Keiser <jkeiser@chef.io>
-# Copyright:: Copyright (c) 2015 Chef Software, Inc.
+# Copyright:: Copyright 2015-2016, Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'chef/dsl/cheffish'
-require 'chef/dsl/chef_provisioning'
+require "chef/dsl/cheffish"
+require "chef/dsl/chef_provisioning"
 
 class Chef
   module DSL
@@ -34,7 +34,7 @@ class Chef
 
       def self.add_resource_dsl(dsl_name)
         begin
-          module_eval(<<-EOM, __FILE__, __LINE__+1)
+          module_eval(<<-EOM, __FILE__, __LINE__ + 1)
             def #{dsl_name}(*args, &block)
               Chef.log_deprecation("Cannot create resource #{dsl_name} with more than one argument. All arguments except the name (\#{args[0].inspect}) will be ignored. This will cause an error in Chef 13. Arguments: \#{args}") if args.size > 1
               declare_resource(#{dsl_name.inspect}, args[0], caller[0], &block)
@@ -48,8 +48,9 @@ class Chef
           end
         end
       end
+
       def self.remove_resource_dsl(dsl_name)
-          remove_method(dsl_name)
+        remove_method(dsl_name)
       rescue NameError
       end
     end

data/lib/chef/encrypted_data_bag_item.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Seth Falcon (<seth@opscode.com>)
-# Copyright:: Copyright 2010-2011 Opscode, Inc.
+# Author:: Seth Falcon (<seth@chef.io>)
+# Copyright:: Copyright 2010-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,11 +16,11 @@
 # limitations under the License.
 #
 
-require 'chef/config'
-require 'chef/data_bag_item'
-require 'chef/encrypted_data_bag_item/decryptor'
-require 'chef/encrypted_data_bag_item/encryptor'
-require 'open-uri'
+require "chef/config"
+require "chef/data_bag_item"
+require "chef/encrypted_data_bag_item/decryptor"
+require "chef/encrypted_data_bag_item/encryptor"
+require "open-uri"
 
 # An EncryptedDataBagItem represents a read-only data bag item where
 # all values, except for the value associated with the id key, have
@@ -47,8 +47,8 @@ require 'open-uri'
 # such nodes in the infrastructure.
 #
 class Chef::EncryptedDataBagItem
-  ALGORITHM = 'aes-256-cbc'
-  AEAD_ALGORITHM = 'aes-256-gcm'
+  ALGORITHM = "aes-256-cbc"
+  AEAD_ALGORITHM = "aes-256-gcm"
 
   #
   # === Synopsis
@@ -125,7 +125,7 @@ class Chef::EncryptedDataBagItem
     self.new(raw_hash, secret)
   end
 
-  def self.load_secret(path=nil)
+  def self.load_secret(path = nil)
     path ||= Chef::Config[:encrypted_data_bag_secret]
     if !path
       raise ArgumentError, "No secret specified and no secret found at #{Chef::Config.platform_specific_path('/etc/chef/encrypted_data_bag_secret')}"

data/lib/chef/encrypted_data_bag_item/assertions.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Xabier de Zuazo (<xabier@onddo.com>)
-# Copyright:: Copyright (c) 2014 Onddo Labs, SL.
+# Copyright:: Copyright 2014-2016, Onddo Labs, SL.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,8 +16,8 @@
 # limitations under the License.
 #
 
-require 'chef/encrypted_data_bag_item/unacceptable_encrypted_data_bag_item_format'
-require 'chef/encrypted_data_bag_item/unsupported_cipher'
+require "chef/encrypted_data_bag_item/unacceptable_encrypted_data_bag_item_format"
+require "chef/encrypted_data_bag_item/unsupported_cipher"
 
 class Chef::EncryptedDataBagItem
 
@@ -30,7 +30,7 @@ class Chef::EncryptedDataBagItem
       unless format_version.kind_of?(Integer) and 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
 

data/lib/chef/encrypted_data_bag_item/check_encrypted.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Tyler Ball (<tball@getchef.com>)
-# Copyright:: Copyright (c) 2010-2014 Opscode, Inc.
+# Author:: Tyler Ball (<tball@chef.io>)
+# Copyright:: Copyright 2010-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require 'chef/encrypted_data_bag_item/encryptor'
+require "chef/encrypted_data_bag_item/encryptor"
 
 class Chef::EncryptedDataBagItem
   # Common code for checking if a data bag appears encrypted

data/lib/chef/encrypted_data_bag_item/decryption_failure.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Seth Falcon (<seth@opscode.com>)
-# Copyright:: Copyright 2010-2011 Opscode, Inc.
+# Author:: Seth Falcon (<seth@chef.io>)
+# Copyright:: Copyright 2010-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/chef/encrypted_data_bag_item/decryptor.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Seth Falcon (<seth@opscode.com>)
-# Copyright:: Copyright 2010-2011 Opscode, Inc.
+# Author:: Seth Falcon (<seth@chef.io>)
+# Copyright:: Copyright 2010-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,15 +16,15 @@
 # limitations under the License.
 #
 
-require 'yaml'
-require 'chef/json_compat'
-require 'openssl'
-require 'base64'
-require 'digest/sha2'
-require 'chef/encrypted_data_bag_item'
-require 'chef/encrypted_data_bag_item/unsupported_encrypted_data_bag_item_format'
-require 'chef/encrypted_data_bag_item/decryption_failure'
-require 'chef/encrypted_data_bag_item/assertions'
+require "yaml"
+require "chef/json_compat"
+require "openssl"
+require "base64"
+require "digest/sha2"
+require "chef/encrypted_data_bag_item"
+require "chef/encrypted_data_bag_item/unsupported_encrypted_data_bag_item_format"
+require "chef/encrypted_data_bag_item/decryption_failure"
+require "chef/encrypted_data_bag_item/assertions"
 
 class Chef::EncryptedDataBagItem
 
@@ -92,7 +92,8 @@ class Chef::EncryptedDataBagItem
           plaintext = openssl_decryptor.update(encrypted_bytes)
           plaintext << openssl_decryptor.final
         rescue OpenSSL::Cipher::CipherError => e
-          raise DecryptionFailure, "Error decrypting data bag value: '#{e.message}'. Most likely the provided key is incorrect"
+          # if the key length is less than 150 characters, and it contains slashes, we think it may be a path.
+          raise DecryptionFailure, "Error decrypting data bag value: '#{e.message}'. Most likely the provided key is incorrect. #{ @key.length < 255 and @key.include?('/') ? 'You may need to use --secret-file rather than --secret.' : '' }"
         end
       end
 
@@ -142,7 +143,8 @@ class Chef::EncryptedDataBagItem
           plaintext = openssl_decryptor.update(encrypted_bytes)
           plaintext << openssl_decryptor.final
         rescue OpenSSL::Cipher::CipherError => e
-          raise DecryptionFailure, "Error decrypting data bag value: '#{e.message}'. Most likely the provided key is incorrect"
+          # if the key length is less than 150 characters, and it contains slashes, we think it may be a path.
+          raise DecryptionFailure, "Error decrypting data bag value: '#{e.message}'. Most likely the provided key is incorrect. #{ @key.length < 255 and @key.include?('/') ? 'You may need to use --secret-file rather than --secret.' : '' }"
         end
       end
 
@@ -214,7 +216,7 @@ class Chef::EncryptedDataBagItem
         @openssl_decryptor ||= begin
           d = super
           d.auth_tag = auth_tag
-          d.auth_data = ''
+          d.auth_data = ""
           d
         end
       end

data/lib/chef/encrypted_data_bag_item/encrypted_data_bag_item_assertions.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Xabier de Zuazo (<xabier@onddo.com>)
-# Copyright:: Copyright (c) 2014 Onddo Labs, SL.
+# Copyright:: Copyright 2014-2016, Onddo Labs, SL.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/chef/encrypted_data_bag_item/encryption_failure.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Xabier de Zuazo (<xabier@onddo.com>)
-# Copyright:: Copyright (c) 2014 Onddo Labs, SL.
+# Copyright:: Copyright 2014-2016, Onddo Labs, SL.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/chef/encrypted_data_bag_item/encryptor.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Seth Falcon (<seth@opscode.com>)
-# Copyright:: Copyright 2010-2011 Opscode, Inc.
+# Author:: Seth Falcon (<seth@chef.io>)
+# Copyright:: Copyright 2010-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,14 +16,14 @@
 # limitations under the License.
 #
 
-require 'base64'
-require 'digest/sha2'
-require 'openssl'
-require 'ffi_yajl'
-require 'chef/encrypted_data_bag_item'
-require 'chef/encrypted_data_bag_item/unsupported_encrypted_data_bag_item_format'
-require 'chef/encrypted_data_bag_item/encryption_failure'
-require 'chef/encrypted_data_bag_item/assertions'
+require "base64"
+require "digest/sha2"
+require "openssl"
+require "ffi_yajl"
+require "chef/encrypted_data_bag_item"
+require "chef/encrypted_data_bag_item/unsupported_encrypted_data_bag_item_format"
+require "chef/encrypted_data_bag_item/encryption_failure"
+require "chef/encrypted_data_bag_item/assertions"
 
 class Chef::EncryptedDataBagItem
 
@@ -35,7 +35,7 @@ class Chef::EncryptedDataBagItem
     # for the desired encrypted data bag format version.
     #
     # +Chef::Config[:data_bag_encrypt_version]+ determines which version is used.
-    def self.new(value, secret, iv=nil)
+    def self.new(value, secret, iv = nil)
       format_version = Chef::Config[:data_bag_encrypt_version]
       case format_version
       when 1
@@ -65,7 +65,7 @@ class Chef::EncryptedDataBagItem
       # * iv: The optional +iv+ parameter is intended for testing use only. When
       # *not* supplied, Encryptor will use OpenSSL to generate a secure random
       # IV, which is what you want.
-      def initialize(plaintext_data, key, iv=nil)
+      def initialize(plaintext_data, key, iv = nil)
         @plaintext_data = plaintext_data
         @key = key
         @iv = iv && Base64.decode64(iv)
@@ -83,7 +83,7 @@ class Chef::EncryptedDataBagItem
           "encrypted_data" => encrypted_data,
           "iv" => Base64.encode64(iv),
           "version" => 1,
-          "cipher" => algorithm
+          "cipher" => algorithm,
         }
       end
 
@@ -127,7 +127,7 @@ class Chef::EncryptedDataBagItem
       end
 
       def self.encryptor_keys
-        %w( encrypted_data iv version cipher )
+        %w{ encrypted_data iv version cipher }
       end
     end
 
@@ -141,7 +141,7 @@ class Chef::EncryptedDataBagItem
           "hmac" => hmac,
           "iv" => Base64.encode64(iv),
           "version" => 2,
-          "cipher" => algorithm
+          "cipher" => algorithm,
         }
       end
 
@@ -155,14 +155,14 @@ class Chef::EncryptedDataBagItem
       end
 
       def self.encryptor_keys
-        super + %w( hmac )
+        super + %w{ hmac }
       end
     end
 
     class Version3Encryptor < Version1Encryptor
       include Chef::EncryptedDataBagItem::Assertions
 
-      def initialize(plaintext_data, key, iv=nil)
+      def initialize(plaintext_data, key, iv = nil)
         super
         assert_aead_requirements_met!(algorithm)
         @auth_tag = nil
@@ -176,7 +176,7 @@ class Chef::EncryptedDataBagItem
           "iv" => Base64.encode64(iv),
           "auth_tag" => Base64.encode64(auth_tag),
           "version" => 3,
-          "cipher" => algorithm
+          "cipher" => algorithm,
         }
       end
 
@@ -201,7 +201,7 @@ class Chef::EncryptedDataBagItem
       def openssl_encryptor
         @openssl_encryptor ||= begin
           encryptor = super
-          encryptor.auth_data = ''
+          encryptor.auth_data = ""
           encryptor
         end
       end
@@ -216,7 +216,7 @@ class Chef::EncryptedDataBagItem
       end
 
       def self.encryptor_keys
-        super + %w( auth_tag )
+        super + %w{ auth_tag }
       end
 
     end

data/lib/chef/encrypted_data_bag_item/unacceptable_encrypted_data_bag_item_format.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Seth Falcon (<seth@opscode.com>)
-# Copyright:: Copyright 2010-2011 Opscode, Inc.
+# Author:: Seth Falcon (<seth@chef.io>)
+# Copyright:: Copyright 2010-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/chef/encrypted_data_bag_item/unsupported_cipher.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Seth Falcon (<seth@opscode.com>)
-# Copyright:: Copyright 2010-2011 Opscode, Inc.
+# Author:: Seth Falcon (<seth@chef.io>)
+# Copyright:: Copyright 2010-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/chef/encrypted_data_bag_item/unsupported_encrypted_data_bag_item_format.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Seth Falcon (<seth@opscode.com>)
-# Copyright:: Copyright 2010-2011 Opscode, Inc.
+# Author:: Seth Falcon (<seth@chef.io>)
+# Copyright:: Copyright 2010-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/chef/environment.rb

@@ -1,9 +1,9 @@
 #
-# Author:: Stephen Delano (<stephen@opscode.com>)
-# Author:: Seth Falcon (<seth@opscode.com>)
+# Author:: Stephen Delano (<stephen@chef.io>)
+# Author:: Seth Falcon (<seth@chef.io>)
 # Author:: John Keiser (<jkeiser@ospcode.com>)
 # Author:: Kyle Goodwin (<kgoodwin@primerevenue.com>)
-# Copyright:: Copyright 2010-2011 Opscode, Inc.
+# Copyright:: Copyright 2010-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,11 +19,12 @@
 # limitations under the License.
 #
 
-require 'chef/config'
-require 'chef/mash'
-require 'chef/mixin/params_validate'
-require 'chef/mixin/from_file'
-require 'chef/version_constraint'
+require "chef/config"
+require "chef/mash"
+require "chef/mixin/params_validate"
+require "chef/mixin/from_file"
+require "chef/version_constraint"
+require "chef/server_api"
 
 class Chef
   class Environment
@@ -38,8 +39,8 @@ class Chef
     COMBINED_COOKBOOK_CONSTRAINT = /(.+)(?:[\s]+)((?:#{Chef::VersionConstraint::OPS.join('|')})(?:[\s]+).+)$/.freeze
 
     def initialize(chef_server_rest: nil)
-      @name = ''
-      @description = ''
+      @name = ""
+      @description = ""
       @default_attributes = Mash.new
       @override_attributes = Mash.new
       @cookbook_versions = Hash.new
@@ -47,14 +48,14 @@ class Chef
     end
 
     def chef_server_rest
-      @chef_server_rest ||= Chef::REST.new(Chef::Config[:chef_server_url])
+      @chef_server_rest ||= Chef::ServerAPI.new(Chef::Config[:chef_server_url])
     end
 
     def self.chef_server_rest
-      Chef::REST.new(Chef::Config[:chef_server_url])
+      Chef::ServerAPI.new(Chef::Config[:chef_server_url])
     end
 
-    def name(arg=nil)
+    def name(arg = nil)
       set_or_return(
         :name,
         arg,
@@ -62,19 +63,19 @@ class Chef
       )
     end
 
-    def description(arg=nil)
+    def description(arg = nil)
       set_or_return(
         :description,
         arg,
-        :kind_of => String
+        :kind_of => String,
       )
     end
 
-    def default_attributes(arg=nil)
+    def default_attributes(arg = nil)
       set_or_return(
         :default_attributes,
         arg,
-        :kind_of => Hash
+        :kind_of => Hash,
       )
     end
 
@@ -82,11 +83,11 @@ class Chef
       default_attributes(attrs)
     end
 
-    def override_attributes(arg=nil)
+    def override_attributes(arg = nil)
       set_or_return(
         :override_attributes,
         arg,
-        :kind_of => Hash
+        :kind_of => Hash,
       )
     end
 
@@ -94,7 +95,7 @@ class Chef
       override_attributes(attrs)
     end
 
-    def cookbook_versions(arg=nil)
+    def cookbook_versions(arg = nil)
       set_or_return(
         :cookbook_versions,
         arg,
@@ -102,19 +103,19 @@ class Chef
           :kind_of => Hash,
           :callbacks => {
             "should be a valid set of cookbook version requirements" => lambda { |cv| Chef::Environment.validate_cookbook_versions(cv) }
-          }
-        }
+          },
+        },
       )
     end
 
     def cookbook(cookbook, version)
       validate({
         :version => version
-      },{
+      }, {
         :version => {
           :callbacks => { "should be a valid version requirement" => lambda { |v| Chef::Environment.validate_cookbook_version(v) } }
         }
-      })
+      },)
       @cookbook_versions[cookbook] = version
     end
 
@@ -126,7 +127,7 @@ class Chef
         "json_class" => self.class.name,
         "chef_type" => "environment",
         "default_attributes" => @default_attributes,
-        "override_attributes" => @override_attributes
+        "override_attributes" => @override_attributes,
       }
       result
     end
@@ -216,6 +217,11 @@ class Chef
     end
 
     def self.json_create(o)
+      Chef.log_deprecation("Auto inflation of JSON data is deprecated. Please use Chef::Environment#from_hash")
+      from_hash(o)
+    end
+
+    def self.from_hash(o)
       environment = new
       environment.name(o["name"])
       environment.description(o["description"])
@@ -225,7 +231,7 @@ class Chef
       environment
     end
 
-    def self.list(inflate=false)
+    def self.list(inflate = false)
       if inflate
         response = Hash.new
         Chef::Search::Query.new.search(:environment) do |e|
@@ -233,7 +239,7 @@ class Chef
         end
         response
       else
-        chef_server_rest.get_rest("environments")
+        chef_server_rest.get("environments")
       end
     end
 
@@ -241,7 +247,7 @@ class Chef
       if Chef::Config[:solo]
         load_from_file(name)
       else
-        chef_server_rest.get_rest("environments/#{name}")
+        self.from_hash(chef_server_rest.get("environments/#{name}"))
       end
     end
 
@@ -255,7 +261,8 @@ class Chef
 
       if File.exists?(js_file)
         # from_json returns object.class => json_class in the JSON.
-        Chef::JSONCompat.from_json(IO.read(js_file))
+        hash = Chef::JSONCompat.parse(IO.read(js_file))
+        from_hash(hash)
       elsif File.exists?(rb_file)
         environment = Chef::Environment.new
         environment.name(name)
@@ -267,26 +274,26 @@ class Chef
     end
 
     def destroy
-      chef_server_rest.delete_rest("environments/#{@name}")
+      chef_server_rest.delete("environments/#{@name}")
     end
 
     def save
       begin
-        chef_server_rest.put_rest("environments/#{@name}", self)
+        chef_server_rest.put("environments/#{@name}", self)
       rescue Net::HTTPServerException => e
         raise e unless e.response.code == "404"
-        chef_server_rest.post_rest("environments", self)
+        chef_server_rest.post("environments", self)
       end
       self
     end
 
     def create
-      chef_server_rest.post_rest("environments", self)
+      chef_server_rest.post("environments", self)
       self
     end
 
     def self.load_filtered_recipe_list(environment)
-      chef_server_rest.get_rest("environments/#{environment}/recipes")
+      chef_server_rest.get("environments/#{environment}/recipes")
     end
 
     def to_s