hybrid_platforms_conductor 32.4.0 → 32.7.0

data/spec/hybrid_platforms_conductor_test/helpers/deployer_test_helpers.rb

@@ -20,7 +20,7 @@ module HybridPlatformsConductorTest
           #
           # Parameters::
           # * *services* (Hash<String, Array<String> >): Expected nodes that should be deployed, with their corresponding services [default: { 'node' => %w[service] }]
-          # * *sudo* (Boolean): Do we expect sudo to be used in commands? [default: true]
+          # * *sudo* (String or nil): sudo supposed to be used, or nil if none [default: 'sudo -u root']
           # * *check_mode* (Boolean): Are we testing in check mode? [default: @check_mode]
           # * *mocked_deploy_result* (Hash or nil): Mocked result of the deployment actions, or nil to use the helper's default [default: nil]
           # * *additional_expected_actions* (Array): Additional expected actions [default: []]
@@ -28,7 +28,7 @@ module HybridPlatformsConductorTest
           # * *expect_actions_timeout* (Integer or nil): Expected timeout in actions, or nil for none [default: nil]
           def expected_actions_for_deploy_on(
             services: { 'node' => %w[service] },
-            sudo: true,
+            sudo: 'sudo -u root',
             check_mode: @check_mode,
             mocked_deploy_result: nil,
             additional_expected_actions: [],
@@ -82,7 +82,7 @@ module HybridPlatformsConductorTest
           # * *expect_prepare_for_deploy* (Boolean): Should we expect calls to prepare for deploy? [default: true]
           # * *expect_connections_to_nodes* (Boolean): Should we expect connections to nodes? [default: true]
           # * *expect_default_actions* (Boolean): Should we expect default actions? [default: true]
-          # * *expect_sudo* (Boolean): Do we expect sudo to be used in commands? [default: true]
+          # * *expect_sudo* (String or nil): Expected sudo command, or nil if none [default: 'sudo -u root']
           # * *expect_secrets* (Hash): Secrets to be expected during deployment [default: {}]
           # * *expect_local_environment* (Boolean): Expected local environment flag [default: false]
           # * *expect_additional_actions* (Array): Additional expected actions [default: []]
@@ -99,7 +99,7 @@ module HybridPlatformsConductorTest
             expect_prepare_for_deploy: true,
             expect_connections_to_nodes: true,
             expect_default_actions: true,
-            expect_sudo: true,
+            expect_sudo: 'sudo -u root',
             expect_secrets: {},
             expect_local_environment: false,
             expect_additional_actions: [],
@@ -201,12 +201,21 @@ module HybridPlatformsConductorTest
           end
 
           it 'deploys on 1 node using root' do
-            with_platform_to_deploy(expect_sudo: false) do
+            with_platform_to_deploy(expect_sudo: nil) do
               test_actions_executor.connector(:ssh).ssh_user = 'root'
               expect(test_deployer.deploy_on('node')).to eq('node' => expected_deploy_result)
             end
           end
 
+          it 'deploys on 1 node using an alternate sudo' do
+            with_platform_to_deploy(
+              expect_sudo: 'other_sudo --user root',
+              additional_config: 'sudo_for { |user| "other_sudo --user #{user}" }'
+            ) do
+              expect(test_deployer.deploy_on('node')).to eq('node' => expected_deploy_result)
+            end
+          end
+
           it 'deploys on 1 node using 1 secret' do
             with_platform_to_deploy(expect_secrets: { 'secret1' => 'password1' }) do
               test_deployer.secrets = [{ 'secret1' => 'password1' }]
@@ -227,9 +236,9 @@ module HybridPlatformsConductorTest
                 nodes_info: { nodes: { 'node' => { meta: { image: 'debian_9' }, services: %w[service] } } },
                 expect_local_environment: true,
                 expect_additional_actions: [
-                  { remote_bash: 'sudo apt update && sudo apt install -y ca-certificates' },
+                  { remote_bash: 'sudo -u root apt update && sudo -u root apt install -y ca-certificates' },
                   {
-                    remote_bash: 'sudo update-ca-certificates',
+                    remote_bash: 'sudo -u root update-ca-certificates',
                     scp:  {
                       certs_dir => '/usr/local/share/ca-certificates',
                       :sudo => true
@@ -244,6 +253,31 @@ module HybridPlatformsConductorTest
             end
           end
 
+          it 'deploys on 1 node in local environment with certificates to install using hpc_certificates on Debian and an alternate sudo' do
+            with_certs_dir do |certs_dir|
+              with_platform_to_deploy(
+                nodes_info: { nodes: { 'node' => { meta: { image: 'debian_9' }, services: %w[service] } } },
+                expect_sudo: 'other_sudo --user root',
+                expect_local_environment: true,
+                expect_additional_actions: [
+                  { remote_bash: 'other_sudo --user root apt update && other_sudo --user root apt install -y ca-certificates' },
+                  {
+                    remote_bash: 'other_sudo --user root update-ca-certificates',
+                    scp:  {
+                      certs_dir => '/usr/local/share/ca-certificates',
+                      :sudo => true
+                    }
+                  }
+                ],
+                additional_config: 'sudo_for { |user| "other_sudo --user #{user}" }'
+              ) do
+                ENV['hpc_certificates'] = certs_dir
+                test_deployer.local_environment = true
+                expect(test_deployer.deploy_on('node')).to eq('node' => expected_deploy_result)
+              end
+            end
+          end
+
           it 'deploys on 1 node with certificates to install using hpc_certificates on Debian but ignores them in non-local environment' do
             with_certs_dir do |certs_dir|
               with_platform_to_deploy(nodes_info: { nodes: { 'node' => { meta: { image: 'debian_9' }, services: %w[service] } } }) do
@@ -257,7 +291,7 @@ module HybridPlatformsConductorTest
             with_certs_dir do |certs_dir|
               with_platform_to_deploy(
                 nodes_info: { nodes: { 'node' => { meta: { image: 'debian_9' }, services: %w[service] } } },
-                expect_sudo: false,
+                expect_sudo: nil,
                 expect_local_environment: true,
                 expect_additional_actions: [
                   { remote_bash: 'apt update && apt install -y ca-certificates' },
@@ -284,9 +318,9 @@ module HybridPlatformsConductorTest
                 nodes_info: { nodes: { 'node' => { meta: { image: 'centos_7' }, services: %w[service] } } },
                 expect_local_environment: true,
                 expect_additional_actions: [
-                  { remote_bash: 'sudo yum install -y ca-certificates' },
+                  { remote_bash: 'sudo -u root yum install -y ca-certificates' },
                   {
-                    remote_bash: ['sudo update-ca-trust enable', 'sudo update-ca-trust extract'],
+                    remote_bash: ['sudo -u root update-ca-trust enable', 'sudo -u root update-ca-trust extract'],
                     scp: {
                       "#{certs_dir}/test_cert.crt" => '/etc/pki/ca-trust/source/anchors',
                       :sudo => true
@@ -301,11 +335,36 @@ module HybridPlatformsConductorTest
             end
           end
 
+          it 'deploys on 1 node with certificates to install using hpc_certificates on CentOS and an alternate sudo' do
+            with_certs_dir do |certs_dir|
+              with_platform_to_deploy(
+                nodes_info: { nodes: { 'node' => { meta: { image: 'centos_7' }, services: %w[service] } } },
+                expect_sudo: 'other_sudo --user root',
+                expect_local_environment: true,
+                expect_additional_actions: [
+                  { remote_bash: 'other_sudo --user root yum install -y ca-certificates' },
+                  {
+                    remote_bash: ['other_sudo --user root update-ca-trust enable', 'other_sudo --user root update-ca-trust extract'],
+                    scp: {
+                      "#{certs_dir}/test_cert.crt" => '/etc/pki/ca-trust/source/anchors',
+                      :sudo => true
+                    }
+                  }
+                ],
+                additional_config: 'sudo_for { |user| "other_sudo --user #{user}" }'
+              ) do
+                ENV['hpc_certificates'] = certs_dir
+                test_deployer.local_environment = true
+                expect(test_deployer.deploy_on('node')).to eq('node' => expected_deploy_result)
+              end
+            end
+          end
+
           it 'deploys on 1 node with certificates to install using hpc_certificates on CentOS using root' do
             with_certs_dir do |certs_dir|
               with_platform_to_deploy(
                 nodes_info: { nodes: { 'node' => { meta: { image: 'centos_7' }, services: %w[service] } } },
-                expect_sudo: false,
+                expect_sudo: nil,
                 expect_local_environment: true,
                 expect_additional_actions: [
                   { remote_bash: 'yum install -y ca-certificates' },

data/spec/hybrid_platforms_conductor_test/helpers/platforms_handler_helpers.rb

@@ -58,7 +58,7 @@ module HybridPlatformsConductorTest
       #
       # Parameters::
       # * *content* (String): hpc_config.rb's content
-      # * Proc: Code called with the platforms.rb file created.
+      # * Proc: Code called with the hpc_config.rb file created.
       #   * Parameters::
       #     * *hybrid_platforms_dir* (String): The hybrid-platforms directory
       def with_platforms(content)

data/spec/hybrid_platforms_conductor_test/helpers/provisioner_proxmox_helpers.rb

@@ -330,7 +330,7 @@ module HybridPlatformsConductorTest
             expect(actions).to eq({
               'node' => {
                 remote_bash: {
-                  commands: "#{expected_sudo ? 'sudo -E ' : ''}./proxmox/reserve_proxmox_container --create ./proxmox/create/create_#{expected_file_id}.json --config ./proxmox/config/config_#{expected_file_id}.json",
+                  commands: "#{expected_sudo ? 'sudo -u root -E ' : ''}./proxmox/reserve_proxmox_container --create ./proxmox/create/create_#{expected_file_id}.json --config ./proxmox/config/config_#{expected_file_id}.json",
                   env: {
                     'hpc_user_for_proxmox' => proxmox_user,
                     'hpc_password_for_proxmox' => proxmox_password,
@@ -382,7 +382,7 @@ module HybridPlatformsConductorTest
               expect(actions).to eq({
                 'node' => {
                   remote_bash: {
-                    commands: "#{expected_sudo ? 'sudo -E ' : ''}./proxmox/reserve_proxmox_container --destroy ./proxmox/destroy/destroy_#{expected_file_id}.json --config ./proxmox/config/config_#{expected_file_id}.json",
+                    commands: "#{expected_sudo ? 'sudo -u root -E ' : ''}./proxmox/reserve_proxmox_container --destroy ./proxmox/destroy/destroy_#{expected_file_id}.json --config ./proxmox/config/config_#{expected_file_id}.json",
                     env: {
                       'hpc_user_for_proxmox' => proxmox_user,
                       'hpc_password_for_proxmox' => proxmox_password,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hybrid_platforms_conductor
 version: !ruby/object:Gem::Version
-  version: 32.4.0
+  version: 32.7.0
 platform: ruby
 authors:
 - Muriel Salvan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-19 00:00:00.000000000 Z
+date: 2021-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: range_operators
@@ -281,20 +281,20 @@ description: Provides a complete toolset to help DevOps maintain, deploy, monito
 email:
 - muriel@x-aeon.com
 executables:
-- test
 - topograph
-- dump_nodes_json
+- test
 - free_veids
-- report
-- setup
-- deploy
+- free_ips
+- nodes_to_deploy
 - last_deploys
+- check-node
+- run
+- report
 - get_impacted_nodes
 - ssh_config
-- run
-- nodes_to_deploy
-- check-node
-- free_ips
+- deploy
+- setup
+- dump_nodes_json
 extensions: []
 extra_rdoc_files: []
 files:
@@ -463,6 +463,7 @@ files:
 - spec/hybrid_platforms_conductor_test/api/nodes_handler/cmdbs/platform_handlers_spec.rb
 - spec/hybrid_platforms_conductor_test/api/nodes_handler/cmdbs_plugins_api_spec.rb
 - spec/hybrid_platforms_conductor_test/api/nodes_handler/common_spec.rb
+- spec/hybrid_platforms_conductor_test/api/nodes_handler/config_dsl_spec.rb
 - spec/hybrid_platforms_conductor_test/api/nodes_handler/git_diff_impacts_spec.rb
 - spec/hybrid_platforms_conductor_test/api/nodes_handler/nodes_selectors_spec.rb
 - spec/hybrid_platforms_conductor_test/api/nodes_handler/platform_handlers_plugins_api_spec.rb