hybrid_platforms_conductor 33.2.3 → 33.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a23231b519652cb5092cf2a20a39086e40b53d59eb55e8465ff309c34d593fa5
-  data.tar.gz: 91a0ccce705223534372189fc43d2a554c06afc9196977ded50e70955daad3a7
+  metadata.gz: bd578efdc520f51dc9752ace39626e73dbdda736fd4376ee5e9ce55ed34a0a4d
+  data.tar.gz: c44c935905b7a62a4a0f3ea037b0f1e4ed8fa07bdad4802e38143fe1a448bfd1
 SHA512:
-  metadata.gz: 6e22d598b75dff5541133543c328538c2135a7e0f6d6d7b00c47104971e0d621a1f5bd9cba929f5aca0e1e4de61c1c086d43f94dc70506dd2808be39548488a8
-  data.tar.gz: 9c5add7617649bcc8e23f059b9d9c342342087d47dc8bdd0bacb8cb5a40bcbaeaa740aa32882e8d5ce296e51a7037625ac2a8520227357f3d66d9439a35fa1c8
+  metadata.gz: f0070cf6736acaa5b9a1e36279bab3b9f6530c26ea341feec4fb4775d022e1c67e2694df832a3ab340b765e10bf510969febe82e4b34fa564e9aab82eea71314
+  data.tar.gz: d5cc0229b32b7f75d1c7604e304e6986b0b7ab121676dfd62121d954c48e3ba93f827dabfbb8320c9f945339c334263ff9404c8c60e1be5a0b03e4b390cc044f

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+# [v33.2.4](https://github.com/sweet-delights/hybrid-platforms-conductor/compare/v33.2.3...v33.2.4) (2021-06-23 15:14:20)
+
+## Global changes
+### Patches
+
+* [[Hotfix(platform_handler_serverless_chef)] Forward environment in sudo commands](https://github.com/sweet-delights/hybrid-platforms-conductor/commit/fd3b58875665c29dd071b5af2055eab0c45c0974)
+* [[Hotfix] Fixed unbundled environment not cleaned + Moved deployer config DSL in deployer.rb](https://github.com/sweet-delights/hybrid-platforms-conductor/commit/2bce6dbc31d98b27f196ed646eb9aa669b0f9a86)
+
+## Changes for platform_handler_serverless_chef
+### Patches
+
+* [[Hotfix(platform_handler_serverless_chef)] Forward environment in sudo commands](https://github.com/sweet-delights/hybrid-platforms-conductor/commit/fd3b58875665c29dd071b5af2055eab0c45c0974)
+
 # [v33.2.3](https://github.com/sweet-delights/hybrid-platforms-conductor/compare/v33.2.2...v33.2.3) (2021-06-23 13:45:56)
 
 ## Global changes

data/lib/hybrid_platforms_conductor/config.rb

@@ -47,12 +47,6 @@ module HybridPlatformsConductor
     # Array<Hash,Symbol,Object>
     attr_reader :expected_failures
 
-    # List of retriable errors. Each info has the following properties:
-    # * *nodes_selectors_stack* (Array<Object>): Stack of nodes selectors impacted by those errors
-    # * *errors_on_stdout* (Array<String or Regexp>): List of errors match (as exact string match or using a regexp) to check against stdout
-    # * *errors_on_stderr* (Array<String or Regexp>): List of errors match (as exact string match or using a regexp) to check against stderr
-    attr_reader :retriable_errors
-
     # List of deployment schedules. Each info has the following properties:
     # * *nodes_selectors_stack* (Array<Object>): Stack of nodes selectors impacted by this rule
     # * *schedule* (IceCube::Schedule): The deployment schedule
@@ -81,11 +75,6 @@ module HybridPlatformsConductor
       # * *reason* (String): Reason for this expected failure
       # Array<Hash,Symbol,Object>
       @expected_failures = []
-      # List of retriable errors. Each info has the following properties:
-      # * *nodes_selectors_stack* (Array<Object>): Stack of nodes selectors impacted by those errors
-      # * *errors_on_stdout* (Array<String or Regexp>): List of errors match (as exact string match or using a regexp) to check against stdout
-      # * *errors_on_stderr* (Array<String or Regexp>): List of errors match (as exact string match or using a regexp) to check against stderr
-      @retriable_errors = []
       # List of deployment schedules. Each info has the following properties:
       # * *nodes_selectors_stack* (Array<Object>): Stack of nodes selectors impacted by this rule
       # * *schedule* (IceCube::Schedule): The deployment schedule
@@ -162,30 +151,6 @@ module HybridPlatformsConductor
     end
     expose :expect_tests_to_fail
 
-    # Mark some errors on stdout to be retriable during a deploy
-    #
-    # Parameters::
-    # * *errors* (String, Regexp or Array<String or Regexp>): Single (or list of) errors matching pattern (either as exact string match or using a regexp).
-    def retry_deploy_for_errors_on_stdout(errors)
-      @retriable_errors << {
-        errors_on_stdout: errors.is_a?(Array) ? errors : [errors],
-        nodes_selectors_stack: current_nodes_selectors_stack
-      }
-    end
-    expose :retry_deploy_for_errors_on_stdout
-
-    # Mark some errors on stderr to be retriable during a deploy
-    #
-    # Parameters::
-    # * *errors* (String, Regexp or Array<String or Regexp>): Single (or list of) errors matching pattern (either as exact string match or using a regexp).
-    def retry_deploy_for_errors_on_stderr(errors)
-      @retriable_errors << {
-        errors_on_stderr: errors.is_a?(Array) ? errors : [errors],
-        nodes_selectors_stack: current_nodes_selectors_stack
-      }
-    end
-    expose :retry_deploy_for_errors_on_stderr
-
     # Set a deployment schedule
     #
     # Parameters::

data/lib/hybrid_platforms_conductor/core_extensions/bundler/without_bundled_env.rb

@@ -11,10 +11,27 @@ module Bundler
     # @return [Hash] Environment with all bundler-related variables removed
     def current_unbundled_env
       env = ENV.clone.to_hash
+      %w[
+        PATH
+        RUBYLIB
+        RUBYOPT
+      ].each do |env_name|
+        if original_env.key?(env_name)
+          env[env_name] = original_env[env_name]
+        else
+          env.delete(env_name)
+        end
+      end
 
       env['MANPATH'] = env['BUNDLER_ORIG_MANPATH'] if env.key?('BUNDLER_ORIG_MANPATH')
 
-      env.delete_if { |k, _| k[0, 7] == 'BUNDLE_' }
+      env.delete_if do |k, _|
+        %w[
+          GEM_
+          BUNDLE_
+          BUNDLER_
+        ].any? { |prefix| k.start_with?(prefix) }
+      end
 
       if env.key?('RUBYOPT')
         rubyopt = env['RUBYOPT'].split

data/lib/hybrid_platforms_conductor/deployer.rb

@@ -18,6 +18,12 @@ module HybridPlatformsConductor
     # Extend the Config DSL
     module ConfigDSLExtension
 
+      # List of retriable errors. Each info has the following properties:
+      # * *nodes_selectors_stack* (Array<Object>): Stack of nodes selectors impacted by those errors
+      # * *errors_on_stdout* (Array<String or Regexp>): List of errors match (as exact string match or using a regexp) to check against stdout
+      # * *errors_on_stderr* (Array<String or Regexp>): List of errors match (as exact string match or using a regexp) to check against stderr
+      attr_reader :retriable_errors
+
       # List of log plugins. Each info has the following properties:
       # * *nodes_selectors_stack* (Array<Object>): Stack of nodes selectors impacted by this rule.
       # * *log_plugins* (Array<Symbol>): List of log plugins to be used to store deployment logs.
@@ -36,6 +42,11 @@ module HybridPlatformsConductor
       # Mixin initializer
       def init_deployer_config
         @packaging_timeout_secs = 60
+        # List of retriable errors. Each info has the following properties:
+        # * *nodes_selectors_stack* (Array<Object>): Stack of nodes selectors impacted by those errors
+        # * *errors_on_stdout* (Array<String or Regexp>): List of errors match (as exact string match or using a regexp) to check against stdout
+        # * *errors_on_stderr* (Array<String or Regexp>): List of errors match (as exact string match or using a regexp) to check against stderr
+        @retriable_errors = []
         @deployment_logs = []
         @secrets_readers = []
       end
@@ -48,6 +59,28 @@ module HybridPlatformsConductor
         @packaging_timeout_secs = packaging_timeout_secs
       end
 
+      # Mark some errors on stdout to be retriable during a deploy
+      #
+      # Parameters::
+      # * *errors* (String, Regexp or Array<String or Regexp>): Single (or list of) errors matching pattern (either as exact string match or using a regexp).
+      def retry_deploy_for_errors_on_stdout(errors)
+        @retriable_errors << {
+          errors_on_stdout: errors.is_a?(Array) ? errors : [errors],
+          nodes_selectors_stack: current_nodes_selectors_stack
+        }
+      end
+
+      # Mark some errors on stderr to be retriable during a deploy
+      #
+      # Parameters::
+      # * *errors* (String, Regexp or Array<String or Regexp>): Single (or list of) errors matching pattern (either as exact string match or using a regexp).
+      def retry_deploy_for_errors_on_stderr(errors)
+        @retriable_errors << {
+          errors_on_stderr: errors.is_a?(Array) ? errors : [errors],
+          nodes_selectors_stack: current_nodes_selectors_stack
+        }
+      end
+
       # Set the deployment log plugins to be used
       #
       # Parameters::

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

@@ -263,7 +263,7 @@ module HybridPlatformsConductor
             raise "Missing file #{chef_versions_file} specifying the Chef Infra Client version to be deployed" unless File.exist?(chef_versions_file)
 
             required_chef_client_version = YAML.load_file(chef_versions_file)['client']
-            sudo = (@actions_executor.connector(:ssh).ssh_user == 'root' ? '' : "#{@nodes_handler.sudo_on(node)} ")
+            sudo = (@actions_executor.connector(:ssh).ssh_user == 'root' ? '' : "#{@nodes_handler.sudo_on(node)} -E ")
             [
               {
                 # Install dependencies

data/lib/hybrid_platforms_conductor/version.rb

@@ -1,5 +1,5 @@
 module HybridPlatformsConductor
 
-  VERSION = '33.2.3'
+  VERSION = '33.2.4'
 
 end

data/spec/hybrid_platforms_conductor_test/api/cmd_runner_spec.rb

@@ -47,7 +47,13 @@ describe HybridPlatformsConductor::CmdRunner do
 
   it 'runs a command in an un-bundled environment' do
     with_repository do
-      expect(test_cmd_runner.run_cmd('echo "${BUNDLE_GEMFILE}"')).to eq [0, "\n", '']
+      %w[
+        BUNDLE_GEMFILE
+        GEM_HOME
+        RUBYOPT
+      ].each do |var_to_check|
+        expect(test_cmd_runner.run_cmd("echo \"${#{var_to_check}}\"")).to eq [0, "\n", '']
+      end
     end
   end
 

data/spec/hybrid_platforms_conductor_test/api/config_spec.rb

@@ -155,40 +155,6 @@ describe HybridPlatformsConductor::Config do
     end
   end
 
-  it 'returns the retriable errors correctly' do
-    with_platforms '
-      retry_deploy_for_errors_on_stdout \'Retry stdout global\'
-      retry_deploy_for_errors_on_stderr [
-        \'Retry stderr global\',
-        /.+Retry stderr regexp global/
-      ]
-      for_nodes(%w[node1 node2 node3]) do
-        retry_deploy_for_errors_on_stdout \'Retry stdout nodes\'
-        retry_deploy_for_errors_on_stderr \'Retry stderr nodes\'
-      end
-    ' do
-      sort_proc = proc { |retriable_error_info| ((retriable_error_info[:errors_on_stdout] || []) + (retriable_error_info[:errors_on_stderr] || [])).first.to_s }
-      expect(test_config.retriable_errors.sort_by(&sort_proc)).to eq [
-        {
-          nodes_selectors_stack: [],
-          errors_on_stdout: ['Retry stdout global']
-        },
-        {
-          nodes_selectors_stack: [],
-          errors_on_stderr: ['Retry stderr global', /.+Retry stderr regexp global/]
-        },
-        {
-          nodes_selectors_stack: [%w[node1 node2 node3]],
-          errors_on_stdout: ['Retry stdout nodes']
-        },
-        {
-          nodes_selectors_stack: [%w[node1 node2 node3]],
-          errors_on_stderr: ['Retry stderr nodes']
-        }
-      ].sort_by(&sort_proc)
-    end
-  end
-
   it 'returns the deployment schedules correctly' do
     with_platforms '
       deployment_schedule(IceCube::Schedule.new(Time.parse(\'2020-05-01 11:22:33 UTC\')))

data/spec/hybrid_platforms_conductor_test/api/deployer/config_dsl_spec.rb

@@ -8,6 +8,40 @@ describe HybridPlatformsConductor::Deployer do
       end
     end
 
+    it 'returns the retriable errors correctly' do
+      with_platforms '
+        retry_deploy_for_errors_on_stdout \'Retry stdout global\'
+        retry_deploy_for_errors_on_stderr [
+          \'Retry stderr global\',
+          /.+Retry stderr regexp global/
+        ]
+        for_nodes(%w[node1 node2 node3]) do
+          retry_deploy_for_errors_on_stdout \'Retry stdout nodes\'
+          retry_deploy_for_errors_on_stderr \'Retry stderr nodes\'
+        end
+      ' do
+        sort_proc = proc { |retriable_error_info| ((retriable_error_info[:errors_on_stdout] || []) + (retriable_error_info[:errors_on_stderr] || [])).first.to_s }
+        expect(test_config.retriable_errors.sort_by(&sort_proc)).to eq [
+          {
+            nodes_selectors_stack: [],
+            errors_on_stdout: ['Retry stdout global']
+          },
+          {
+            nodes_selectors_stack: [],
+            errors_on_stderr: ['Retry stderr global', /.+Retry stderr regexp global/]
+          },
+          {
+            nodes_selectors_stack: [%w[node1 node2 node3]],
+            errors_on_stdout: ['Retry stdout nodes']
+          },
+          {
+            nodes_selectors_stack: [%w[node1 node2 node3]],
+            errors_on_stderr: ['Retry stderr nodes']
+          }
+        ].sort_by(&sort_proc)
+      end
+    end
+
     it 'declares log plugins to be used' do
       with_platforms(
         <<~EO_CONFIG

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

@@ -35,7 +35,7 @@ describe HybridPlatformsConductor::HpcPlugins::PlatformHandler::ServerlessChef d
     def expected_actions_to_deploy_chef(
       repository,
       check_mode: false,
-      sudo: 'sudo -u root ',
+      sudo: 'sudo -u root -E ',
       env: 'prod',
       policy: 'test_policy',
       node: 'node',

metadata

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