chef-dk 1.2.22 → 1.3.40

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

@@ -15,13 +15,13 @@
 # limitations under the License.
 #
 
-require 'ffi_yajl'
+require "ffi_yajl"
 
-require 'chef-dk/service_exceptions'
-require 'chef-dk/authenticated_http'
-require 'chef-dk/policyfile_compiler'
-require 'chef-dk/policyfile/uploader'
-require 'chef-dk/policyfile/storage_config'
+require "chef-dk/service_exceptions"
+require "chef-dk/authenticated_http"
+require "chef-dk/policyfile_compiler"
+require "chef-dk/policyfile/uploader"
+require "chef-dk/policyfile/storage_config"
 
 module ChefDK
   module PolicyfileServices
@@ -77,7 +77,6 @@ module ChefDK
         validate_lockfile
         write_updated_lockfile
         upload_policy
-
       end
 
       def policyfile_lock
@@ -111,4 +110,3 @@ module ChefDK
     end
   end
 end
-

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

@@ -15,13 +15,13 @@
 # limitations under the License.
 #
 
-require 'zlib'
-require 'archive/tar/minitar'
+require "zlib"
+require "archive/tar/minitar"
 
-require 'chef-dk/service_exceptions'
-require 'chef-dk/policyfile_lock'
-require 'chef-dk/authenticated_http'
-require 'chef-dk/policyfile/uploader'
+require "chef-dk/service_exceptions"
+require "chef-dk/policyfile_lock"
+require "chef-dk/authenticated_http"
+require "chef-dk/policyfile/uploader"
 
 module ChefDK
   module PolicyfileServices
@@ -37,7 +37,6 @@ module ChefDK
 
       attr_reader :policyfile_lock
 
-
       def initialize(archive_file: nil, policy_group: nil, root_dir: nil, ui: nil, config: nil)
         @archive_file = archive_file
         @policy_group = policy_group
@@ -104,7 +103,6 @@ MESSAGE
           raise InvalidPolicyArchive, "Archive does not contain a cookbook_artifacts directory"
         end
 
-
         policy_data = load_policy_data(policyfile_lock_path)
         storage_config = Policyfile::StorageConfig.new.use_policyfile_lock(policyfile_lock_path)
         @policyfile_lock = ChefDK::PolicyfileLock.new(storage_config).build_from_archive(policy_data)
@@ -118,7 +116,6 @@ MESSAGE
             "Missing cookbooks: '#{missing_cookbooks.keys.join('", "')}'."
           raise InvalidPolicyArchive, message
         end
-
       end
 
       def load_policy_data(policyfile_lock_path)
@@ -132,7 +129,6 @@ MESSAGE
           unpack_to(staging_dir)
           yield staging_dir
         end
-
       end
 
       def unpack_to(staging_dir)

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

@@ -15,10 +15,10 @@
 # limitations under the License.
 #
 
-require 'chef-dk/service_exceptions'
-require 'chef-dk/authenticated_http'
-require 'chef-dk/policyfile/undo_stack'
-require 'chef-dk/policyfile/undo_record'
+require "chef-dk/service_exceptions"
+require "chef-dk/authenticated_http"
+require "chef-dk/policyfile/undo_stack"
+require "chef-dk/policyfile/undo_record"
 
 module ChefDK
   module PolicyfileServices
@@ -139,4 +139,3 @@ module ChefDK
     end
   end
 end
-

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

@@ -15,10 +15,10 @@
 # limitations under the License.
 #
 
-require 'chef-dk/service_exceptions'
-require 'chef-dk/authenticated_http'
-require 'chef-dk/policyfile/undo_stack'
-require 'chef-dk/policyfile/undo_record'
+require "chef-dk/service_exceptions"
+require "chef-dk/authenticated_http"
+require "chef-dk/policyfile/undo_stack"
+require "chef-dk/policyfile/undo_record"
 
 module ChefDK
   module PolicyfileServices
@@ -83,4 +83,3 @@ module ChefDK
     end
   end
 end
-

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

@@ -15,9 +15,9 @@
 # limitations under the License.
 #
 
-require 'chef-dk/policyfile/comparison_base'
-require 'chef-dk/policyfile/lister'
-require 'chef-dk/pager'
+require "chef-dk/policyfile/comparison_base"
+require "chef-dk/policyfile/lister"
+require "chef-dk/pager"
 
 module ChefDK
   module PolicyfileServices
@@ -214,7 +214,7 @@ module ChefDK
       end
 
       def shorten_rev_id(revision_id)
-        revision_id[0,10]
+        revision_id[0, 10]
       end
 
       def http_client
@@ -227,11 +227,10 @@ module ChefDK
 
       def format_rev_ids_for_report(rev_id_by_group)
         rev_id_by_group.format_revision_ids do |rev_id|
-          rev_id ? rev_id[0,10] : "*NOT APPLIED*"
+          rev_id ? rev_id[0, 10] : "*NOT APPLIED*"
         end
       end
 
-
     end
   end
 end

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

@@ -15,9 +15,9 @@
 # limitations under the License.
 #
 
-require 'chef-dk/authenticated_http'
-require 'chef-dk/service_exceptions'
-require 'chef-dk/policyfile/undo_stack'
+require "chef-dk/authenticated_http"
+require "chef-dk/service_exceptions"
+require "chef-dk/policyfile/undo_stack"
 
 module ChefDK
   module PolicyfileServices

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

@@ -15,10 +15,10 @@
 # limitations under the License.
 #
 
-require 'chef-dk/helpers'
-require 'chef-dk/policyfile/storage_config'
-require 'chef-dk/service_exceptions'
-require 'chef-dk/policyfile_compiler'
+require "chef-dk/helpers"
+require "chef-dk/policyfile/storage_config"
+require "chef-dk/service_exceptions"
+require "chef-dk/policyfile_compiler"
 
 module ChefDK
   module PolicyfileServices
@@ -88,7 +88,6 @@ module ChefDK
         end
       end
 
-
       def assert_policy_and_lock_present!
         unless File.exist?(policyfile_expanded_path)
           raise PolicyfileNotFound, "Policyfile not found at path #{policyfile_expanded_path}"
@@ -101,4 +100,3 @@ module ChefDK
     end
   end
 end
-

data/lib/chef-dk/service_exception_inspectors.rb

@@ -15,11 +15,10 @@
 # limitations under the License.
 #
 
-require 'chef-dk/service_exception_inspectors/base'
-require 'chef-dk/service_exception_inspectors/http'
+require "chef-dk/service_exception_inspectors/base"
+require "chef-dk/service_exception_inspectors/http"
 
 module ChefDK
   module ServiceExceptionInspectors
   end
 end
-

data/lib/chef-dk/service_exception_inspectors/base.rb

@@ -37,4 +37,3 @@ module ChefDK
     end
   end
 end
-

data/lib/chef-dk/service_exception_inspectors/http.rb

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require 'ffi_yajl'
+require "ffi_yajl"
 
 module ChefDK
   module ServiceExceptionInspectors
@@ -117,5 +117,3 @@ END
     end
   end
 end
-
-

data/lib/chef-dk/service_exceptions.rb

@@ -20,7 +20,7 @@
 # dependencies, so they are split into their own file here.
 ##
 
-require 'chef-dk/service_exception_inspectors'
+require "chef-dk/service_exception_inspectors"
 
 module ChefDK
 
@@ -140,4 +140,3 @@ module ChefDK
   class ChefConvergeError < ChefRunnerError; end
 
 end
-

data/lib/chef-dk/shell_out.rb

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require 'mixlib/shellout'
+require "mixlib/shellout"
 
 module ChefDK
 

data/lib/chef-dk/skeletons/code_generator/files/default/build_cookbook/.kitchen.yml

@@ -8,14 +8,14 @@ provisioner:
   name: chef_zero
   encrypted_data_bag_secret_key_path: 'secrets/fakey-mcfakerton'
   data_bags_path: './data_bags'
+  product_name: chefdk
 
 platforms:
   - name: ubuntu-16.04
-  - name: centos-7.2
+  - name: centos-7.3
 
 suites:
   - name: default
     run_list:
-      - recipe[delivery_build::default]
       - recipe[test]
     attributes:

data/lib/chef-dk/skeletons/code_generator/files/default/build_cookbook/README.md

@@ -47,9 +47,9 @@ The change we'll use for an example is to install the `zsh` package. Write a fai
 require 'spec_helper'
 
 describe 'godzilla::default' do
-  context 'When all attributes are default, on an unspecified platform' do
+  context 'When all attributes are default, on Ubuntu 16.04' do
     let(:chef_run) do
-      runner = ChefSpec::ServerRunner.new
+      runner = ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '16.04')
       runner.converge(described_recipe)
     end
 

data/lib/chef-dk/skeletons/code_generator/files/default/build_cookbook/test-fixture-recipe.rb

@@ -3,5 +3,6 @@
   execute "HOME=/home/vagrant delivery job verify #{phase} --server localhost --ent test --org kitchen" do
     cwd '/tmp/repo-data'
     user 'vagrant'
+    environment('GIT_DISCOVERY_ACROSS_FILESYSTEM' => '1')
   end
 end

data/lib/chef-dk/skeletons/code_generator/files/default/repo/cookbooks/example/attributes/default.rb

@@ -2,6 +2,6 @@
 # attributes to be applied to nodes that run this cookbook.
 
 # Set a default name
-default["example"]["name"] = "Sam Doe"
+default['example']['name'] = 'Sam Doe'
 
 # For further information, see the Chef documentation (https://docs.chef.io/essentials_cookbook_attribute_files.html).

data/lib/chef-dk/skeletons/code_generator/files/default/repo/cookbooks/example/recipes/default.rb

@@ -1,7 +1,7 @@
 # This is a Chef recipe file. It can be used to specify resources which will
 # apply configuration to a server.
 
-log "Welcome to Chef, #{node["example"]["name"]}!" do
+log "Welcome to Chef, #{node['example']['name']}!" do
   level :info
 end
 

data/lib/chef-dk/skeletons/code_generator/metadata.rb

@@ -5,4 +5,3 @@ license          'Apache 2 License'
 description      'Generates Chef code for Chef DK'
 long_description 'Generates Chef code for Chef DK'
 version          '0.1.0'
-

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

@@ -56,7 +56,7 @@ cookbook_file "#{cookbook_dir}/Berksfile"
 directory "#{cookbook_dir}/recipes"
 
 template "#{cookbook_dir}/recipes/default.rb" do
-  source "recipe.rb.erb"
+  source 'recipe.rb.erb'
   helpers(ChefDK::Generator::TemplateHelper)
 end
 
@@ -70,20 +70,20 @@ cookbook_file "#{cookbook_dir}/spec/spec_helper.rb" do
 end
 
 template "#{cookbook_dir}/spec/unit/recipes/default_spec.rb" do
-  source "recipe_spec.rb.erb"
+  source 'recipe_spec.rb.erb'
   helpers(ChefDK::Generator::TemplateHelper)
   action :create_if_missing
 end
 
 # git
 if context.have_git
-  if !context.skip_git_init
-    execute("initialize-git") do
-      command("git init .")
+  unless context.skip_git_init
+    execute('initialize-git') do
+      command('git init .')
       cwd app_dir
     end
   end
   cookbook_file "#{app_dir}/.gitignore" do
-    source "gitignore"
+    source 'gitignore'
   end
 end

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

@@ -1,12 +1,12 @@
 
 context = ChefDK::Generator.context
 cookbook_dir = File.join(context.cookbook_root, context.cookbook_name)
-attribute_dir = File.join(cookbook_dir, "attributes")
-attribute_path = File.join(cookbook_dir, "attributes", "#{context.new_file_basename}.rb")
+attribute_dir = File.join(cookbook_dir, 'attributes')
+attribute_path = File.join(cookbook_dir, 'attributes', "#{context.new_file_basename}.rb")
 
 directory attribute_dir
 
 template attribute_path do
-  source "attribute.rb.erb"
+  source 'attribute.rb.erb'
   helpers(ChefDK::Generator::TemplateHelper)
 end

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

@@ -2,38 +2,42 @@
 context = ChefDK::Generator.context
 delivery_project_dir = context.delivery_project_dir
 pipeline = context.pipeline
-dot_delivery_dir = File.join(delivery_project_dir, ".delivery")
+dot_delivery_dir = File.join(delivery_project_dir, '.delivery')
+config_json = File.join(dot_delivery_dir, 'config.json')
+project_toml = File.join(dot_delivery_dir, 'project.toml')
 
-generator_desc("Ensuring delivery configuration")
+generator_desc('Ensuring delivery configuration')
 
 directory dot_delivery_dir
 
-cookbook_file File.join(dot_delivery_dir, "config.json") do
-  source "delivery-config.json"
+cookbook_file config_json do
+  source 'delivery-config.json'
+  not_if { File.exist?(config_json) }
 end
 
 # Adding a new prototype file for delivery-cli local commands
-cookbook_file File.join(dot_delivery_dir, "project.toml") do
-  source "delivery-project.toml"
+cookbook_file project_toml do
+  source 'delivery-project.toml'
+  not_if { File.exist?(project_toml) }
 end
 
-generator_desc("Ensuring correct delivery build cookbook content")
+generator_desc('Ensuring correct delivery build cookbook content')
 
-build_cookbook_dir = File.join(dot_delivery_dir, "build_cookbook")
+build_cookbook_dir = File.join(dot_delivery_dir, 'build_cookbook')
 
 # cookbook root dir
 directory build_cookbook_dir
 
 # metadata.rb
 template "#{build_cookbook_dir}/metadata.rb" do
-  source "build_cookbook/metadata.rb.erb"
+  source 'build_cookbook/metadata.rb.erb'
   helpers(ChefDK::Generator::TemplateHelper)
   action :create_if_missing
 end
 
 # README
 cookbook_file "#{build_cookbook_dir}/README.md" do
-  source "build_cookbook/README.md"
+  source 'build_cookbook/README.md'
   action :create_if_missing
 end
 
@@ -49,7 +53,7 @@ cookbook_file "#{build_cookbook_dir}/chefignore"
 
 # Berksfile
 template "#{build_cookbook_dir}/Berksfile" do
-  source "build_cookbook/Berksfile.erb"
+  source 'build_cookbook/Berksfile.erb'
   helpers(ChefDK::Generator::TemplateHelper)
   action :create_if_missing
 end
@@ -68,7 +72,7 @@ end
 
 # Test Kitchen build node
 cookbook_file "#{build_cookbook_dir}/.kitchen.yml" do
-  source "build_cookbook/.kitchen.yml"
+  source 'build_cookbook/.kitchen.yml'
 end
 
 directory "#{build_cookbook_dir}/data_bags/keys" do
@@ -93,7 +97,7 @@ version '0.1.0')
 end
 
 cookbook_file "#{build_cookbook_dir}/test/fixtures/cookbooks/test/recipes/default.rb" do
-  source "build_cookbook/test-fixture-recipe.rb"
+  source 'build_cookbook/test-fixture-recipe.rb'
 end
 
 # Construct git history as if we did all the work in a feature branch which we
@@ -111,52 +115,52 @@ end
 #
 if context.have_git && context.delivery_project_git_initialized && !context.skip_git_init
 
-  generator_desc("Adding delivery configuration to feature branch")
+  generator_desc('Adding delivery configuration to feature branch')
 
-  execute("git-create-feature-branch") do
-    command("git checkout -t -b add-delivery-configuration")
+  execute('git-create-feature-branch') do
+    command('git checkout -t -b add-delivery-configuration')
     cwd delivery_project_dir
-    
-    not_if "git branch |grep \"add-delivery-configuration\""
+
+    not_if 'git branch |grep "add-delivery-configuration"'
   end
 
-  execute("git-add-delivery-config-json") do
-    command("git add .delivery/config.json")
+  execute('git-add-delivery-config-json') do
+    command('git add .delivery/config.json')
     cwd delivery_project_dir
 
-    only_if "git status --porcelain |grep \".\""
+    only_if 'git status -u --porcelain |grep ".delivery/config.json"'
   end
 
   # Adding the new prototype file to the feature branch
   # so it gets checked in with the delivery config commit
-  execute("git-add-delivery-project-toml") do
-    command("git add .delivery/project.toml")
+  execute('git-add-delivery-project-toml') do
+    command('git add .delivery/project.toml')
     cwd delivery_project_dir
 
-    only_if "git status --porcelain |grep \".\""
+    only_if 'git status -u --porcelain |grep ".delivery/project.toml"'
   end
 
-  execute("git-commit-delivery-config") do
-    command("git commit -m \"Add generated delivery configuration\"")
+  execute('git-commit-delivery-config') do
+    command('git commit -m "Add generated delivery configuration"')
     cwd delivery_project_dir
 
-    only_if "git status --porcelain |grep \".\""
+    only_if 'git status -u --porcelain | egrep "config.json|project.toml"'
   end
 
-  generator_desc("Adding build cookbook to feature branch")
+  generator_desc('Adding build cookbook to feature branch')
 
-  execute("git-add-delivery-build-cookbook-files") do
-    command("git add .delivery")
+  execute('git-add-delivery-build-cookbook-files') do
+    command('git add .delivery')
     cwd delivery_project_dir
 
-    only_if "git status --porcelain |grep \".\""
+    only_if 'git status -u --porcelain |grep ".delivery"'
   end
 
-  execute("git-commit-delivery-build-cookbook") do
-    command("git commit -m \"Add generated delivery build cookbook\"")
+  execute('git-commit-delivery-build-cookbook') do
+    command('git commit -m "Add generated delivery build cookbook"')
     cwd delivery_project_dir
 
-    only_if "git status --porcelain |grep \".\""
+    only_if 'git status -u --porcelain |grep ".delivery"'
   end
 
   execute("git-return-to-#{pipeline}-branch") do
@@ -164,15 +168,15 @@ if context.have_git && context.delivery_project_git_initialized && !context.skip
     cwd delivery_project_dir
   end
 
-  generator_desc("Merging delivery content feature branch to master")
+  generator_desc('Merging delivery content feature branch to master')
 
-  execute("git-merge-delivery-config-branch") do
-    command("git merge --no-ff add-delivery-configuration")
+  execute('git-merge-delivery-config-branch') do
+    command('git merge --no-ff add-delivery-configuration')
     cwd delivery_project_dir
   end
 
-  execute("git-remove-delivery-config-branch") do
-    command("git branch -D add-delivery-configuration")
+  execute('git-remove-delivery-config-branch') do
+    command('git branch -D add-delivery-configuration')
     cwd delivery_project_dir
   end
 end