cem_acpt 0.8.5 → 0.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3835ee97ead5dca9e1b7445b4705efef12c7de1ff7f2574bca70d55f06091b47
-  data.tar.gz: 5482b561206e95a2ee465116c829fff6b9bb953330dbdc77427221e954ccf8ac
+  metadata.gz: bd72076945b79db4583d665e691c86214c901331f37ccdfc25e0d07b999b50ca
+  data.tar.gz: f32e25b3c220e20c73aa3bcd7bab9873c2ac753b5d41c61e2f069988eaf29822
 SHA512:
-  metadata.gz: 597ae4e7b86e3559f40113fe9681ced0cce7152722430e17f0502d9d83aecf80526a1b8d1f3deb2586fcc8a0bf90489191d9898f52767081a2da45384e9de4e6
-  data.tar.gz: b0587d2487fcb010eea86eb196fd948d23e6e05ed602e920765c0d3e21551f3e4bb173bb971001eb9de2a8617b148cbb42e2cac6645932129e8ac3d7235e7365
+  metadata.gz: a9e7b0d71cfd8efedd0faef1e8fb2cb23b0335a049b1b8d270a7325a3cf19b97d1d603042d7326478c6e4e23ae42de890de0b88bc38a21085ab44e19c47d605b
+  data.tar.gz: ab1df006f61525ead0c8b64f38b52fe93a1152a337eea0d7a78535f3496fa3d4856b3fdc46e6f9dd29f8fea038e17af5acd76ced4df502707f3880201d6df511

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cem_acpt (0.8.5)
+    cem_acpt (0.8.7)
       async-http (>= 0.60, < 0.70)
       bcrypt_pbkdf (>= 1.0, < 2.0)
       deep_merge (>= 1.2, < 2.0)
@@ -143,4 +143,4 @@ DEPENDENCIES
   rubocop-rspec
 
 BUNDLED WITH
-   2.4.18
+   2.4.19

data/lib/cem_acpt/image_builder/provision_commands.rb

@@ -81,6 +81,7 @@ module CemAcpt
           'rhel' => 'EnterpriseLinuxFamily',
           'alma' => 'EnterpriseLinuxFamily',
           'oel' => 'EnterpriseLinuxFamily',
+          'rocky' => 'EnterpriseLinuxFamily',
           'windows' => 'WindowsFamily',
         }.freeze
 

data/lib/cem_acpt/image_builder.rb

@@ -144,7 +144,11 @@ module CemAcpt
       end
 
       def terraform
-        @terraform ||= CemAcpt::Provision::TerraformCmd.new(@image_terraform_dir, @environment)
+        # Instead of passing in @image_terraform_dir, we pass in @working_dir. The reason being
+        # @image_terraform_dir is the parent directory that has path like ~/.cem_acpt/terraform/image/gcp (gcp being the platform)
+        # We want to pass the working directory that has the linux and windows directories in it
+        # which we can then further manipulate to get the correct path.
+        @terraform ||= CemAcpt::Provision::TerraformCmd.new(@working_dir, @environment)
       end
 
       def new_environment(config)

data/lib/cem_acpt/provision/terraform/linux.rb

@@ -7,7 +7,7 @@ module CemAcpt
     # Class provides methods for gathering provision data for Linux nodes
     class Linux < OsData
       def self.valid_names
-        %w[centos rhel oel alma]
+        %w[centos rhel oel alma rocky]
       end
 
       def self.valid_versions
@@ -40,9 +40,25 @@ module CemAcpt
             commands << "sudo systemctl start #{file} && sudo systemctl enable #{file}"
           end
         end
+
         commands << apply_command
       end
 
+      # A wrapper around provision_commands that allows for extra commands to be added for a specific OS version(i.e EL 8)
+      def provision_commands_wrapper(image_name)
+        if ['rhel-8', 'oel-8', 'alma-8', 'rocky-8'].any? { |el8| image_name.include?(el8) }
+          commands = [
+            'sudo dnf upgrade --refresh -y rpm glibc',
+            'sudo rm /var/lib/rpm/.rpm.lock',
+            'sudo dnf upgrade -y dnf',
+          ]
+          commands = (commands << provision_commands).flatten
+          commands
+        else
+          provision_commands
+        end
+      end
+
       private
 
       def apply_command

data/lib/cem_acpt/provision/terraform/terraform_cmd.rb

@@ -89,11 +89,17 @@ module CemAcpt
       end
 
       def chdir(opts = {})
-        [extract_arg!(opts, :chdir), working_dir, Dir.pwd].each do |d|
+        [Dir.pwd, working_dir, extract_arg!(opts, :chdir)].each do |d|
           next if d.nil? || d.empty?
 
           d = File.expand_path(d)
-          return "-chdir=#{d}" if File.directory?(d)
+
+          # Added a check for main.tf to make sure we're in the right directory and have necessary file whhen running terraform
+          # There are three possible path that we can be in:
+          # 1. The working directory that was passed in, which is usually the created temporary directory
+          # 2. The current directory that this code is being executed from (usually in a linux or windows directory of working directory)
+          # 3. The working directory that was passed in, but with a linux or windows directory appended to it
+          return "-chdir=#{d}" if File.directory?(d) && File.exist?(File.join(d, 'main.tf'))
 
           logger.warn('CemAcpt::Provision::TerraformCmd') { "Directory #{d} does not exist, using next..." }
         end
@@ -121,7 +127,9 @@ module CemAcpt
           k = k.to_s
           k.tr!('_', '-')
           if k == 'vars'
-            v.map { |vk, vv| "-var '#{vk}=#{vv}'" }.join(' ')
+            # Included a check for Hash so that we can generate JSON to pass to terraform.
+            # If not a Hash, then we just pass the value as is, which is a string.
+            v.map { |vk, vv| "-var='#{vk}=#{vv.is_a?(Hash) ? JSON.generate(vv) : vv}'" }.join(' ')
           elsif %w[input lock refresh].include?(k) # These are boolean flags with values
             "-#{k}=#{v}"
           elsif v.nil? || (v.respond_to?(:empty) && v.empty?) || v.is_a?(TrueClass)

data/lib/cem_acpt/provision/terraform.rb

@@ -209,7 +209,7 @@ module CemAcpt
               puppet_manifest: node.test_data[:puppet_manifest],
               provision_dir_source: @backend.provision_directory,
               provision_dir_dest: @backend.destination_provision_directory,
-              provision_commands: @backend.provision_commands,
+              provision_commands: @backend.instance_of?(CemAcpt::Provision::Linux) ? @backend.provision_commands_wrapper(node.node_data[:image]) : @backend.provision_commands,
             }
           )
         end

data/lib/cem_acpt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CemAcpt
-  VERSION = '0.8.5'
+  VERSION = '0.8.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cem_acpt
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.7
 platform: ruby
 authors:
 - puppetlabs
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-05 00:00:00.000000000 Z
+date: 2023-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-http
@@ -277,7 +277,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.18
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: CEM Acceptance Tests