clc-promote 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 290e5ca5541a9a0d6ced4cb0f989cd2b5a4aed6e
-  data.tar.gz: 952dc7f9a1cb50aab255aae8220af84cac3eaed2
+  metadata.gz: 3cc35177c05853e5ebedbc92108bfad0fe143355
+  data.tar.gz: c2f0586fedd03adff7a45cdf65b7d72b8008eba5
 SHA512:
-  metadata.gz: 7e7d0caf1683438fd382cc9dee8d0a4db2e5926acefdadb48884d227c838cec65801a5c787ef368b78f2df203f2e17bdba26e0c921a25df0ad7db3bba9598a5f
-  data.tar.gz: ff690c7b57bc16b1a135ec6c27b999762a83a2ecb484a2f40c459b2fdafb6febff0b32d3bef1944c3f234336220940c391780f407cd17bf5ab94bdb43efbd99c
+  metadata.gz: 44ed3925abcc6c61d15d6e56c99fde9bd16956c9533fabc2ecfe2d3fba3f57e453c6e51877f15976523aab5f5146b88cfc96852e870cba2eb55aab3844d995d4
+  data.tar.gz: c7fd0aace5ab30dd38fda484d208e1db7f890b036512fbeca59acd49fdad23d6c6a2d85fdfbeb1df780f2acca985cda91b6bae41a3f08ca2a9df1dc22cac3da8

data/lib/chef/knife/promote.rb

@@ -0,0 +1,68 @@
+require 'chef/knife'
+require 'git'
+require 'promote'
+
+module KnifePromote
+  class PromoteEnvironment < Chef::Knife
+
+    banner "knife promote environment SOURCE_ENVIRONMENT DESTINATION_ENVIRONMENT"
+
+    def run
+      if @name_args.length < 2
+        show_usage
+        ui.error("You must specify a source and destination environment")
+        exit 1
+      end
+
+      source_env = @name_args[0]
+      dest_env = @name_args[1]
+
+      ui.info "#{source_env} is being promoted to #{dest_env}"
+      ui.confirm "Are you sure #{source_env} deserves this promotion"
+
+      config = Promote::Config.new({
+        :repo_root => File.expand_path("../",Chef::Config[:cookbook_path][0]),
+        :node_name => Chef::Config[:node_name],
+        :client_key => Chef::Config[:client_key],
+        :chef_server_url => Chef::Config[:chef_server_url]
+      })
+      destination_config = Promote::Config.new({
+        :repo_root => [config.temp_directory],
+        :node_name => Chef::Config[:knife][:promote_prod_user],
+        :client_key => Chef::Config[:knife][:promote_prod_client_key],
+        :chef_server_url => Chef::Config[:knife][:promote_prod_url]
+      })
+
+      promoter = Promote::Promoter.new(config)
+      uploader = Promote::Uploader.new(config)
+      #Chef::Config[:verbosity] = 2
+
+      promoter.promote_to(source_env, dest_env)
+
+      ui.info "Commiting and pushing changes to #{dest_env} back to git"
+      commit(config, source_env, dest_env)
+
+      ui.info "uploading #{dest_env} to #{config.chef_server_url}"
+      uploader.upload_environment(dest_env)
+
+      promoter.stage_promotion(dest_env, destination_config, ui)
+      promoter.upload_to(dest_env, destination_config, ui)
+
+      ui.info "promotion complete. Congratulations #{dest_env} on a well deserved promotion!!"
+    end
+
+    private
+
+    include Promote::GitHelper
+
+    def commit(config, source_env, dest_env)
+      git = git_chef(config)
+      dest_path = File.join(config.environment_directory, "#{dest_env}.json")
+      git.add(dest_path)
+      if !(git.status.changed.select{|s| dest_path.end_with?(s)}).keys.empty?
+        git.commit("promoted new constraints from #{source_env} to #{dest_env}")
+        git.push
+      end
+    end
+  end
+end

data/lib/promote.rb

@@ -1,4 +1,6 @@
 require 'promote/config'
+require 'promote/git_helper'
 require 'promote/uploader'
 require 'promote/versioner'
 require 'promote/promoter'
+require 'promote/utils'

data/lib/promote/config.rb

@@ -11,6 +11,18 @@ module Promote
       self.temp_directory ||= "/tmp/promote"
     end
 
+    def to_hash
+      hash = {}
+      instance_variables.each do |key|
+        hash[key[1..-1].to_sym] = instance_variable_get key
+      end
+      hash
+    end
+
+    def to_s
+      to_hash.to_s
+    end
+
     attr_accessor :repo_root
     attr_accessor :cookbook_directory
     attr_accessor :environment_directory

data/lib/promote/git_helper.rb

@@ -0,0 +1,16 @@
+require 'git'
+
+module Promote
+  module GitHelper
+    
+    def git_chef(config)
+      Git.open(git_root(config.repo_root))
+    end
+
+    def git_root(start_leaf)
+      return start_leaf if File.exist?(File.join(start_leaf, '.git'))
+      git_root(File.expand_path('..', start_leaf))
+    end
+
+  end
+end

data/lib/promote/promoter.rb

@@ -21,5 +21,53 @@ module Promote
         out << JSON.pretty_generate(dest_content)
       end
     end
+
+    def stage_promotion(promote_environment, destination_config, ui)
+      ui.info "Staging artifacts from #{config.chef_server_url} to #{config.temp_directory}"
+      FileUtils.rm_rf(config.temp_directory) if Dir.exist?(config.temp_directory)
+      Dir.mkdir(config.temp_directory)
+
+      deploy_file = "/environments/#{promote_environment}.json"
+      ui.info "Downloading #{deploy_file}..."
+      download_files(config.temp_directory, deploy_file)
+      ui.info "Downloading data bags..."
+      download_files(config.temp_directory, "/data_bags/*")
+
+      ui.info "Downloading cookbooks..."
+      server_versions = Promote::Utils.chef_server_cookbooks(destination_config)
+      env_content = JSON.parse(File.read(File.join(config.temp_directory, deploy_file)))
+      env_content['cookbook_versions'].each do |k,v|
+        if !server_versions.has_key?(k) || (server_versions[k]["versions"].select {|version| version['version'] == v}).empty?
+          ui.info "#{k}-#{v}"
+          download_files(config.temp_directory, "/cookbooks/#{k}", v)
+        end
+      end      
+    end
+
+    def upload_to(promote_environment, destination_config, ui)
+      ui.info "Uploading staged artifacts to #{destination_config.chef_server_url}"
+      uploader = Uploader.new(destination_config)
+      ui.info("Uploading #{promote_environment} environment file...")
+      uploader.upload_environment(promote_environment)
+      ui.info("Uploading data bags...")
+      uploader.upload_data_bags
+      ui.info("Uploading cookbooks...")
+      uploader.upload_cookbook_directory(destination_config.cookbook_directory)
+    end
+
+    private
+
+    def download_files(local_root, path, cookbook_version = nil)
+      fs_config = Chef::ChefFS::Config.new(Chef::Config, cwd = Dir.pwd, {:cookbook_version => cookbook_version})
+      pattern = Chef::ChefFS::FilePattern.new(path)
+      local = Chef::ChefFS::FileSystem::ChefRepositoryFileSystemRootDir.new(
+        {
+          'environments' => ["#{local_root}/environments"], 
+          'data_bags' => ["#{local_root}/data_bags"],
+          'cookbooks' => ["#{local_root}/cookbooks"]
+        }
+      )
+      Chef::ChefFS::FileSystem.copy_to(pattern, fs_config.chef_fs, local, 1, Chef::Config)
+    end
   end
 end

data/lib/promote/uploader.rb

@@ -4,8 +4,11 @@ require 'chef/chef_fs/config'
 require 'chef/chef_fs/file_pattern'
 require 'chef/chef_fs/file_system'
 require 'chef/config'
-require 'chef/knife/cookbook_upload'
 require 'chef/chef_fs/path_utils'
+require 'chef/knife'
+unless defined? Chef::Knife::CookbookUpload 
+  require 'chef/knife/cookbook_upload'
+end
 
 module Promote
   class Uploader
@@ -21,8 +24,7 @@ module Promote
 
     def upload_cookbooks
       nothing_to_upload = true
-      rest = Chef::REST.new(config.chef_server_url, config.node_name, config.client_key)
-      server_cookbooks = rest.get_rest("/cookbooks?num_versions=all")
+      server_cookbooks = Utils.chef_server_cookbooks(config)
       FileUtils.rm_rf(config.temp_directory) if Dir.exist?(config.temp_directory)
       Dir.mkdir(config.temp_directory)
       Dir.glob(File.expand_path("~/.berkshelf/cookbooks/*")).each do | dir |
@@ -44,20 +46,26 @@ module Promote
       end
 
       if !nothing_to_upload
+        upload_cookbook_directory(config.temp_directory)
+      end
+    end
+    
+    def upload_cookbook_directory(directory)
+      if !Dir.glob(File.join(config.cookbook_directory, "*")).empty?
         knife = Chef::Knife::CookbookUpload.new()
         knife.config[:all] = true
         knife.config[:freeze] = true      
-        knife.config[:cookbook_path] = config.temp_directory
+        knife.config[:cookbook_path] = directory
         knife.run
       end
     end
-        
+
     def upload_environment(environment_name)
       upload_file("/environments/#{environment_name}.json")
     end
 
     def upload_data_bags
-      upload_file("/data_bags")
+      upload_file("/data_bags/**/*.json")
     end
 
     attr_accessor :config
@@ -66,7 +74,7 @@ module Promote
 
     def upload_file(file_path)
       fs_config = Chef::ChefFS::Config.new
-      pattern = Chef::ChefFS::FilePattern.new(Chef::ChefFS::PathUtils::join(fs_config.base_path, file_path))
+      pattern = Chef::ChefFS::FilePattern.new(file_path)
       Chef::ChefFS::FileSystem.copy_to(pattern, fs_config.local_fs, fs_config.chef_fs, 1, Chef::Config)
       file_path
     end

data/lib/promote/utils.rb

@@ -0,0 +1,10 @@
+require 'chef'
+
+module Promote
+  class Utils
+    def self.chef_server_cookbooks(config)
+      rest = Chef::REST.new(config.chef_server_url, config.node_name, config.client_key)
+      rest.get_rest("/cookbooks?num_versions=all")
+    end
+  end
+end

data/lib/promote/versioner.rb

@@ -6,7 +6,7 @@ module Promote
   class Versioner
     def initialize(config = Config.new)
       @config = config
-      @git = Git.open(git_root(config.repo_root))
+      @git = git_chef(config)
       version_tags = @git.tags.select { |t| t.name[/^[0-9\.]+/] }
       @current_tag = version_tags[-1]
       @sha1 = @git.log(10000).between(current_tag.sha).first.sha
@@ -171,9 +171,6 @@ module Promote
       "#{current_tag.name}.#{commit_count}"
     end
 
-    def git_root(start_leaf)
-      return start_leaf if File.exist?(File.join(start_leaf, '.git'))
-      git_root(File.expand_path('..', start_leaf))
-    end
+    include Promote::GitHelper
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clc-promote
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - CenturyLink Cloud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-09 00:00:00.000000000 Z
+date: 2014-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -112,11 +112,14 @@ extra_rdoc_files:
 - README.md
 files:
 - README.md
+- lib/chef/knife/promote.rb
 - lib/promote.rb
 - lib/promote/config.rb
+- lib/promote/git_helper.rb
 - lib/promote/promoter.rb
 - lib/promote/rake_tasks.rb
 - lib/promote/uploader.rb
+- lib/promote/utils.rb
 - lib/promote/versioner.rb
 homepage: https://github.com/tier3/DevOps/gems/clc-promote
 licenses: []