r10k 3.5.2

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

@@ -0,0 +1,35 @@
+require 'git_utils'
+require 'r10k_utils'
+require 'master_manipulator'
+test_name 'CODEMGMT-101 - C59231 - Attempt to Deploy Environment from Git Source with Branches Containing Unicode'
+
+#Init
+git_environments_path = '/root/environments'
+last_commit = git_last_commit(master, git_environments_path)
+r10k_fqp = get_r10k_fqp(master)
+
+unicode_env = "\uAD62\uCC63\uC0C3\uBEE7\uBE23\uB7E9\uC715\uCEFE\uBF90\uAE69"
+
+#Verification
+error_message_regex = /ERROR\].*Blah/m
+
+#Teardown
+teardown do
+  clean_up_r10k(master, last_commit, git_environments_path)
+end
+
+#Setup
+step "Create \"#{unicode_env}\" Branch from \"production\""
+git_on(master, 'checkout production', git_environments_path)
+git_on(master, "checkout -b #{unicode_env}".force_encoding('BINARY'), git_environments_path)
+
+step "Push Changes to \"#{unicode_env}\" Environment"
+git_push(master, unicode_env, git_environments_path)
+
+#Tests
+step 'Attempt to Deploy via r10k'
+on(master, "#{r10k_fqp} deploy environment -v -t", :acceptable_exit_codes => [0,1]) do |result|
+  expect_failure('Expected to fail due to RK-29') do
+    assert_match(error_message_regex, result.stderr, 'Expected message not found!')
+  end
+end

data/integration/tests/i18n/deploy_module_with_unicode_in_file_name.rb

@@ -0,0 +1,64 @@
+require 'git_utils'
+require 'r10k_utils'
+require 'master_manipulator'
+require 'beaker-qa-i18n'
+
+test_name 'Deploy module with unicode file name'
+
+#Init
+master_certname = on(master, puppet('config', 'print', 'certname')).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')
+r10k_fqp = get_r10k_fqp(master)
+
+#Manifest
+site_pp_path = File.join(git_environments_path, 'manifests', 'site.pp')
+site_pp = create_site_pp(master_certname, '  include helloworld')
+
+#Verification
+notify_message_regex = /I am in the production environment/
+
+#Teardown
+teardown do
+  clean_up_r10k(master, last_commit, git_environments_path)
+end
+
+test_i18n_strings(10, [:syntax, :white_space]) do |test_string|
+  #Setup
+  test_file_path = File.join(git_environments_path, "site", 'helloworld', 'manifests', test_string)
+
+  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 'Add unicode file to helloworld Module'
+  create_remote_file(master, test_file_path, 'test file contents')
+
+  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_fqp} deploy environment -v")
+
+  step 'test deployment of Unicode file'
+  deployed_test_file_path = "/etc/puppetlabs/code/environments/production/site/helloworld/manifests/#{test_string}"
+  on(master, "test -f #{deployed_test_file_path}", :accept_all_exit_codes => true) do |result|
+    assert(result.exit_code == 0, "The unicode test file #{test_string} was not deployed by r10k")
+  end
+
+  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_regex, result.stdout, 'Expected message not found!')
+    end
+  end
+end

data/integration/tests/purging/content_not_purged_at_root.rb

@@ -0,0 +1,89 @@
+require 'git_utils'
+require 'r10k_utils'
+require 'master_manipulator'
+test_name 'RK-256 - C98049 - verify if non-module content is at root of dir, does not cause erroneous purging'
+
+#Init
+env_path = on(master, puppet('config print environmentpath')).stdout.rstrip
+r10k_fqp = get_r10k_fqp(master)
+git_environments_path = '/root/environments'
+git_repo_path = '/git_repos'
+git_repo_name = 'environments'
+git_control_remote = File.join(git_repo_path, "#{git_repo_name}.git")
+code_dir = '/etc/puppetlabs/code/environments/production'
+
+last_commit = git_last_commit(master, git_environments_path)
+git_provider = ENV['GIT_PROVIDER']
+r10k_config_path = get_r10k_config_file_path(master)
+r10k_config_bak_path = "#{r10k_config_path}.bak"
+#In-line files
+r10k_conf = <<-CONF
+cachedir: '/var/cache/r10k'
+git:
+  provider: '#{git_provider}'
+sources:
+  control:
+    basedir: "#{env_path}"
+    remote: "#{git_control_remote}"
+CONF
+
+puppetfile = <<-EOS
+mod 'non_module_object_1',
+  :install_path => './',
+  :git => 'git://github.com/puppetlabs/control-repo.git',
+  :branch => 'production'
+
+mod 'non_module_object_2',
+ :install_path => '',
+ :git => 'git://github.com/puppetlabs/control-repo.git',
+  :branch => 'production'
+EOS
+
+puppetfile_2 = <<-EOS
+mod 'puppetlabs-motd'
+EOS
+
+teardown do
+  step 'Restore Original "r10k" Config'
+  on(master, "mv #{r10k_config_bak_path} #{r10k_config_path}")
+
+  clean_up_r10k(master, last_commit, git_environments_path)
+end
+
+step 'Stub the forge'
+stub_forge_on(master)
+
+step 'Backup Current "r10k" Config'
+on(master, "mv #{r10k_config_path} #{r10k_config_bak_path}")
+
+step 'Update the "r10k" Config'
+create_remote_file(master, r10k_config_path, r10k_conf)
+
+step 'Ask r10k to deploy'
+on(master, "#{r10k_fqp} deploy environment -p")
+
+step 'Add puppetfile with non-module content at top of directory'
+create_remote_file(master, "#{git_environments_path}/Puppetfile", puppetfile)
+git_add_commit_push(master, 'production', 'add Puppetfile', git_environments_path)
+
+step 'Deploy r10k'
+on(master, "#{r10k_fqp} deploy environment -p")
+
+step 'Add puppetfile #2'
+create_remote_file(master, "#{git_environments_path}/Puppetfile", puppetfile_2)
+git_add_commit_push(master, 'production', 'add Puppetfile to production', git_environments_path)
+
+step 'Deploy r10k after adding puppetfile #2'
+on(master, "#{r10k_fqp} deploy environment -p")
+
+step 'Verify that non-module object 1 has not been purged'
+on(master, "test -d #{code_dir}/non_module_object_1", :accept_all_exit_codes => true) do |result|
+  non_module_error = 'Non-module object was purged; should have been left alone'
+  assert(result.exit_code == 0, non_module_error)
+end
+
+step 'Verify that non-module object 2 has not been purged'
+on(master, "test -d #{code_dir}/non_module_object_2", :accept_all_exit_codes => true) do |result|
+  non_module_error = 'Non-module object was purged; should have been left alone'
+  assert(result.exit_code == 0, non_module_error)
+end

data/integration/tests/purging/default_purging.rb

@@ -0,0 +1,125 @@
+require 'git_utils'
+require 'r10k_utils'
+require 'master_manipulator'
+test_name 'RK-256 - C98013 - verify default purging behavior'
+
+#Init
+env_path = on(master, puppet('config print environmentpath')).stdout.rstrip
+r10k_fqp = get_r10k_fqp(master)
+git_environments_path = '/root/environments'
+git_repo_path = '/git_repos'
+git_repo_name = 'environments'
+git_control_remote = File.join(git_repo_path, "#{git_repo_name}.git")
+
+last_commit = git_last_commit(master, git_environments_path)
+git_provider = ENV['GIT_PROVIDER']
+r10k_config_path = get_r10k_config_file_path(master)
+r10k_config_bak_path = "#{r10k_config_path}.bak"
+#In-line files
+r10k_conf = <<-CONF
+cachedir: '/var/cache/r10k'
+git:
+  provider: '#{git_provider}'
+sources:
+  control:
+    basedir: "#{env_path}"
+    remote: "#{git_control_remote}"
+CONF
+
+teardown do
+  step 'Restore Original "r10k" Config'
+  on(master, "mv #{r10k_config_bak_path} #{r10k_config_path}")
+
+  clean_up_r10k(master, last_commit, git_environments_path)
+end
+
+# initialize path name a....d (where it is)
+code_dir_path = '/etc/puppetlabs/code'
+fake_environment_path_a = [code_dir_path, 'environments'].join('/')
+fake_environment_path_b = [code_dir_path,'environments', 'production'].join('/')
+fake_environment_path_c = [code_dir_path, 'environments', 'production', 'modules'].join('/')
+fake_environment_path_d = [code_dir_path, 'environments', 'production', 'modules', 'motd'].join('/')  #not sure if need
+
+# initalize directory name a...c (where it is, what it is called)
+fake_dir_a_to_be_purged     = "#{fake_environment_path_a}/fakedir1"
+fake_dir_b_to_be_left_alone = "#{fake_environment_path_b}/fakedir2"
+fake_dir_c_to_be_purged     = "#{fake_environment_path_c}/fakedir3"
+
+# initalize file name a...c (where it is, what it is called)
+fake_file_a_to_be_purged     = "#{fake_environment_path_a}/fakefile1.txt"
+fake_file_b_to_be_left_alone = "#{fake_environment_path_b}/fakefile2.txt"
+fake_file_c_to_be_purged     = "#{fake_environment_path_c}/fakefile3.txt"
+
+# initalize file content
+step 'Stub the forge'
+stub_forge_on(master)
+
+step 'Backup Current "r10k" Config'
+on(master, "mv #{r10k_config_path} #{r10k_config_bak_path}")
+
+step 'Update the "r10k" Config'
+create_remote_file(master, r10k_config_path, r10k_conf)
+
+step 'Create content to be managed by r10k'
+git_on(master, 'checkout production', git_environments_path)
+create_remote_file(master, "#{git_environments_path}/Puppetfile", 'mod "puppetlabs-motd"')
+git_add_commit_push(master, 'production', 'add Puppetfile to production', git_environments_path)
+
+git_on(master, 'checkout production', git_environments_path)
+git_on(master, 'checkout -b cats', git_environments_path)
+create_remote_file(master, "#{git_environments_path}/Puppetfile", 'mod "puppetlabs-inifile"')
+git_add_commit_push(master, 'cats', 'add Puppetfile to cats', git_environments_path)
+
+step 'Ask r10k to deploy'
+on(master, "#{r10k_fqp} deploy environment -p")
+
+step 'Create fake file and directory at deployment level to be purged'
+create_remote_file(master, fake_file_a_to_be_purged, "foobar nonsense")
+on(master, "mkdir #{fake_dir_a_to_be_purged}")
+
+step 'Create fake file and directory at environment level to be left alone'
+create_remote_file(master, fake_file_b_to_be_left_alone, "foobar nonsense")
+on(master, "mkdir #{fake_dir_b_to_be_left_alone}")
+
+step 'Create fake file and directory at puppetfile level to be purged '
+create_remote_file(master, fake_file_c_to_be_purged, "foobar nonsense")
+on(master, "mkdir #{fake_dir_c_to_be_purged}")
+
+step('Deploy r10k')
+on(master, "#{r10k_fqp} deploy environment -p")
+
+step('Assert to see if deployment level file is not there')
+on(master, "test -f #{fake_file_a_to_be_purged}", :accept_all_exit_codes => true) do |result|
+  file_a_error = 'Puppet file purging was not observed'
+  assert(result.exit_code == 1, file_a_error)
+end
+
+step('Assert to see if deployment level directory is not there')
+on(master, "test -d #{fake_dir_a_to_be_purged}", :accept_all_exit_codes => true) do |result|
+  dir_a_error = 'Puppet directory purging was not observed'
+  assert(result.exit_code == 1, dir_a_error)
+end
+
+step('Assert to see if environment level file is still there after second deployment')
+on(master, "test -f #{fake_file_b_to_be_left_alone}", :accept_all_exit_codes => true) do |result|
+  file_b_error = 'Puppet file purging deleted this file when it should have left it alone :('
+  assert(result.exit_code == 0, file_b_error)
+end
+
+step('Assert to see if environment level directory is still there after second deployment')
+on(master, "test -d #{fake_dir_b_to_be_left_alone}", :accept_all_exit_codes => true) do |result|
+  dir_b_error = 'Puppet directory purging deleted this directory when it should have left it alone :('
+  assert(result.exit_code == 0, dir_b_error)
+end
+
+step('Assert to see if puppetfile level file is not there')
+on(master, "test -f #{fake_file_c_to_be_purged}", :accept_all_exit_codes => true) do |result|
+  file_c_error = 'Puppet file purging was not observed'
+  assert(result.exit_code == 1, file_c_error)
+end
+
+step('Assert to see if puppetfile level directory is not there')
+on(master, "test -d #{fake_dir_c_to_be_purged}", :accept_all_exit_codes => true) do |result|
+  dir_c_error = 'Puppet directory purging was not observed'
+  assert(result.exit_code == 1, dir_c_error)
+end

data/integration/tests/purging/does_not_purge_files_on_white_list.rb

@@ -0,0 +1,93 @@
+require 'git_utils'
+require 'r10k_utils'
+require 'master_manipulator'
+test_name 'RK-257 - C98046 - r10k does not purge files on whitelist'
+
+#Init
+env_path = on(master, puppet('config print environmentpath')).stdout.rstrip
+r10k_fqp = get_r10k_fqp(master)
+git_environments_path = '/root/environments'
+
+git_repo_path = '/git_repos'
+git_repo_name = 'environments'
+git_control_remote = File.join(git_repo_path, "#{git_repo_name}.git")
+
+last_commit = git_last_commit(master, git_environments_path)
+git_provider = ENV['GIT_PROVIDER']
+
+r10k_config_path = get_r10k_config_file_path(master)
+r10k_config_bak_path = "#{r10k_config_path}.bak"
+
+teardown do
+  step 'Restore Original "r10k" Config'
+  on(master, "mv #{r10k_config_bak_path} #{r10k_config_path}")
+
+  clean_up_r10k(master, last_commit, git_environments_path)
+end
+
+# initalize file content
+step 'Stub the forge'
+stub_forge_on(master)
+
+step 'Backup Current "r10k" Config'
+on(master, "mv #{r10k_config_path} #{r10k_config_bak_path}")
+
+r10k_conf = <<-CONF
+cachedir: '/var/cache/r10k'
+git:
+  provider: '#{git_provider}'
+sources:
+  control:
+    basedir: "#{env_path}"
+    remote: "#{git_control_remote}"
+deploy:
+  purge_levels: ['deployment', 'environment', 'puppetfile']
+  purge_whitelist: ['**/*.pp']
+CONF
+
+step 'Update the "r10k" Config'
+create_remote_file(master, r10k_config_path, r10k_conf)
+
+step 'Copy Puppetfile to "production" Environment Git Repo'
+create_remote_file(master, "#{git_environments_path}/Puppetfile", "mod 'puppetlabs-stdlib' \n mod 'puppetlabs-motd'")
+
+step 'Push Changes'
+git_add_commit_push(master, 'production', 'add Puppetfile', git_environments_path)
+
+step 'Deploy production'
+on(master, "#{r10k_fqp} deploy environment -p")
+
+step 'commit a new Puppetfile to production'
+create_remote_file(master, "#{git_environments_path}/Puppetfile", 'mod "puppetlabs-motd"')
+
+step 'Push Changes'
+git_add_commit_push(master, 'production', 'add Puppetfile', git_environments_path)
+
+step 'create test pp files'
+do_not_purge = [
+    "/etc/puppetlabs/code/environments/production/environment_level.pp",
+    "/etc/puppetlabs/code/environments/production/site/environment_level.pp"
+].each do |file|
+  create_remote_file(master, file, 'this is a test')
+end
+
+purge = [
+    "/etc/puppetlabs/code/environments/production/environment_level.zz",
+    "/etc/puppetlabs/code/environments/production/site/environment_level.zz"
+].each do |file|
+  create_remote_file(master, file, 'this is a test')
+end
+
+#TEST
+step 'Deploy again and check files'
+on(master, "#{r10k_fqp} deploy environment -p")
+
+purge.each do |file|
+  assert_message = "The file #{file}\n was not purged, it was expected to be"
+  assert(on(master, "test -f #{file}", :accept_all_exit_codes => true).exit_code == 1, assert_message)
+end
+
+do_not_purge.each do |file|
+  assert_message = "The file #{file}\n was purged, it was not expected to be"
+  assert(on(master, "test -f #{file}", :accept_all_exit_codes => true).exit_code == 0, assert_message)
+end

data/integration/tests/purging/invalid_whitelist_types.rb

@@ -0,0 +1,63 @@
+require 'git_utils'
+require 'r10k_utils'
+require 'master_manipulator'
+test_name 'RK-257 - C98043 - verify default whitelist only accepts strings or array of strings'
+
+#Init
+env_path = on(master, puppet('config print environmentpath')).stdout.rstrip
+r10k_fqp = get_r10k_fqp(master)
+git_environments_path = '/root/environments'
+
+git_repo_path = '/git_repos'
+git_repo_name = 'environments'
+git_control_remote = File.join(git_repo_path, "#{git_repo_name}.git")
+
+last_commit = git_last_commit(master, git_environments_path)
+git_provider = ENV['GIT_PROVIDER']
+
+r10k_config_path = get_r10k_config_file_path(master)
+r10k_config_bak_path = "#{r10k_config_path}.bak"
+
+#invalid content to test
+hash_whitelist = '{:cats => \'cats.txt\'}'
+invalid_array_content_whitelist = '[\'cats.txt\', [:broken]]'
+
+teardown do
+  step 'Restore Original "r10k" Config'
+  on(master, "mv #{r10k_config_bak_path} #{r10k_config_path}")
+
+  clean_up_r10k(master, last_commit, git_environments_path)
+end
+
+# initalize file content
+step 'Stub the forge'
+stub_forge_on(master)
+
+step 'Backup Current "r10k" Config'
+on(master, "mv #{r10k_config_path} #{r10k_config_bak_path}")
+
+[hash_whitelist, invalid_array_content_whitelist].each do |whitelist_content|
+  r10k_conf = <<-CONF
+cachedir: '/var/cache/r10k'
+git:
+  provider: '#{git_provider}'
+sources:
+  control:
+    basedir: "#{env_path}"
+    remote: "#{git_control_remote}"
+deploy:
+  purge_whitelist: #{whitelist_content}
+  CONF
+
+  step 'Update the "r10k" Config'
+  create_remote_file(master, r10k_config_path, r10k_conf)
+
+  step 'Deploy r10k, and verify that invalid whitelist content causes error'
+  on(master, "#{r10k_fqp} deploy environment -p", :accept_all_exit_codes => true) do |result|
+    error = /did not find expected node content while parsing a flow node/
+    error_message = 'whitelist content did not generate expected error'
+    expect_failure('RK-263') do
+      assert_no_match(result.stdout, error, error_message)
+    end
+  end
+end