chef-dk 3.13.1 → 4.0.60

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

@@ -28,7 +28,7 @@ module ChefDK
 
       class Cookbook
 
-        VALID_STRING_FORMAT = /\A[^\s]+ \([^\s]+\)\Z/
+        VALID_STRING_FORMAT = /\A[^\s]+ \([^\s]+\)\Z/.freeze
 
         def self.valid_str?(str)
           !!(str =~ VALID_STRING_FORMAT)

data/lib/chef-dk/policyfile_compiler.rb

@@ -39,7 +39,7 @@ module ChefDK
     DEFAULT_DEMAND_CONSTRAINT = ">= 0.0.0".freeze
 
     # Cookbooks from these sources lock that cookbook to exactly one version
-    SOURCE_TYPES_WITH_FIXED_VERSIONS = %i{git path}.freeze
+    SOURCE_TYPES_WITH_FIXED_VERSIONS = [:git, :path].freeze
 
     def self.evaluate(policyfile_string, policyfile_filename, ui: nil, chef_config: nil)
       compiler = new(ui: ui, chef_config: chef_config)
@@ -225,7 +225,6 @@ module ChefDK
 
     def graph_solution
       return @solution if @solution
-
       cache_fixed_version_cookbooks
       @solution = Solve.it!(graph, graph_demands)
     end
@@ -516,8 +515,7 @@ module ChefDK
             false
           end
         end
-
-        conflicting_source_messages << "#{source_b.desc} sets a preferred for cookbook(s) #{conflicting_preferences.join(", ")}. This conflicts with an included policy."
+        conflicting_source_messages << "#{source_b.desc} sets a preferred for cookbook(s) #{conflicting_preferences.join(', ')}. This conflicts with an included policy."
       end
       unless conflicting_source_messages.empty?
         msg = "You may not override the cookbook sources for any cookbooks required by included policies.\n"

data/lib/chef-dk/policyfile_lock.rb

@@ -65,7 +65,7 @@ module ChefDK
       end
     end
 
-    RUN_LIST_ITEM_FORMAT = /\Arecipe\[[^\s]+::[^\s]+\]\Z/
+    RUN_LIST_ITEM_FORMAT = /\Arecipe\[[^\s]+::[^\s]+\]\Z/.freeze
 
     def self.build(storage_config)
       lock = new(storage_config)
@@ -324,7 +324,6 @@ module ChefDK
       unless attributes.kind_of?(Hash)
         raise "Top level attributes must be a Hash (you gave: #{attributes})"
       end
-
       canonicalize_elements(attributes)
     end
 
@@ -356,7 +355,6 @@ module ChefDK
         unless item.finite?
           raise InvalidPolicyfileAttribute, "Floating point numbers cannot be infinite or NaN. You gave #{item.inspect}"
         end
-
         # Support for floats assumes that any implementation of our JSON
         # canonicalization routine will use IEEE-754 doubles. In decimal terms,
         # doubles give 15-17 digits of precision, so we err on the safe side

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

@@ -33,7 +33,7 @@ module ChefDK
 
     class ExportRepo
 
-      # Policy groups provide namespaces for policies so that a Chef Server can
+      # Policy groups provide namespaces for policies so that a Chef Infra Server can
       # have multiple active iterations of a policy at once, but we don't need
       # this when serving a single exported policy via Chef Zero, so hardcode
       # it to a "well known" value:
@@ -229,7 +229,7 @@ module ChefDK
       def create_client_rb
         File.open(client_rb_staging_path, "wb+") do |f|
           f.print( <<~CONFIG )
-            ### Chef Client Configuration ###
+            ### Chef Infra Client Configuration ###
             # The settings in this file will configure chef to apply the exported policy in
             # this directory. To use it, run:
             #
@@ -279,9 +279,9 @@ module ChefDK
 
             ### .chef/config.rb
 
-            A configuration file for Chef Client. This file configures Chef Client to use
-            the correct `policy_name` and `policy_group` for this exported repository. Chef
-            Client will use this configuration automatically if you've set your working
+            A configuration file for Chef Infra Client. This file configures Chef Infra Client to
+            use the correct `policy_name` and `policy_group` for this exported repository. Chef
+            Infra Client will use this configuration automatically if you've set your working
             directory properly.
 
             ### cookbook_artifacts/
@@ -294,7 +294,7 @@ module ChefDK
 
             ### policy_groups/
 
-            Policy groups are used by Chef Server to manage multiple revisions of the same
+            Policy groups are used by Chef Infra Server to manage multiple revisions of the same
             policy. However, exported policies contain only a single policy revision, so
             this policy group name is hardcoded to "local" and should not be changed.
 

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

@@ -90,8 +90,8 @@ module ChefDK
             This archive is in an unsupported format.
 
             This archive was created with an older version of ChefDK. This version of
-            ChefDK does not support archives in the older format. Re-create the archive
-            with a newer version of ChefDK or downgrade ChefDK.
+            ChefDK does not support archives in the older format. Please Re-create the
+            archive with a newer version of ChefDK or Workstation.
           MESSAGE
         end
 

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

@@ -11,7 +11,7 @@ provisioner:
   product_name: chefdk
 
 platforms:
-  - name: ubuntu-16.04
+  - name: ubuntu-18.04
   - name: centos-7
 
 suites:

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

@@ -1,11 +1,11 @@
 context = ChefDK::Generator.context
-delivery_project_dir = context.delivery_project_dir
+workflow_project_dir = context.workflow_project_dir
 pipeline = context.pipeline
-dot_delivery_dir = File.join(delivery_project_dir, '.delivery')
+dot_delivery_dir = File.join(workflow_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 CLI configuration')
 
 directory dot_delivery_dir
 
@@ -20,7 +20,7 @@ cookbook_file project_toml do
   not_if { File.exist?(project_toml) }
 end
 
-generator_desc('Ensuring correct delivery build cookbook content')
+generator_desc('Ensuring correct Workflow (Delivery) build cookbook content')
 
 build_cookbook_dir = File.join(dot_delivery_dir, 'build_cookbook')
 
@@ -112,64 +112,64 @@ end
 # * db22790 Add generated cookbook content
 # ```
 #
-if context.have_git && context.delivery_project_git_initialized && !context.skip_git_init
+if context.have_git && context.workflow_project_git_initialized && !context.skip_git_init
 
   generator_desc('Adding delivery configuration to feature branch')
 
   execute('git-create-feature-branch') do
     command('git checkout -t -b add-delivery-configuration')
-    cwd delivery_project_dir
-    not_if { shell_out('git branch', cwd: delivery_project_dir).stdout.match(/add-delivery-configuration/) }
+    cwd workflow_project_dir
+    not_if { shell_out('git branch', cwd: workflow_project_dir).stdout.match(/add-delivery-configuration/) }
   end
 
   execute('git-add-delivery-config-json') do
     command('git add .delivery/config.json')
-    cwd delivery_project_dir
-    only_if { shell_out('git status -u --porcelain', cwd: delivery_project_dir).stdout.match(%r{.delivery/config.json}) }
+    cwd workflow_project_dir
+    only_if { shell_out('git status -u --porcelain', cwd: workflow_project_dir).stdout.match(%r{.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')
-    cwd delivery_project_dir
-    only_if { shell_out('git status -u --porcelain', cwd: delivery_project_dir).stdout.match(%r{.delivery/project.toml}) }
+    cwd workflow_project_dir
+    only_if { shell_out('git status -u --porcelain', cwd: workflow_project_dir).stdout.match(%r{.delivery/project.toml}) }
   end
 
   execute('git-commit-delivery-config') do
     command('git commit -m "Add generated delivery configuration"')
-    cwd delivery_project_dir
-    only_if { shell_out('git status -u --porcelain', cwd: delivery_project_dir).stdout.match(/config\.json|project\.toml/) }
+    cwd workflow_project_dir
+    only_if { shell_out('git status -u --porcelain', cwd: workflow_project_dir).stdout.match(/config\.json|project\.toml/) }
   end
 
   generator_desc('Adding build cookbook to feature branch')
 
   execute('git-add-delivery-build-cookbook-files') do
     command('git add .delivery')
-    cwd delivery_project_dir
-    only_if { shell_out('git status -u --porcelain', cwd: delivery_project_dir).stdout.match(/\.delivery/) }
+    cwd workflow_project_dir
+    only_if { shell_out('git status -u --porcelain', cwd: workflow_project_dir).stdout.match(/\.delivery/) }
   end
 
   execute('git-commit-delivery-build-cookbook') do
     command('git commit -m "Add generated delivery build cookbook"')
-    cwd delivery_project_dir
-    only_if { shell_out('git status -u --porcelain', cwd: delivery_project_dir).stdout.match(/\.delivery/) }
+    cwd workflow_project_dir
+    only_if { shell_out('git status -u --porcelain', cwd: workflow_project_dir).stdout.match(/\.delivery/) }
   end
 
   execute("git-return-to-#{pipeline}-branch") do
     command("git checkout #{pipeline}")
-    cwd delivery_project_dir
+    cwd workflow_project_dir
   end
 
   generator_desc('Merging delivery content feature branch to master')
 
   execute('git-merge-delivery-config-branch') do
     command('git merge --no-ff add-delivery-configuration')
-    cwd delivery_project_dir
+    cwd workflow_project_dir
   end
 
   execute('git-remove-delivery-config-branch') do
     command('git branch -D add-delivery-configuration')
-    cwd delivery_project_dir
+    cwd workflow_project_dir
   end
 end

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

@@ -45,20 +45,17 @@ end
 # chefignore
 cookbook_file "#{cookbook_dir}/chefignore"
 
-if context.use_berkshelf
-
-  # Berks
-  cookbook_file "#{cookbook_dir}/Berksfile" do
-    action :create_if_missing
-  end
-else
-
+if context.use_policyfile
   # Policyfile
   template "#{cookbook_dir}/Policyfile.rb" do
     source 'Policyfile.rb.erb'
     helpers(ChefDK::Generator::TemplateHelper)
   end
-
+else
+  # Berks
+  cookbook_file "#{cookbook_dir}/Berksfile" do
+    action :create_if_missing
+  end
 end
 
 # LICENSE
@@ -73,10 +70,10 @@ template "#{cookbook_dir}/kitchen.yml" do
   if context.kitchen == 'dokken'
     # kitchen-dokken configuration works with berkshelf and policyfiles
     source 'kitchen_dokken.yml.erb'
-  elsif context.use_berkshelf
-    source 'kitchen.yml.erb'
-  else
+  elsif context.use_policyfile
     source 'kitchen_policyfile.yml.erb'
+  else
+    source 'kitchen.yml.erb'
   end
 
   helpers(ChefDK::Generator::TemplateHelper)
@@ -100,10 +97,10 @@ directory "#{cookbook_dir}/spec/unit/recipes" do
 end
 
 cookbook_file "#{cookbook_dir}/spec/spec_helper.rb" do
-  if context.use_berkshelf
-    source 'spec_helper.rb'
-  else
+  if context.use_policyfile
     source 'spec_helper_policyfile.rb'
+  else
+    source 'spec_helper.rb'
   end
 
   action :create_if_missing
@@ -125,6 +122,17 @@ template "#{cookbook_dir}/recipes/default.rb" do
   action :create_if_missing
 end
 
+# the same will be done below if workflow was enabled so avoid double work and skip this
+unless context.enable_workflow
+  directory "#{cookbook_dir}/.delivery"
+
+  # Adding the delivery local-mode config
+  cookbook_file "#{cookbook_dir}/.delivery/project.toml" do
+    source 'delivery-project.toml'
+    not_if { File.exist?("#{cookbook_dir}/.delivery/project.toml") }
+  end
+end
+
 # git
 if context.have_git
   unless context.skip_git_init
@@ -156,4 +164,4 @@ if context.have_git
   end
 end
 
-include_recipe '::build_cookbook' if context.enable_delivery
+include_recipe '::build_cookbook' if context.enable_workflow

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

@@ -1,6 +1,10 @@
 context = ChefDK::Generator.context
 repo_dir = File.join(context.repo_root, context.repo_name)
 
+silence_chef_formatter unless context.verbose
+
+generator_desc('Ensuring correct Chef Infra repo file content')
+
 # repo root dir
 directory repo_dir
 
@@ -28,10 +32,10 @@ end
 
 directories_to_create = %w( cookbooks data_bags )
 
-directories_to_create += if context.use_roles
-                           %w( roles environments )
-                         else
+directories_to_create += if context.use_policy
                            %w( policyfiles )
+                         else
+                           %w( roles environments )
                          end
 
 directories_to_create.each do |tlo|