chef-dk 0.3.5 → 0.4.0

data/lib/chef-dk/policyfile_lock.rb

@@ -80,6 +80,7 @@ module ChefDK
 
     attr_accessor :name
     attr_accessor :run_list
+    attr_accessor :named_run_lists
 
     attr_reader :solution_dependencies
 
@@ -92,6 +93,7 @@ module ChefDK
     def initialize(storage_config, ui: nil)
       @name = nil
       @run_list = []
+      @named_run_lists = {}
       @cookbook_locks = {}
       @relative_paths_root = Dir.pwd
       @storage_config = storage_config
@@ -125,6 +127,7 @@ module ChefDK
       {}.tap do |lock|
         lock["name"] = name
         lock["run_list"] = run_list
+        lock["named_run_lists"] = named_run_lists unless named_run_lists.empty?
         lock["cookbook_locks"] = cookbook_locks_for_lockfile
         lock["solution_dependencies"] = solution_dependencies.to_lock
       end
@@ -170,6 +173,8 @@ module ChefDK
 
       @run_list = compiler.normalized_run_list
 
+      @named_run_lists = compiler.normalized_named_run_lists
+
       compiler.all_cookbook_location_specs.each do |cookbook_name, spec|
         if spec.mirrors_canonical_upstream?
           cached_cookbook(cookbook_name) do |cached_cb|

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

@@ -0,0 +1,194 @@
+#
+# Copyright:: Copyright (c) 2014 Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'fileutils'
+
+require 'chef-dk/service_exceptions'
+require 'chef-dk/policyfile_lock'
+require 'chef-dk/policyfile/storage_config'
+
+module ChefDK
+  module PolicyfileServices
+
+    class ExportRepo
+
+      # Policy groups provide namespaces for policies so that a Chef 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:
+      POLICY_GROUP = 'local'.freeze
+
+      include Policyfile::StorageConfigDelegation
+
+      attr_reader :storage_config
+      attr_reader :root_dir
+      attr_reader :export_dir
+
+      def initialize(policyfile: nil, export_dir: nil, root_dir: nil, force: false)
+        @root_dir = root_dir
+        @export_dir = File.expand_path(export_dir)
+        @force_export = force
+
+        @policy_data = nil
+        @policyfile_lock = nil
+
+        policyfile_rel_path = policyfile || "Policyfile.rb"
+        policyfile_full_path = File.expand_path(policyfile_rel_path, root_dir)
+        @storage_config = Policyfile::StorageConfig.new.use_policyfile(policyfile_full_path)
+      end
+
+      def policy_name
+        policyfile_lock.name
+      end
+
+      def run
+        assert_lockfile_exists!
+        assert_export_dir_clean!
+
+        validate_lockfile
+        write_updated_lockfile
+        export
+      end
+
+      def policy_data
+        @policy_data ||= FFI_Yajl::Parser.parse(IO.read(policyfile_lock_expanded_path))
+      rescue => error
+        raise PolicyfileExportRepoError.new("Error reading lockfile #{policyfile_lock_expanded_path}", error)
+      end
+
+      def policyfile_lock
+        @policyfile_lock || validate_lockfile
+      end
+
+      def export
+        create_repo_structure
+        copy_cookbooks
+        create_policyfile_data_item
+      rescue => error
+        msg = "Failed to export policy (in #{policyfile_filename}) to #{export_dir}"
+        raise PolicyfileExportRepoError.new(msg, error)
+      end
+
+      private
+
+      def create_repo_structure
+        FileUtils.rm_rf(cookbooks_dir)
+        FileUtils.rm_rf(policyfiles_data_bag_dir)
+
+        FileUtils.mkdir_p(export_dir)
+        FileUtils.mkdir_p(cookbooks_dir)
+        FileUtils.mkdir_p(policyfiles_data_bag_dir)
+      end
+
+      def copy_cookbooks
+        policyfile_lock.cookbook_locks.each do |name, lock|
+          copy_cookbook(lock)
+        end
+      end
+
+      def copy_cookbook(lock)
+        dirname = "#{lock.name}-#{lock.dotted_decimal_identifier}"
+        export_path = File.join(export_dir, "cookbooks", dirname)
+        metadata_rb_path = File.join(export_path, "metadata.rb")
+        FileUtils.cp_r(lock.cookbook_path, export_path)
+        FileUtils.rm_f(metadata_rb_path)
+        metadata = lock.cookbook_version.metadata
+        metadata.version(lock.dotted_decimal_identifier)
+
+        metadata_json_path = File.join(export_path, "metadata.json")
+
+        File.open(metadata_json_path, "wb+") do |f|
+          f.print(FFI_Yajl::Encoder.encode(metadata.to_hash, pretty: true ))
+        end
+      end
+
+      def create_policyfile_data_item
+        policy_id = "#{policyfile_lock.name}-#{POLICY_GROUP}"
+        item_path = File.join(export_dir, "data_bags", "policyfiles", "#{policy_id}.json")
+
+        lock_data = policyfile_lock.to_lock.dup
+
+        lock_data["id"] = policy_id
+
+        data_item = {
+          "id" => policy_id,
+          "name" => "data_bag_item_policyfiles_#{policy_id}",
+          "data_bag" => "policyfiles",
+          "raw_data" => lock_data,
+          # we'd prefer to leave this out, but the "compatibility mode"
+          # implementation in chef-client relies on magical class inflation
+          "json_class" => "Chef::DataBagItem"
+        }
+
+        File.open(item_path, "wb+") do |f|
+          f.print(FFI_Yajl::Encoder.encode(data_item, pretty: true ))
+        end
+      end
+
+      def validate_lockfile
+        return @policyfile_lock if @policyfile_lock
+        @policyfile_lock = ChefDK::PolicyfileLock.new(storage_config).build_from_lock_data(policy_data)
+        # TODO: enumerate any cookbook that have been updated
+        @policyfile_lock.validate_cookbooks!
+        @policyfile_lock
+      rescue PolicyfileExportRepoError
+        raise
+      rescue => error
+        raise PolicyfileExportRepoError.new("Invalid lockfile data", error)
+      end
+
+      def write_updated_lockfile
+        File.open(policyfile_lock_expanded_path, "wb+") do |f|
+          f.print(FFI_Yajl::Encoder.encode(policyfile_lock.to_lock, pretty: true ))
+        end
+      end
+
+      def assert_lockfile_exists!
+        unless File.exist?(policyfile_lock_expanded_path)
+          raise LockfileNotFound, "No lockfile at #{policyfile_lock_expanded_path} - you need to run `install` before `push`"
+        end
+      end
+
+      def assert_export_dir_clean!
+        if !force_export? && !conflicting_fs_entries.empty?
+          msg = "Export dir (#{export_dir}) not clean. Refusing to export. (Conflicting files: #{conflicting_fs_entries.join(', ')})"
+          raise ExportDirNotEmpty, msg
+        end
+      end
+
+      def force_export?
+        @force_export
+      end
+
+      def conflicting_fs_entries
+        Dir.glob(File.join(cookbooks_dir, "*")) +
+          Dir.glob(File.join(policyfiles_data_bag_dir, "*"))
+      end
+
+      def cookbooks_dir
+        File.join(export_dir, "cookbooks")
+      end
+
+      def policyfiles_data_bag_dir
+        File.join(export_dir, "data_bags", "policyfiles")
+      end
+
+    end
+
+  end
+end
+

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

@@ -32,9 +32,11 @@ module ChefDK
 
       attr_reader :ui
       attr_reader :storage_config
+      attr_reader :overwrite
 
-      def initialize(policyfile: nil, ui: nil, root_dir: nil)
+      def initialize(policyfile: nil, ui: nil, root_dir: nil, overwrite: false)
         @ui = ui
+        @overwrite = overwrite
 
         policyfile_rel_path = policyfile || "Policyfile.rb"
         policyfile_full_path = File.expand_path(policyfile_rel_path, root_dir)
@@ -51,7 +53,7 @@ module ChefDK
           raise PolicyfileNotFound, "Policyfile not found at path #{policyfile_expanded_path}"
         end
 
-        if File.exist?(policyfile_lock_expanded_path)
+        if installing_from_lock?
           install_from_lock
         else
           generate_lock_and_install
@@ -113,6 +115,10 @@ module ChefDK
         raise PolicyfileInstallError.new("Failed to install cookbooks from lockfile", error)
       end
 
+      def installing_from_lock?
+        !@overwrite && File.exist?(policyfile_lock_expanded_path)
+      end
+
     end
   end
 end

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

@@ -63,7 +63,10 @@ module ChefDK
       end
 
       def uploader
-        ChefDK::Policyfile::Uploader.new(policyfile_lock, policy_group, ui: ui, http_client: http_client)
+        ChefDK::Policyfile::Uploader.new(policyfile_lock, policy_group,
+                                         ui: ui,
+                                         http_client: http_client,
+                                         policy_document_native_api: config.policy_document_native_api)
       end
 
       def run

data/lib/chef-dk/service_exceptions.rb

@@ -36,6 +36,9 @@ module ChefDK
   class LockfileNotFound < PolicyfileServiceError
   end
 
+  class ExportDirNotEmpty < PolicyfileServiceError
+  end
+
   class PolicyfileNestedException < PolicyfileServiceError
 
     attr_reader :cause
@@ -73,5 +76,8 @@ module ChefDK
   class PolicyfilePushError < PolicyfileNestedException
   end
 
+  class PolicyfileExportRepoError < PolicyfileNestedException
+  end
+
 end
 

data/lib/chef-dk/skeletons/code_generator/files/default/Berksfile

@@ -1,3 +1,3 @@
-source "https://supermarket.getchef.com"
+source "https://supermarket.chef.io"
 
 metadata

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

@@ -58,7 +58,7 @@ If you use the `ssl_cert` task, change the values in the `config/rake.rb` file a
 
 The second config file, `.chef/knife.rb` is a repository specific configuration file for knife. If you're using the Opscode Platform, you can download one for your organization from the management console. If you're using the Open Source Chef Server, you can generate a new one with `knife configure`. For more information about configuring Knife, see the Knife documentation.
 
-http://docs.opscode.com/knife.html
+http://docs.chef.io/knife.html
 
 Next Steps
 ==========

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

@@ -33,7 +33,7 @@ The first and recommended method is to use a vendor branch if you're using Git.
 
 This will:
 
-* Download the cookbook tarball from cookbooks.opscode.com.
+* Download the cookbook tarball from the Chef Supermarket.
 * Ensure its on the git master branch.
 * Checks for an existing vendor branch, and creates if it doesn't.
 * Checks out the vendor branch (chef-vendor-COOKBOOK).

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

@@ -1,5 +1,5 @@
 Requires Chef 0.10.0+.
 
-This directory is for Ruby DSL and JSON files for environments. For more information see the Chef wiki page:
+This directory is for Ruby DSL and JSON files for environments. For more information see "About Environments" in the Chef documentation:
 
-http://wiki.opscode.com/display/chef/Environments
+http://docs.chef.io/environments.html

data/lib/chef-dk/skeletons/code_generator/files/default/serverspec_spec_helper.rb

@@ -0,0 +1,3 @@
+require 'serverspec'
+
+set :backend, :exec

data/lib/chef-dk/skeletons/code_generator/files/default/spec_helper.rb

@@ -1,8 +1,2 @@
 require 'chefspec'
-
-current_dir = File.dirname(__FILE__)
-
-RSpec.configure do |config|
-  # Point to the cookbooks directory
-  config.cookbook_path = File.join(current_dir, '../cookbooks')
-end
+require 'chefspec/berkshelf'

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

@@ -1,6 +1,6 @@
 name             'code_generator'
 maintainer       'Chef Software, Inc.'
-maintainer_email 'dev@getchef.com'
+maintainer_email 'dev@chef.io'
 license          'Apache 2 License'
 description      'Generates Chef code for Chef DK'
 long_description 'Generates Chef code for Chef DK'

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

@@ -18,6 +18,21 @@ template "#{app_dir}/.kitchen.yml" do
   helpers(ChefDK::Generator::TemplateHelper)
 end
 
+directory "#{app_dir}/test/integration/default/serverspec" do
+  recursive true
+end
+
+cookbook_file "#{app_dir}/test/integration/default/serverspec/spec_helper.rb" do
+  source 'serverspec_spec_helper.rb'
+  action :create_if_missing
+end
+
+template "#{app_dir}/test/integration/default/serverspec/default_spec.rb" do
+  source 'serverspec_default_spec.rb.erb'
+  helpers(ChefDK::Generator::TemplateHelper)
+  action :create_if_missing
+end
+
 # README
 template "#{app_dir}/README.md" do
   helpers(ChefDK::Generator::TemplateHelper)
@@ -47,8 +62,23 @@ cookbook_file "#{cookbook_dir}/Berksfile"
 directory "#{cookbook_dir}/recipes"
 
 template "#{cookbook_dir}/recipes/default.rb" do
-  source "default_recipe.rb.erb"
+  source "recipe.rb.erb"
+  helpers(ChefDK::Generator::TemplateHelper)
+end
+
+# Chefspec
+directory "#{cookbook_dir}/spec/unit/recipes" do
+  recursive true
+end
+
+cookbook_file "#{cookbook_dir}/spec/spec_helper.rb" do
+  action :create_if_missing
+end
+
+template "#{cookbook_dir}/spec/unit/recipes/default_spec.rb" do
+  source "recipe_spec.rb.erb"
   helpers(ChefDK::Generator::TemplateHelper)
+  action :create_if_missing
 end
 
 # git

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

@@ -25,19 +25,49 @@ cookbook_file "#{cookbook_dir}/Berksfile" do
   action :create_if_missing
 end
 
-# TK
+# TK & Serverspec
 template "#{cookbook_dir}/.kitchen.yml" do
   source 'kitchen.yml.erb'
   helpers(ChefDK::Generator::TemplateHelper)
   action :create_if_missing
 end
 
+directory "#{cookbook_dir}/test/integration/default/serverspec" do
+  recursive true
+end
+
+cookbook_file "#{cookbook_dir}/test/integration/default/serverspec/spec_helper.rb" do
+  source 'serverspec_spec_helper.rb'
+  action :create_if_missing
+end
+
+template "#{cookbook_dir}/test/integration/default/serverspec/default_spec.rb" do
+  source 'serverspec_default_spec.rb.erb'
+  helpers(ChefDK::Generator::TemplateHelper)
+  action :create_if_missing
+end
+
+# Chefspec
+directory "#{cookbook_dir}/spec/unit/recipes" do
+  recursive true
+end
+
+cookbook_file "#{cookbook_dir}/spec/spec_helper.rb" do
+  action :create_if_missing
+end
+
+template "#{cookbook_dir}/spec/unit/recipes/default_spec.rb" do
+  source "recipe_spec.rb.erb"
+  helpers(ChefDK::Generator::TemplateHelper)
+  action :create_if_missing
+end
+
 # Recipes
 
 directory "#{cookbook_dir}/recipes"
 
 template "#{cookbook_dir}/recipes/default.rb" do
-  source "default_recipe.rb.erb"
+  source "recipe.rb.erb"
   helpers(ChefDK::Generator::TemplateHelper)
   action :create_if_missing
 end