chef-dk 3.1.0 → 3.2.30

data/README.md

@@ -3,6 +3,8 @@
 [![Build Status Master](https://travis-ci.org/chef/chef-dk.svg?branch=master)](https://travis-ci.org/chef/chef-dk)
 [![Build Status Master](https://ci.appveyor.com/api/projects/status/github/chef/chef-dk?branch=master&svg=true&passingText=master%20-%20Ok&pendingText=master%20-%20Pending&failingText=master%20-%20Failing)](https://ci.appveyor.com/project/Chef/chef-dk/branch/master)
 [![](https://img.shields.io/badge/Release%20Policy-Cadence%20Release-brightgreen.svg)](https://github.com/chef/chef-rfc/blob/master/rfc086-chef-oss-project-policies.md#cadence-release)
+[![Docker Stars](https://img.shields.io/docker/stars/chef/chefdk.svg?maxAge=2592000)](https://hub.docker.com/r/chef/chefdk)
+[![Docker Pulls](https://img.shields.io/docker/pulls/chef/chefdk.svg?maxAge=2592000)](https://hub.docker.com/r/chef/chefdk)
 
 Chef Development Kit (ChefDK) brings Chef and the development tools developed by the Chef Community together and acts as the consistent interface to this awesomeness. This awesomeness is composed of:
 

data/acceptance/Gemfile.lock

@@ -12,18 +12,18 @@ GEM
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
     artifactory (2.8.2)
-    aws-sdk (2.11.8)
-      aws-sdk-resources (= 2.11.8)
-    aws-sdk-core (2.11.8)
+    aws-sdk (2.11.120)
+      aws-sdk-resources (= 2.11.120)
+    aws-sdk-core (2.11.120)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.11.8)
-      aws-sdk-core (= 2.11.8)
-    aws-sigv4 (1.0.2)
-    berkshelf (6.3.1)
+    aws-sdk-resources (2.11.120)
+      aws-sdk-core (= 2.11.120)
+    aws-sigv4 (1.0.3)
+    berkshelf (6.3.4)
       buff-config (~> 2.0)
       buff-extensions (~> 2.0)
-      chef (>= 12.7.2)
+      chef (>= 12.7.2, < 14.0)
       cleanroom (~> 1.0)
       concurrent-ruby (~> 1.0)
       faraday (~> 0.9)
@@ -91,14 +91,14 @@ GEM
     coderay (1.1.2)
     concurrent-ruby (1.0.5)
     diff-lcs (1.3)
-    docker-api (1.34.1)
+    docker-api (1.34.2)
       excon (>= 0.47.0)
       multi_json
     erubis (2.7.0)
-    excon (0.60.0)
-    faraday (0.14.0)
+    excon (0.62.0)
+    faraday (0.15.2)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.23)
+    ffi (1.9.25)
     ffi-yajl (2.3.1)
       libyajl2 (~> 1.2)
     fuzzyurl (0.8.0)
@@ -106,13 +106,13 @@ GEM
       ffi (>= 1.0.1)
     gyoku (1.3.1)
       builder (>= 2.1.2)
-    hashie (3.5.7)
+    hashie (3.6.0)
     highline (1.7.10)
-    hitimes (1.2.6)
+    hitimes (1.3.0)
     htmlentities (4.3.4)
     httpclient (2.8.3)
     iniparse (1.4.4)
-    inspec (1.51.21)
+    inspec (1.51.25)
       addressable (~> 2.4)
       faraday (>= 0.9.0)
       hashie (~> 3.4)
@@ -132,9 +132,9 @@ GEM
       tomlrb (~> 1.2)
       train (~> 0.32)
     ipaddress (0.8.3)
-    jmespath (1.3.1)
+    jmespath (1.4.0)
     json (2.1.0)
-    kitchen-ec2 (2.2.1)
+    kitchen-ec2 (2.2.2)
       aws-sdk (~> 2)
       excon
       multi_json
@@ -144,7 +144,7 @@ GEM
       hashie (~> 3.4)
       inspec (>= 0.34.0, < 3.0.0)
       test-kitchen (~> 1.6)
-    kitchen-vagrant (1.3.1)
+    kitchen-vagrant (1.3.3)
       test-kitchen (~> 1.4)
     libyajl2 (1.2.0)
     little-plugger (1.1.4)
@@ -153,19 +153,20 @@ GEM
       multi_json (~> 1.10)
     method_source (0.9.0)
     minitar (0.6.1)
-    mixlib-archive (0.4.1)
+    mixlib-archive (0.4.16)
       mixlib-log
     mixlib-authentication (1.4.2)
     mixlib-cli (1.7.0)
-    mixlib-config (2.2.5)
+    mixlib-config (2.2.13)
+      tomlrb
     mixlib-install (1.2.3)
       artifactory
       mixlib-shellout
       mixlib-versioning
     mixlib-log (1.7.1)
-    mixlib-shellout (2.3.2)
+    mixlib-shellout (2.4.0)
     mixlib-versioning (1.2.2)
-    molinillo (0.6.4)
+    molinillo (0.6.6)
     multi_json (1.13.1)
     multipart-post (2.0.0)
     net-scp (1.2.1)
@@ -178,10 +179,10 @@ GEM
     net-ssh-multi (1.2.1)
       net-ssh (>= 2.6.5)
       net-ssh-gateway (>= 1.2.0)
-    net-telnet (0.1.1)
-    nio4r (2.2.0)
+    net-telnet (0.2.0)
+    nio4r (2.3.1)
     nori (2.6.0)
-    octokit (4.8.0)
+    octokit (4.10.0)
       sawyer (~> 0.8.0, >= 0.5.3)
     ohai (8.26.1)
       chef-config (>= 12.5.0.alpha.1, < 14)
@@ -202,8 +203,8 @@ GEM
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    public_suffix (3.0.2)
-    rack (1.6.9)
+    public_suffix (3.0.3)
+    rack (1.6.10)
     rainbow (2.1.0)
     retryable (2.0.4)
     ridley (5.1.1)
@@ -259,9 +260,9 @@ GEM
     solve (4.0.0)
       molinillo (~> 0.6)
       semverse (>= 1.1, < 3.0)
-    specinfra (2.73.2)
+    specinfra (2.76.1)
       net-scp
-      net-ssh (>= 2.7, < 5.0)
+      net-ssh (>= 2.7)
       net-telnet
       sfl
     sslshake (1.2.0)
@@ -278,7 +279,7 @@ GEM
     thor (0.19.1)
     timers (4.0.4)
       hitimes
-    tomlrb (1.2.6)
+    tomlrb (1.2.7)
     train (0.32.0)
       docker-api (~> 1.26)
       json (>= 1.8, < 3.0)
@@ -305,7 +306,7 @@ GEM
     winrm-elevated (1.1.0)
       winrm (~> 2.0)
       winrm-fs (~> 1.0)
-    winrm-fs (1.2.0)
+    winrm-fs (1.2.1)
       erubis (~> 2.7)
       logging (>= 1.6.1, < 3.0)
       rubyzip (~> 1.1)
@@ -331,4 +332,4 @@ DEPENDENCIES
   winrm-fs
 
 BUNDLED WITH
-   1.16.1
+   1.16.4

data/chef-dk.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |gem|
   gem.email         = [ "dan@chef.io", "lamont@chef.io", "serdar@chef.io"]
   gem.description   = "A streamlined development and deployment workflow for Chef platform."
   gem.summary       = gem.description
+  gem.license       = "Apache-2.0"
   gem.homepage      = "https://www.chef.io/"
 
   gem.required_ruby_version = ">= 2.4"

data/lib/chef-dk/builtin_commands.rb

@@ -55,5 +55,8 @@ ChefDK.commands do |c|
 
   c.builtin "undelete", :Undelete, desc: "Undo a delete command"
 
+  c.builtin "describe-cookbook", :DescribeCookbook, require_path: "chef-dk/command/describe_cookbook",
+                                                    desc: "Prints cookbook checksum information used for cookbook identifier"
+
   c.builtin "verify", :Verify, desc: "Test the embedded ChefDK applications", hidden: true
 end

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

@@ -0,0 +1,95 @@
+require "chef-dk/command/base"
+require "chef-dk/ui"
+require "chef-dk/cookbook_profiler/identifiers"
+
+module ChefDK
+  class IdDumper
+
+    attr_reader :cb_path
+    attr_reader :ui
+
+    def initialize(ui, cb_relpath)
+      @ui = ui
+      @cb_path = cb_relpath
+    end
+
+    def run
+      id = ChefDK::CookbookProfiler::Identifiers.new(cookbook_version)
+      ui.msg "Path: #{cookbook_path}"
+      ui.msg "SemVer version: #{id.semver_version}"
+      ui.msg "Identifier: #{id.content_identifier}"
+      ui.msg "File fingerprints:"
+      ui.msg id.fingerprint_text
+    end
+
+    def cookbook_version
+      @cookbook_version ||= cookbook_loader.cookbook_version
+    end
+
+    def cookbook_path
+      File.expand_path(cb_path)
+    end
+
+    def cookbook_loader
+      @cookbook_loader ||=
+        begin
+          loader = Chef::Cookbook::CookbookVersionLoader.new(cookbook_path, chefignore)
+          loader.load!
+          loader
+        end
+    end
+
+    def chefignore
+      @chefignore ||= Chef::Cookbook::Chefignore.new(File.join(cookbook_path, "chefignore"))
+    end
+  end
+
+  module Command
+
+    class DescribeCookbook < ChefDK::Command::Base
+
+      banner "Usage: chef describe-cookbook <path/to/cookbook>"
+
+      attr_reader :cookbook_path
+      attr_reader :ui
+
+      def initialize(*args)
+        super
+        @cookbook_path = nil
+        @ui = UI.new
+      end
+
+      def run(params = [])
+        return 1 unless apply_params!(params)
+        return 1 unless check_cookbook_path
+        IdDumper.new(ui, cookbook_path).run
+      end
+
+      def check_cookbook_path
+        unless File.exist?(cookbook_path)
+          ui.err("Given cookbook path '#{cookbook_path}' does not exist or is not readable")
+          return false
+        end
+
+        md_path = File.join(cookbook_path, "metadata.rb")
+        unless File.exist?(md_path)
+          ui.err("Given cookbook path '#{cookbook_path}' does not appear to be a cookbook, it does not contain a metadata.rb")
+          return false
+        end
+        true
+      end
+
+      def apply_params!(params)
+        remaining_args = parse_options(params)
+        if remaining_args.size != 1
+          ui.err(opt_parser)
+          return false
+        else
+          @cookbook_path = File.expand_path(remaining_args.first)
+          true
+        end
+      end
+
+    end
+  end
+end

data/lib/chef-dk/command/generator_commands/policyfile.rb

@@ -104,7 +104,7 @@ module ChefDK
           given_policy_dirname = File.expand_path(File.dirname(new_file_path))
           @policyfile_dir =
             if chef_repo_mode? && (given_policy_dirname == Dir.pwd)
-              File.expand_path("policies")
+              File.expand_path("policyfiles")
             else
               given_policy_dirname
             end

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

@@ -184,6 +184,15 @@ KITCHEN_YML
         end
       end
 
+      add_component "chef-apply" do |c|
+        c.gem_base_dir = "chef-apply"
+        c.unit_test do
+          bundle_install_mutex.synchronize { sh("#{embedded_bin("bundle")} install") }
+          sh("#{embedded_bin("bundle")} exec rspec")
+        end
+        c.smoke_test { sh("#{bin("chef-run")} -v") }
+      end
+
       # entirely possible this needs to be driven by a utility method in chef-provisioning.
       add_component "chef-provisioning" do |c|
         c.gem_base_dir = "chef-dk"

data/lib/chef-dk/skeletons/code_generator/files/default/repo/{policies → policyfiles}/README.md

@@ -5,20 +5,20 @@ the same filename as the name set in the policyfile itself, and use the
 Compile the policy with a command like this:
 
 ```
-chef install policies/my-app-frontend.rb
+chef install policyfiles/my-app-frontend.rb
 ```
 
-This will create a lockfile `policies/my-app-frontend.lock.json`.
+This will create a lockfile `policyfiles/my-app-frontend.lock.json`.
 
 To update locked dependencies, run `chef update` like this:
 
 ```
-chef update policies/my-app-frontend.rb
+chef update policyfiles/my-app-frontend.rb
 ```
 
 You can upload the policy (with associated cookbooks) to the server
 using a command like:
 
 ```
-chef push staging policies/my-app-frontend.rb
+chef push staging policyfiles/my-app-frontend.rb
 ```

data/lib/chef-dk/skeletons/code_generator/recipes/repo.rb

@@ -32,7 +32,7 @@ directories_to_create = %w( cookbooks data_bags )
 directories_to_create += if context.use_roles
                            %w( roles environments )
                          else
-                           %w( policies )
+                           %w( policyfiles )
                          end
 
 directories_to_create.each do |tlo|

data/lib/chef-dk/version.rb

@@ -16,5 +16,5 @@
 #
 
 module ChefDK
-  VERSION = "3.1.0"
+  VERSION = "3.2.30"
 end

data/omnibus_overrides.rb

@@ -22,4 +22,4 @@ override "util-macros", version: "1.19.0"
 override "xproto", version: "7.0.28"
 override "zlib", version: "1.2.11"
 override "libzmq", version: "4.0.7"
-override "openssl", version: "1.0.2o"
+override "openssl", version: "1.0.2p"

data/spec/unit/command/generator_commands/policyfile_spec.rb

@@ -111,7 +111,7 @@ describe ChefDK::Command::GeneratorCommands::Policyfile do
 
     let(:chef_repo_dot_txt) { File.join(tempdir, ".chef-repo.txt") }
 
-    let(:policies_dir) { File.join(tempdir, "policies") }
+    let(:policies_dir) { File.join(tempdir, "policyfiles") }
 
     let(:expected_policyfile_content) do
       <<-POLICYFILE_RB

data/spec/unit/command/generator_commands/repo_spec.rb

@@ -291,9 +291,9 @@ describe ChefDK::Command::GeneratorCommands::Repo do
           expect(File).to_not exist(File.join(repo_path, "environments"))
         end
 
-        describe "policies" do
+        describe "policyfiles" do
           describe "README.md" do
-            let(:file) { "policies/README.md" }
+            let(:file) { "policyfiles/README.md" }
 
             let(:expected_content) do
               <<-README
@@ -315,8 +315,8 @@ README
 
         let(:argv) { %w{new_repo --roles} }
 
-        it "does not create a policies directory" do
-          expect(File).to_not exist(File.join(repo_path, "policies"))
+        it "does not create a policyfiles directory" do
+          expect(File).to_not exist(File.join(repo_path, "policyfiles"))
         end
 
         describe "roles" do

data/spec/unit/command/verify_spec.rb

@@ -42,6 +42,7 @@ describe ChefDK::Command::Verify do
       "tk-policyfile-provisioner",
       "chef-client",
       "chef-dk",
+      "chef-apply",
       "chef-provisioning",
       "chefspec",
       "generated-cookbooks-pass-chefspec",

data/spec/unit/policyfile/included_policies_cookbook_source_spec.rb

@@ -137,9 +137,9 @@ describe ChefDK::Policyfile::IncludedPoliciesCookbookSource do
     end
   end
 
-  let(:policies) { [] }
+  let(:policyfiles) { [] }
 
-  let(:cookbook_source) { ChefDK::Policyfile::IncludedPoliciesCookbookSource.new(policies) }
+  let(:cookbook_source) { ChefDK::Policyfile::IncludedPoliciesCookbookSource.new(policyfiles) }
 
   context "when no policies are included" do
     it "returns false for preferred_source_for" do
@@ -152,7 +152,7 @@ describe ChefDK::Policyfile::IncludedPoliciesCookbookSource do
   end
 
   context "when a single policy is to be included" do
-    let(:policies) { [policy1_location_spec] }
+    let(:policyfiles) { [policy1_location_spec] }
 
     it "does not have a preferred source for unlocked cookbooks" do
       expect(cookbook_source.preferred_source_for?("cookbookC")).to eq(false)
@@ -185,7 +185,7 @@ describe ChefDK::Policyfile::IncludedPoliciesCookbookSource do
   end
 
   context "when multiple policies are to be included" do
-    let(:policies) { [policy1_location_spec, policy2_location_spec] }
+    let(:policyfiles) { [policy1_location_spec, policy2_location_spec] }
 
     context "when the policies use the same cookbooks with the same versions and sources" do
       let(:policy2_cookbooks) { policy1_cookbooks + [{ name: "cookbookC", version: "2.0.0" }] }

data/tasks/announce.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2016-2017, Chef Software Inc.
+# Copyright:: Copyright 2016-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/tasks/dependencies.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2016-2017, Chef Software Inc.
+# Copyright:: Copyright (c) 2016-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,30 +15,15 @@
 # limitations under the License.
 #
 
+require "bundler"
+
 desc "Tasks to update and check dependencies"
 namespace :dependencies do
-
-  # Running update_ci on your local system wont' work. The best way to update
-  # dependencies locally is by running the dependency update script.
-  desc "Update all dependencies. dependencies:update to update as little as possible."
-  task :update do |t, rake_args|
-    # FIXME: probably broken, and needs less indirection
-    system("#{File.join(Dir.pwd, "ci", "dependency_update.sh")}")
-  end
-
-  desc "Force update (when adding new gems to Gemfiles)"
-  task :force_update do |t, rake_args|
-    # FIXME: probably broken, and needs less indirection
-    FileUtils.rm_f(File.join(Dir.pwd, ".bundle", "config"))
-    system("#{File.join(Dir.pwd, "ci", "dependency_update.sh")}")
-  end
-
   # Update all dependencies to the latest constraint-matching version
-  desc "Update all dependencies. dependencies:update to update as little as possible (CI-only)."
-  task :update_ci => %w{
+  desc "Update all dependencies."
+  task update: %w{
                     dependencies:update_gemfile_lock
                     dependencies:update_omnibus_gemfile_lock
-                    dependencies:update_acceptance_gemfile_lock
                   }
 
   def bundle_update_locked_multiplatform_task(task_name, dir)
@@ -66,24 +51,6 @@ namespace :dependencies do
     end
   end
 
-  def berks_update_task(task_name, dir)
-    desc "Update #{dir}/Berksfile.lock."
-    task task_name do
-      FileUtils.rm_f("#{dir}/Berksfile.lock")
-      Dir.chdir(dir) do
-        Bundler.with_clean_env do
-          sh "bundle exec berks install"
-        end
-      end
-    end
-  end
-
   bundle_update_locked_multiplatform_task :update_gemfile_lock, "."
   bundle_update_locked_multiplatform_task :update_omnibus_gemfile_lock, "omnibus"
-  bundle_update_task :update_acceptance_gemfile_lock, "acceptance"
 end
-
-desc "Update all dependencies and check for outdated gems."
-task :dependencies_ci => [ "dependencies:update_ci" ]
-task :dependencies => [ "dependencies:update" ]
-task :update => [ "dependencies:update" ]