hybrid_platforms_conductor 33.7.4 → 33.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8966575d336257c3b6aa9371ac750a69dcdff5e1817a84847cf9895348bddf4
-  data.tar.gz: 065a1a3ff659e3d0a7c129884208a8299d378df383c57d67c0a6f2447464cefa
+  metadata.gz: 80a9228f00ac63d2ddf325f1fd4faeab83af8d7bbf73c43ff46d4632883462a4
+  data.tar.gz: 225b174fb0107a743e4daeda8a65148b8ce7d0ea81fb0862066a3626e60b7571
 SHA512:
-  metadata.gz: 6f838436afdc89e284a0c6071b6fd06ef754361b615be00a8489f9d8991cdbb35546c19823035e677cfaaeff8cb3aac347cc005932dc3515a4578fdfccc7989d
-  data.tar.gz: 1b544cf67be8b647cd07e8a37a59f448cde59f36a6711353b3b6c6b1264f4d5ec5bd6db0b77b409166e5062b4ffb613cf3ef54067c8c051513f3b7995c2c05aa
+  metadata.gz: cc3c6a8c0a245a1929481f2e5482fdc3b9100dc24dab7a98bfbc026a294a8ef88b359060608cafb5c9937197ad89fc39630e3b56265888f5c913be9435960a3b
+  data.tar.gz: c82665286ed8c6783b02640e4122eb08d555c0d04fecbc49a688194caf828144f63f243824e28be8a120f41a331cd5194497b9ede07630d9347e8888383187b9

data/CHANGELOG.md

@@ -1,3 +1,45 @@
+# [v33.8.3](https://github.com/sweet-delights/hybrid-platforms-conductor/compare/v33.8.2...v33.8.3) (2021-08-16 14:18:52)
+
+## Global changes
+### Patches
+
+* [[Fix(platform_handler_serverless_chef)] [#97] Fix git_diff_impacts when a library file is removed](https://github.com/sweet-delights/hybrid-platforms-conductor/commit/da60609dbd395b9a78c5df8089b39255db1fed9f)
+
+## Changes for platform_handler_serverless_chef
+### Patches
+
+* [[Fix(platform_handler_serverless_chef)] [#97] Fix git_diff_impacts when a library file is removed](https://github.com/sweet-delights/hybrid-platforms-conductor/commit/da60609dbd395b9a78c5df8089b39255db1fed9f)
+
+# [v33.8.2](https://github.com/sweet-delights/hybrid-platforms-conductor/compare/v33.8.1...v33.8.2) (2021-08-14 21:12:19)
+
+## Global changes
+### Patches
+
+* [[Fix(test_github_ci)] [#95] Make sure the github_ci test does not fail when a repository has no workflow run](https://github.com/sweet-delights/hybrid-platforms-conductor/commit/e805c5b2d7e391c3c5205996fd56dadc14ddec7f)
+
+## Changes for test_github_ci
+### Patches
+
+* [[Fix(test_github_ci)] [#95] Make sure the github_ci test does not fail when a repository has no workflow run](https://github.com/sweet-delights/hybrid-platforms-conductor/commit/e805c5b2d7e391c3c5205996fd56dadc14ddec7f)
+
+# [v33.8.1](https://github.com/sweet-delights/hybrid-platforms-conductor/compare/v33.8.0...v33.8.1) (2021-08-05 17:11:39)
+
+### Patches
+
+* [[Hotfix] Added test checking that test keys are not deployed in production for security](https://github.com/sweet-delights/hybrid-platforms-conductor/commit/f2e5bcc59b595592bf0a2b4f63c92966f10902ef)
+
+# [v33.8.0](https://github.com/sweet-delights/hybrid-platforms-conductor/compare/v33.7.4...v33.8.0) (2021-08-04 15:55:54)
+
+## Global changes
+### Patches
+
+* [[Feature(platform_handler_serverless_chef)] Integrate testadmin public key while deploying in local mode](https://github.com/sweet-delights/hybrid-platforms-conductor/commit/6083463bf3bc760c393b786515db59af89315333)
+
+## Changes for platform_handler_serverless_chef
+### Features
+
+* [[Feature(platform_handler_serverless_chef)] Integrate testadmin public key while deploying in local mode](https://github.com/sweet-delights/hybrid-platforms-conductor/commit/6083463bf3bc760c393b786515db59af89315333)
+
 # [v33.7.4](https://github.com/sweet-delights/hybrid-platforms-conductor/compare/v33.7.3...v33.7.4) (2021-08-04 14:21:08)
 
 ## Global changes

data/lib/hybrid_platforms_conductor/hpc_plugins/log/remote_fs.rb

@@ -138,22 +138,23 @@ module HybridPlatformsConductor
                   value = Regexp.last_match(2)
                   key = key_str.to_sym
                   # Type-cast some values
-                  case key_str
-                  when 'date'
-                    # Date and time values
-                    # Thu Nov 23 18:43:01 UTC 2017
-                    deploy_info[key] = Time.parse("#{value} UTC")
-                  when 'debug'
-                    # Boolean values
-                    # Yes
-                    deploy_info[key] = (value == 'Yes')
-                  when /^diff_files_.+$/, 'services'
-                    # Array of strings
-                    # my_file.txt, other_file.txt
-                    deploy_info[key] = value.split(', ')
-                  else
-                    deploy_info[key] = value
-                  end
+                  deploy_info[key] =
+                    case key_str
+                    when 'date'
+                      # Date and time values
+                      # Thu Nov 23 18:43:01 UTC 2017
+                      Time.parse("#{value} UTC")
+                    when 'debug'
+                      # Boolean values
+                      # Yes
+                      value == 'Yes'
+                    when /^diff_files_.+$/, 'services'
+                      # Array of strings
+                      # my_file.txt, other_file.txt
+                      value.split(', ')
+                    else
+                      value
+                    end
                 else
                   deploy_info[:unknown_lines] = [] unless deploy_info.key?(:unknown_lines)
                   deploy_info[:unknown_lines] << line

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

@@ -190,6 +190,15 @@ module HybridPlatformsConductor
             secrets_file = "#{@repository_path}/#{package_dir}/data_bags/hpc_secrets/hpc_secrets.json"
             FileUtils.mkdir_p(File.dirname(secrets_file))
             File.write(secrets_file, secrets.merge(id: 'hpc_secrets').to_json)
+            # Make the testadmin public key available for deployment for hpc_test cookbook
+            testadmin_pub_key = "#{@config.hybrid_platforms_dir}/testadmin.key.pub"
+            if local_environment && File.exist?(testadmin_pub_key)
+              Dir.glob("#{@repository_path}/#{package_dir}/cookbook_artifacts/hpc_test-*") do |hpc_test_cookbook_path|
+                hpc_test_files_dir = "#{hpc_test_cookbook_path}/files/default"
+                FileUtils.mkdir_p hpc_test_files_dir
+                FileUtils.cp(testadmin_pub_key, "#{hpc_test_files_dir}/testadmin.key.pub")
+              end
+            end
             # Remember the package info
             File.write(package_info_file, package_info.to_json)
           end
@@ -419,14 +428,16 @@ module HybridPlatformsConductor
                   end
                 when %r{libraries/(.+)}
                   # Find any recipe using methods from this library
-                  lib_methods_regexps = File.read("#{@repository_path}/#{impacted_file}").scan(/(\W|^)def\s+(\w+)(\W|$)/).map { |_grp_1, method_name, _grp_2| /(\W|^)#{Regexp.escape(method_name)}(\W|$)/ }
-                  known_cookbook_paths.each do |cookbooks_path|
-                    Dir.glob("#{@repository_path}/#{cookbooks_path}/**/recipes/*.rb") do |recipe_path|
-                      file_content = File.read(recipe_path)
-                      found_lib_regexp = lib_methods_regexps.find { |regexp| file_content =~ regexp }
-                      unless found_lib_regexp.nil?
-                        cookbook_name, recipe_name = recipe_path.match(%r{#{cookbooks_path}/(\w+)/recipes/(\w+)\.rb})[1..2]
-                        register.call("included library helper #{found_lib_regexp.source[6..-7]}", recipe_name, cookbook_name: cookbook_name)
+                  if File.exist?("#{@repository_path}/#{impacted_file}")
+                    lib_methods_regexps = File.read("#{@repository_path}/#{impacted_file}").scan(/(\W|^)def\s+(\w+)(\W|$)/).map { |_grp_1, method_name, _grp_2| /(\W|^)#{Regexp.escape(method_name)}(\W|$)/ }
+                    known_cookbook_paths.each do |cookbooks_path|
+                      Dir.glob("#{@repository_path}/#{cookbooks_path}/**/recipes/*.rb") do |recipe_path|
+                        file_content = File.read(recipe_path)
+                        found_lib_regexp = lib_methods_regexps.find { |regexp| file_content =~ regexp }
+                        unless found_lib_regexp.nil?
+                          cookbook_name, recipe_name = recipe_path.match(%r{#{cookbooks_path}/(\w+)/recipes/(\w+)\.rb})[1..2]
+                          register.call("included library helper #{found_lib_regexp.source[6..-7]}", recipe_name, cookbook_name: cookbook_name)
+                        end
                       end
                     end
                   end

data/lib/hybrid_platforms_conductor/hpc_plugins/test/github_ci.rb

@@ -18,10 +18,15 @@ module HybridPlatformsConductor
         def test
           for_each_github_repo do |client, repo_info|
             log_debug "Checking CI for Github repository #{repo_info[:slug]}"
-            last_status = client.repository_workflow_runs(repo_info[:slug])[:workflow_runs].
+            last_run = client.repository_workflow_runs(repo_info[:slug])[:workflow_runs].
               select { |run| run[:head_branch] == 'master' }.
-              max_by { |run| run[:created_at] }[:conclusion]
-            error "Last workflow status for repository #{repo_info[:slug]} is #{last_status}" unless last_status == 'success'
+              max_by { |run| run[:created_at] }
+            if last_run.nil?
+              error "No workflow run found for repository #{repo_info[:slug]}"
+            else
+              last_status = last_run[:conclusion]
+              error "Last workflow status for repository #{repo_info[:slug]} is #{last_status}" unless last_status == 'success'
+            end
           end
         end
 

data/lib/hybrid_platforms_conductor/version.rb

@@ -1,5 +1,5 @@
 module HybridPlatformsConductor
 
-  VERSION = '33.7.4'
+  VERSION = '33.8.3'
 
 end

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

@@ -158,6 +158,16 @@ describe HybridPlatformsConductor::HpcPlugins::PlatformHandler::ServerlessChef d
       end
     end
 
+    it 'returns no impacted service due to a library helper being removed' do
+      with_serverless_chef_platforms('recipes') do |platform|
+        expect(platform.impacts_from('cookbooks/test_cookbook_2/libraries/removed.rb' => {})).to eq [
+          [],
+          [],
+          false
+        ]
+      end
+    end
+
     it 'ignored impacted service from an unknown helper' do
       with_serverless_chef_platforms('recipes') do |platform, repository|
         File.write("#{repository}/cookbooks/test_cookbook_1/recipes/default.rb", <<~EO_RECIPE)

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

@@ -51,6 +51,7 @@ 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
+                # Mock the packaging in the dist directory
                 package_dir = "#{repository}/dist/#{env}/#{policy}"
                 FileUtils.mkdir_p package_dir
                 FileUtils.cp_r("#{repository}/data_bags", "#{package_dir}/") if data_bags
@@ -329,6 +330,40 @@ describe HybridPlatformsConductor::HpcPlugins::PlatformHandler::ServerlessChef d
         end
       end
 
+      it 'packages the repository with a testadmin public key in local mode' do
+        with_serverless_chef_platforms('hpc_test') do |platform, repository|
+          File.write("#{ENV['hpc_platforms']}/testadmin.key.pub", 'ssh-rsa 12345 testadmin@test.com')
+          with_packaging_mocked(
+            repository,
+            policy_file: 'policyfiles/test_policy.local.rb',
+            env: 'local',
+            cookbook_metadata: {
+              'hpc_test-1234' => {}
+            }
+          ) do
+            platform.package(services: { 'node' => %w[test_policy] }, secrets: {}, local_environment: true)
+            testadmin_key_pub = Dir.glob("#{repository}/dist/local/test_policy/cookbook_artifacts/hpc_test-*/files/default/testadmin.key.pub").first
+            expect(testadmin_key_pub).not_to eq nil
+            expect(File.read(testadmin_key_pub)).to eq 'ssh-rsa 12345 testadmin@test.com'
+          end
+        end
+      end
+
+      it 'does not package the repository with a testadmin public key in prod mode' do
+        with_serverless_chef_platforms('hpc_test') do |platform, repository|
+          File.write("#{ENV['hpc_platforms']}/testadmin.key.pub", 'ssh-rsa 12345 testadmin@test.com')
+          with_packaging_mocked(
+            repository,
+            cookbook_metadata: {
+              'hpc_test-1234' => {}
+            }
+          ) do
+            platform.package(services: { 'node' => %w[test_policy] }, secrets: {}, local_environment: false)
+            expect(Dir.glob("#{repository}/dist/prod/test_policy/cookbook_artifacts/hpc_test-*/files/default/testadmin.key.pub")).to eq []
+          end
+        end
+      end
+
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hybrid_platforms_conductor
 version: !ruby/object:Gem::Version
-  version: 33.7.4
+  version: 33.8.3
 platform: ruby
 authors:
 - Muriel Salvan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-04 00:00:00.000000000 Z
+date: 2021-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: range_operators