hybrid_platforms_conductor 32.16.1 → 32.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f01de7476f9279e990b054d1b5709c1a549ea2a2069f3a12ace8b40d639451b0
-  data.tar.gz: f6336d1668fe315ac99bd1268fc91514b1644663633a6299654808597d8d202b
+  metadata.gz: f78c78a80235a940f793af89344e6a972609f92d79ddce8acc6735b0e6b54ceb
+  data.tar.gz: 9c0bfef24e47646c61dd79899af40f33f063f90e73a626ed9c2617c7f7933593
 SHA512:
-  metadata.gz: 5a931593af6eb20bf83eb478a2a438612dbcf3acf0f0e3cc93541c163b593a0aad88fd59f56340411d4cd95fe60618e58ae5ba845a44e42b0123394c93cab713
-  data.tar.gz: 5708d46f33bbfa53a0ddd48607b23c93468b7cdb588ba1d969c997047944e89ff8303009f63c54438db02b23b8633b3fdef9989a49527fdcca812d1cf6ce8ddd
+  metadata.gz: 60a24969416d8d674cad078642e575c1b22e3b4457dcabb5a436bf62a597d13388bf042851008d5a3b01a7de82ee6003c6856b90821adddc1436bf2a0ecbfdd1
+  data.tar.gz: 83cdf6e30fefad4d1d97cb1e1af84278e71aff6eadac4fe5d27232f70d6537a35a48d0e30494213a616796177fd1e6aa36f26bc6ac86d313b651ca2023ade1a0

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# [v32.16.2](https://github.com/sweet-delights/hybrid-platforms-conductor/compare/v32.16.1...v32.16.2) (2021-06-01 09:52:22)
+
+## Global changes
+### Patches
+
+* [[Hotfix(platform_handler_serverless_chef)] Fix Chef Workstation bash steps when run by root](https://github.com/sweet-delights/hybrid-platforms-conductor/commit/1d99d1faa9cf66cd607eacc00205e312fd589715)
+
+## Changes for platform_handler_serverless_chef
+### Patches
+
+* [[Hotfix(platform_handler_serverless_chef)] Fix Chef Workstation bash steps when run by root](https://github.com/sweet-delights/hybrid-platforms-conductor/commit/1d99d1faa9cf66cd607eacc00205e312fd589715)
+
 # [v32.16.1](https://github.com/sweet-delights/hybrid-platforms-conductor/compare/v32.16.0...v32.16.1) (2021-06-01 09:21:47)
 
 ## Global changes

data/lib/hybrid_platforms_conductor/hpc_plugins/platform_handler/serverless_chef.rb

@@ -84,7 +84,7 @@ module HybridPlatformsConductor
                 expected_match.nil? ? 'unreadable' : expected_match[1]
               end
             log_debug "Current Chef version: #{existing_version}. Required version: #{required_version}"
-            @cmd_runner.run_cmd "curl -L https://omnitruck.chef.io/install.sh | sudo bash -s -- -P chef-workstation -v #{required_version}" unless existing_version == required_version
+            @cmd_runner.run_cmd "curl -L https://omnitruck.chef.io/install.sh | #{@cmd_runner.root? ? '' : 'sudo '}bash -s -- -P chef-workstation -v #{required_version}" unless existing_version == required_version
           end
         end
 
@@ -178,7 +178,7 @@ module HybridPlatformsConductor
                 @cmd_runner.run_cmd "cd #{@repository_path} && /opt/chef-workstation/bin/chef install #{policy_file}" unless File.exist?("#{@repository_path}/#{lock_file}")
                 extra_cp_data_bags = File.exist?("#{@repository_path}/data_bags") ? " && cp -ar data_bags/ #{package_dir}/" : ''
                 @cmd_runner.run_cmd "cd #{@repository_path} && \
-                  sudo rm -rf #{package_dir} && \
+                  #{@cmd_runner.root? ? '' : 'sudo '}rm -rf #{package_dir} && \
                   /opt/chef-workstation/bin/chef export #{policy_file} #{package_dir}#{extra_cp_data_bags}"
               end
               unless @cmd_runner.dry_run
@@ -236,7 +236,7 @@ module HybridPlatformsConductor
           client_options << '--why-run' if use_why_run
           if @nodes_handler.get_use_local_chef_of(node)
             # Just run the chef-client directly from the packaged repository
-            [{ bash: "cd #{package_dir} && sudo SSL_CERT_DIR=/etc/ssl/certs /opt/chef-workstation/bin/chef-client #{client_options.join(' ')}" }]
+            [{ bash: "cd #{package_dir} && #{@cmd_runner.root? ? '' : 'sudo '}SSL_CERT_DIR=/etc/ssl/certs /opt/chef-workstation/bin/chef-client #{client_options.join(' ')}" }]
           else
             # Upload the package and run it from the node
             package_name = File.basename(package_dir)

data/lib/hybrid_platforms_conductor/hpc_plugins/provisioner/podman.rb

@@ -112,7 +112,7 @@ module HybridPlatformsConductor
         # Result::
         # * String: The Podman command
         def podman_cmd
-          @podman_cmd = @cmd_runner.root? ? 'podman' : 'sudo podman' unless defined?(@podman_cmd)
+          @podman_cmd = "#{@cmd_runner.root? ? '' : 'sudo '}podman" unless defined?(@podman_cmd)
           @podman_cmd
         end
 

data/lib/hybrid_platforms_conductor/version.rb

@@ -1,5 +1,5 @@
 module HybridPlatformsConductor
 
-  VERSION = '32.16.1'
+  VERSION = '32.16.2'
 
 end

data/spec/hybrid_platforms_conductor_test/api/platform_handlers/serverless_chef/packaging_spec.rb

@@ -44,6 +44,7 @@ describe HybridPlatformsConductor::HpcPlugins::PlatformHandler::ServerlessChef d
         end +
         if export
           [
+            ['whoami', proc { [0, 'test_user', ''] }, { optional: true }],
             [
               /^cd #{Regexp.escape(repository)} &&\s+sudo rm -rf dist\/#{Regexp.escape(env)}\/#{Regexp.escape(policy)} &&\s+\/opt\/chef-workstation\/bin\/chef export #{Regexp.escape(policy_file)} dist\/#{Regexp.escape(env)}\/#{Regexp.escape(policy)}#{data_bags ? " && cp -ar data_bags/ dist/#{Regexp.escape(env)}/#{Regexp.escape(policy)}/" : ''}$/,
               proc do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hybrid_platforms_conductor
 version: !ruby/object:Gem::Version
-  version: 32.16.1
+  version: 32.16.2
 platform: ruby
 authors:
 - Muriel Salvan