diff options
Diffstat (limited to 'lib/chef/api_client.rb')
| -rw-r--r-- | lib/chef/api_client.rb | 215 |
1 files changed, 21 insertions, 194 deletions
diff --git a/lib/chef/api_client.rb b/lib/chef/api_client.rb index ce9ceb312c..6de6910dbd 100644 --- a/lib/chef/api_client.rb +++ b/lib/chef/api_client.rb @@ -1,7 +1,6 @@ # -# Author:: Adam Jacob (<adam@opscode.com>) -# Author:: Nuo Yan (<nuo@opscode.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Author:: Tyler Cloke (tyler@chef.io) +# Copyright:: Copyright 2015 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -17,209 +16,37 @@ # limitations under the License. # -require 'chef/config' -require 'chef/mixin/params_validate' -require 'chef/mixin/from_file' -require 'chef/mash' -require 'chef/json_compat' -require 'chef/search/query' +require 'chef/exceptions' +require 'chef/api_client_v0' +require 'chef/api_client_v1' class Chef - class ApiClient + # Proxy object for Chef::ApiClientV0 and Chef::ApiClientV1 + class ApiClient < BasicObject - include Chef::Mixin::FromFile - include Chef::Mixin::ParamsValidate + SUPPORTED_VERSIONS = [0,1] - # Create a new Chef::ApiClient object. - def initialize - @name = '' - @public_key = nil - @private_key = nil - @admin = false - @validator = false - end - - # Gets or sets the client name. - # - # @params [Optional String] The name must be alpha-numeric plus - and _. - # @return [String] The current value of the name. - def name(arg=nil) - set_or_return( - :name, - arg, - :regex => /^[\-[:alnum:]_\.]+$/ - ) - end - - # Gets or sets whether this client is an admin. - # - # @params [Optional True/False] Should be true or false - default is false. - # @return [True/False] The current value - def admin(arg=nil) - set_or_return( - :admin, - arg, - :kind_of => [ TrueClass, FalseClass ] - ) - end - - # Gets or sets the public key. - # - # @params [Optional String] The string representation of the public key. - # @return [String] The current value. - def public_key(arg=nil) - set_or_return( - :public_key, - arg, - :kind_of => String - ) - end - - # Gets or sets whether this client is a validator. - # - # @params [Boolean] whether or not the client is a validator. If - # `nil`, retrieves the already-set value. - # @return [Boolean] The current value - def validator(arg=nil) - set_or_return( - :validator, - arg, - :kind_of => [TrueClass, FalseClass] - ) - end - - # Gets or sets the private key. - # - # @params [Optional String] The string representation of the private key. - # @return [String] The current value. - def private_key(arg=nil) - set_or_return( - :private_key, - arg, - :kind_of => [String, FalseClass] - ) - end - - # The hash representation of the object. Includes the name and public_key. - # Private key is included if available. - # - # @return [Hash] - def to_hash - result = { - "name" => @name, - "public_key" => @public_key, - "validator" => @validator, - "admin" => @admin, - 'json_class' => self.class.name, - "chef_type" => "client" - } - result["private_key"] = @private_key if @private_key - result - end - - # The JSON representation of the object. - # - # @return [String] the JSON string. - def to_json(*a) - Chef::JSONCompat.to_json(to_hash, *a) - end - - def self.from_hash(o) - client = Chef::ApiClient.new - client.name(o["name"] || o["clientname"]) - client.private_key(o["private_key"]) if o.key?("private_key") - client.public_key(o["public_key"]) - client.admin(o["admin"]) - client.validator(o["validator"]) - client - end - - def self.json_create(data) - from_hash(data) - end + attr_reader :proxy_object - def self.from_json(j) - from_hash(Chef::JSONCompat.parse(j)) - end - - def self.http_api - Chef::REST.new(Chef::Config[:chef_server_url]) - end - - def self.reregister(name) - api_client = load(name) - api_client.reregister - end - - def self.list(inflate=false) - if inflate - response = Hash.new - Chef::Search::Query.new.search(:client) do |n| - n = self.json_create(n) if n.instance_of?(Hash) - response[n.name] = n - end - response - else - http_api.get("clients") + def initialize(version=0) + unless SUPPORTED_VERSIONS.include?(version) + # something about inherting from BasicObject is forcing me to use :: in front of Chef::<whatever> + raise ::Chef::Exceptions::InvalidObjectAPIVersionRequested, "You requested Chef::ApiClient version #{version}. Valid versions include #{SUPPORTED_VERSIONS.join(', ')}." end - end - # Load a client by name via the API - def self.load(name) - response = http_api.get("clients/#{name}") - if response.kind_of?(Chef::ApiClient) - response - else - json_create(response) + if version == 0 + @proxy_object = ::Chef::ApiClientV0.new + elsif version == 1 + @proxy_object = ::Chef::ApiClientV1.new end end - # Remove this client via the REST API - def destroy - http_api.delete("clients/#{@name}") - end - - # Save this client via the REST API, returns a hash including the private key - def save - begin - http_api.put("clients/#{name}", { :name => self.name, :admin => self.admin, :validator => self.validator}) - rescue Net::HTTPServerException => e - # If that fails, go ahead and try and update it - if e.response.code == "404" - http_api.post("clients", {:name => self.name, :admin => self.admin, :validator => self.validator }) - else - raise e - end - end - end - - def reregister - reregistered_self = http_api.put("clients/#{name}", { :name => name, :admin => admin, :validator => validator, :private_key => true }) - if reregistered_self.respond_to?(:[]) - private_key(reregistered_self["private_key"]) - else - private_key(reregistered_self.private_key) - end - self - end - - # Create the client via the REST API - def create - http_api.post("clients", self) - end - - # As a string - def to_s - "client[#{@name}]" - end - - def inspect - "Chef::ApiClient name:'#{name}' admin:'#{admin.inspect}' validator:'#{validator}' " + - "public_key:'#{public_key}' private_key:'#{private_key}'" + def method_missing(method, *args, &block) + @proxy_object.send(method, *args, &block) end - def http_api - @http_api ||= Chef::REST.new(Chef::Config[:chef_server_url]) + def self.method_missing(method, *arguments, &block) + @proxy_class.send(method, *args, &block) end end |