r10k 1.5.1 → 2.0.0

data/integration/tests/git_source/git_source_git.rb

@@ -93,7 +93,7 @@ step 'Update the "r10k" Config'
 create_remote_file(master, r10k_config_path, r10k_conf)
 
 step 'Install "puppetlabs-xinetd" Module'
-on(master, puppet('module install puppetlabs-xinetd'))
+on(master, puppet('module install puppetlabs-xinetd --modulepath /opt/puppet/share/puppet/modules'))
 
 step 'Install and Configure "git-daemon" service'
 on(master, puppet('apply'), :stdin => git_daemon_xinetd_enable_manifest)

data/integration/tests/git_source/git_source_ssh.rb

@@ -8,7 +8,7 @@ env_path = on(master, puppet('config print environmentpath')).stdout.rstrip
 git_control_remote = 'git@github.com:puppetlabs/codemgmt-92.git'
 git_provider = ENV['GIT_PROVIDER'] || 'shellgit'
 
-jenkins_key_path = File.file?('/var/lib/jenkins/.ssh/id_rsa-jenkins') ? '/var/lib/jenkins/.ssh/id_rsa-jenkins' : File.expand_path('~/.ssh/id_rsa-jenkins')
+jenkins_key_path = File.file?("#{ENV['HOME']}/.ssh/id_rsa") ? "#{ENV['HOME']}/.ssh/id_rsa" : File.expand_path('~/.ssh/id_rsa-jenkins')
 ssh_private_key_path = '/root/.ssh/id_rsa-jenkins'
 ssh_config_path = '/root/.ssh/config'
 

data/integration/tests/git_source/negative/neg_git_unauthorized_https.rb

@@ -23,7 +23,7 @@ sources:
 CONF
 
 #Verification
-error_message_regex = /ERROR\]/m
+error_message_regex = /ERROR.*Unable to determine current branches for Git source 'broken'/m
 
 #Teardown
 teardown do

data/integration/tests/git_source/negative/neg_git_unauthorized_ssh.rb

@@ -36,7 +36,7 @@ Host github.com
 CONF
 
 #Verification
-error_message_regex = /ERROR\].*Permission denied/m
+error_message_regex = /ERROR.*Unable to determine current branches for Git source 'broken'/m
 
 #Teardown
 teardown do

data/integration/tests/user_scenario/basic_workflow/negative/neg_bad_basedir.rb

@@ -23,7 +23,7 @@ sources:
 CONF
 
 #Verification
-error_message_regex = /could not create leading directories of.*File name too long/
+error_message_regex = /ERROR.*(Failed to make directory|could not create leading directories of.*File name too long)/m
 
 #Teardown
 teardown do

data/integration/tests/user_scenario/basic_workflow/negative/neg_bad_git_module.rb

@@ -3,6 +3,10 @@ require 'r10k_utils'
 require 'master_manipulator'
 test_name 'CODEMGMT-42 - C59229 - Attempt to Deploy Environment with Non-existent Git Module'
 
+if ENV['GIT_PROVIDER'] == 'shellgit'
+  skip_test('Skipping test because of known failure RK-80.')
+end
+
 #Init
 master_certname = on(master, puppet('config', 'print', 'certname')).stdout.rstrip
 git_environments_path = '/root/environments'
@@ -16,7 +20,7 @@ PUPPETFILE
 puppet_file_path = File.join(git_environments_path, 'Puppetfile')
 
 #Verification
-error_message_regex = /ERROR\] Couldn't update git cache/
+error_message_regex = /ERROR.*uses the SSH protocol but no private key was given/
 
 #Teardown
 teardown do
@@ -36,5 +40,7 @@ git_add_commit_push(master, 'production', 'Update Puppetfile.', git_environments
 #Tests
 step 'Attempt to Deploy via r10k'
 on(master, 'r10k deploy environment -v -p', :acceptable_exit_codes => 1) do |result|
-  assert_match(error_message_regex, result.stderr, 'Expected message not found!')
+  expect_failure('Expected to fail due to RK-80') do
+    assert_no_match(error_message_regex, result.stderr, 'Expected message not found!')
+  end
 end

data/integration/tests/user_scenario/basic_workflow/negative/neg_bad_git_module_ref.rb

@@ -18,7 +18,7 @@ PUPPETFILE
 puppet_file_path = File.join(git_environments_path, 'Puppetfile')
 
 #Verification
-error_message_regex = /Cannot check out Git ref 'does_not_exist'/
+error_message_regex = /ERROR.*Unable to sync repo to unresolvable ref/
 
 #Teardown
 teardown do

data/integration/tests/user_scenario/basic_workflow/negative/neg_bad_git_remote.rb

@@ -22,7 +22,7 @@ sources:
 CONF
 
 #Verification
-error_message_regex = /ERROR\] Couldn't update git cache for \/does\/not\/exist/
+error_message_regex = /ERROR.*Unable to determine current branches for Git source 'broken'/
 
 #Teardown
 teardown do

data/integration/tests/user_scenario/basic_workflow/negative/neg_branch_name_collision.rb

@@ -35,7 +35,7 @@ sources:
 CONF
 
 #Verification
-error_message_regex = /ERROR\] Environment collision/
+error_message_regex = /ERROR.*Environment collision/
 
 #Teardown
 teardown do

data/integration/tests/user_scenario/basic_workflow/negative/neg_disk_full.rb

@@ -2,6 +2,10 @@ require 'git_utils'
 require 'r10k_utils'
 test_name 'CODEMGMT-86 - C59265 - Attempt to Deploy Environment to Disk with Insufficient Free Space'
 
+if fact_on(master, 'osfamily') == 'RedHat' and fact_on(master, "operatingsystemmajrelease").to_i < 6
+  skip_test('This version of EL is not supported by this test case!')
+end
+
 #Init
 git_repo_path = '/git_repos'
 git_repo_name = 'environments'
@@ -33,7 +37,7 @@ sources:
 CONF
 
 #Verification
-error_message_regex = /ERROR\].*No space left on device/m
+error_message_regex = /ERROR.*No space left on device/m
 
 #Teardown
 teardown do

data/integration/tests/user_scenario/basic_workflow/negative/neg_duplicate_module_names.rb

@@ -8,7 +8,7 @@ git_environments_path = '/root/environments'
 last_commit = git_last_commit(master, git_environments_path)
 
 #Verification
-error_message_regex = /ERROR\]/
+error_message_regex = /ERROR.*undefined method `full_module_name' for nil:NilClass/
 
 #File
 puppet_file = <<-PUPPETFILE
@@ -38,8 +38,8 @@ git_add_commit_push(master, 'production', 'Add modules.', git_environments_path)
 
 #Tests
 step 'Attempt to Deploy via r10k'
-on(master, 'r10k deploy environment -v -p', :acceptable_exit_codes => 0) do |result|
+on(master, 'r10k deploy environment -v -p', :acceptable_exit_codes => 1) do |result|
   expect_failure('Expected to fail due to CODEMGMT-71') do
-    assert_match(error_message_regex, result.stderr, 'Expected message not found!')
+    assert_no_match(error_message_regex, result.stderr, 'Expected message not found!')
   end
 end

data/integration/tests/user_scenario/basic_workflow/negative/neg_invalid_puppet_file.rb

@@ -14,7 +14,7 @@ puppet_file = <<-PUPPETFILE
 PUPPETFILE
 
 #Verification
-error_message_regex = /ERROR\].*syntax error/m
+error_message_regex = /ERROR.*Failed to evaluate/m
 
 #Teardown
 teardown do

data/integration/tests/user_scenario/basic_workflow/negative/neg_read_only.rb

@@ -27,7 +27,7 @@ sources:
 CONF
 
 #Verification
-error_message_regex = /ERROR\].*Read-only file system/m
+error_message_regex = /ERROR.*Read-only file system/m
 
 #Teardown
 teardown do

data/integration/tests/user_scenario/basic_workflow/single_env_10000_files.rb

@@ -3,6 +3,10 @@ require 'r10k_utils'
 require 'master_manipulator'
 test_name 'CODEMGMT-62 - C59239 - Single Environment with 10,000 Files'
 
+if fact_on(master, 'osfamily') == 'RedHat' and fact_on(master, "operatingsystemmajrelease").to_i < 6
+  skip_test('This version of EL is not supported by this test case!')
+end
+
 #Init
 master_certname = on(master, puppet('config', 'print', 'certname')).stdout.rstrip
 environment_path = on(master, puppet('config', 'print', 'environmentpath')).stdout.rstrip

data/integration/tests/user_scenario/basic_workflow/single_env_large_files.rb

@@ -3,6 +3,10 @@ require 'r10k_utils'
 require 'master_manipulator'
 test_name 'CODEMGMT-62 - C59242 - Single Environment with Large Binary Files'
 
+if fact_on(master, 'osfamily') == 'RedHat' and fact_on(master, "operatingsystemmajrelease").to_i < 6
+  skip_test('This version of EL is not supported by this test case!')
+end
+
 #Init
 master_certname = on(master, puppet('config', 'print', 'certname')).stdout.rstrip
 environment_path = on(master, puppet('config', 'print', 'environmentpath')).stdout.rstrip

data/integration/tests/user_scenario/complex_workflow/multi_env_unamanaged.rb

@@ -0,0 +1,77 @@
+require 'git_utils'
+require 'r10k_utils'
+require 'master_manipulator'
+test_name 'CODEMGMT-155 - C62421 - Multiple Environments with Existing Unmanaged Environments'
+
+#Init
+master_certname = on(master, puppet('config', 'print', 'certname')).stdout.rstrip
+environment_path = on(master, puppet('config', 'print', 'environmentpath')).stdout.rstrip
+
+git_environments_path = '/root/environments'
+last_commit = git_last_commit(master, git_environments_path)
+
+local_files_root_path = ENV['FILES'] || 'files'
+helloworld_module_path = File.join(local_files_root_path, 'modules', 'helloworld')
+
+#Manifest
+site_pp_path = File.join(git_environments_path, 'manifests', 'site.pp')
+site_pp = create_site_pp(master_certname, '  include helloworld')
+
+#Verification
+notify_message_prod_env_regex = /I am in the production environment/
+notify_message_test_env_regex = /I am in the test environment/
+removal_message_test_env_regex = /Removing unmanaged path.*test/
+error_message_regex = /Could not retrieve catalog from remote server/
+
+#Teardown
+teardown do
+  clean_up_r10k(master, last_commit, git_environments_path)
+end
+
+#Setup
+step 'Checkout "production" Branch'
+git_on(master, 'checkout production', git_environments_path)
+
+step 'Copy "helloworld" Module to "production" Environment Git Repo'
+scp_to(master, helloworld_module_path, File.join(git_environments_path, "site", 'helloworld'))
+
+step 'Inject New "site.pp" to the "production" Environment'
+inject_site_pp(master, site_pp_path, site_pp)
+
+step 'Push Changes'
+git_add_commit_push(master, 'production', 'Update site.pp and add module.', git_environments_path)
+
+#Tests
+step 'Deploy "production" Environment via r10k'
+on(master, 'r10k deploy environment -v')
+
+agents.each do |agent|
+  step 'Run Puppet Agent'
+  on(agent, puppet('agent', '--test', '--environment production'), :acceptable_exit_codes => 2) do |result|
+    assert_no_match(/Error:/, result.stderr, 'Unexpected error was detected!')
+    assert_match(notify_message_prod_env_regex, result.stdout, 'Expected message not found!')
+  end
+end
+
+step 'Create Unmanaged "test" Environment'
+on(master, "cp -r #{environment_path}/production #{environment_path}/test")
+
+agents.each do |agent|
+  step 'Run Puppet Agent Against "test" Environment'
+  on(agent, puppet('agent', '--test', '--environment test'), :acceptable_exit_codes => 2) do |result|
+    assert_no_match(/Error:/, result.stderr, 'Unexpected error was detected!')
+    assert_match(notify_message_test_env_regex, result.stdout, 'Expected message not found!')
+  end
+end
+
+step 'Re-deploy Environments via r10k'
+on(master, 'r10k deploy environment -v') do |result|
+  assert_match(removal_message_test_env_regex, result.output, 'Unexpected error was detected!')
+end
+
+agents.each do |agent|
+  step 'Run Puppet Agent Against "test" Environment'
+  on(agent, puppet('agent', '--test', '--environment test'), :acceptable_exit_codes => 1) do |result|
+    assert_match(error_message_regex, result.stderr, 'Expected message not found!')
+  end
+end

data/integration/tests/user_scenario/complex_workflow/single_env_git_module_update.rb

@@ -0,0 +1,99 @@
+require 'git_utils'
+require 'r10k_utils'
+require 'master_manipulator'
+test_name 'CODEMGMT-155 - C64588 - Single Environment with Git Module Using a Branch Reference where Updates Occur After Initial Deploy'
+
+#Init
+master_certname = on(master, puppet('config', 'print', 'certname')).stdout.rstrip
+environment_path = on(master, puppet('config', 'print', 'environmentpath')).stdout.rstrip
+
+git_repo_parent_path = '/git_repos'
+git_repo_module_name = 'helloworld_module'
+git_remote_module_path = File.join(git_repo_parent_path, "#{git_repo_module_name}.git")
+git_module_clone_path = '/root/helloworld'
+
+git_environments_path = '/root/environments'
+last_commit = git_last_commit(master, git_environments_path)
+
+local_files_root_path = ENV['FILES'] || 'files'
+helloworld_module_path = File.join(local_files_root_path, 'modules', 'helloworld')
+
+#Verification
+notify_original_message_regex = /I am in the production environment/
+notify_updated_message = 'A totally different message'
+notify_updated_message_regex = /#{notify_updated_message}/
+
+#File
+puppet_file = <<-PUPPETFILE
+mod 'test/helloworld',
+  :git => '#{git_remote_module_path}',
+  :ref => 'master'
+PUPPETFILE
+
+puppet_file_path = File.join(git_environments_path, 'Puppetfile')
+
+updated_helloworld_manifest = <<-MANIFEST
+class helloworld {
+  notify { "Hello world!": message => "#{notify_updated_message}"}
+}
+MANIFEST
+
+#Manifest
+site_pp_path = File.join(git_environments_path, 'manifests', 'site.pp')
+site_pp = create_site_pp(master_certname, '  include helloworld')
+
+#Teardown
+teardown do
+  step 'Remove Git Repo and Clone for Module'
+  on(master, "rm -rf #{git_remote_module_path} #{git_module_clone_path}")
+
+  clean_up_r10k(master, last_commit, git_environments_path)
+end
+
+#Setup
+step 'Create Bare Git Repo and Clone'
+on(master, "mkdir -p #{git_remote_module_path} #{git_module_clone_path}")
+git_init_bare_repo_and_clone(master, git_repo_parent_path, git_repo_module_name, git_module_clone_path)
+
+step 'Copy "helloworld" Module to Git Repo'
+scp_to(master, "#{helloworld_module_path}/manifests", git_module_clone_path)
+
+step 'Push Changes for Module Git Repo to Remote'
+git_add_commit_push(master, 'master', 'Add module.', git_module_clone_path)
+
+step 'Inject New "site.pp" to the "production" Environment'
+inject_site_pp(master, site_pp_path, site_pp)
+
+step 'Create "Puppetfile" for the "production" Environment'
+create_remote_file(master, puppet_file_path, puppet_file)
+
+step 'Push Changes to Environments Git Repo Remote'
+git_add_commit_push(master, 'production', 'Update site.pp and add module.', git_environments_path)
+
+#Tests
+step 'Deploy "production" Environment via r10k'
+on(master, 'r10k deploy environment -v -p')
+
+agents.each do |agent|
+  step 'Run Puppet Agent'
+  on(agent, puppet('agent', '--test', '--environment production'), :acceptable_exit_codes => 2) do |result|
+    assert_no_match(/Error:/, result.stderr, 'Unexpected error was detected!')
+    assert_match(notify_original_message_regex, result.stdout, 'Expected message not found!')
+  end
+end
+
+step 'Update "helloworld" Module and Push Changes'
+create_remote_file(master, "#{git_module_clone_path}/manifests/init.pp", updated_helloworld_manifest)
+on(master, "chmod -R 644 #{git_module_clone_path}")
+git_add_commit_push(master, 'master', 'Update module.', git_module_clone_path)
+
+step 'Deploy "production" Environment Again via r10k'
+on(master, 'r10k deploy environment -v -p')
+
+agents.each do |agent|
+  step 'Run Puppet Agent'
+  on(agent, puppet('agent', '--test', '--environment production'), :acceptable_exit_codes => 2) do |result|
+    assert_no_match(/Error:/, result.stderr, 'Unexpected error was detected!')
+    assert_match(notify_updated_message_regex, result.stdout, 'Expected message not found!')
+  end
+end

data/lib/r10k/action/deploy/display.rb

@@ -1,4 +1,3 @@
-require 'r10k/util/monkey_patches'
 require 'r10k/util/setopts'
 require 'r10k/deployment'
 require 'r10k/logging'

data/lib/r10k/action/runner.rb

@@ -1,6 +1,13 @@
+require 'r10k/logging'
+require 'r10k/errors'
+require 'r10k/util/license'
+require 'shared/puppet_forge/connection'
+
 module R10K
   module Action
     class Runner
+      include R10K::Logging
+
       def initialize(opts, argv, klass)
         @opts = opts
         @argv = argv
@@ -30,6 +37,19 @@ module R10K
       end
 
       def setup_settings
+        setup_authorization
+      end
+
+      def setup_authorization
+        begin
+          license = R10K::Util::License.load
+
+          if license.respond_to?(:authorization_token)
+            PuppetForge::Connection.authorization = license.authorization_token
+          end
+        rescue R10K::Error => e
+          logger.warn e.message
+        end
       end
     end
   end

data/lib/r10k/cli.rb

@@ -48,9 +48,6 @@ module R10K::CLI
 end
 
 require 'r10k/cli/deploy'
-require 'r10k/cli/environment'
-require 'r10k/cli/module'
-require 'r10k/cli/synchronize'
 require 'r10k/cli/puppetfile'
 require 'r10k/cli/version'
 require 'r10k/cli/help'

data/lib/r10k/cli/deploy.rb

@@ -2,9 +2,6 @@ require 'r10k/cli'
 require 'r10k/deployment'
 require 'r10k/deployment/config'
 
-require 'r10k/task_runner'
-require 'r10k/task/deployment'
-
 require 'r10k/action/cri_runner'
 require 'r10k/action/deploy'
 

data/lib/r10k/deployment.rb

@@ -11,9 +11,6 @@ module R10K
   # @api private
   class Deployment
 
-    require 'r10k/deployment/environment'
-    require 'r10k/deployment/basedir'
-    require 'r10k/deployment/source'
     require 'r10k/deployment/config'
 
     # Generate a deployment object based on a config
@@ -37,9 +34,6 @@ module R10K
       sources.each(&:preload!)
     end
 
-    # @deprecated
-    alias fetch_sources preload!
-
     # Lazily load all sources
     #
     # This instantiates the @_sources instance variable, but should not be
@@ -94,7 +88,7 @@ module R10K
             msg = ""
             msg << "Environment collision at #{environment.path} between "
             msg << "#{source.name}:#{environment.name} and #{osource.name}:#{oenvironment.name}"
-            raise R10K::R10KError, msg
+            raise R10K::Error, msg
           else
             hash[environment.path] = [source, environment]
           end