cem_acpt 0.8.4 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 787d1c625a43532fe24478c1dd0e6a078737121e0fd3f0c9b3de33dd4d2f8e2d
-  data.tar.gz: 64eae38282ae2ade5ecbff398f297842114d9f7ed702f9460997836e551c7d75
+  metadata.gz: 8b20898f83c35c92ab9276fe4753a82aca2da25da72169d35600b6dba3c27435
+  data.tar.gz: 4ef575b47bfee5102cf5c8effb6a50183cfc927da524ab319b135f2654211726
 SHA512:
-  metadata.gz: 955300268e06a6a00a0a7ab3849b2a2f5e3dd05e46b9020d9c5ecc5d999e14fff229947a9e9c47db8071a8b3fa4b2cd740070b5b5a53dd69e97092fb57676ec4
-  data.tar.gz: 14cde5b14ebdf22baa7c720355c596e6825eed11b775bfd9a15baa695ececdb3cc63d0bf56c38e5e7d3dd862151ddd7ca3932c9583aed7eeed1966d1e9eebd02
+  metadata.gz: 19414bc367fdb4a101b9969ebb3a76276712238455947648f0434c1df748b959013fcfe0206491cee841709554d3738021e1524dee646e4e40c1f967ccf73729
+  data.tar.gz: 3366d39bedcb059f2f8d848aae6f872677e62c9593b59021286e1a4bfaa1eb2939f0574dc83aab643cd180e04909c948c5d2a0b27ef05c63f7db0808dd8239b6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cem_acpt (0.8.4)
+    cem_acpt (0.8.6)
       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/platform/gcp.rb

@@ -21,6 +21,7 @@ module Platform
     nd = {}
     nd[:machine_type] = gcp_machine_type
     nd[:disk_size] = gcp_disk_size
+    nd[:max_run_duration] = gcp_max_run_duration
     nd[:image] = image_name if image_name
     nd[:test_name] = @test_data[:test_name] if @test_data&.key?(:test_name)
     nd
@@ -68,4 +69,8 @@ module Platform
   def gcp_disk_size
     @gcp_disk_size ||= (@config.get('node_data.disk_size') || 40)
   end
+
+  def gcp_max_run_duration
+    @gcp_max_run_duration ||= (@config.get('node_data.max_run_duration') || 3600)
+  end
 end

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

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

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

data/lib/terraform/gcp/linux/main.tf

@@ -49,6 +49,7 @@ variable "node_data" {
         machine_type = string
         image = string
         disk_size = number
+        max_run_duration = number
         test_name = string
         goss_file = string
         puppet_manifest = string
@@ -58,7 +59,7 @@ variable "node_data" {
     }))
 }
 
-provider "google" {
+provider "google-beta" {
     credentials = file(var.credentials_file)
     project = var.project
     region = var.region
@@ -66,7 +67,7 @@ provider "google" {
 }
 
 resource "google_compute_instance" "acpt-test-node" {
-    provider = google
+    provider = google-beta
     for_each = var.node_data
     name = each.key
     machine_type = each.value.machine_type
@@ -84,6 +85,9 @@ resource "google_compute_instance" "acpt-test-node" {
         automatic_restart = false
         provisioning_model = "SPOT"
         instance_termination_action = "DELETE"
+        max_run_duration {
+            seconds = each.value.max_run_duration
+        }
     }
 
     network_interface {

data/lib/terraform/gcp/windows/main.tf

@@ -53,11 +53,12 @@ variable "node_data" {
         machine_type = string
         image = string
         disk_size = number
+        max_run_duration = number
         test_name = string
     }))
 }
 
-provider "google" {
+provider "google-beta" {
     credentials = file(var.credentials_file)
     project = var.project
     region = var.region
@@ -65,7 +66,7 @@ provider "google" {
 }
 
 resource "google_compute_instance" "acpt-test-node" {
-    provider = google
+    provider = google-beta
     for_each = var.node_data
     name = each.key
     machine_type = each.value.machine_type
@@ -83,6 +84,9 @@ resource "google_compute_instance" "acpt-test-node" {
         automatic_restart = false
         provisioning_model = "SPOT"
         instance_termination_action = "DELETE"
+        max_run_duration {
+            seconds = each.value.max_run_duration
+        }
     }
 
     network_interface {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cem_acpt
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.6
 platform: ruby
 authors:
 - puppetlabs
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-14 00:00:00.000000000 Z
+date: 2023-10-09 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