chef 12.22.1 → 12.22.3

data/lib/chef/rest.rb

@@ -1,210 +1,210 @@
-#--
-# Author:: Adam Jacob (<adam@chef.io>)
-# Author:: Thom May (<thom@clearairturbulence.org>)
-# Author:: Nuo Yan (<nuo@chef.io>)
-# Author:: Christopher Brown (<cb@chef.io>)
-# Author:: Christopher Walters (<cw@chef.io>)
-# Copyright:: Copyright 2009-2016, 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 "tempfile"
-require "chef/http"
-class Chef
-  class HTTP; end
-  class REST < HTTP; end
-end
-
-require "chef/http/authenticator"
-require "chef/http/decompressor"
-require "chef/http/json_input"
-require "chef/http/json_to_model_output"
-require "chef/http/cookie_manager"
-require "chef/http/validate_content_length"
-require "chef/config"
-require "chef/exceptions"
-require "chef/platform/query_helpers"
-require "chef/http/remote_request_id"
-require "chef/chef_class"
-
-class Chef
-
-  # == Chef::REST
-  # Chef's custom REST client with built-in JSON support and RSA signed header
-  # authentication.
-  class REST < HTTP
-
-    # Backwards compatibility for things that use
-    # Chef::REST::RESTRequest or its constants
-    RESTRequest = HTTP::HTTPRequest
-
-    attr_accessor :url, :cookies, :sign_on_redirect, :redirect_limit
-
-    attr_reader :authenticator
-
-    # Create a REST client object. The supplied +url+ is used as the base for
-    # all subsequent requests. For example, when initialized with a base url
-    # http://localhost:4000, a call to +get_rest+ with 'nodes' will make an
-    # HTTP GET request to http://localhost:4000/nodes
-    def initialize(url, client_name = Chef::Config[:node_name], signing_key_filename = Chef::Config[:client_key], options = {})
-      Chef.deprecated(:chef_rest, "Chef::REST is deprecated. Please use Chef::ServerAPI, or investigate Ridley or ChefAPI.")
-
-      signing_key_filename = nil if chef_zero_uri?(url)
-
-      options = options.dup
-      options[:client_name] = client_name
-      options[:signing_key_filename] = signing_key_filename
-
-      super(url, options)
-
-      @decompressor = Decompressor.new(options)
-      @authenticator = Authenticator.new(options)
-      @request_id = RemoteRequestID.new(options)
-
-      @middlewares << JSONInput.new(options)
-      @middlewares << JSONToModelOutput.new(options)
-      @middlewares << CookieManager.new(options)
-      @middlewares << @decompressor
-      @middlewares << @authenticator
-      @middlewares << @request_id
-
-      # ValidateContentLength should come after Decompressor
-      # because the order of middlewares is reversed when handling
-      # responses.
-      @middlewares << ValidateContentLength.new(options)
-    end
-
-    def signing_key_filename
-      authenticator.signing_key_filename
-    end
-
-    def auth_credentials
-      authenticator.auth_credentials
-    end
-
-    def client_name
-      authenticator.client_name
-    end
-
-    def signing_key
-      authenticator.raw_key
-    end
-
-    def sign_requests?
-      authenticator.sign_requests?
-    end
-
-    # Send an HTTP GET request to the path
-    #
-    # Using this method to +fetch+ a file is considered deprecated.
-    #
-    # === Parameters
-    # path:: The path to GET
-    # raw:: Whether you want the raw body returned, or JSON inflated.  Defaults
-    #   to JSON inflated.
-    def get(path, raw = false, headers = {})
-      if raw
-        streaming_request(path, headers)
-      else
-        request(:GET, path, headers)
-      end
-    end
-
-    alias :get_rest :get
-
-    alias :delete_rest :delete
-
-    alias :post_rest :post
-
-    alias :put_rest :put
-
-    # Streams a download to a tempfile, then yields the tempfile to a block.
-    # After the download, the tempfile will be closed and unlinked.
-    # If you rename the tempfile, it will not be deleted.
-    # Beware that if the server streams infinite content, this method will
-    # stream it until you run out of disk space.
-    def fetch(path, headers = {})
-      streaming_request(create_url(path), headers) { |tmp_file| yield tmp_file }
-    end
-
-    alias :api_request :request
-
-    # Do a HTTP request where no middleware is loaded (e.g. JSON input/output
-    # conversion) but the standard Chef Authentication headers are added to the
-    # request.
-    def raw_http_request(method, path, headers, data)
-      url = create_url(path)
-      method, url, headers, data = @authenticator.handle_request(method, url, headers, data)
-      method, url, headers, data = @request_id.handle_request(method, url, headers, data)
-      response, rest_request, return_value = send_http_request(method, url, headers, data)
-      response.error! unless success_response?(response)
-      return_value
-    rescue Exception => exception
-      log_failed_request(response, return_value) unless response.nil?
-
-      if exception.respond_to?(:chef_rest_request=)
-        exception.chef_rest_request = rest_request
-      end
-      raise
-    end
-
-    # Deprecated:
-    # Responsibilities of this method have been split up. The #http_client is
-    # now responsible for making individual requests, while
-    # #retrying_http_errors handles error/retry logic.
-    def retriable_http_request(method, url, req_body, headers)
-      rest_request = Chef::HTTP::HTTPRequest.new(method, url, req_body, headers)
-
-      Chef::Log.debug("Sending HTTP request via #{method} to #{url.host}:#{url.port}#{rest_request.path}")
-
-      retrying_http_errors(url) do
-        yield rest_request
-      end
-    end
-
-    # Customized streaming behavior; sets the accepted content type to "*/*"
-    # if not otherwise specified for compatibility purposes
-    def streaming_request(url, headers, &block)
-      headers["Accept"] ||= "*/*"
-      super
-    end
-
-    alias :retriable_rest_request :retriable_http_request
-
-    def follow_redirect
-      unless @sign_on_redirect
-        @authenticator.sign_request = false
-      end
-      super
-    ensure
-      @authenticator.sign_request = true
-    end
-
-    public :create_url
-
-    ############################################################################
-    # DEPRECATED
-    ############################################################################
-
-    def decompress_body(body)
-      @decompressor.decompress_body(body)
-    end
-
-    def authentication_headers(method, url, json_body = nil)
-      authenticator.authentication_headers(method, url, json_body)
-    end
-
-  end
-end
+#--
+# Author:: Adam Jacob (<adam@chef.io>)
+# Author:: Thom May (<thom@clearairturbulence.org>)
+# Author:: Nuo Yan (<nuo@chef.io>)
+# Author:: Christopher Brown (<cb@chef.io>)
+# Author:: Christopher Walters (<cw@chef.io>)
+# Copyright:: Copyright 2009-2016, 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 "tempfile"
+require "chef/http"
+class Chef
+  class HTTP; end
+  class REST < HTTP; end
+end
+
+require "chef/http/authenticator"
+require "chef/http/decompressor"
+require "chef/http/json_input"
+require "chef/http/json_to_model_output"
+require "chef/http/cookie_manager"
+require "chef/http/validate_content_length"
+require "chef/config"
+require "chef/exceptions"
+require "chef/platform/query_helpers"
+require "chef/http/remote_request_id"
+require "chef/chef_class"
+
+class Chef
+
+  # == Chef::REST
+  # Chef's custom REST client with built-in JSON support and RSA signed header
+  # authentication.
+  class REST < HTTP
+
+    # Backwards compatibility for things that use
+    # Chef::REST::RESTRequest or its constants
+    RESTRequest = HTTP::HTTPRequest
+
+    attr_accessor :url, :cookies, :sign_on_redirect, :redirect_limit
+
+    attr_reader :authenticator
+
+    # Create a REST client object. The supplied +url+ is used as the base for
+    # all subsequent requests. For example, when initialized with a base url
+    # http://localhost:4000, a call to +get_rest+ with 'nodes' will make an
+    # HTTP GET request to http://localhost:4000/nodes
+    def initialize(url, client_name = Chef::Config[:node_name], signing_key_filename = Chef::Config[:client_key], options = {})
+      Chef.deprecated(:chef_rest, "Chef::REST is deprecated. Please use Chef::ServerAPI, or investigate Ridley or ChefAPI.")
+
+      signing_key_filename = nil if chef_zero_uri?(url)
+
+      options = options.dup
+      options[:client_name] = client_name
+      options[:signing_key_filename] = signing_key_filename
+
+      super(url, options)
+
+      @decompressor = Decompressor.new(options)
+      @authenticator = Authenticator.new(options)
+      @request_id = RemoteRequestID.new(options)
+
+      @middlewares << JSONInput.new(options)
+      @middlewares << JSONToModelOutput.new(options)
+      @middlewares << CookieManager.new(options)
+      @middlewares << @decompressor
+      @middlewares << @authenticator
+      @middlewares << @request_id
+
+      # ValidateContentLength should come after Decompressor
+      # because the order of middlewares is reversed when handling
+      # responses.
+      @middlewares << ValidateContentLength.new(options)
+    end
+
+    def signing_key_filename
+      authenticator.signing_key_filename
+    end
+
+    def auth_credentials
+      authenticator.auth_credentials
+    end
+
+    def client_name
+      authenticator.client_name
+    end
+
+    def signing_key
+      authenticator.raw_key
+    end
+
+    def sign_requests?
+      authenticator.sign_requests?
+    end
+
+    # Send an HTTP GET request to the path
+    #
+    # Using this method to +fetch+ a file is considered deprecated.
+    #
+    # === Parameters
+    # path:: The path to GET
+    # raw:: Whether you want the raw body returned, or JSON inflated.  Defaults
+    #   to JSON inflated.
+    def get(path, raw = false, headers = {})
+      if raw
+        streaming_request(path, headers)
+      else
+        request(:GET, path, headers)
+      end
+    end
+
+    alias :get_rest :get
+
+    alias :delete_rest :delete
+
+    alias :post_rest :post
+
+    alias :put_rest :put
+
+    # Streams a download to a tempfile, then yields the tempfile to a block.
+    # After the download, the tempfile will be closed and unlinked.
+    # If you rename the tempfile, it will not be deleted.
+    # Beware that if the server streams infinite content, this method will
+    # stream it until you run out of disk space.
+    def fetch(path, headers = {})
+      streaming_request(create_url(path), headers) { |tmp_file| yield tmp_file }
+    end
+
+    alias :api_request :request
+
+    # Do a HTTP request where no middleware is loaded (e.g. JSON input/output
+    # conversion) but the standard Chef Authentication headers are added to the
+    # request.
+    def raw_http_request(method, path, headers, data)
+      url = create_url(path)
+      method, url, headers, data = @authenticator.handle_request(method, url, headers, data)
+      method, url, headers, data = @request_id.handle_request(method, url, headers, data)
+      response, rest_request, return_value = send_http_request(method, url, headers, data)
+      response.error! unless success_response?(response)
+      return_value
+    rescue Exception => exception
+      log_failed_request(response, return_value) unless response.nil?
+
+      if exception.respond_to?(:chef_rest_request=)
+        exception.chef_rest_request = rest_request
+      end
+      raise
+    end
+
+    # Deprecated:
+    # Responsibilities of this method have been split up. The #http_client is
+    # now responsible for making individual requests, while
+    # #retrying_http_errors handles error/retry logic.
+    def retriable_http_request(method, url, req_body, headers)
+      rest_request = Chef::HTTP::HTTPRequest.new(method, url, req_body, headers)
+
+      Chef::Log.debug("Sending HTTP request via #{method} to #{url.host}:#{url.port}#{rest_request.path}")
+
+      retrying_http_errors(url) do
+        yield rest_request
+      end
+    end
+
+    # Customized streaming behavior; sets the accepted content type to "*/*"
+    # if not otherwise specified for compatibility purposes
+    def streaming_request(url, headers, &block)
+      headers["Accept"] ||= "*/*"
+      super
+    end
+
+    alias :retriable_rest_request :retriable_http_request
+
+    def follow_redirect
+      unless @sign_on_redirect
+        @authenticator.sign_request = false
+      end
+      super
+    ensure
+      @authenticator.sign_request = true
+    end
+
+    public :create_url
+
+    ############################################################################
+    # DEPRECATED
+    ############################################################################
+
+    def decompress_body(body)
+      @decompressor.decompress_body(body)
+    end
+
+    def authentication_headers(method, url, json_body = nil)
+      authenticator.authentication_headers(method, url, json_body)
+    end
+
+  end
+end

data/lib/chef/role.rb

@@ -1,280 +1,280 @@
-#
-# Author:: Adam Jacob (<adam@chef.io>)
-# Author:: Nuo Yan (<nuo@chef.io>)
-# Author:: Christopher Brown (<cb@chef.io>)
-# Copyright:: Copyright 2008-2016, 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 "chef/config"
-require "chef/mixin/params_validate"
-require "chef/mixin/from_file"
-require "chef/run_list"
-require "chef/mash"
-require "chef/json_compat"
-require "chef/server_api"
-require "chef/search/query"
-
-class Chef
-  class Role
-
-    include Chef::Mixin::FromFile
-    include Chef::Mixin::ParamsValidate
-
-    attr_accessor :chef_server_rest
-
-    # Create a new Chef::Role object.
-    def initialize(chef_server_rest: nil)
-      @name = ""
-      @description = ""
-      @default_attributes = Mash.new
-      @override_attributes = Mash.new
-      @env_run_lists = { "_default" => Chef::RunList.new }
-      @chef_server_rest = chef_server_rest
-    end
-
-    def chef_server_rest
-      @chef_server_rest ||= Chef::ServerAPI.new(Chef::Config[:chef_server_url])
-    end
-
-    def self.chef_server_rest
-      Chef::ServerAPI.new(Chef::Config[:chef_server_url])
-    end
-
-    def name(arg = nil)
-      set_or_return(
-        :name,
-        arg,
-        :regex => /^[\-[:alnum:]_]+$/
-      )
-    end
-
-    def description(arg = nil)
-      set_or_return(
-        :description,
-        arg,
-        :kind_of => String
-      )
-    end
-
-    def run_list(*args)
-      if args.length > 0
-        @env_run_lists["_default"].reset!(args)
-      end
-      @env_run_lists["_default"]
-    end
-
-    alias_method :recipes, :run_list
-
-    # For run_list expansion
-    def run_list_for(environment)
-      if env_run_lists[environment].nil?
-        env_run_lists["_default"]
-      else
-        env_run_lists[environment]
-      end
-    end
-
-    def active_run_list_for(environment)
-      @env_run_lists.has_key?(environment) ? environment : "_default"
-    end
-
-    # Per environment run lists
-    def env_run_lists(env_run_lists = nil)
-      if !env_run_lists.nil?
-        unless env_run_lists.key?("_default")
-          msg = "_default key is required in env_run_lists.\n"
-          msg << "(env_run_lists: #{env_run_lists.inspect})"
-          raise Chef::Exceptions::InvalidEnvironmentRunListSpecification, msg
-        end
-        @env_run_lists.clear
-        env_run_lists.each { |k, v| @env_run_lists[k] = Chef::RunList.new(*Array(v)) }
-      end
-      @env_run_lists
-    end
-
-    alias :env_run_list :env_run_lists
-
-    def env_run_lists_add(env_run_lists = nil)
-      if !env_run_lists.nil?
-        env_run_lists.each { |k, v| @env_run_lists[k] = Chef::RunList.new(*Array(v)) }
-      end
-      @env_run_lists
-    end
-
-    alias :env_run_list_add :env_run_lists_add
-
-    def default_attributes(arg = nil)
-      set_or_return(
-        :default_attributes,
-        arg,
-        :kind_of => Hash
-      )
-    end
-
-    def override_attributes(arg = nil)
-      set_or_return(
-        :override_attributes,
-        arg,
-        :kind_of => Hash
-      )
-    end
-
-    def to_hash
-      env_run_lists_without_default = @env_run_lists.dup
-      env_run_lists_without_default.delete("_default")
-      result = {
-        "name" => @name,
-        "description" => @description,
-        "json_class" => self.class.name,
-        "default_attributes" => @default_attributes,
-        "override_attributes" => @override_attributes,
-        "chef_type" => "role",
-
-        #Render to_json correctly for run_list items (both run_list and evn_run_lists)
-        #so malformed json does not result
-        "run_list" => run_list.run_list.map { |item| item.to_s },
-        "env_run_lists" => env_run_lists_without_default.inject({}) do |accumulator, (k, v)|
-          accumulator[k] = v.map { |x| x.to_s }
-          accumulator
-        end,
-      }
-      result
-    end
-
-    # Serialize this object as a hash
-    def to_json(*a)
-      Chef::JSONCompat.to_json(to_hash, *a)
-    end
-
-    def update_from!(o)
-      description(o.description)
-      recipes(o.recipes) if defined?(o.recipes)
-      default_attributes(o.default_attributes)
-      override_attributes(o.override_attributes)
-      env_run_lists(o.env_run_lists) unless o.env_run_lists.nil?
-      self
-    end
-
-    # Create a Chef::Role from JSON
-    def self.json_create(o)
-      Chef.deprecated(:json_auto_inflate, "Auto inflation of JSON data is deprecated. Please use Chef::Role#from_hash")
-      from_hash(o)
-    end
-
-    def self.from_hash(o)
-      role = new
-      role.name(o["name"])
-      role.description(o["description"])
-      role.default_attributes(o["default_attributes"])
-      role.override_attributes(o["override_attributes"])
-
-      # _default run_list is in 'run_list' for newer clients, and
-      # 'recipes' for older clients.
-      env_run_list_hash = { "_default" => (o.has_key?("run_list") ? o["run_list"] : o["recipes"]) }
-
-      # Clients before 0.10 do not include env_run_lists, so only
-      # merge if it's there.
-      if o["env_run_lists"]
-        env_run_list_hash.merge!(o["env_run_lists"])
-      end
-      role.env_run_lists(env_run_list_hash)
-
-      role
-    end
-
-    # Get the list of all roles from the API.
-    def self.list(inflate = false)
-      if inflate
-        response = Hash.new
-        Chef::Search::Query.new.search(:role) do |n|
-          response[n.name] = n unless n.nil?
-        end
-        response
-      else
-        chef_server_rest.get("roles")
-      end
-    end
-
-    # Load a role by name from the API
-    def self.load(name)
-      from_hash(chef_server_rest.get("roles/#{name}"))
-    end
-
-    def environment(env_name)
-      chef_server_rest.get("roles/#{@name}/environments/#{env_name}")
-    end
-
-    def environments
-      chef_server_rest.get("roles/#{@name}/environments")
-    end
-
-    # Remove this role via the REST API
-    def destroy
-      chef_server_rest.delete("roles/#{@name}")
-    end
-
-    # Save this role via the REST API
-    def save
-      begin
-        chef_server_rest.put("roles/#{@name}", self)
-      rescue Net::HTTPServerException => e
-        raise e unless e.response.code == "404"
-        chef_server_rest.post("roles", self)
-      end
-      self
-    end
-
-    # Create the role via the REST API
-    def create
-      chef_server_rest.post("roles", self)
-      self
-    end
-
-    # As a string
-    def to_s
-      "role[#{@name}]"
-    end
-
-    # Load a role from disk - prefers to load the JSON, but will happily load
-    # the raw rb files as well. Can search within directories in the role_path.
-    def self.from_disk(name)
-      paths = Array(Chef::Config[:role_path])
-      paths.each do |path|
-        roles_files = Dir.glob(File.join(Chef::Util::PathHelper.escape_glob_dir(path), "**", "**"))
-        js_files = roles_files.select { |file| file.match(/\/#{name}\.json$/) }
-        rb_files = roles_files.select { |file| file.match(/\/#{name}\.rb$/) }
-        if js_files.count > 1 || rb_files.count > 1
-          raise Chef::Exceptions::DuplicateRole, "Multiple roles of same type found named #{name}"
-        end
-        js_path, rb_path = js_files.first, rb_files.first
-
-        if js_path && File.exists?(js_path)
-          # from_json returns object.class => json_class in the JSON.
-          hsh = Chef::JSONCompat.parse(IO.read(js_path))
-          return from_hash(hsh)
-        elsif rb_path && File.exists?(rb_path)
-          role = Chef::Role.new
-          role.name(name)
-          role.from_file(rb_path)
-          return role
-        end
-      end
-
-      raise Chef::Exceptions::RoleNotFound, "Role '#{name}' could not be loaded from disk"
-    end
-
-  end
-end
+#
+# Author:: Adam Jacob (<adam@chef.io>)
+# Author:: Nuo Yan (<nuo@chef.io>)
+# Author:: Christopher Brown (<cb@chef.io>)
+# Copyright:: Copyright 2008-2016, 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 "chef/config"
+require "chef/mixin/params_validate"
+require "chef/mixin/from_file"
+require "chef/run_list"
+require "chef/mash"
+require "chef/json_compat"
+require "chef/server_api"
+require "chef/search/query"
+
+class Chef
+  class Role
+
+    include Chef::Mixin::FromFile
+    include Chef::Mixin::ParamsValidate
+
+    attr_accessor :chef_server_rest
+
+    # Create a new Chef::Role object.
+    def initialize(chef_server_rest: nil)
+      @name = ""
+      @description = ""
+      @default_attributes = Mash.new
+      @override_attributes = Mash.new
+      @env_run_lists = { "_default" => Chef::RunList.new }
+      @chef_server_rest = chef_server_rest
+    end
+
+    def chef_server_rest
+      @chef_server_rest ||= Chef::ServerAPI.new(Chef::Config[:chef_server_url])
+    end
+
+    def self.chef_server_rest
+      Chef::ServerAPI.new(Chef::Config[:chef_server_url])
+    end
+
+    def name(arg = nil)
+      set_or_return(
+        :name,
+        arg,
+        :regex => /^[\-[:alnum:]_]+$/
+      )
+    end
+
+    def description(arg = nil)
+      set_or_return(
+        :description,
+        arg,
+        :kind_of => String
+      )
+    end
+
+    def run_list(*args)
+      if args.length > 0
+        @env_run_lists["_default"].reset!(args)
+      end
+      @env_run_lists["_default"]
+    end
+
+    alias_method :recipes, :run_list
+
+    # For run_list expansion
+    def run_list_for(environment)
+      if env_run_lists[environment].nil?
+        env_run_lists["_default"]
+      else
+        env_run_lists[environment]
+      end
+    end
+
+    def active_run_list_for(environment)
+      @env_run_lists.has_key?(environment) ? environment : "_default"
+    end
+
+    # Per environment run lists
+    def env_run_lists(env_run_lists = nil)
+      if !env_run_lists.nil?
+        unless env_run_lists.key?("_default")
+          msg = "_default key is required in env_run_lists.\n"
+          msg << "(env_run_lists: #{env_run_lists.inspect})"
+          raise Chef::Exceptions::InvalidEnvironmentRunListSpecification, msg
+        end
+        @env_run_lists.clear
+        env_run_lists.each { |k, v| @env_run_lists[k] = Chef::RunList.new(*Array(v)) }
+      end
+      @env_run_lists
+    end
+
+    alias :env_run_list :env_run_lists
+
+    def env_run_lists_add(env_run_lists = nil)
+      if !env_run_lists.nil?
+        env_run_lists.each { |k, v| @env_run_lists[k] = Chef::RunList.new(*Array(v)) }
+      end
+      @env_run_lists
+    end
+
+    alias :env_run_list_add :env_run_lists_add
+
+    def default_attributes(arg = nil)
+      set_or_return(
+        :default_attributes,
+        arg,
+        :kind_of => Hash
+      )
+    end
+
+    def override_attributes(arg = nil)
+      set_or_return(
+        :override_attributes,
+        arg,
+        :kind_of => Hash
+      )
+    end
+
+    def to_hash
+      env_run_lists_without_default = @env_run_lists.dup
+      env_run_lists_without_default.delete("_default")
+      result = {
+        "name" => @name,
+        "description" => @description,
+        "json_class" => self.class.name,
+        "default_attributes" => @default_attributes,
+        "override_attributes" => @override_attributes,
+        "chef_type" => "role",
+
+        #Render to_json correctly for run_list items (both run_list and evn_run_lists)
+        #so malformed json does not result
+        "run_list" => run_list.run_list.map { |item| item.to_s },
+        "env_run_lists" => env_run_lists_without_default.inject({}) do |accumulator, (k, v)|
+          accumulator[k] = v.map { |x| x.to_s }
+          accumulator
+        end,
+      }
+      result
+    end
+
+    # Serialize this object as a hash
+    def to_json(*a)
+      Chef::JSONCompat.to_json(to_hash, *a)
+    end
+
+    def update_from!(o)
+      description(o.description)
+      recipes(o.recipes) if defined?(o.recipes)
+      default_attributes(o.default_attributes)
+      override_attributes(o.override_attributes)
+      env_run_lists(o.env_run_lists) unless o.env_run_lists.nil?
+      self
+    end
+
+    # Create a Chef::Role from JSON
+    def self.json_create(o)
+      Chef.deprecated(:json_auto_inflate, "Auto inflation of JSON data is deprecated. Please use Chef::Role#from_hash")
+      from_hash(o)
+    end
+
+    def self.from_hash(o)
+      role = new
+      role.name(o["name"])
+      role.description(o["description"])
+      role.default_attributes(o["default_attributes"])
+      role.override_attributes(o["override_attributes"])
+
+      # _default run_list is in 'run_list' for newer clients, and
+      # 'recipes' for older clients.
+      env_run_list_hash = { "_default" => (o.has_key?("run_list") ? o["run_list"] : o["recipes"]) }
+
+      # Clients before 0.10 do not include env_run_lists, so only
+      # merge if it's there.
+      if o["env_run_lists"]
+        env_run_list_hash.merge!(o["env_run_lists"])
+      end
+      role.env_run_lists(env_run_list_hash)
+
+      role
+    end
+
+    # Get the list of all roles from the API.
+    def self.list(inflate = false)
+      if inflate
+        response = Hash.new
+        Chef::Search::Query.new.search(:role) do |n|
+          response[n.name] = n unless n.nil?
+        end
+        response
+      else
+        chef_server_rest.get("roles")
+      end
+    end
+
+    # Load a role by name from the API
+    def self.load(name)
+      from_hash(chef_server_rest.get("roles/#{name}"))
+    end
+
+    def environment(env_name)
+      chef_server_rest.get("roles/#{@name}/environments/#{env_name}")
+    end
+
+    def environments
+      chef_server_rest.get("roles/#{@name}/environments")
+    end
+
+    # Remove this role via the REST API
+    def destroy
+      chef_server_rest.delete("roles/#{@name}")
+    end
+
+    # Save this role via the REST API
+    def save
+      begin
+        chef_server_rest.put("roles/#{@name}", self)
+      rescue Net::HTTPServerException => e
+        raise e unless e.response.code == "404"
+        chef_server_rest.post("roles", self)
+      end
+      self
+    end
+
+    # Create the role via the REST API
+    def create
+      chef_server_rest.post("roles", self)
+      self
+    end
+
+    # As a string
+    def to_s
+      "role[#{@name}]"
+    end
+
+    # Load a role from disk - prefers to load the JSON, but will happily load
+    # the raw rb files as well. Can search within directories in the role_path.
+    def self.from_disk(name)
+      paths = Array(Chef::Config[:role_path])
+      paths.each do |path|
+        roles_files = Dir.glob(File.join(Chef::Util::PathHelper.escape_glob_dir(path), "**", "**"))
+        js_files = roles_files.select { |file| file.match(/\/#{name}\.json$/) }
+        rb_files = roles_files.select { |file| file.match(/\/#{name}\.rb$/) }
+        if js_files.count > 1 || rb_files.count > 1
+          raise Chef::Exceptions::DuplicateRole, "Multiple roles of same type found named #{name}"
+        end
+        js_path, rb_path = js_files.first, rb_files.first
+
+        if js_path && File.exists?(js_path)
+          # from_json returns object.class => json_class in the JSON.
+          hsh = Chef::JSONCompat.parse(IO.read(js_path))
+          return from_hash(hsh)
+        elsif rb_path && File.exists?(rb_path)
+          role = Chef::Role.new
+          role.name(name)
+          role.from_file(rb_path)
+          return role
+        end
+      end
+
+      raise Chef::Exceptions::RoleNotFound, "Role '#{name}' could not be loaded from disk"
+    end
+
+  end
+end