chef-dk 2.0.26 → 2.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1dff22a233fa31d95ddc8f9c378a7139d27512c4
-  data.tar.gz: b9f03e35987d604d4dc2878c44d7c5ba5da3711a
+  metadata.gz: d7c538127b41469986112eb247d10d88cb61ad50
+  data.tar.gz: 762a7278a191796c23999ef213e4ee759f4c7abd
 SHA512:
-  metadata.gz: c8bb87919fcfb310d42226ba1d1799d8799d885778af3d8674ccbb5ae5fd8b25f3f07cefe87034331c66279683e9f6fe43cfb7c91f2b5a2a7821efa427a7a2fe
-  data.tar.gz: 94c0a5452c7174eea6a084122d4176c2504fae0edfcd64d15ed627d0ebb112b16647c0895267ccc59a079c6d164bd8dac57fd0ea6ef7de826e79e9d1e29dc987
+  metadata.gz: 0e60359a3e42359a7f0921566aec2eb27b03a601ca01649f1afd6d77eddfc44cea1baaa2d3fd61ce573551c2904d255c74f6a71e9b11df1a0242415c7b962231
+  data.tar.gz: 6abcb025604915f25f1d27c0ce8531d83dc0b3d0abeb9f8c8bda02840e0be03f4fa54c4fadf6ba74d5d02386ba36b9b45284dce8f0a66f8b146f1cd8ec130fe3

data/Gemfile.lock

@@ -14,7 +14,7 @@ GIT
 PATH
   remote: .
   specs:
-    chef-dk (2.0.26)
+    chef-dk (2.0.28)
       addressable (>= 2.3.5, < 2.6)
       chef (~> 13.0)
       chef-provisioning (~> 2.0)
@@ -47,17 +47,17 @@ GEM
       addressable (>= 2.3.1)
       extlib (>= 0.9.15)
       multi_json (>= 1.0.0)
-    aws-sdk (2.10.7)
-      aws-sdk-resources (= 2.10.7)
-    aws-sdk-core (2.10.7)
+    aws-sdk (2.10.10)
+      aws-sdk-resources (= 2.10.10)
+    aws-sdk-core (2.10.10)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.10.7)
-      aws-sdk-core (= 2.10.7)
+    aws-sdk-resources (2.10.10)
+      aws-sdk-core (= 2.10.10)
     aws-sdk-v1 (1.67.0)
       json (~> 1.4)
       nokogiri (~> 1)
-    aws-sigv4 (1.0.0)
+    aws-sigv4 (1.0.1)
     berkshelf (6.2.0)
       addressable (~> 2.3, >= 2.3.4)
       berkshelf-api-client (>= 4.0.0)
@@ -199,8 +199,8 @@ GEM
       google-api-client (~> 0.8.0)
       retryable
       winrm-elevated
-    chef-sugar (3.4.0)
-    chef-vault (3.1.0)
+    chef-sugar (3.5.0)
+    chef-vault (3.2.0)
     chef-zero (13.0.0)
       ffi-yajl (~> 2.2)
       hashie (>= 2.0, < 4.0)
@@ -397,7 +397,7 @@ GEM
     fog-voxel (0.1.0)
       fog-core
       fog-xml
-    fog-vsphere (1.11.0)
+    fog-vsphere (1.11.2)
       fog-core
       rbvmomi (~> 1.9)
     fog-xenserver (0.3.0)
@@ -406,14 +406,14 @@ GEM
     fog-xml (0.1.3)
       fog-core
       nokogiri (>= 1.5.11, < 2.0.0)
-    foodcritic (11.2.0)
+    foodcritic (11.3.0)
       cucumber-core (>= 1.3)
       erubis
+      ffi-yajl (~> 2.0)
       nokogiri (>= 1.5, < 2.0)
       rake
       rufus-lru (~> 1.0)
       treetop (~> 1.4)
-      yajl-ruby (~> 1.1)
     formatador (0.2.5)
     fuzzyurl (0.9.0)
     gherkin (4.1.3)
@@ -450,17 +450,17 @@ GEM
       thor (>= 0.18.1)
     gyoku (1.3.1)
       builder (>= 2.1.2)
-    hashie (3.5.5)
+    hashie (3.5.6)
     highline (1.7.8)
     hitimes (1.2.5)
     hitimes (1.2.5-x86-mingw32)
     htmlentities (4.3.4)
     httpclient (2.8.3)
-    i18n (0.8.4)
+    i18n (0.8.6)
     inflecto (0.0.2)
     inifile (3.0.0)
     iniparse (1.4.4)
-    inspec (1.30.0)
+    inspec (1.31.1)
       addressable (~> 2.4)
       faraday (>= 0.9.0)
       hashie (~> 3.4)
@@ -495,7 +495,7 @@ GEM
       multi_json
       retryable (~> 2.0)
       test-kitchen (~> 1.4, >= 1.4.1)
-    kitchen-hyperv (0.4.1)
+    kitchen-hyperv (0.5.0)
       test-kitchen (~> 1.4)
     kitchen-inspec (0.19.0)
       hashie (~> 3.4)
@@ -714,7 +714,7 @@ GEM
     solve (3.1.0)
       molinillo (>= 0.5)
       semverse (>= 1.1, < 3.0)
-    specinfra (2.68.1)
+    specinfra (2.68.2)
       net-scp
       net-ssh (>= 2.7, < 5.0)
       net-telnet
@@ -805,7 +805,6 @@ GEM
       winrm (~> 2.0)
     wmi-lite (1.0.0)
     xml-simple (1.1.5)
-    yajl-ruby (1.3.0)
     yard (0.9.9)
 
 PLATFORMS

data/acceptance/Gemfile.lock

@@ -11,35 +11,34 @@ GEM
   specs:
     addressable (2.5.1)
       public_suffix (~> 2.0, >= 2.0.2)
-    artifactory (2.8.1)
-    aws-sdk (2.9.25)
-      aws-sdk-resources (= 2.9.25)
-    aws-sdk-core (2.9.25)
+    artifactory (2.8.2)
+    aws-sdk (2.10.10)
+      aws-sdk-resources (= 2.10.10)
+    aws-sdk-core (2.10.10)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.9.25)
-      aws-sdk-core (= 2.9.25)
-    aws-sigv4 (1.0.0)
-    berkshelf (6.0.1)
+    aws-sdk-resources (2.10.10)
+      aws-sdk-core (= 2.10.10)
+    aws-sigv4 (1.0.1)
+    berkshelf (6.2.0)
       addressable (~> 2.3, >= 2.3.4)
-      berkshelf-api-client (>= 2.0.2, < 4.0)
+      berkshelf-api-client (>= 4.0.0)
       buff-config (~> 2.0)
       buff-extensions (~> 2.0)
-      buff-shell_out (~> 1.0)
       cleanroom (~> 1.0)
+      concurrent-ruby (~> 1.0)
       faraday (~> 0.9)
       httpclient (~> 2.7)
       minitar (~> 0.5, >= 0.5.4)
       mixlib-archive (~> 0.4)
+      mixlib-shellout (~> 2.0)
       octokit (~> 4.0)
       retryable (~> 2.0)
       ridley (~> 5.0)
       solve (> 2.0, < 4.0)
       thor (~> 0.19, < 0.19.2)
-    berkshelf-api-client (3.0.0)
-      faraday (~> 0.9)
-      httpclient (~> 2.7)
-      ridley (>= 4.5, < 6.0)
+    berkshelf-api-client (4.0.1)
+      chef (>= 12.0)
     blankslate (2.1.2.4)
     buff-config (2.0.0)
       buff-extensions (~> 2.0)
@@ -55,34 +54,73 @@ GEM
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef-config (13.0.118)
-      addressable
-      fuzzyurl
+    chef (12.12.15)
+      bundler (>= 1.10)
+      chef-config (= 12.12.15)
+      chef-zero (~> 4.5)
+      diff-lcs (~> 1.2, >= 1.2.4)
+      erubis (~> 2.7)
+      ffi-yajl (~> 2.2)
+      highline (~> 1.6, >= 1.6.9)
+      iniparse (~> 1.4)
+      mixlib-authentication (~> 1.4)
+      mixlib-cli (~> 1.4)
+      mixlib-log (~> 1.3)
+      mixlib-shellout (~> 2.0)
+      net-sftp (~> 2.1, >= 2.1.2)
+      net-ssh (>= 2.9, < 4.0)
+      net-ssh-multi (~> 1.1)
+      ohai (>= 8.6.0.alpha.1, < 9)
+      plist (~> 3.2)
+      proxifier (~> 1.0)
+      rspec-core (~> 3.4)
+      rspec-expectations (~> 3.4)
+      rspec-mocks (~> 3.4)
+      rspec_junit_formatter (~> 0.2.0)
+      serverspec (~> 2.7)
+      specinfra (~> 2.10)
+      syslog-logger (~> 1.6)
+      uuidtools (~> 2.1.5)
+    chef-config (12.12.15)
+      fuzzyurl (~> 0.8.0)
       mixlib-config (~> 2.0)
       mixlib-shellout (~> 2.0)
+    chef-zero (4.9.0)
+      ffi-yajl (~> 2.2)
+      hashie (>= 2.0, < 4.0)
+      mixlib-log (~> 1.3)
+      rack (< 2)
+      uuidtools (~> 2.1)
     cleanroom (1.0.0)
     coderay (1.1.1)
+    concurrent-ruby (1.0.5)
     diff-lcs (1.3)
-    docker-api (1.33.4)
+    docker-api (1.33.6)
       excon (>= 0.38.0)
       json
     erubis (2.7.0)
-    excon (0.55.0)
-    faraday (0.9.2)
+    excon (0.57.1)
+    faraday (0.12.1)
       multipart-post (>= 1.2, < 3)
     ffi (1.9.18)
-    fuzzyurl (0.9.0)
+    ffi-yajl (2.3.1)
+      libyajl2 (~> 1.2)
+    fuzzyurl (0.8.0)
     gssapi (1.2.0)
       ffi (>= 1.0.1)
     gyoku (1.3.1)
       builder (>= 2.1.2)
-    hashie (3.5.5)
+    hashie (3.5.6)
+    highline (1.7.8)
     hitimes (1.2.5)
+    htmlentities (4.3.4)
     httpclient (2.8.3)
-    inspec (1.25.1)
+    iniparse (1.4.4)
+    inspec (1.31.1)
       addressable (~> 2.4)
       faraday (>= 0.9.0)
       hashie (~> 3.4)
+      htmlentities
       json (>= 1.8, < 3.0)
       method_source (~> 0.8)
       mixlib-log
@@ -97,7 +135,8 @@ GEM
       sslshake (~> 1.2)
       thor (~> 0.19)
       toml (~> 0.1)
-      train (>= 0.22.0, < 1.0)
+      train (>= 0.24.0, < 1.0)
+    ipaddress (0.8.3)
     jmespath (1.3.1)
     json (2.1.0)
     kitchen-ec2 (1.3.2)
@@ -112,6 +151,7 @@ GEM
       test-kitchen (~> 1.6)
     kitchen-vagrant (1.1.0)
       test-kitchen (~> 1.4)
+    libyajl2 (1.2.0)
     little-plugger (1.1.4)
     logging (2.2.2)
       little-plugger (~> 1.1)
@@ -122,6 +162,7 @@ GEM
       mixlib-log
     mixlib-authentication (1.4.1)
       mixlib-log
+    mixlib-cli (1.7.0)
     mixlib-config (2.2.4)
     mixlib-install (1.2.3)
       artifactory
@@ -135,24 +176,45 @@ GEM
     multipart-post (2.0.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (4.1.0)
+    net-sftp (2.1.2)
+      net-ssh (>= 2.6.5)
+    net-ssh (3.2.0)
     net-ssh-gateway (1.3.0)
       net-ssh (>= 2.6.5)
-    nio4r (2.0.0)
+    net-ssh-multi (1.2.1)
+      net-ssh (>= 2.6.5)
+      net-ssh-gateway (>= 1.2.0)
+    net-telnet (0.1.1)
+    nio4r (2.1.0)
     nori (2.6.0)
     octokit (4.7.0)
       sawyer (~> 0.8.0, >= 0.5.3)
+    ohai (8.24.1)
+      chef-config (>= 12.5.0.alpha.1, < 14)
+      ffi (~> 1.9)
+      ffi-yajl (~> 2.2)
+      ipaddress
+      mixlib-cli
+      mixlib-config (~> 2.0)
+      mixlib-log (>= 1.7.1, < 2.0)
+      mixlib-shellout (~> 2.0)
+      plist (~> 3.1)
+      systemu (~> 2.6.4)
+      wmi-lite (~> 1.0)
     parallel (1.11.2)
     parslet (1.5.0)
       blankslate (~> 2.0)
+    plist (3.3.0)
+    proxifier (1.0.3)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
     public_suffix (2.0.5)
+    rack (1.6.8)
     rainbow (2.1.0)
     retryable (2.0.4)
-    ridley (5.1.0)
+    ridley (5.1.1)
       addressable
       buff-config (~> 2.0)
       buff-extensions (~> 2.0)
@@ -162,7 +224,7 @@ GEM
       celluloid-io (~> 0.16.1)
       chef-config (>= 12.5.0)
       erubis
-      faraday (~> 0.9.0)
+      faraday (~> 0.9)
       hashie (>= 2.0.2, < 4.0.0)
       httpclient (~> 2.7)
       json (>= 1.7.7)
@@ -186,6 +248,9 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
+    rspec_junit_formatter (0.2.3)
+      builder (< 4)
+      rspec-core (>= 2, < 4, != 2.12.0)
     rubyntlm (0.6.2)
     rubyzip (1.2.1)
     safe_yaml (1.0.4)
@@ -193,11 +258,24 @@ GEM
       addressable (>= 2.3.5, < 2.6)
       faraday (~> 0.8, < 1.0)
     semverse (2.0.0)
+    serverspec (2.39.1)
+      multi_json
+      rspec (~> 3.0)
+      rspec-its
+      specinfra (~> 2.68)
+    sfl (2.3)
     slop (3.6.0)
     solve (3.1.0)
       molinillo (>= 0.5)
       semverse (>= 1.1, < 3.0)
+    specinfra (2.68.2)
+      net-scp
+      net-ssh (>= 2.7, < 5.0)
+      net-telnet
+      sfl
     sslshake (1.2.0)
+    syslog-logger (1.6.8)
+    systemu (2.6.5)
     test-kitchen (1.16.0)
       mixlib-install (>= 1.2, < 3.0)
       mixlib-shellout (>= 1.2, < 3.0)
@@ -211,7 +289,7 @@ GEM
       hitimes
     toml (0.1.2)
       parslet (~> 1.5.0)
-    train (0.23.0)
+    train (0.25.0)
       docker-api (~> 1.26)
       json (>= 1.8, < 3.0)
       mixlib-shellout (~> 2.0)
@@ -219,6 +297,7 @@ GEM
       net-ssh (>= 2.9, < 5.0)
       winrm (~> 2.0)
       winrm-fs (~> 1.0)
+    uuidtools (2.1.5)
     varia_model (0.6.0)
       buff-extensions (~> 2.0)
       hashie (>= 2.0.2, < 4.0.0)
@@ -241,6 +320,7 @@ GEM
       logging (>= 1.6.1, < 3.0)
       rubyzip (~> 1.1)
       winrm (~> 2.0)
+    wmi-lite (1.0.0)
 
 PLATFORMS
   ruby
@@ -260,4 +340,4 @@ DEPENDENCIES
   winrm-fs
 
 BUNDLED WITH
-   1.15.0
+   1.15.1

data/lib/chef-dk/authenticated_http.rb

@@ -15,25 +15,8 @@
 # limitations under the License.
 #
 
-require "chef/http"
-require "chef/http/authenticator"
-require "chef/http/json_input"
-require "chef/http/json_output"
-require "chef/http/decompressor"
-require "chef/http/validate_content_length"
+require "chef/server_api"
 
 module ChefDK
-  class AuthenticatedHTTP < Chef::HTTP
-
-    use JSONInput
-    use JSONOutput
-    use Decompressor
-    use Authenticator
-
-    # ValidateContentLength should come after Decompressor
-    # because the order of middlewares is reversed when handling
-    # responses.
-    use ValidateContentLength
-
-  end
+  AuthenticatedHTTP = Chef::ServerAPI
 end

data/lib/chef-dk/command/diff.rb

@@ -22,7 +22,7 @@ require "chef-dk/policyfile/differ"
 require "chef-dk/policyfile/comparison_base"
 require "chef-dk/policyfile/storage_config"
 require "chef-dk/configurable"
-require "chef-dk/authenticated_http"
+require "chef/server_api"
 
 module ChefDK
   module Command
@@ -161,9 +161,9 @@ BANNER
       end
 
       def http_client
-        @http_client ||= ChefDK::AuthenticatedHTTP.new(chef_config.chef_server_url,
-                                                       signing_key_filename: chef_config.client_key,
-                                                       client_name: chef_config.node_name)
+        @http_client ||= Chef::ServerAPI.new(chef_config.chef_server_url,
+                                             signing_key_filename: chef_config.client_key,
+                                             client_name: chef_config.node_name)
       end
 
       def old_lock

data/lib/chef-dk/policyfile/chef_server_cookbook_source.rb

@@ -18,7 +18,7 @@
 require "ffi_yajl"
 require "chef-dk/exceptions"
 require "chef-dk/policyfile/source_uri"
-require "chef-dk/authenticated_http"
+require "chef/server_api"
 
 module ChefDK
   module Policyfile
@@ -82,7 +82,7 @@ module ChefDK
       private
 
       def http_connection_for(base_url)
-        @http_connections[base_url] ||= ChefDK::AuthenticatedHTTP.new(base_url,
+        @http_connections[base_url] ||= Chef::ServerAPI.new(base_url,
                                                        signing_key_filename: chef_config.client_key,
                                                        client_name: chef_config.node_name)
       end

data/lib/chef-dk/policyfile/lister.rb

@@ -17,7 +17,7 @@
 
 require "set"
 
-require "chef-dk/authenticated_http"
+require "chef/server_api"
 require "chef-dk/service_exceptions"
 
 module ChefDK
@@ -183,7 +183,7 @@ module ChefDK
       end
 
       def http_client
-        @http_client ||= ChefDK::AuthenticatedHTTP.new(config.chef_server_url,
+        @http_client ||= Chef::ServerAPI.new(config.chef_server_url,
                                                        signing_key_filename: config.client_key,
                                                        client_name: config.node_name)
       end

data/lib/chef-dk/policyfile_services/clean_policies.rb

@@ -75,9 +75,9 @@ module ChefDK
       end
 
       def http_client
-        @http_client ||= ChefDK::AuthenticatedHTTP.new(chef_config.chef_server_url,
-                                                       signing_key_filename: chef_config.client_key,
-                                                       client_name: chef_config.node_name)
+        @http_client ||= Chef::ServerAPI.new(chef_config.chef_server_url,
+                                               signing_key_filename: chef_config.client_key,
+                                               client_name: chef_config.node_name)
       end
 
       private

data/lib/chef-dk/policyfile_services/clean_policy_cookbooks.rb

@@ -17,7 +17,7 @@
 
 require "set"
 
-require "chef-dk/authenticated_http"
+require "chef/server_api"
 require "chef-dk/service_exceptions"
 
 module ChefDK
@@ -111,12 +111,12 @@ module ChefDK
       end
 
       # @api private
-      # An instance of ChefDK::AuthenticatedHTTP configured with the user's
+      # An instance of Chef::ServerAPI configured with the user's
       # server URL and credentials.
       def http_client
-        @http_client ||= ChefDK::AuthenticatedHTTP.new(chef_config.chef_server_url,
-                                                       signing_key_filename: chef_config.client_key,
-                                                       client_name: chef_config.node_name)
+        @http_client ||= Chef::ServerAPI.new(chef_config.chef_server_url,
+                                             signing_key_filename: chef_config.client_key,
+                                             client_name: chef_config.node_name)
       end
     end
   end

data/lib/chef-dk/policyfile_services/push.rb

@@ -18,7 +18,7 @@
 require "ffi_yajl"
 
 require "chef-dk/service_exceptions"
-require "chef-dk/authenticated_http"
+require "chef/server_api"
 require "chef-dk/policyfile_compiler"
 require "chef-dk/policyfile/uploader"
 require "chef-dk/policyfile/storage_config"
@@ -51,7 +51,7 @@ module ChefDK
       end
 
       def http_client
-        @http_client ||= ChefDK::AuthenticatedHTTP.new(config.chef_server_url,
+        @http_client ||= Chef::ServerAPI.new(config.chef_server_url,
                                                        signing_key_filename: config.client_key,
                                                        client_name: config.node_name)
       end

data/lib/chef-dk/policyfile_services/push_archive.rb

@@ -20,7 +20,7 @@ require "archive/tar/minitar"
 
 require "chef-dk/service_exceptions"
 require "chef-dk/policyfile_lock"
-require "chef-dk/authenticated_http"
+require "chef/server_api"
 require "chef-dk/policyfile/uploader"
 
 module ChefDK
@@ -75,9 +75,9 @@ module ChefDK
 
       # @api private
       def http_client
-        @http_client ||= ChefDK::AuthenticatedHTTP.new(config.chef_server_url,
-                                                       signing_key_filename: config.client_key,
-                                                       client_name: config.node_name)
+        @http_client ||= Chef::ServerAPI.new(config.chef_server_url,
+                                             signing_key_filename: config.client_key,
+                                             client_name: config.node_name)
       end
 
       private

data/lib/chef-dk/policyfile_services/rm_policy.rb

@@ -16,7 +16,7 @@
 #
 
 require "chef-dk/service_exceptions"
-require "chef-dk/authenticated_http"
+require "chef/server_api"
 require "chef-dk/policyfile/undo_stack"
 require "chef-dk/policyfile/undo_record"
 
@@ -72,12 +72,12 @@ module ChefDK
       end
 
       # @api private
-      # An instance of ChefDK::AuthenticatedHTTP configured with the user's
+      # An instance of Chef::ServerAPI configured with the user's
       # server URL and credentials.
       def http_client
-        @http_client ||= ChefDK::AuthenticatedHTTP.new(chef_config.chef_server_url,
-                                                       signing_key_filename: chef_config.client_key,
-                                                       client_name: chef_config.node_name)
+        @http_client ||= Chef::ServerAPI.new(chef_config.chef_server_url,
+                                             signing_key_filename: chef_config.client_key,
+                                             client_name: chef_config.node_name)
       end
 
       private

data/lib/chef-dk/policyfile_services/rm_policy_group.rb

@@ -16,7 +16,7 @@
 #
 
 require "chef-dk/service_exceptions"
-require "chef-dk/authenticated_http"
+require "chef/server_api"
 require "chef-dk/policyfile/undo_stack"
 require "chef-dk/policyfile/undo_record"
 
@@ -73,12 +73,12 @@ module ChefDK
       end
 
       # @api private
-      # An instance of ChefDK::AuthenticatedHTTP configured with the user's
+      # An instance of Chef::ServerAPI configured with the user's
       # server URL and credentials.
       def http_client
-        @http_client ||= ChefDK::AuthenticatedHTTP.new(chef_config.chef_server_url,
-                                                       signing_key_filename: chef_config.client_key,
-                                                       client_name: chef_config.node_name)
+        @http_client ||= Chef::ServerAPI.new(chef_config.chef_server_url,
+                                             signing_key_filename: chef_config.client_key,
+                                             client_name: chef_config.node_name)
       end
     end
   end

data/lib/chef-dk/policyfile_services/show_policy.rb

@@ -218,9 +218,9 @@ module ChefDK
       end
 
       def http_client
-        @http_client ||= ChefDK::AuthenticatedHTTP.new(chef_config.chef_server_url,
-                                                       signing_key_filename: chef_config.client_key,
-                                                       client_name: chef_config.node_name)
+        @http_client ||= Chef::ServerAPI.new(chef_config.chef_server_url,
+                                             signing_key_filename: chef_config.client_key,
+                                             client_name: chef_config.node_name)
       end
 
       private

data/lib/chef-dk/policyfile_services/undelete.rb

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require "chef-dk/authenticated_http"
+require "chef/server_api"
 require "chef-dk/service_exceptions"
 require "chef-dk/policyfile/undo_stack"
 
@@ -71,7 +71,7 @@ module ChefDK
       end
 
       def http_client
-        @http_client ||= ChefDK::AuthenticatedHTTP.new(chef_config.chef_server_url,
+        @http_client ||= Chef::ServerAPI.new(chef_config.chef_server_url,
                                                        signing_key_filename: chef_config.client_key,
                                                        client_name: chef_config.node_name)
       end

data/lib/chef-dk/version.rb

@@ -16,5 +16,5 @@
 #
 
 module ChefDK
-  VERSION = "2.0.26"
+  VERSION = "2.0.28"
 end

data/spec/unit/command/diff_spec.rb

@@ -45,7 +45,7 @@ describe ChefDK::Command::Diff do
 
     let(:ui) { TestHelpers::TestUI.new }
 
-    let(:http_client) { instance_double("ChefDK::AuthenticatedHTTP") }
+    let(:http_client) { instance_double("Chef::ServerAPI") }
 
     let(:differ) { instance_double("ChefDK::Policyfile::Differ", run_report: nil) }
 

data/spec/unit/policyfile/chef_server_cookbook_source_spec.rb

@@ -23,7 +23,7 @@ describe ChefDK::Policyfile::ChefServerCookbookSource do
 
   let(:cookbook_source) { "https://chef.example.com/organizations/example" }
 
-  let(:http_connection) { double("ChefDK::AuthenticatedHTTP") }
+  let(:http_connection) { double("Chef::ServerAPI") }
 
   let(:universe_response_encoded) { JSON.parse(IO.read(File.join(fixtures_path, "cookbooks_api/chef_server_universe.json"))) }
 

data/spec/unit/policyfile/comparison_base_spec.rb

@@ -222,7 +222,7 @@ E
 
     let(:group) { "acceptance" }
     let(:policy_name) { "chatserver" }
-    let(:http_client) { instance_double("ChefDK::AuthenticatedHTTP", url: "https://chef.example/organizations/monkeynews") }
+    let(:http_client) { instance_double("Chef::ServerAPI", url: "https://chef.example/organizations/monkeynews") }
 
     subject(:comparison_base) { described_class.new(group, policy_name, http_client) }
 

data/spec/unit/policyfile/lister_spec.rb

@@ -31,14 +31,14 @@ describe ChefDK::Policyfile::Lister do
            node_name: "deuce")
   end
 
-  let(:http_client) { instance_double(ChefDK::AuthenticatedHTTP) }
+  let(:http_client) { instance_double(Chef::ServerAPI) }
 
   subject(:info_fetcher) do
     described_class.new(config: config)
   end
 
   it "configures an HTTP client" do
-    expect(ChefDK::AuthenticatedHTTP).to receive(:new).with("https://localhost:10443",
+    expect(Chef::ServerAPI).to receive(:new).with("https://localhost:10443",
                                                        signing_key_filename: "/path/to/client/key.pem",
                                                        client_name: "deuce")
     info_fetcher.http_client

data/spec/unit/policyfile/uploader_spec.rb

@@ -20,7 +20,7 @@ require "chef-dk/policyfile/uploader"
 
 # We load this here to ensure we get the "verifying doubles" behavior from
 # RSpec. It's not used by Policyfile::Uploader, but it's a collaborator.
-require "chef-dk/authenticated_http"
+require "chef/server_api"
 
 describe ChefDK::Policyfile::Uploader do
 
@@ -50,7 +50,7 @@ describe ChefDK::Policyfile::Uploader do
 
   let(:policy_group) { "unit-test" }
 
-  let(:http_client) { instance_double("ChefDK::AuthenticatedHTTP") }
+  let(:http_client) { instance_double("Chef::ServerAPI") }
 
   let(:policy_document_native_api) { false }
 

data/spec/unit/policyfile_evaluation_spec.rb

@@ -357,10 +357,8 @@ E
         end
 
         it "has a default source" do
-          skip "Chef server isn't yet supported in cookbook-omnifetch (pending /universe endpoint in Chef Server)"
-
           expect(policyfile.errors).to eq([])
-          expected = ChefDK::Policyfile::ChefServerCookbookSource.new("https://mychef.example.com")
+          expected = [ ChefDK::Policyfile::ChefServerCookbookSource.new("https://mychef.example.com") ]
           expect(policyfile.default_source).to eq(expected)
         end
 
@@ -536,9 +534,7 @@ MESSAGE
           EOH
         end
 
-        # Chef server isn't yet supported in cookbook-omnifetch (pending /universe endpoint in Chef Server)
-        # We have to skip at the example definition level or else we fail in the before block
-        skip "sets the source of the cookbook to the git URL" do
+        it "sets the source of the cookbook to the git URL" do
           expected_cb_spec = ChefDK::Policyfile::CookbookLocationSpecification.new("foo", ">= 0.0.0", { chef_server: "https://mychefserver.example.com" }, storage_config)
           expect(policyfile.cookbook_location_specs).to eq("foo" => expected_cb_spec)
         end

data/spec/unit/policyfile_services/clean_policies_spec.rb

@@ -37,7 +37,7 @@ describe ChefDK::PolicyfileServices::CleanPolicies do
 
   describe "when there is an error listing data from the server" do
 
-    let(:http_client) { instance_double(ChefDK::AuthenticatedHTTP) }
+    let(:http_client) { instance_double(Chef::ServerAPI) }
 
     let(:response) do
       Net::HTTPResponse.send(:response_class, "500").new("1.0", "500", "Internal Server Error").tap do |r|
@@ -66,7 +66,7 @@ describe ChefDK::PolicyfileServices::CleanPolicies do
 
   context "when existing policies are listed successfully" do
 
-    let(:http_client) { instance_double(ChefDK::AuthenticatedHTTP) }
+    let(:http_client) { instance_double(Chef::ServerAPI) }
 
     before do
       policy_lister.set!(policies_by_name, policies_by_group)

data/spec/unit/policyfile_services/clean_policy_cookbooks_spec.rb

@@ -72,7 +72,7 @@ describe ChefDK::PolicyfileServices::CleanPolicyCookbooks do
     }
   end
 
-  let(:http_client) { instance_double(ChefDK::AuthenticatedHTTP) }
+  let(:http_client) { instance_double(Chef::ServerAPI) }
 
   let(:ui) { TestHelpers::TestUI.new }
 
@@ -88,7 +88,7 @@ describe ChefDK::PolicyfileServices::CleanPolicyCookbooks do
   end
 
   it "configures an HTTP client with the user's credentials" do
-    expect(ChefDK::AuthenticatedHTTP).to receive(:new).with("https://localhost:10443",
+    expect(Chef::ServerAPI).to receive(:new).with("https://localhost:10443",
                                                        signing_key_filename: "/path/to/client/key.pem",
                                                        client_name: "deuce")
     clean_policy_cookbooks_service.http_client

data/spec/unit/policyfile_services/push_archive_spec.rb

@@ -120,7 +120,7 @@ E
   end
 
   it "configures an HTTP client" do
-    expect(ChefDK::AuthenticatedHTTP).to receive(:new).with("https://localhost:10443",
+    expect(Chef::ServerAPI).to receive(:new).with("https://localhost:10443",
                                                        signing_key_filename: "/path/to/client/key.pem",
                                                        client_name: "deuce")
     push_archive_service.http_client
@@ -336,7 +336,7 @@ MESSAGE
       ]
     end
 
-    let(:http_client) { instance_double(ChefDK::AuthenticatedHTTP) }
+    let(:http_client) { instance_double(Chef::ServerAPI) }
 
     let(:uploader) { instance_double(ChefDK::Policyfile::Uploader) }
 

data/spec/unit/policyfile_services/push_spec.rb

@@ -59,7 +59,7 @@ describe ChefDK::PolicyfileServices::Push do
   let(:push_service) { described_class.new(policyfile: policyfile_rb_name, policy_group: policy_group, ui: ui, config: config, root_dir: working_dir) }
 
   it "configures an HTTP client" do
-    expect(ChefDK::AuthenticatedHTTP).to receive(:new).with("https://localhost:10443",
+    expect(Chef::ServerAPI).to receive(:new).with("https://localhost:10443",
                                                        signing_key_filename: "/path/to/client/key.pem",
                                                        client_name: "deuce")
     push_service.http_client
@@ -180,7 +180,7 @@ describe ChefDK::PolicyfileServices::Push do
 E
       end
 
-      let(:http_client) { instance_double(ChefDK::AuthenticatedHTTP) }
+      let(:http_client) { instance_double(Chef::ServerAPI) }
 
       let(:updated_lockfile_io) { StringIO.new }
 

data/spec/unit/policyfile_services/rm_policy_group_spec.rb

@@ -22,7 +22,7 @@ describe ChefDK::PolicyfileServices::RmPolicyGroup do
 
   let(:policy_group) { "preprod" }
 
-  let(:http_client) { instance_double(ChefDK::AuthenticatedHTTP) }
+  let(:http_client) { instance_double(Chef::ServerAPI) }
 
   let(:ui) { TestHelpers::TestUI.new }
 
@@ -78,7 +78,7 @@ describe ChefDK::PolicyfileServices::RmPolicyGroup do
   end
 
   it "configures an HTTP client" do
-    expect(ChefDK::AuthenticatedHTTP).to receive(:new).with("https://localhost:10443",
+    expect(Chef::ServerAPI).to receive(:new).with("https://localhost:10443",
                                                        signing_key_filename: "/path/to/client/key.pem",
                                                        client_name: "deuce")
     rm_policy_group_service.http_client

data/spec/unit/policyfile_services/rm_policy_spec.rb

@@ -22,7 +22,7 @@ describe ChefDK::PolicyfileServices::RmPolicy do
 
   let(:policy_name) { "appserver" }
 
-  let(:http_client) { instance_double(ChefDK::AuthenticatedHTTP) }
+  let(:http_client) { instance_double(Chef::ServerAPI) }
 
   let(:policy_revisions_data) do
     {
@@ -54,7 +54,7 @@ describe ChefDK::PolicyfileServices::RmPolicy do
   end
 
   it "configures an HTTP client" do
-    expect(ChefDK::AuthenticatedHTTP).to receive(:new).with("https://localhost:10443",
+    expect(Chef::ServerAPI).to receive(:new).with("https://localhost:10443",
                                                        signing_key_filename: "/path/to/client/key.pem",
                                                        client_name: "deuce")
     rm_policy_service.http_client

data/spec/unit/policyfile_services/show_policy_spec.rb

@@ -56,7 +56,7 @@ describe ChefDK::PolicyfileServices::ShowPolicy do
 
     describe "when an error occurs fetching data from the server" do
 
-      let(:http_client) { instance_double(ChefDK::AuthenticatedHTTP) }
+      let(:http_client) { instance_double(Chef::ServerAPI) }
 
       let(:response) do
         Net::HTTPResponse.send(:response_class, "500").new("1.0", "500", "Internal Server Error").tap do |r|
@@ -804,7 +804,7 @@ OUTPUT
 
     let(:policy_group) { "dev" }
 
-    let(:http_client) { instance_double("ChefDK::AuthenticatedHTTP", url: "https://chef.example/organizations/monkeynews") }
+    let(:http_client) { instance_double("Chef::ServerAPI", url: "https://chef.example/organizations/monkeynews") }
 
     before do
       allow(show_policy_service).to receive(:http_client).and_return(http_client)

data/spec/unit/policyfile_services/undelete_spec.rb

@@ -169,7 +169,7 @@ OUTPUT
       end
     end
 
-    let(:http_client) { instance_double(ChefDK::AuthenticatedHTTP) }
+    let(:http_client) { instance_double(Chef::ServerAPI) }
 
     before do
       allow(undelete_service).to receive(:http_client).and_return(http_client)
@@ -276,7 +276,7 @@ OUTPUT
       end
     end
 
-    let(:http_client) { instance_double(ChefDK::AuthenticatedHTTP) }
+    let(:http_client) { instance_double(Chef::ServerAPI) }
 
     before do
       allow(undelete_service).to receive(:http_client).and_return(http_client)

data/tasks/version.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2016 Chef Software Inc.
+# Copyright:: Copyright (c) 2016-2017, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -98,9 +98,6 @@ namespace :version do
     puts "Updating version in #{version_rb_path} from #{version} to #{new_version.chomp}"
     IO.write(version_rb_path, new_version_file)
     IO.write(release_notes_path, "# ChefDK #{$2}.#{$3.to_i + 1} Release Notes")
-    Rake::Task["changelog::archive"].invoke
-    Rake::Task["version:update_gemfile_lock"].invoke
-    Rake::Task["bundle:install"].invoke
   end
 
   # Can be deleted when we migrate fully to expeditor
@@ -115,9 +112,6 @@ namespace :version do
     puts "Updating version in #{version_rb_path} from #{version} to #{new_version.chomp}"
     IO.write(version_rb_path, new_version_file)
     IO.write(release_notes_path, "# ChefDK #{$2.to_i + 1}.0 Release Notes")
-    Rake::Task["changelog::archive"].invoke
-    Rake::Task["version:update_gemfile_lock"].invoke
-    Rake::Task["bundle:install"].invoke
   end
 
   # Called from .expeditor/update_version.sh

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-dk
 version: !ruby/object:Gem::Version
-  version: 2.0.26
+  version: 2.0.28
 platform: ruby
 authors:
 - Daniel DeLeo
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-05 00:00:00.000000000 Z
+date: 2017-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli