hybrid_platforms_conductor 33.1.1 → 33.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8698bc386b9a607d4dda6b8a21ee754860b8027a26f851be1887ec8bbe3aaa96
-  data.tar.gz: ddb3c31da1f23113755fcfc07d97785b0ddc03611922568401043405e50014e8
+  metadata.gz: bd578efdc520f51dc9752ace39626e73dbdda736fd4376ee5e9ce55ed34a0a4d
+  data.tar.gz: c44c935905b7a62a4a0f3ea037b0f1e4ed8fa07bdad4802e38143fe1a448bfd1
 SHA512:
-  metadata.gz: 8076f914cd5675de3b990e78191569ba96c368c840644183c5a52f75feaa67f2b93172465595f8d6619c921c694ea16fb05eed18cc559b560f8dae7c5584fdf0
-  data.tar.gz: 42b83e310c9f03473e50c4b9694f3320126ebcbe30a4777845eecda87da4ccad78ffb7bcd99f4fb6b2e8b6f98f131052ae667389961602bb525e7e888fb71243
+  metadata.gz: f0070cf6736acaa5b9a1e36279bab3b9f6530c26ea341feec4fb4775d022e1c67e2694df832a3ab340b765e10bf510969febe82e4b34fa564e9aab82eea71314
+  data.tar.gz: d5cc0229b32b7f75d1c7604e304e6986b0b7ab121676dfd62121d954c48e3ba93f827dabfbb8320c9f945339c334263ff9404c8c60e1be5a0b03e4b390cc044f

data/CHANGELOG.md

@@ -1,3 +1,64 @@
+# [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
+### Patches
+
+* [[Hotfix(provisioner_proxmox)] Add missing require in synchronization script](https://github.com/sweet-delights/hybrid-platforms-conductor/commit/7a6c71595789c9180e1d95323fc5cf5051f2e2cd)
+
+## Changes for provisioner_proxmox
+### Patches
+
+* [[Hotfix(provisioner_proxmox)] Add missing require in synchronization script](https://github.com/sweet-delights/hybrid-platforms-conductor/commit/7a6c71595789c9180e1d95323fc5cf5051f2e2cd)
+
+# [v33.2.2](https://github.com/sweet-delights/hybrid-platforms-conductor/compare/v33.2.1...v33.2.2) (2021-06-21 12:41:35)
+
+## Global changes
+### Patches
+
+* [[Hotfix(cmd_runner)] Retain dynamically set environment while executing commands](https://github.com/sweet-delights/hybrid-platforms-conductor/commit/d709d5d2871e43196cc1f5f9eaf5b2155b34ed4e)
+
+## Changes for cmd_runner
+### Patches
+
+* [[Hotfix(cmd_runner)] Retain dynamically set environment while executing commands](https://github.com/sweet-delights/hybrid-platforms-conductor/commit/d709d5d2871e43196cc1f5f9eaf5b2155b34ed4e)
+
+# [v33.2.1](https://github.com/sweet-delights/hybrid-platforms-conductor/compare/v33.2.0...v33.2.1) (2021-06-21 10:23:51)
+
+## Global changes
+### Patches
+
+* [[Hotfix(platform_handler_serverless_chef)] Corrected dry-run mode not working](https://github.com/sweet-delights/hybrid-platforms-conductor/commit/4800a0f4255c1999eed33651c1e66c445acd17bb)
+
+## Changes for platform_handler_serverless_chef
+### Patches
+
+* [[Hotfix(platform_handler_serverless_chef)] Corrected dry-run mode not working](https://github.com/sweet-delights/hybrid-platforms-conductor/commit/4800a0f4255c1999eed33651c1e66c445acd17bb)
+
+# [v33.2.0](https://github.com/sweet-delights/hybrid-platforms-conductor/compare/v33.1.1...v33.2.0) (2021-06-18 23:22:21)
+
+## Global changes
+### Patches
+
+* [[Feature(platform_handler_serverless_chef)] [#70] Install dependency gems from cookbook metadata before calling chef-client](https://github.com/sweet-delights/hybrid-platforms-conductor/commit/6dfe7aa053db63489f3d0a236433304606051ecd)
+
+## Changes for platform_handler_serverless_chef
+### Features
+
+* [[Feature(platform_handler_serverless_chef)] [#70] Install dependency gems from cookbook metadata before calling chef-client](https://github.com/sweet-delights/hybrid-platforms-conductor/commit/6dfe7aa053db63489f3d0a236433304606051ecd)
+
 # [v33.1.1](https://github.com/sweet-delights/hybrid-platforms-conductor/compare/v33.1.0...v33.1.1) (2021-06-18 13:19:39)
 
 ### Patches

data/lib/hybrid_platforms_conductor/cmd_runner.rb

@@ -130,7 +130,7 @@ module HybridPlatformsConductor
               (log_to_stdout ? [@logger_stderr] : []) +
               (file_output.nil? ? [] : [file_output])
           ) do
-            Bundler.with_unbundled_env do
+            Bundler.without_bundled_env do
               cmd_result = TTY::Command.new(
                 printer: :null,
                 pty: true,

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

@@ -0,0 +1,54 @@
+# Add a way to clean the current env from Bundler variables
+module Bundler
+
+  class << self
+
+    # Run block with all bundler-related variables removed from the current environment
+    def without_bundled_env(&block)
+      with_env(current_unbundled_env, &block)
+    end
+
+    # @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 do |k, _|
+        %w[
+          GEM_
+          BUNDLE_
+          BUNDLER_
+        ].any? { |prefix| k.start_with?(prefix) }
+      end
+
+      if env.key?('RUBYOPT')
+        rubyopt = env['RUBYOPT'].split
+        rubyopt.delete("-r#{File.expand_path('bundler/setup', __dir__)}")
+        rubyopt.delete('-rbundler/setup')
+        env['RUBYOPT'] = rubyopt.join(' ')
+      end
+
+      if env.key?('RUBYLIB')
+        rubylib = env['RUBYLIB'].split(File::PATH_SEPARATOR)
+        rubylib.delete(File.expand_path(__dir__))
+        env['RUBYLIB'] = rubylib.join(File::PATH_SEPARATOR)
+      end
+
+      env
+    end
+
+  end
+
+end

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/executable.rb

@@ -1,4 +1,6 @@
 require 'English'
+require 'bundler'
+require 'hybrid_platforms_conductor/core_extensions/bundler/without_bundled_env'
 require 'optparse'
 require 'logger'
 require 'hybrid_platforms_conductor/config'

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

@@ -179,6 +179,13 @@ module HybridPlatformsConductor
               /opt/chef-workstation/bin/chef export #{policy_file} #{package_dir} --chef-license accept#{extra_cp_data_bags}"
             next if @cmd_runner.dry_run
 
+            # Write the list of gems to be installed for this package
+            File.write(
+              "#{@repository_path}/#{package_dir}/gems.json",
+              Dir.glob("#{@repository_path}/#{package_dir}/cookbook_artifacts/*/metadata.json").map do |metadata|
+                JSON.parse(File.read(metadata))['gems']
+              end.flatten(1).to_json
+            )
             # Create secrets file
             secrets_file = "#{@repository_path}/#{package_dir}/data_bags/hpc_secrets/hpc_secrets.json"
             FileUtils.mkdir_p(File.dirname(secrets_file))
@@ -220,10 +227,13 @@ module HybridPlatformsConductor
         # * Array< Hash<Symbol,Object> >: List of actions to be done
         def actions_to_deploy_on(node, service, use_why_run: true)
           package_dir = "#{@repository_path}/dist/#{@local_env ? 'local' : 'prod'}/#{service}"
+          gems_to_install = []
           # Generate the nodes attributes file
           unless @cmd_runner.dry_run
             FileUtils.mkdir_p "#{package_dir}/nodes"
             File.write("#{package_dir}/nodes/#{node}.json", (known_nodes.include?(node) ? metadata_for(node) : {}).merge(@nodes_handler.metadata_of(node)).to_json)
+            # Get the gems to be installed
+            gems_to_install = JSON.parse(File.read("#{package_dir}/gems.json"))
           end
           client_options = [
             '--local-mode',
@@ -233,7 +243,19 @@ 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} && #{@cmd_runner.root? ? '' : 'sudo '}SSL_CERT_DIR=/etc/ssl/certs /opt/chef-workstation/bin/chef-client #{client_options.join(' ')}" }]
+            sudo_prefix = @cmd_runner.root? ? '' : 'sudo '
+            [
+              {
+                bash: [
+                  'set -e',
+                  "cd #{package_dir}"
+                ] +
+                  gems_to_install.map { |(gem_name, gem_version)| "#{sudo_prefix}SSL_CERT_DIR=/etc/ssl/certs /opt/chef-workstation/bin/chef gem install #{gem_name} --version \"#{gem_version}\"" } +
+                  [
+                    "#{sudo_prefix}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)
@@ -241,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
@@ -261,10 +283,14 @@ module HybridPlatformsConductor
                 scp: { package_dir => './hpc_deploy' },
                 remote_bash: [
                   'set -e',
-                  "cd ./hpc_deploy/#{package_name}",
-                  "#{sudo}SSL_CERT_DIR=/etc/ssl/certs /opt/chef/bin/chef-client #{client_options.join(' ')}",
-                  'cd ..'
-                ] + (log_debug? ? [] : ["#{sudo}rm -rf ./hpc_deploy/#{package_name}"])
+                  "cd ./hpc_deploy/#{package_name}"
+                ] +
+                  gems_to_install.map { |(gem_name, gem_version)| "#{sudo}SSL_CERT_DIR=/etc/ssl/certs /opt/chef/embedded/bin/gem install #{gem_name} --version \"#{gem_version}\"" } +
+                  [
+                    "#{sudo}SSL_CERT_DIR=/etc/ssl/certs /opt/chef/bin/chef-client #{client_options.join(' ')}",
+                    'cd ..'
+                  ] +
+                  (log_debug? ? [] : ["#{sudo}rm -rf ./hpc_deploy/#{package_name}"])
               }
             ]
           end

data/lib/hybrid_platforms_conductor/hpc_plugins/provisioner/proxmox/reserve_proxmox_container

@@ -34,6 +34,7 @@
 #   * *hpc_password_for_proxmox*: Password to be used to query Proxmox API
 #   * *hpc_realm_for_proxmox*: Realm used to connect to the Proxmox API [default = 'pam']
 
+require 'English'
 require 'json'
 
 reserved_resource = nil

data/lib/hybrid_platforms_conductor/version.rb

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

data/spec/hybrid_platforms_conductor_test/api/cmd_runner_spec.rb

@@ -47,7 +47,21 @@ 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
+
+  it 'keeps dynamically set environment' do
+    with_repository do
+      value = ('a'..'z').to_a.sample(8).join
+      ENV['hpc_test_new_variable'] = value
+      expect(test_cmd_runner.run_cmd('echo "${hpc_test_new_variable}"')).to eq [0, "#{value}\n", '']
     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/packaging_spec.rb

@@ -12,6 +12,7 @@ describe HybridPlatformsConductor::HpcPlugins::PlatformHandler::ServerlessChef d
     # * *export* (Boolean): Are we expecting the chef export stage? [default: true]
     # * *data_bags* (Boolean): Do we expect data bags copy? [default: false]
     # * *env* (String): Expected environment being packaged [default: 'prod']
+    # * *cookbook_metadata* (Hash<String, Hash>): JSON metadata to generate for packaged cookbooks [default: {}]
     # * *block* (Proc): Code called with mock in place
     def with_packaging_mocked(
       repository,
@@ -21,6 +22,7 @@ describe HybridPlatformsConductor::HpcPlugins::PlatformHandler::ServerlessChef d
       export: true,
       data_bags: false,
       env: 'prod',
+      cookbook_metadata: {},
       &block
     )
       with_cmd_runner_mocked(
@@ -49,8 +51,14 @@ describe HybridPlatformsConductor::HpcPlugins::PlatformHandler::ServerlessChef d
             [
               %r{^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)} --chef-license accept#{data_bags ? " && cp -ar data_bags/ dist/#{Regexp.escape(env)}/#{Regexp.escape(policy)}/" : ''}$},
               proc do
-                FileUtils.mkdir_p "#{repository}/dist/#{env}/#{policy}"
-                FileUtils.cp_r("#{repository}/data_bags", "#{repository}/dist/#{env}/#{policy}/") if data_bags
+                package_dir = "#{repository}/dist/#{env}/#{policy}"
+                FileUtils.mkdir_p package_dir
+                FileUtils.cp_r("#{repository}/data_bags", "#{package_dir}/") if data_bags
+                cookbook_metadata.each do |cookbook, metadata|
+                  metadata_file = "#{package_dir}/cookbook_artifacts/#{cookbook}/metadata.json"
+                  FileUtils.mkdir_p File.dirname(metadata_file)
+                  File.write(metadata_file, metadata.to_json)
+                end
                 [0, 'Chef export done', '']
               end
             ]
@@ -80,6 +88,9 @@ describe HybridPlatformsConductor::HpcPlugins::PlatformHandler::ServerlessChef d
         with_serverless_chef_platforms('1_node') do |platform, repository|
           with_packaging_mocked(repository) do
             platform.package(services: { 'node' => %w[test_policy] }, secrets: {}, local_environment: false)
+            gems_file = "#{repository}/dist/prod/test_policy/gems.json"
+            expect(File.exist?(gems_file)).to eq true
+            expect(JSON.parse(File.read(gems_file))).to eq []
           end
         end
       end
@@ -212,6 +223,41 @@ describe HybridPlatformsConductor::HpcPlugins::PlatformHandler::ServerlessChef d
 
     end
 
+    context 'with a platform having several cookbooks' do
+
+      it 'generates the gems info to be installed' do
+        with_serverless_chef_platforms('several_cookbooks') do |platform, repository|
+          with_packaging_mocked(
+            repository,
+            policy: 'test_policy_1',
+            cookbook_metadata: {
+              'test_cookbook_1' => {
+                gems: [
+                  ['my_gem_1', '0.0.1'],
+                  ['my_gem_2', '0.0.2']
+                ]
+              },
+              'dependency_cookbook' => {
+                gems: [
+                  ['my_gem_3', '~> 1.3']
+                ]
+              }
+            }
+          ) do
+            platform.package(services: { 'node1' => %w[test_policy_1] }, secrets: {}, local_environment: false)
+            gems_file = "#{repository}/dist/prod/test_policy_1/gems.json"
+            expect(File.exist?(gems_file)).to eq true
+            expect(JSON.parse(File.read(gems_file)).sort).to eq [
+              ['my_gem_1', '0.0.1'],
+              ['my_gem_2', '0.0.2'],
+              ['my_gem_3', '~> 1.3']
+            ].sort
+          end
+        end
+      end
+
+    end
+
     context 'with a platform having data bags' do
 
       it 'packages data bags' do

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

@@ -6,9 +6,18 @@ describe HybridPlatformsConductor::HpcPlugins::PlatformHandler::ServerlessChef d
     #
     # Parameters::
     # * *repository* (String): The repository we package
+    # * *env* (String): The environment for which this repository is packaged [default: 'prod']
     # * *service* (String): The service being packaged in this repository [default: 'test_policy']
-    def mock_package(repository, service: 'test_policy')
-      FileUtils.mkdir_p "#{repository}/dist/prod/#{service}"
+    # * *gems* (Array<String, String>): The [<name>, <version>] gems info to be installed as generated by the packaging [default: []]
+    def mock_package(
+      repository,
+      env: 'prod',
+      service: 'test_policy',
+      gems: []
+    )
+      package_dir = "#{repository}/dist/#{env}/#{service}"
+      FileUtils.mkdir_p package_dir
+      File.write("#{package_dir}/gems.json", gems.to_json)
     end
 
     # Get expected actions to deploy a service on a given node
@@ -20,15 +29,17 @@ describe HybridPlatformsConductor::HpcPlugins::PlatformHandler::ServerlessChef d
     # * *env* (String): Environment expected to be packaged [default: 'prod']
     # * *policy* (String): Expected policy to be packaged [default: 'test_policy']
     # * *node* (String): Expected node to be deployed [default: 'node']
+    # * *gems_install_cmds* (Array<String>): Expected gem install commands [default: []]
     # Result::
     # * Array: Expected actions
     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'
+      node: 'node',
+      gems_install_cmds: []
     )
       [
         {
@@ -48,11 +59,14 @@ describe HybridPlatformsConductor::HpcPlugins::PlatformHandler::ServerlessChef d
           scp: { "#{repository}/dist/#{env}/#{policy}" => './hpc_deploy' },
           remote_bash: [
             'set -e',
-            "cd ./hpc_deploy/#{policy}",
-            "#{sudo}SSL_CERT_DIR=/etc/ssl/certs /opt/chef/bin/chef-client --local-mode --chef-license accept --json-attributes nodes/#{node}.json#{check_mode ? ' --why-run' : ''}",
-            'cd ..',
-            "#{sudo}rm -rf ./hpc_deploy/#{policy}"
-          ]
+            "cd ./hpc_deploy/#{policy}"
+          ] +
+            gems_install_cmds.map { |gem_install_cmd| "#{sudo}SSL_CERT_DIR=/etc/ssl/certs /opt/chef/embedded/bin/#{gem_install_cmd}" } +
+            [
+              "#{sudo}SSL_CERT_DIR=/etc/ssl/certs /opt/chef/bin/chef-client --local-mode --chef-license accept --json-attributes nodes/#{node}.json#{check_mode ? ' --why-run' : ''}",
+              'cd ..',
+              "#{sudo}rm -rf ./hpc_deploy/#{policy}"
+            ]
         }
       ]
     end
@@ -109,6 +123,33 @@ describe HybridPlatformsConductor::HpcPlugins::PlatformHandler::ServerlessChef d
         end
       end
 
+      it 'returns actions to deploy on this node with gems to be installed' do
+        with_serverless_chef_platforms('1_node') do |platform, repository|
+          mock_package(
+            repository,
+            gems: [
+              ['my_gem_1', '0.0.1'],
+              ['my_gem_2', '0.0.2'],
+              ['my_gem_3', '~> 1.3']
+            ]
+          )
+          platform.prepare_for_deploy(
+            services: { 'node' => %w[test_policy] },
+            secrets: {},
+            local_environment: false,
+            why_run: false
+          )
+          expect(platform.actions_to_deploy_on('node', 'test_policy', use_why_run: false)).to eq expected_actions_to_deploy_chef(
+            repository,
+            gems_install_cmds: [
+              'gem install my_gem_1 --version "0.0.1"',
+              'gem install my_gem_2 --version "0.0.2"',
+              'gem install my_gem_3 --version "~> 1.3"'
+            ]
+          )
+        end
+      end
+
       it 'returns actions to deploy on this node with node attributes setup from metadata' do
         with_serverless_chef_platforms('1_node') do |platform, repository|
           test_nodes_handler.override_metadata_of 'node', :new_metadata, 'new_value'
@@ -161,7 +202,7 @@ describe HybridPlatformsConductor::HpcPlugins::PlatformHandler::ServerlessChef d
 
       it 'returns actions to deploy on this node using local mode' do
         with_serverless_chef_platforms('1_node') do |platform, repository|
-          mock_package(repository)
+          mock_package(repository, env: 'local')
           platform.prepare_for_deploy(
             services: { 'node' => %w[test_policy] },
             secrets: {},
@@ -174,7 +215,7 @@ describe HybridPlatformsConductor::HpcPlugins::PlatformHandler::ServerlessChef d
 
       it 'returns actions to deploy on this node in why-run mode and local mode' do
         with_serverless_chef_platforms('1_node') do |platform, repository|
-          mock_package(repository)
+          mock_package(repository, env: 'local')
           platform.prepare_for_deploy(
             services: { 'node' => %w[test_policy] },
             secrets: {},
@@ -219,7 +260,7 @@ describe HybridPlatformsConductor::HpcPlugins::PlatformHandler::ServerlessChef d
 
       it 'deploys services declared on 1 node on another node if asked' do
         with_serverless_chef_platforms('several_nodes') do |platform, repository|
-          mock_package(repository)
+          mock_package(repository, service: 'test_policy_1')
           platform.prepare_for_deploy(
             services: { 'node2' => %w[test_policy_1] },
             secrets: {},
@@ -230,9 +271,38 @@ describe HybridPlatformsConductor::HpcPlugins::PlatformHandler::ServerlessChef d
         end
       end
 
-      it 'deploys local nodes' do
+      it 'deploys using the local chef workstation when use_local_chef is set' do
         with_serverless_chef_platforms('several_nodes') do |platform, repository|
-          mock_package(repository)
+          mock_package(repository, service: 'test_policy_1')
+          platform.prepare_for_deploy(
+            services: { 'local' => %w[test_policy_1] },
+            secrets: {},
+            local_environment: false,
+            why_run: false
+          )
+          expect(platform.actions_to_deploy_on('local', 'test_policy_1', use_why_run: false)).to eq [
+            {
+              bash: [
+                'set -e',
+                "cd #{repository}/dist/prod/test_policy_1",
+                'sudo SSL_CERT_DIR=/etc/ssl/certs /opt/chef-workstation/bin/chef-client --local-mode --chef-license accept --json-attributes nodes/local.json'
+              ]
+            }
+          ]
+        end
+      end
+
+      it 'deploys using the local chef workstation with gems to be installed when use_local_chef is set' do
+        with_serverless_chef_platforms('several_nodes') do |platform, repository|
+          mock_package(
+            repository,
+            service: 'test_policy_1',
+            gems: [
+              ['my_gem_1', '0.0.1'],
+              ['my_gem_2', '0.0.2'],
+              ['my_gem_3', '~> 1.3']
+            ]
+          )
           platform.prepare_for_deploy(
             services: { 'local' => %w[test_policy_1] },
             secrets: {},
@@ -241,7 +311,14 @@ describe HybridPlatformsConductor::HpcPlugins::PlatformHandler::ServerlessChef d
           )
           expect(platform.actions_to_deploy_on('local', 'test_policy_1', use_why_run: false)).to eq [
             {
-              bash: "cd #{repository}/dist/prod/test_policy_1 && sudo SSL_CERT_DIR=/etc/ssl/certs /opt/chef-workstation/bin/chef-client --local-mode --chef-license accept --json-attributes nodes/local.json"
+              bash: [
+                'set -e',
+                "cd #{repository}/dist/prod/test_policy_1",
+                'sudo SSL_CERT_DIR=/etc/ssl/certs /opt/chef-workstation/bin/chef gem install my_gem_1 --version "0.0.1"',
+                'sudo SSL_CERT_DIR=/etc/ssl/certs /opt/chef-workstation/bin/chef gem install my_gem_2 --version "0.0.2"',
+                'sudo SSL_CERT_DIR=/etc/ssl/certs /opt/chef-workstation/bin/chef gem install my_gem_3 --version "~> 1.3"',
+                'sudo SSL_CERT_DIR=/etc/ssl/certs /opt/chef-workstation/bin/chef-client --local-mode --chef-license accept --json-attributes nodes/local.json'
+              ]
             }
           ]
         end
@@ -254,7 +331,7 @@ describe HybridPlatformsConductor::HpcPlugins::PlatformHandler::ServerlessChef d
       it 'deploys a service on a node belonging to another platform' do
         with_serverless_chef_platforms({ 'p1' => '1_node', 'p2' => 'several_nodes' }) do |repositories|
           platform_1, repository_1 = repositories.find { |platform, _repository| platform.name == 'p1' }
-          mock_package(repository_1)
+          mock_package(repository_1, service: 'test_policy_1')
           platform_1.prepare_for_deploy(
             services: { 'node2' => %w[test_policy_1] },
             secrets: {},

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hybrid_platforms_conductor
 version: !ruby/object:Gem::Version
-  version: 33.1.1
+  version: 33.2.4
 platform: ruby
 authors:
 - Muriel Salvan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-18 00:00:00.000000000 Z
+date: 2021-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: range_operators
@@ -695,6 +695,7 @@ files:
 - lib/hybrid_platforms_conductor/config.rb
 - lib/hybrid_platforms_conductor/confluence.rb
 - lib/hybrid_platforms_conductor/connector.rb
+- lib/hybrid_platforms_conductor/core_extensions/bundler/without_bundled_env.rb
 - lib/hybrid_platforms_conductor/core_extensions/cleanroom/fix_kwargs.rb
 - lib/hybrid_platforms_conductor/core_extensions/symbol/zero.rb
 - lib/hybrid_platforms_conductor/credentials.rb