hybrid_platforms_conductor 33.0.3 → 33.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eada2aa4c440c2fdfc69fc7f6ec20d2175d4d52d7405bc192ae32cf7a4850f38
-  data.tar.gz: a720caa3b3c584a5c354cb787a5374866bfa40f7740ecf727d14db9a271e09d5
+  metadata.gz: bedd336d4e713f15ac516cd61d50cf964c2a25051fbb624e1ca75196ccd9dd39
+  data.tar.gz: 2d75b29868194072733dd273f6d2f17ca001cc167f446105b72381e1620c57a1
 SHA512:
-  metadata.gz: 5369c44dd7647622a49f8db8c01722ca0ba96ff7c5e7439fb3c4b208faea076513de0ec47fe3f5a6612807680ecff7b7e2962baf3da569c67c3fd8632dfb9a20
-  data.tar.gz: 882ca15df05a0a209a7de8f723cc5ddda0a3ea89ce3b5655d6b5c4968e01adc9aa07437bbd17dafe6363331f373776c84fca307e150a53c69ef800926e54ee92
+  metadata.gz: f4333f83879592e3089ce6cf0e40609efab2435fe9bbecae699462871bab7c3df6b5e44da476b823dfde6f0f1868d1cbd5ca621a076ca147355950b1610b6e38
+  data.tar.gz: e0f21e5ccec863d19c93fa1f36bcf51ce1be1a7b1e7bcdbcf83329914df3b3c852eb43b8af2e178b68f94305584c406007de0d47acc713f8170e7b7bba3da621

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# [v33.0.4](https://github.com/sweet-delights/hybrid-platforms-conductor/compare/v33.0.3...v33.0.4) (2021-06-18 10:09:57)
+
+## Global changes
+### Patches
+
+* [[Fix(cmd_runner)] [#69] Make sure commands are run in unbundled env](https://github.com/sweet-delights/hybrid-platforms-conductor/commit/0795c1ffdcf1b355c9dc91423bb6b7d88918fcf7)
+
+## Changes for cmd_runner
+### Patches
+
+* [[Fix(cmd_runner)] [#69] Make sure commands are run in unbundled env](https://github.com/sweet-delights/hybrid-platforms-conductor/commit/0795c1ffdcf1b355c9dc91423bb6b7d88918fcf7)
+
 # [v33.0.3](https://github.com/sweet-delights/hybrid-platforms-conductor/compare/v33.0.2...v33.0.3) (2021-06-17 12:42:32)
 
 ### Patches

data/lib/hybrid_platforms_conductor/cmd_runner.rb

@@ -130,18 +130,20 @@ module HybridPlatformsConductor
               (log_to_stdout ? [@logger_stderr] : []) +
               (file_output.nil? ? [] : [file_output])
           ) do
-            cmd_result = TTY::Command.new(
-              printer: :null,
-              pty: true,
-              timeout: timeout,
-              uuid: false
-            ).run!(cmd) do |stdout, stderr|
-              stdout_queue << stdout if stdout
-              stderr_queue << stderr if stderr
+            Bundler.with_unbundled_env do
+              cmd_result = TTY::Command.new(
+                printer: :null,
+                pty: true,
+                timeout: timeout,
+                uuid: false
+              ).run!(cmd) do |stdout, stderr|
+                stdout_queue << stdout if stdout
+                stderr_queue << stderr if stderr
+              end
+              exit_status = cmd_result.exit_status
+              cmd_stdout = cmd_result.out
+              cmd_stderr = cmd_result.err
             end
-            exit_status = cmd_result.exit_status
-            cmd_stdout = cmd_result.out
-            cmd_stderr = cmd_result.err
           end
         rescue TTY::Command::TimeoutExceeded
           exit_status = :timeout

data/lib/hybrid_platforms_conductor/hpc_plugins/connector/local.rb

@@ -50,7 +50,9 @@ module HybridPlatformsConductor
         # [API] - @stdout_io can be used to send stdout output
         # [API] - @stderr_io can be used to send stderr output
         def remote_interactive
-          system "cd #{workspace_for(@node)} ; /bin/bash"
+          Bundler.with_unbundled_env do
+            system "cd #{workspace_for(@node)} ; /bin/bash"
+          end
         end
 
         # rubocop:disable Lint/UnusedMethodArgument

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

@@ -74,18 +74,16 @@ module HybridPlatformsConductor
         # [API] - @cmd_runner is accessible.
         def setup
           required_version = YAML.load_file("#{@repository_path}/chef_versions.yml")['workstation']
-          Bundler.with_unbundled_env do
-            exit_status, stdout, _stderr = @cmd_runner.run_cmd '/opt/chef-workstation/bin/chef --version', expected_code: [0, :command_error]
-            existing_version =
-              if exit_status == :command_error
-                'not installed'
-              else
-                expected_match = stdout.match(/^Chef Workstation version: (.+)\.\d+$/)
-                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 | #{@cmd_runner.root? ? '' : 'sudo '}bash -s -- -P chef-workstation -v #{required_version}" unless existing_version == required_version
-          end
+          exit_status, stdout, _stderr = @cmd_runner.run_cmd '/opt/chef-workstation/bin/chef --version', expected_code: [0, :command_error]
+          existing_version =
+            if exit_status == :command_error
+              'not installed'
+            else
+              expected_match = stdout.match(/^Chef Workstation version: (.+)\.\d+$/)
+              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 | #{@cmd_runner.root? ? '' : 'sudo '}bash -s -- -P chef-workstation -v #{required_version}" unless existing_version == required_version
         end
 
         # Get the list of known nodes.
@@ -160,27 +158,25 @@ module HybridPlatformsConductor
             current_package_info = File.exist?(package_info_file) ? JSON.parse(File.read(package_info_file)).transform_keys(&:to_sym) : {}
             next if current_package_info == package_info
 
-            Bundler.with_unbundled_env do
-              policy_file = "policyfiles/#{service}.rb"
-              if local_environment
-                local_policy_file = "policyfiles/#{service}.local.rb"
-                # In local mode, we always regenerate the lock file as we may modify the run list
-                run_list = known_cookbook_paths.any? { |cookbook_path| File.exist?("#{@repository_path}/#{cookbook_path}/hpc_test/recipes/before_run.rb") } ? ['hpc_test::before_run'] : []
-                dsl_parser = DslParser.new
-                dsl_parser.parse("#{@repository_path}/#{policy_file}")
-                run_list.concat dsl_parser.calls.find { |call_info| call_info[:method] == :run_list }[:args].flatten
-                run_list << 'hpc_test::after_run' if known_cookbook_paths.any? { |cookbook_path| File.exist?("#{@repository_path}/#{cookbook_path}/hpc_test/recipes/after_run.rb") }
-                File.write("#{@repository_path}/#{local_policy_file}", File.read("#{@repository_path}/#{policy_file}") + "\nrun_list #{run_list.map { |recipe| "'#{recipe}'" }.join(', ')}\n")
-                policy_file = local_policy_file
-              end
-              lock_file = "#{File.dirname(policy_file)}/#{File.basename(policy_file, '.rb')}.lock.json"
-              # If the policy lock file does not exist, generate it
-              @cmd_runner.run_cmd "cd #{@repository_path} && /opt/chef-workstation/bin/chef install #{policy_file} --chef-license accept" 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} && \
-                #{@cmd_runner.root? ? '' : 'sudo '}rm -rf #{package_dir} && \
-                /opt/chef-workstation/bin/chef export #{policy_file} #{package_dir} --chef-license accept#{extra_cp_data_bags}"
+            policy_file = "policyfiles/#{service}.rb"
+            if local_environment
+              local_policy_file = "policyfiles/#{service}.local.rb"
+              # In local mode, we always regenerate the lock file as we may modify the run list
+              run_list = known_cookbook_paths.any? { |cookbook_path| File.exist?("#{@repository_path}/#{cookbook_path}/hpc_test/recipes/before_run.rb") } ? ['hpc_test::before_run'] : []
+              dsl_parser = DslParser.new
+              dsl_parser.parse("#{@repository_path}/#{policy_file}")
+              run_list.concat dsl_parser.calls.find { |call_info| call_info[:method] == :run_list }[:args].flatten
+              run_list << 'hpc_test::after_run' if known_cookbook_paths.any? { |cookbook_path| File.exist?("#{@repository_path}/#{cookbook_path}/hpc_test/recipes/after_run.rb") }
+              File.write("#{@repository_path}/#{local_policy_file}", File.read("#{@repository_path}/#{policy_file}") + "\nrun_list #{run_list.map { |recipe| "'#{recipe}'" }.join(', ')}\n")
+              policy_file = local_policy_file
             end
+            lock_file = "#{File.dirname(policy_file)}/#{File.basename(policy_file, '.rb')}.lock.json"
+            # If the policy lock file does not exist, generate it
+            @cmd_runner.run_cmd "cd #{@repository_path} && /opt/chef-workstation/bin/chef install #{policy_file} --chef-license accept" 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} && \
+              #{@cmd_runner.root? ? '' : 'sudo '}rm -rf #{package_dir} && \
+              /opt/chef-workstation/bin/chef export #{policy_file} #{package_dir} --chef-license accept#{extra_cp_data_bags}"
             next if @cmd_runner.dry_run
 
             # Create secrets file

data/lib/hybrid_platforms_conductor/version.rb

@@ -1,5 +1,5 @@
 module HybridPlatformsConductor
 
-  VERSION = '33.0.3'
+  VERSION = '33.0.4'
 
 end

data/spec/hybrid_platforms_conductor_test/api/cmd_runner_spec.rb

@@ -45,6 +45,12 @@ describe HybridPlatformsConductor::CmdRunner do
     end
   end
 
+  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", '']
+    end
+  end
+
   it 'fails when the command does not exit 0' do
     with_repository do
       expect { test_cmd_runner.run_cmd 'exit 1' }.to raise_error(HybridPlatformsConductor::CmdRunner::UnexpectedExitCodeError, 'Command \'exit 1\' returned error code 1 (expected 0).')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hybrid_platforms_conductor
 version: !ruby/object:Gem::Version
-  version: 33.0.3
+  version: 33.0.4
 platform: ruby
 authors:
 - Muriel Salvan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-17 00:00:00.000000000 Z
+date: 2021-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: range_operators