r10k 3.5.2

data/integration/tests/git_source/HTTP_proxy_and_git_source.rb

@@ -0,0 +1,70 @@
+require 'git_utils'
+require 'r10k_utils'
+require 'master_manipulator'
+test_name 'CODEMGMT-730 - C97977 - Specify HTTP_PROXY environment var and proxy for specific git source'
+
+#Init
+env_path = on(master, puppet('config print environmentpath')).stdout.rstrip
+r10k_fqp = get_r10k_fqp(master)
+
+git_environments_path = '/root/environments'
+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"
+
+puppetfile =<<-EOS
+mod 'motd',
+  :git    => 'git://github.com/puppetlabs/puppetlabs-motd'
+EOS
+
+proxy_env_value = 'http://cattastic.net:3219'
+
+#In-line files
+r10k_conf = <<-CONF
+cachedir: '/var/cache/r10k'
+git:
+  provider: '#{git_provider}'
+  repositories:
+    - remote: 'http://example.com/fake_git_source.git'
+      proxy: 'http://foooooooo.unresolvable:3128'
+sources:
+  control:
+    basedir: "#{env_path}"
+    remote: "http://example.com/fake_git_source.git"
+CONF
+
+teardown do
+  master.clear_env_var('HTTP_PROXY')
+
+  step 'Restore Original "r10k" Config'
+  on(master, "mv #{r10k_config_bak_path} #{r10k_config_path}")
+
+  step 'cleanup r10k'
+  clean_up_r10k(master, last_commit, git_environments_path)
+end
+
+master.add_env_var('HTTP_PROXY', proxy_env_value)
+
+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 'Checkout "production" Branch'
+git_on(master, 'checkout production', git_environments_path)
+
+step 'Copy Puppetfile to "production" Environment Git Repo'
+create_remote_file(master, "#{git_environments_path}/Puppetfile", puppetfile)
+
+step 'Push Changes'
+git_add_commit_push(master, 'production', 'add Puppetfile', git_environments_path)
+
+#test
+on(master, "#{r10k_fqp} deploy environment -p", :accept_all_exit_codes => true) do |r|
+  regex = /proxy.*foooooooo\.unresolvable/
+  assert(r.exit_code == 1, 'expected error code was not observed')
+  assert_match(regex, r.stderr, 'The expected error message was not observed' )
+end

data/integration/tests/git_source/git_source_git.rb

@@ -0,0 +1,128 @@
+require 'git_utils'
+require 'r10k_utils'
+require 'master_manipulator'
+test_name 'CODEMGMT-92 - C59235 - Single Git Source Using "GIT" Transport Protocol'
+
+confine(:to, :platform => 'el')
+
+if 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
+env_path = on(master, puppet('config print environmentpath')).stdout.rstrip
+r10k_fqp = get_r10k_fqp(master)
+
+git_control_remote = 'git://localhost/environments.git'
+git_environments_path = '/root/environments'
+git_provider = ENV['GIT_PROVIDER'] || 'shellgit'
+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_config_path = get_r10k_config_file_path(master)
+r10k_config_bak_path = "#{r10k_config_path}.bak"
+
+#Manifest
+site_pp_path = File.join(git_environments_path, 'manifests', 'site.pp')
+site_pp = create_site_pp(master_certname, '  include helloworld')
+
+#In-line files
+r10k_conf = <<-CONF
+cachedir: '/var/cache/r10k'
+git:
+  provider: '#{git_provider}'
+sources:
+  broken:
+    basedir: "#{env_path}"
+    remote: "#{git_control_remote}"
+CONF
+
+git_daemon_xinetd_enable_manifest = <<-MANIFEST
+package { 'git-daemon':
+  ensure => present
+}
+include xinetd
+xinetd::service { 'git-daemon':
+  port         => '9418',
+  server       => '/usr/libexec/git-core/git-daemon',
+  server_args  => '--inetd --verbose --syslog --export-all --base-path=/git_repos',
+  socket_type  => 'stream',
+  user         => 'nobody',
+  wait         => 'no',
+  service_type => 'UNLISTED',
+  disable      => 'no'
+}
+MANIFEST
+
+git_daemon_xinetd_disable_manifest = <<-MANIFEST
+xinetd::service { 'git-daemon':
+  port    => '9418',
+  server  => '/usr/libexec/git-core/git-daemon',
+  disable => 'yes'
+}
+MANIFEST
+
+#Verification
+notify_message_regex = /I am in the production environment/
+
+#Teardown
+teardown do
+  step 'Restore Original "r10k" Config'
+  on(master, "mv #{r10k_config_bak_path} #{r10k_config_path}")
+
+  step 'Stop "xinetd" Service'
+  on(master, puppet('apply'), :stdin => git_daemon_xinetd_disable_manifest)
+  on(master, puppet('resource', 'service', 'xinetd', 'ensure=stopped'))
+
+  clean_up_r10k(master, last_commit, git_environments_path)
+
+  step 'Run Puppet Agent to Clear Plug-in Cache'
+  on(agents, puppet('agent', '--test', '--environment production'))
+end
+
+#Setup
+step 'Stub Forge on Master'
+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 'Install "puppetlabs-xinetd" Module'
+on(master, puppet('config print basemodulepath')) do |result|
+  (result.stdout.include? ':') ? separator = ':' : separator = ';'
+  @module_path = result.stdout.split(separator).first
+end
+on(master, puppet("module install puppetlabs-xinetd --modulepath #{@module_path}"))
+
+step 'Install and Configure "git-daemon" service'
+on(master, puppet('apply'), :stdin => git_daemon_xinetd_enable_manifest)
+
+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_fqp} 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_regex, result.stdout, 'Expected message not found!')
+  end
+end

data/integration/tests/git_source/git_source_ssh.rb

@@ -0,0 +1,87 @@
+require 'git_utils'
+require 'r10k_utils'
+require 'master_manipulator'
+test_name 'CODEMGMT-92 - C59234 - Single Git Source Using "SSH" Transport Protocol'
+
+skip_test 'refactor to use shared private key internal to puppet'
+
+#Init
+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'
+r10k_fqp = get_r10k_fqp(master)
+
+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'
+
+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}'
+  private_key: '#{ssh_private_key_path}'
+sources:
+  broken:
+    basedir: "#{env_path}"
+    remote: "#{git_control_remote}"
+CONF
+
+ssh_config = <<-CONF
+StrictHostKeyChecking no
+
+Host github.com
+    IdentityFile #{ssh_private_key_path}
+CONF
+
+#Verification
+notify_message_regex = /I am in the production environment/
+
+#Teardown
+teardown do
+  step 'Restore Original "r10k" Config'
+  on(master, "mv #{r10k_config_bak_path} #{r10k_config_path}")
+
+  step 'Remove Jenkins SSH Key'
+  on(master, "rm -rf #{ssh_private_key_path}")
+
+  step 'Remove SSH Config'
+  on(master, "rm -rf #{ssh_config_path}")
+
+  step 'Restore Original "production" Environment via r10k'
+  on(master, "#{r10k_fqp} deploy environment -v")
+end
+
+#Setup
+step 'Backup Current "r10k" Config'
+on(master, "mv #{r10k_config_path} #{r10k_config_bak_path}")
+
+if File.file?(jenkins_key_path) == false
+  skip_test('Skipping test because necessary SSH key is not present!')
+end
+
+step 'Update the "r10k" Config'
+create_remote_file(master, r10k_config_path, r10k_conf)
+
+step 'Configure SSH to Use SSH Key for "github.com"'
+create_remote_file(master, ssh_config_path, ssh_config)
+on(master, "chmod 600 #{ssh_config_path}")
+
+step 'Copy SSH Key to Master'
+scp_to(master, jenkins_key_path, ssh_private_key_path)
+on(master, "chmod 600 #{ssh_private_key_path}")
+
+#Tests
+step 'Deploy "production" Environment via r10k'
+on(master, "#{r10k_fqp} 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_regex, result.stdout, 'Expected message not found!')
+  end
+end

data/integration/tests/git_source/git_source_submodule.rb

@@ -0,0 +1,70 @@
+require 'git_utils'
+require 'r10k_utils'
+require 'master_manipulator'
+test_name 'CODEMGMT-92 - C59238 - Single Git Source with Git Sub-module'
+
+#Init
+master_certname = on(master, puppet('config', 'print', 'certname')).stdout.rstrip
+
+git_repo_module_parent_path = '/git_repos'
+git_repo_module_name = 'helloworld'
+git_repo_module_path = File.join(git_repo_module_parent_path, "#{git_repo_module_name}.git")
+git_clone_module_path = '/root/helloworld_module'
+git_environments_path = '/root/environments'
+last_commit = git_last_commit(master, git_environments_path)
+r10k_fqp = get_r10k_fqp(master)
+
+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_regex = /I am in the production environment/
+
+#Teardown
+teardown do
+  'Remove "helloworld" Git Repo'
+  on(master, "rm -rf #{git_repo_module_path}")
+
+  'Remove "helloworld" Git Clone'
+  on(master, "rm -rf #{git_clone_module_path}")
+
+  clean_up_r10k(master, last_commit, git_environments_path)
+end
+
+#Setup
+step 'Create Git Repo for "helloworld" Module'
+git_init_bare_repo_and_clone(master, git_repo_module_parent_path, git_repo_module_name, git_clone_module_path)
+
+step 'Copy "helloworld" Module to Git Repo'
+scp_to(master, helloworld_module_path, File.join(git_clone_module_path, 'helloworld'))
+git_add_commit_push(master, 'master', 'Add module.', git_clone_module_path)
+
+step 'Add "helloworld" Module Git Repo as Submodule'
+on(master, "cd #{git_environments_path};git submodule add file://#{git_repo_module_path} dist")
+
+step 'Checkout "production" Branch'
+git_on(master, 'checkout production', git_environments_path)
+
+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.', git_environments_path)
+
+#Tests
+step 'Deploy "production" Environment via r10k'
+on(master, "#{r10k_fqp} deploy environment -v")
+
+agents.each do |agent|
+  step "Run Puppet Agent"
+  on(agent, puppet('agent', '--test', '--environment production'), :acceptable_exit_codes => 1) do |result|
+    expect_failure('Expected to fail due to RK-30') do
+      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/git_source/negative/neg_git_broken_remote.rb

@@ -0,0 +1,38 @@
+require 'git_utils'
+require 'r10k_utils'
+require 'master_manipulator'
+require 'digest/sha1'
+test_name 'CODEMGMT-101 - C59261 - Attempt to Deploy Environment with Broken Git Remote'
+
+#Init
+git_control_remote = '/git_repos/environments.git'
+prod_branch_head_ref_path = File.join(git_control_remote, 'refs', 'heads', 'production')
+prod_branch_head_ref_path_backup = '/tmp/production.bak'
+r10k_fqp = get_r10k_fqp(master)
+
+invalid_sha_ref = Digest::SHA1.hexdigest('broken')
+
+#Verification
+error_message_regex = /ERROR\].*Blah/m
+
+#Teardown
+teardown do
+  step 'Restore Original "production" Branch Head Ref'
+  on(master, "mv #{prod_branch_head_ref_path_backup} #{prod_branch_head_ref_path}")
+end
+
+#Setup
+step 'Backup Current "production" Branch Head Ref'
+on(master, "mv #{prod_branch_head_ref_path} #{prod_branch_head_ref_path_backup}")
+
+step 'Inject Corrupt "production" Branch Head Ref'
+create_remote_file(master, prod_branch_head_ref_path, "#{invalid_sha_ref}\n")
+on(master, "chmod 644 #{prod_branch_head_ref_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-28') do
+    assert_match(error_message_regex, result.stderr, 'Expected message not found!')
+  end
+end

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

@@ -0,0 +1,46 @@
+require 'git_utils'
+require 'r10k_utils'
+require 'master_manipulator'
+test_name 'CODEMGMT-101 - C59236 - Attempt to Deploy Environment with Unauthorized "HTTPS" Git Source'
+
+#Init
+env_path = on(master, puppet('config print environmentpath')).stdout.rstrip
+git_control_remote = 'https://bad:user@github.com/puppetlabs/codemgmt-92.git'
+git_provider = ENV['GIT_PROVIDER'] || 'shellgit'
+r10k_fqp = get_r10k_fqp(master)
+
+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:
+  broken:
+    basedir: "#{env_path}"
+    remote: "#{git_control_remote}"
+CONF
+
+#Verification
+error_message_regex = /ERROR.*Unable to determine current branches for Git source 'broken'/m
+
+#Teardown
+teardown do
+  step 'Restore Original "r10k" Config'
+  on(master, "mv #{r10k_config_bak_path} #{r10k_config_path}")
+end
+
+#Setup
+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)
+
+#Tests
+step 'Attempt to Deploy via r10k'
+on(master, "#{r10k_fqp} deploy environment -v", :acceptable_exit_codes => 1) do |result|
+  assert_match(error_message_regex, result.stderr, 'Expected message not found!')
+end

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

@@ -0,0 +1,73 @@
+require 'git_utils'
+require 'r10k_utils'
+require 'master_manipulator'
+require 'openssl'
+test_name 'CODEMGMT-101 - C59237 - Attempt to Deploy Environment with Unauthorized "SSH" Git Source'
+
+#Init
+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'
+r10k_fqp = get_r10k_fqp(master)
+
+unauthorized_rsa_key = OpenSSL::PKey::RSA.new(2048)
+ssh_private_key_path = '/root/.ssh/unauthorized_key'
+ssh_config_path = '/root/.ssh/config'
+
+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}'
+  private_key: '#{ssh_private_key_path}'
+sources:
+  broken:
+    basedir: "#{env_path}"
+    remote: "#{git_control_remote}"
+CONF
+
+ssh_config = <<-CONF
+StrictHostKeyChecking no
+
+Host github.com
+    IdentityFile #{ssh_private_key_path}
+CONF
+
+#Verification
+error_message_regex = /ERROR.*Unable to determine current branches for Git source 'broken'/m
+
+#Teardown
+teardown do
+  step 'Restore Original "r10k" Config'
+  on(master, "mv #{r10k_config_bak_path} #{r10k_config_path}")
+
+  step 'Remove Unauthorized SSH Key'
+  on(master, "rm -rf #{ssh_private_key_path}")
+
+  step 'Remove SSH Config'
+  on(master, "rm -rf #{ssh_config_path}")
+end
+
+#Setup
+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 'Copy Unauthorized SSH Key to Master'
+create_remote_file(master, ssh_config_path, ssh_config)
+on(master, "chmod 600 #{ssh_config_path}")
+
+step 'Configure SSH to Use Unauthorized SSH Key for "github.com"'
+create_remote_file(master, ssh_private_key_path, unauthorized_rsa_key)
+on(master, "chmod 600 #{ssh_private_key_path}")
+
+#Tests
+step 'Attempt to Deploy via r10k'
+on(master, "#{r10k_fqp} deploy environment -v", :acceptable_exit_codes => 1) do |result|
+  assert_match(error_message_regex, result.stderr, 'Expected message not found!')
+end