clc-promote 0.4.5 → 0.7.8

data/lib/promote/rake_tasks.rb

@@ -13,18 +13,22 @@ module Promote
       @uploader = Uploader.new(@config)
       @promoter = Promoter.new(@config)
       yield self if block_given?
-      define_version_cookbook
-      define_version_cookbooks
-      define_version_environment
-      define_version_environments
+      define_constrain_environment
+      define_promote_environment
+      define_promote_environments
       define_sync_berksfile
       define_sync_berksfiles
-      define_upload_cookbooks
       define_upload_cookbook
-      define_upload_environment
+      define_upload_cookbooks
       define_upload_data_bags
-      define_constrain_environment
-      define_promote_environment
+      define_upload_environment
+      define_upload_roles
+      define_version_cookbook
+      define_version_cookbooks
+      define_version_environment
+      define_version_environments
+      define_version_role
+      define_version_roles
     end
 
     private
@@ -95,7 +99,17 @@ module Promote
     def define_promote_environment
       namespace "Promote" do
         desc "Promote one environment from another"
-        task "promote_environment", :source_environment, :destination_environment do |task, args|
+        task "promote_environment", :source_environment, :destination_environments do |task, args|
+          puts "Promoting constraints in #{args.source_environment} to #{args.destination_environments}"
+          @promoter.monitor_promotion(args.source_environment, args.destination_environments, 60 * 5)
+        end
+      end
+    end
+
+    def define_promote_environments
+      namespace "Promote" do
+        desc "Promote a list of environments from another"
+        task "promote_environments", :source_environment, :destination_environments do |task, args|
           puts "Promoting constraints in #{args.source_environment} to #{args.destination_environment}"
           deps = @promoter.promote_to(args.source_environment, args.destination_environment)
         end
@@ -114,6 +128,27 @@ module Promote
       end
     end
 
+    def define_version_role
+      namespace "Promote" do
+        desc "Version a role"
+        task "version_role", :role do |task, args|
+          @versioner.version_role(args.role)
+        end
+      end
+    end
+
+    def define_version_roles
+      namespace "Promote" do
+        desc "Version all roles"
+        task "version_roles" do
+          puts "Version stamping changed roles..."
+          @versioner.version_roles.each do |result|
+            puts "Versioned role: #{result[:artifact]} v#{result[:version]}"
+          end
+        end
+      end
+    end
+
     def define_upload_cookbooks
       namespace "Promote" do
         desc "Upload all cookbooks in an environment to the chef server"
@@ -144,15 +179,25 @@ module Promote
       end
     end
 
-   def define_upload_data_bags
-     namespace "Promote" do
-       desc "Upload data_bags to the chef server"
-       task "upload_data_bags" do
-         file_uploaded = @uploader.upload_data_bags
-         puts "Uploading #{file_uploaded} to #{@uploader.config.chef_server_url} as #{@uploader.config.node_name} using #{@uploader.config.client_key}"
-       end
-     end
-   end
+    def define_upload_roles
+      namespace "Promote" do
+        desc "Upload roles to the chef server"
+        task "upload_roles" do
+          file_uploaded = @uploader.upload_roles
+          puts "Uploading #{file_uploaded} to #{@uploader.config.chef_server_url} as #{@uploader.config.node_name} using #{@uploader.config.client_key}"
+        end
+      end
+    end
+
+    def define_upload_data_bags
+      namespace "Promote" do
+        desc "Upload data_bags to the chef server"
+        task "upload_data_bags" do
+          file_uploaded = @uploader.upload_data_bags
+          puts "Uploading #{file_uploaded} to #{@uploader.config.chef_server_url} as #{@uploader.config.node_name} using #{@uploader.config.client_key}"
+        end
+      end
+    end
 
   end
 end

data/lib/promote/role_file.rb

@@ -0,0 +1,26 @@
+require 'json'
+
+module Promote
+  class RoleFile
+    attr_accessor :name
+
+    def initialize(role_name, config)
+      @name = role_name
+      @config = config
+    end
+
+    def file_path
+      File.join(@config.role_directory, "#{name}.json")
+    end
+
+    private
+
+    def content
+      @content ||= get_role_content
+    end
+
+    def get_role_content
+      JSON.parse(File.read(file_path))
+    end
+  end
+end

data/lib/promote/uploader.rb

@@ -3,10 +3,11 @@ require 'chef/chef_fs/parallelizer'
 require 'chef/chef_fs/config'
 require 'chef/chef_fs/file_pattern'
 require 'chef/chef_fs/file_system'
+require 'chef/chef_fs/file_system/chef_repository_file_system_root_dir'
 require 'chef/config'
 require 'chef/chef_fs/path_utils'
 require 'chef/knife'
-unless defined? Chef::Knife::CookbookUpload 
+unless defined? Chef::Knife::CookbookUpload
   require 'chef/knife/cookbook_upload'
 end
 
@@ -41,14 +42,19 @@ module Promote
 
       upload_filtered_cookbooks(dirs, environment)
     end
-    
-    def upload_cookbook_directory(directory)
-      if !Dir.glob(File.join(config.cookbook_directory, "*")).empty?
+
+    def upload_cookbook_directory(directory, ui = nil)
+      if !Dir.glob(File.join(directory, "*")).empty?
+        if ui
+          ui.info "Uploading cookbooks from #{directory} to #{Chef::Config[:chef_server_url]}"
+        end
         knife = Chef::Knife::CookbookUpload.new()
         knife.config[:all] = true
-        knife.config[:freeze] = true      
+        knife.config[:freeze] = true
         knife.config[:cookbook_path] = directory
         knife.run
+      elsif ui
+        ui.info "No cookbooks found in #{directory}"
       end
     end
 
@@ -60,8 +66,29 @@ module Promote
       upload_file("/environments/*.json")
     end
 
+    def upload_roles
+      upload_file("/roles/*.json")
+    end
+
     def upload_data_bags
-      upload_file("/data_bags/**/*.json")
+      data_bag_directory = File.join(config.temp_directory, "data_bags")
+      chef_fs_directory = Chef::ChefFS::FileSystem::ChefRepositoryFileSystemRootDir.new(
+        {
+          'data_bags' => [data_bag_directory]
+        }
+      )
+
+      config.reset_temp_dir
+
+      Dir.glob(File.join(config.data_bag_directory,'**/*.json')).
+        reject{ |file| file.end_with?("_keys.json")}.each do |file|
+          new_path = file.sub(config.repo_root, config.temp_directory)
+          new_dir = File.dirname(new_path)
+          FileUtils.mkdir_p(new_dir) unless Dir.exist?(new_dir)
+          FileUtils.cp(file, new_path)
+        end
+
+      upload_file("/data_bags/**/*.json", chef_fs_directory)
     end
 
     attr_accessor :config
@@ -70,7 +97,7 @@ module Promote
 
     def upload_filtered_cookbooks(dirs, environment = nil)
       anything_to_upload = false
-      
+
       server_cookbooks = Utils.chef_server_cookbooks(config)
       if environment.nil?
         env_versions = nil
@@ -78,8 +105,7 @@ module Promote
         env_versions = EnvironmentFile.new(environment, config).cookbook_versions
       end
 
-      FileUtils.rm_rf(config.temp_directory) if Dir.exist?(config.temp_directory)
-      Dir.mkdir(config.temp_directory)
+      config.reset_temp_dir
 
       dirs.each do | dir |
         anything_to_upload = cookbooks_copied?(dir, server_cookbooks, env_versions) || anything_to_upload
@@ -108,10 +134,16 @@ module Promote
       end
     end
 
-    def upload_file(file_path)
-      fs_config = Chef::ChefFS::Config.new
+    def upload_file(file_path, src = Chef::ChefFS::Config.new.local_fs)
       pattern = Chef::ChefFS::FilePattern.new(file_path)
-      Chef::ChefFS::FileSystem.copy_to(pattern, fs_config.local_fs, fs_config.chef_fs, 1, Chef::Config)
+
+      Chef::ChefFS::FileSystem.copy_to(
+        pattern,
+        src,
+        Chef::ChefFS::Config.new.chef_fs,
+        nil,
+        Chef::Config
+      )
       file_path
     end
 
@@ -127,4 +159,4 @@ module Promote
       end
     end
   end
-end
+end

data/lib/promote/version.rb

@@ -1,3 +1,3 @@
 module Promote
-  VERSION = '0.4.5'
-end
+  VERSION = '0.7.8'
+end

data/lib/promote/versioner.rb

@@ -13,9 +13,9 @@ module Promote
       if cookbook.version.to_s != version
         cookbook.version = Semverse::Version.new(version)
         cookbook.stamp_commit(repo.sha1)
-        return { 
-          :cookbook => cookbook_name, 
-          :version => version, 
+        return {
+          :cookbook => cookbook_name,
+          :version => version,
           :sha1 => repo.sha1
         }
       end
@@ -49,6 +49,34 @@ module Promote
       results
     end
 
+    def version_role(role_name)
+      # if role doesn't include an override_attributes key, create it
+      file = File.join(config.role_directory, "#{role_name}.json")
+      role = JSON.parse(File.read(file))
+      if !role.has_key?("override_attributes")
+        overrides_hash = { "override_attributes" => {} }
+        role.merge!(overrides_hash)
+        File.open(file, 'w') do |out|
+          out << JSON.pretty_generate(role)
+        end
+      end
+
+      version_json config.role_directory, role_name do | content |
+        content['override_attributes']
+      end
+    end
+
+    def version_roles
+      results = []
+      Dir.glob(File.join(config.role_directory, "*.json")).each do |file|
+        result = version_role(File.basename(file ,File.extname(file)))
+        if !result.nil?
+          results << result
+        end
+      end
+      results
+    end
+
     def constrain_environment(environment_name, cookbook_name)
       dependencies = Cookbook.new(cookbook_name, config).dependencies
       env_file = EnvironmentFile.new(environment_name, config)
@@ -56,12 +84,18 @@ module Promote
       dependencies
     end
 
-    def is_dirty(source_environment, target_environment, cookbook_name)
+    def is_dirty(source_environment, target_environment, cookbook_name, dependency_hash = nil)
       target_env_file = EnvironmentFile.new(target_environment, config)
       return true unless target_env_file.cookbook_versions.has_key?(cookbook_name)
-      
+
       source_env_file = EnvironmentFile.new(source_environment, config)
-      return source_env_file.cookbook_versions[cookbook_name] != target_env_file.cookbook_versions[cookbook_name]
+      target_version_parts = target_env_file.cookbook_versions[cookbook_name].split('.')
+      target_version = target_version_parts[0..2].join('.')
+      target_hash = nil
+      if target_version_parts.count > 3
+        target_hash = target_version_parts[3]
+      end
+      return source_env_file.cookbook_versions[cookbook_name] != target_version || dependency_hash != target_hash
     end
 
     attr_accessor :config
@@ -92,12 +126,13 @@ module Promote
         File.open(file, 'w') do |out|
           out << JSON.pretty_generate(content)
         end
-        { 
-          :artifact => file_name, 
-          :version => version, 
+        {
+          :artifact => file_name,
+          :version => version,
           :sha1 => repo.sha1
         }
       end
+
     end
   end
 end

data/spec/unit/promote/config_spec.rb

@@ -1,15 +1,17 @@
 require 'promote'
 
 describe Promote::Config do
-	let(:opts) {{ 
-		:repo_root => "root", 
-		:cookbook_directory => "cookbooks", 
-		:environment_directory => "environments", 
-		:data_bag_directory => "data_bags", 
-		:temp_directory => "temp", 
-		:node_name => "user", 
-		:client_key => "key", 
-		:chef_server_url => "url"}}
+	let(:opts) {{
+		:repo_root => "root",
+		:cookbook_directory => "cookbooks",
+		:environment_directory => "environments",
+		:data_bag_directory => "data_bags",
+		:role_directory => "roles",
+		:temp_directory => "temp",
+		:node_name => "user",
+		:client_key => "key",
+		:chef_server_url => "url",
+		:bags => ['foo']}}
 	subject { Promote::Config.new(opts) }
 
 	it "assigns options to node_name attribute" do
@@ -33,20 +35,25 @@ describe Promote::Config do
 	it "assigns options to environment_directory attribute" do
 		expect(subject.environment_directory).to eq(opts[:environment_directory])
 	end
+	it "assigns options to role_directory attribute" do
+		expect(subject.role_directory).to eq(opts[:role_directory])
+	end
 	it "assigns options to temp_directory attribute" do
 		expect(subject.temp_directory).to eq(opts[:temp_directory])
 	end
+	it "assigns options to bags attribute" do
+		expect(subject.bags).to eq(opts[:bags])
+	end
 	it "can correctly convert to a hash" do
 		hash = subject.to_hash
 		expect(hash[:repo_root]).to eq(opts[:repo_root])
 	end
 
 	context "directories are not in options" do
-		let(:opts) {{ 
-			:node_name => "user", 
-			:client_key => "key", 
+		let(:opts) {{
+			:node_name => "user",
+			:client_key => "key",
 			:chef_server_url => "url"}}
-		subject { Promote::Config.new(opts) }
 
 		it "assigns repo_root to pwd" do
 			expect(subject.repo_root).to eq(Dir.pwd)
@@ -60,18 +67,31 @@ describe Promote::Config do
 		it "assigns environment_directory to environments off root" do
 			expect(subject.environment_directory).to eq(File.join(subject.repo_root, "environments"))
 		end
+		it "assigns role_directory to roles off root" do
+			expect(subject.role_directory).to eq(File.join(subject.repo_root, "roles"))
+		end
 		it "assigns temp_directory to tmp" do
 			expect(subject.temp_directory).to eq("/tmp/promote")
 		end
 	end
 
+  context "no --data-bag option is specified" do
+		let(:opts) {{
+			:node_name => "user",
+			:client_key => "key",
+			:chef_server_url => "url"}}
+
+		it "defaults to secrets_*" do
+			expect(subject.bags).to eq(['secrets_*'])
+		end
+	end
+
 	context "directories are not in options but repo root is" do
-		let(:opts) {{ 
+		let(:opts) {{
 			:repo_root => "root",
-			:node_name => "user", 
-			:client_key => "key", 
+			:node_name => "user",
+			:client_key => "key",
 			:chef_server_url => "url"}}
-		subject { Promote::Config.new(opts) }
 
 		it "assigns repo_root to pwd" do
 			expect(subject.repo_root).to eq(opts[:repo_root])
@@ -85,8 +105,40 @@ describe Promote::Config do
 		it "assigns environment_directory to environments off root" do
 			expect(subject.environment_directory).to eq(File.join(subject.repo_root, "environments"))
 		end
+		it "assigns role_directory to roles off root" do
+			expect(subject.role_directory).to eq(File.join(subject.repo_root, "roles"))
+		end
 		it "assigns temp_directory to tmp" do
 			expect(subject.temp_directory).to eq("/tmp/promote")
 		end
 	end
-end
+
+	context "reset_temp_dir" do
+		after {
+			FileUtils.rm_rf(opts[:temp_directory])
+		}
+
+		context "temp dir is populated" do
+			before {
+				opts[:temp_directory] = "/tmp/promote_tests"
+				Dir.mkdir(opts[:temp_directory])
+				FileUtils.touch(File.join(opts[:temp_directory], 'file.txt'))
+			}
+
+			it "empties the temp directory" do
+				subject.reset_temp_dir
+
+				expect(Dir[File.join(subject.temp_directory, '*')]).to be_empty
+			end
+		end
+
+		context "temp dir is populated" do
+
+			it "creates the temp directory" do
+				subject.reset_temp_dir
+
+				expect(Dir).to exist(subject.temp_directory)
+			end
+		end
+	end
+end