chef-dk 1.1.16 → 1.2.20

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

@@ -38,6 +38,9 @@ module ChefDK
       end
 
       def use_policyfile(policyfile_filename)
+        if policyfile_filename.end_with?(".lock.json")
+          return use_policyfile_lock(policyfile_filename)
+        end
         unless policyfile_filename.end_with?(".rb")
           raise InvalidPolicyfileFilename, "Policyfile filenames must end with `.rb' extension (you gave: `#{policyfile_filename}')"
         end

data/lib/chef-dk/policyfile_compiler.rb

@@ -38,8 +38,8 @@ module ChefDK
     # Cookbooks from these sources lock that cookbook to exactly one version
     SOURCE_TYPES_WITH_FIXED_VERSIONS = [:git, :path].freeze
 
-    def self.evaluate(policyfile_string, policyfile_filename, ui: nil)
-      compiler = new(ui: ui)
+    def self.evaluate(policyfile_string, policyfile_filename, ui: nil, chef_config: nil)
+      compiler = new(ui: ui, chef_config: chef_config)
       compiler.evaluate_policyfile(policyfile_string, policyfile_filename)
       compiler
     end
@@ -56,9 +56,9 @@ module ChefDK
     attr_reader :storage_config
     attr_reader :install_report
 
-    def initialize(ui: nil)
+    def initialize(ui: nil, chef_config: nil)
       @storage_config = Policyfile::StorageConfig.new
-      @dsl = Policyfile::DSL.new(storage_config)
+      @dsl = Policyfile::DSL.new(storage_config, chef_config: chef_config)
       @artifact_server_cookbook_location_specs = {}
 
       @merged_graph = nil

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

@@ -34,10 +34,12 @@ module ChefDK
       attr_reader :ui
       attr_reader :storage_config
       attr_reader :overwrite
+      attr_reader :chef_config
 
-      def initialize(policyfile: nil, ui: nil, root_dir: nil, overwrite: false)
+      def initialize(policyfile: nil, ui: nil, root_dir: nil, overwrite: false, config: nil)
         @ui = ui
         @overwrite = overwrite
+        @chef_config = config
 
         policyfile_rel_path = policyfile || "Policyfile.rb"
         policyfile_full_path = File.expand_path(policyfile_rel_path, root_dir)
@@ -66,7 +68,7 @@ module ChefDK
       end
 
       def policyfile_compiler
-        @policyfile_compiler ||= ChefDK::PolicyfileCompiler.evaluate(policyfile_content, policyfile_expanded_path, ui: ui)
+        @policyfile_compiler ||= ChefDK::PolicyfileCompiler.evaluate(policyfile_content, policyfile_expanded_path, ui: ui, chef_config: chef_config)
       end
 
       def expanded_run_list

data/lib/chef-dk/skeletons/code_generator/files/default/delivery-project.toml

@@ -12,14 +12,25 @@
 # config.json file and it will continue working as usual.
 
 [local_phases]
-unit = "rspec spec/"
-lint = "cookstyle"
+unit = "chef exec rspec spec/"
+lint = "chef exec cookstyle"
 # Foodcritic includes rules only appropriate for community cookbooks
 # uploaded to Supermarket. We turn off any rules tagged "supermarket"
 # by default. If you plan to share this cookbook you should remove
 # '-t ~supermarket' below to enable supermarket rules.
-syntax = "foodcritic . --exclude spec -f any -t ~supermarket"
+syntax = "chef exec foodcritic . --exclude spec -f any -t ~supermarket"
 provision = "chef exec kitchen create"
 deploy = "chef exec kitchen converge"
 smoke = "chef exec kitchen verify"
+# The functional phase is optional, you can define it by uncommenting
+# the line below and running the command: `delivery local functional`
+# functional = ""
 cleanup = "chef exec kitchen destroy"
+
+# Remote project.toml file
+#
+# Specify a remote URI location for the `project.toml` file.
+# This is useful for teams that wish to centrally manage the behavior
+# of the `delivery local` command across many different projects.
+#
+# remote_file = "https://url/project.toml"

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

@@ -1,3 +1,6 @@
 name 'example'
 description 'An example cookbook'
+maintainer 'Example maintainer'
+maintainer_email 'maintainer@example.com'
+license 'Apache v2'
 version '1.0.0'

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

@@ -116,6 +116,8 @@ if context.have_git && context.delivery_project_git_initialized && !context.skip
   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\""
   end
 
   execute("git-add-delivery-config-json") do

data/lib/chef-dk/skeletons/code_generator/templates/default/repo/gitignore.erb

@@ -1,11 +1,128 @@
-.rake_test_cache
+## Below are example of common git excludes.
+## Please note that /cookbooks folder is ignored. This allows users to
+## clone individual cookbooks into the /cookbook folder of the chef repo
+## and work on them in parallel. This pattern also allows for chef-workstation
+## pattern, where base repo also builds out a dynamic chef workstation.
+## Examples of workstation cookbooks:
+##    https://github.com/mwrock/chef_workstation
+##    https://github.com/Nordstrom/chefdk_bootstrap
+
 
-###
-# Ignore Chef key files and secrets
-###
+## Ignore Chef related files and secrets
+.chef
 .chef/*.pem
 .chef/encrypted_data_bag_secret
 <%- if policy_only -%>
 cookbooks/**
 !cookbooks/README.md
 <%- end -%>
+
+## Ignore Chef-Zero files
+clients
+nodes
+
+# ## OS junk files
+# [Tt]humbs.db
+# *.DS_Store
+
+# ## Example of the workstation pattern.
+# !/cookbooks/chef_workstation/files/default/bundler/Gemfile
+# !/cookbooks/chef_workstation/files/default/bundler/Gemfile.lock
+# cookbooks/*
+# !cookbooks/chef_workstation
+
+# ##Chef
+# .kitchen/
+# .vagrant
+# nodes
+# metadata.json
+
+# ##ruby
+# *.gem
+# Gemfile
+# Gemfile.lock
+.rake_test_cache
+
+# ## Rails Heroku and other bits to ignore
+# *.log
+# *.sqlite3
+# db/*.sqlite3
+# .bundle
+# log/*
+# tmp/*
+# public/system/*
+
+# ##nodejs
+# node_modules
+
+# # Nuget (exclude all exes except for the one in the global build folder)
+# nuget.exe
+# !build/nuget/nuget.exe
+# *.nupkg
+# # NuGet packages (based on default naming convention)
+# [Bb]uild/[Pp]ackages/
+
+# # Build System # common build output folders
+# build-common/
+# output/
+
+# ## Probably not a good idea to be keeing VM inages in source control
+# *.vhd
+# *.vhdx
+
+# ## Pester Test summary
+# Test.xml
+
+# ##Webstorm files
+# *.idea
+# .idea
+# .idea/
+
+# ##Mono (or something?) files
+# *.pidb
+# *.userprefs
+
+# ## Visual Studio files
+# *.docstates
+# *.[Oo]bj
+# *.dat
+# *.crc
+# *.dbmdl
+# *.pdb
+# *.user
+# *.aps
+# *.pch
+# *.vspscc
+# *.vssscc
+# *_i.c
+# *_p.c
+# *.ncb
+# *.suo
+# *.tlb
+# *.tlh
+# *.bak
+# *.[Cc]ache
+# *.ilk
+# *.log
+# *.lib
+# *.sbr
+# *.schemaview
+# ipch/
+# [Oo]bj/
+# [Bb]in/*
+# [Dd]ebug*/
+# [Rr]elease*/
+# Ankh.NoLoad
+
+# ##Tooling
+# _ReSharper*/
+# *.[Rr]e[Ss]harper
+# [Tt]est[Rr]esult*
+# .[Jj]ust[Cc]ode
+# *ncrunch*
+
+# ##Subversion files
+# .svn
+
+# ## Office Temp Files
+# ~$*

data/lib/chef-dk/version.rb

@@ -16,5 +16,5 @@
 #
 
 module ChefDK
-  VERSION = "1.1.16"
+  VERSION = "1.2.20"
 end

data/omnibus_overrides.rb

@@ -1,4 +1,5 @@
 # DO NOT EDIT. Generated by "rake dependencies". Edit version_policy.rb instead.
+override :rubygems, version: "2.6.10"
 override :bundler, version: "1.12.5"
 override "libffi", version: "3.2.1"
 override "libiconv", version: "1.14"
@@ -16,3 +17,4 @@ override "util-macros", version: "1.19.0"
 override "xproto", version: "7.0.28"
 override "zlib", version: "1.2.8"
 override "libzmq", version: "4.0.5"
+override "kitchen-dokken", version: "1.1.0"

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

@@ -193,18 +193,29 @@ EOF
 # config.json file and it will continue working as usual.
 
 [local_phases]
-unit = "rspec spec/"
-lint = "cookstyle"
+unit = "chef exec rspec spec/"
+lint = "chef exec cookstyle"
 # Foodcritic includes rules only appropriate for community cookbooks
 # uploaded to Supermarket. We turn off any rules tagged "supermarket"
 # by default. If you plan to share this cookbook you should remove
 # '-t ~supermarket' below to enable supermarket rules.
-syntax = "foodcritic . --exclude spec -f any -t ~supermarket"
+syntax = "chef exec foodcritic . --exclude spec -f any -t ~supermarket"
 provision = "chef exec kitchen create"
 deploy = "chef exec kitchen converge"
 smoke = "chef exec kitchen verify"
+# The functional phase is optional, you can define it by uncommenting
+# the line below and running the command: `delivery local functional`
+# functional = ""
 cleanup = "chef exec kitchen destroy"
-  PROJECT_DOT_TOML
+
+# Remote project.toml file
+#
+# Specify a remote URI location for the `project.toml` file.
+# This is useful for teams that wish to centrally manage the behavior
+# of the `delivery local` command across many different projects.
+#
+# remote_file = "https://url/project.toml"
+PROJECT_DOT_TOML
         end
 
         it "exists with default config for Cookbook Workflow" do
@@ -252,7 +263,7 @@ cleanup = "chef exec kitchen destroy"
 # Cookbook:: build_cookbook
 # Recipe:: publish
 #
-# Copyright:: 2016, The Authors, All Rights Reserved.
+# Copyright:: 2017, The Authors, All Rights Reserved.
 include_recipe 'delivery-truck::publish'
   CONFIG_DOT_JSON
         end

data/spec/unit/command/install_spec.rb

@@ -78,7 +78,7 @@ describe ChefDK::Command::Install do
 
     it "creates the installer service with a `nil` policyfile path" do
       expect(ChefDK::PolicyfileServices::Install).to receive(:new).
-        with(policyfile: nil, ui: command.ui, root_dir: Dir.pwd).
+        with(hash_including(policyfile: nil, ui: command.ui, root_dir: Dir.pwd)).
         and_return(install_service)
       expect(command.installer).to eq(install_service)
     end
@@ -95,7 +95,7 @@ describe ChefDK::Command::Install do
 
     it "creates the installer service with the specified policyfile path" do
       expect(ChefDK::PolicyfileServices::Install).to receive(:new).
-        with(policyfile: "MyPolicy.rb", ui: command.ui, root_dir: Dir.pwd).
+        with(hash_including(policyfile: "MyPolicy.rb", ui: command.ui, root_dir: Dir.pwd)).
         and_return(install_service)
       expect(command.installer).to eq(install_service)
     end

data/spec/unit/fixtures/cookbooks_api/chef_server_universe.json

@@ -0,0 +1,56 @@
+{
+  "yum": {
+    "4.1.0": {
+      "location_path": "https://chef.example.com/organizations/example/cookbooks/yum/4.1.0",
+      "location_type": "chef_server",
+      "dependencies": {
+
+      }
+    }
+  },
+  "windows": {
+    "2.1.1": {
+      "location_path": "https://chef.example.com/organizations/example/cookbooks/windows/2.1.1",
+      "location_type": "chef_server",
+      "dependencies": {
+        "ohai": ">= 4.0.0"
+      }
+    }
+  },
+  "ubuntu": {
+    "2.0.0": {
+      "location_path": "https://chef.example.com/organizations/example/cookbooks/ubuntu/2.0.0",
+      "location_type": "chef_server",
+      "dependencies": {
+        "apt": ">= 0.0.0"
+      }
+    }
+  },
+  "ohai": {
+    "4.2.3": {
+      "location_path": "https://chef.example.com/organizations/example/cookbooks/ohai/4.2.3",
+      "location_type": "chef_server",
+      "dependencies": {
+        "compat_resource": ">= 12.14.7"
+      }
+    }
+  },
+  "compat_resource": {
+    "12.16.3": {
+      "location_path": "https://chef.example.com/organizations/example/cookbooks/compat_resource/12.16.3",
+      "location_type": "chef_server",
+      "dependencies": {
+
+      }
+    }
+  },
+  "apt": {
+    "5.0.1": {
+      "location_path": "https://chef.example.com/organizations/example/cookbooks/apt/5.0.1",
+      "location_type": "chef_server",
+      "dependencies": {
+        "compat_resource": ">= 12.16.3"
+      }
+    }
+  }
+}

data/spec/unit/fixtures/cookbooks_api/pruned_chef_server_universe.json

@@ -0,0 +1,30 @@
+{
+  "yum": {
+    "4.1.0": {
+    }
+  },
+  "windows": {
+    "2.1.1": {
+      "ohai": ">= 4.0.0"
+    }
+  },
+  "ubuntu": {
+    "2.0.0": {
+      "apt": ">= 0.0.0"
+    }
+  },
+  "ohai": {
+    "4.2.3": {
+      "compat_resource": ">= 12.14.7"
+    }
+  },
+  "compat_resource": {
+    "12.16.3": {
+    }
+  },
+  "apt": {
+    "5.0.1": {
+      "compat_resource": ">= 12.16.3"
+    }
+  }
+}

data/spec/unit/policyfile/chef_server_cookbook_source_spec.rb

@@ -16,19 +16,40 @@
 #
 
 require 'spec_helper'
-
 require 'chef-dk/policyfile/chef_server_cookbook_source'
 
 describe ChefDK::Policyfile::ChefServerCookbookSource do
+  subject { described_class.new(cookbook_source) }
 
-  let(:cookbook_source) { ChefDK::Policyfile::ChefServerCookbookSource.new("https://chef.example.com") }
+  let(:cookbook_source) { 'https://chef.example.com/organizations/example' }
 
-  it "emits a not supported error when attempting to fetch universe" do
-    expect { cookbook_source.universe_graph }.to raise_error(ChefDK::UnsupportedFeature)
-  end
+  let(:http_connection) { double('ChefDK::AuthenticatedHTTP') }
 
-  it "emits a not supported error when attempting to get source options for a cookbook" do
-    expect { cookbook_source.source_options_for("foo", "1.2.3") }.to raise_error(ChefDK::UnsupportedFeature)
-  end
+  let(:universe_response_encoded) { JSON.parse(IO.read(File.join(fixtures_path, 'cookbooks_api/chef_server_universe.json'))) }
+
+  let(:pruned_universe) { JSON.parse(IO.read(File.join(fixtures_path, "cookbooks_api/pruned_chef_server_universe.json"))) }
 
+  describe 'fetching the Universe graph' do
+
+    before do
+      expect(subject).to receive(:http_connection_for).with(cookbook_source).and_return(http_connection)
+    end
+
+    it 'fetches the universe graph' do
+      expect(http_connection).to receive(:get).with('/universe').and_return(universe_response_encoded)
+      actual_universe = subject.universe_graph
+      expect(actual_universe).to have_key('apt')
+      expect(actual_universe['apt']).to eq(pruned_universe['apt'])
+      expect(subject.universe_graph).to eq(pruned_universe)
+    end
+
+    it 'generates location options for a cookbook from the given graph' do
+      expected_opts = {
+        chef_server: "https://chef.example.com/organizations/example",
+        http_client: http_connection,
+        version: "4.2.3"
+      }
+      expect(subject.source_options_for('ohai', '4.2.3')).to eq(expected_opts)
+    end
+  end
 end