cem_acpt 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b51e308bc7002bf4732a8f9aba7f8a43f2a62c5af67d1f6fffc6d524da9d683f
-  data.tar.gz: 53de22ef68903167653ac98136ed657c6c34a88adc308d4191fdfec94860b294
+  metadata.gz: 4f33bff59cae8ea713a55134ce914c83aa3583e16e56cd0d5aca4bc7106df092
+  data.tar.gz: e1f8f76188ad32473da89fc389eead2b9d63af2bc8856cf3b30863b6454f89d2
 SHA512:
-  metadata.gz: aa5189d13239222956bf6480ae2fa82513d241b88757e8dd3ef81d89bbbc576b71e1c5af3fbe01c3edf5a9ff3dc36506538be9572c3d647acf6536da8c3023c2
-  data.tar.gz: be23f52aa2291ba5a82e60654b2aa07de3bdc262e4795447ac54b0f38ba780a669a9984fdd64cc9dd3fcaf94932f283c598af1f8e74d67a4a44ce322490b2fdd
+  metadata.gz: 8a54dfbf7dcf40684b3d00bec253822943cacd7388d3dabaaf6d6ed260811c5862d694544ea07f2cd135274cd9227aaa16e00e0dcc712e41c906bfffaa8fef17
+  data.tar.gz: '06678cf120f230d981d5247c39b688e8ca96ed13225e0595595579041232e17c3220044b4f51091ab6900e10b8b4f2aedd0115da901a9619025e7576aa7ceec2'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cem_acpt (0.7.1)
+    cem_acpt (0.7.2)
       async-http (>= 0.60, < 0.70)
       bcrypt_pbkdf (>= 1.0, < 2.0)
       deep_merge (>= 1.2, < 2.0)

data/lib/cem_acpt/cli.rb

@@ -36,15 +36,23 @@ module CemAcpt
             options[:tests] = t.split(',')
           end
         when :cem_acpt_image
-          opts.on('-U', '--no-linux', 'Do not build Linux images') do
+          opts.on('--dry-run', 'Logs the information for the images that would be created. Does not create images.') do
+            options[:dry_run] = true
+          end
+
+          opts.on('--no-linux', 'Do not build Linux images') do
             options[:cem_acpt_image] ||= {}
             options[:cem_acpt_image][:no_linux] = true
           end
 
-          opts.on('-W', '--no-windows', 'Do not build Windows images') do
+          opts.on('--no-windows', 'Do not build Windows images') do
             options[:cem_acpt_image] ||= {}
             options[:cem_acpt_image][:no_windows] = true
           end
+
+          opts.on('-F', '--filter FILTER', 'Filter images to build by name with regex. Example: -F "(alma|rhel)-8"') do |f|
+            options[:image_name_filter] = Regexp.new(f)
+          end
         end
       
         opts.on('-D', '--debug', 'Enable debug logging') do

data/lib/cem_acpt/config/cem_acpt_image.rb

@@ -7,9 +7,12 @@ module CemAcpt
     # Holds the configuration for cem_acpt_image
     class CemAcptImage < Base
       VALID_KEYS = %i[
+        cem_acpt_image
         ci_mode
         config_file
+        dry_run
         images
+        image_name_filter
         log_level
         log_file
         log_format
@@ -34,9 +37,15 @@ module CemAcpt
       # The default configuration
       def defaults
         {
+          cem_acpt_image: {
+            no_linux: false,
+            no_windows: false,
+          },
           ci_mode: false,
           config_file: nil,
+          dry_run: false,
           images: {},
+          image_name_filter: Regexp.new('.*'),
           log_level: 'info',
           log_file: nil,
           log_format: 'text',

data/lib/cem_acpt/image_builder/provision_commands.rb

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

data/lib/cem_acpt/image_builder.rb

@@ -44,17 +44,19 @@ module CemAcpt
       def run
         @start_time = Time.now
         logger.with_ci_group("CemAcptImage v#{CemAcpt::VERSION} run started at #{@start_time}") do
-          logger.info('CemAcptImage') { "Using working directory: #{@working_dir}..." }
-          keep_terminal_alive
           @all_tfvars = new_tfvars(@config)
-          @working_dir = new_working_dir
           @linux_tfvars, @windows_tfvars = divide_tfvars_by_os(@all_tfvars)
-          save_vars_to_file!('linux', @linux_tfvars)
-          save_vars_to_file!('windows', @windows_tfvars)
-          terraform_init
           image_types = []
           image_types << [@linux_tfvars, 'linux'] unless no_linux?
           image_types << [@windows_tfvars, 'windows'] unless no_windows?
+          return dry_run(image_types) if @config.get('dry_run')
+
+          @working_dir = new_working_dir
+          logger.info('CemAcptImage') { "Using working directory: #{@working_dir}..." }
+          keep_terminal_alive
+          save_vars_to_file!('linux', @linux_tfvars)
+          save_vars_to_file!('windows', @windows_tfvars)
+          terraform_init
           image_types.each do |tfvars, os_str|
             terraform_plan(os_str, tfvars, DEFAULT_PLAN_NAME)
             begin
@@ -107,6 +109,14 @@ module CemAcpt
         @linux_tfvars[:node_data].empty? || @config.get('cem_acpt_image.no_linux')
       end
 
+      def dry_run(image_types)
+        logger.info('CemAcptImage') { 'Dry run mode enabled. No images will be built.' }
+        image_types.each do |tfvars, os_str|
+          logger.info('CemAcptImage') { "Dry run for #{os_str}..." }
+          logger.info('CemAcptImage') { "Terraform vars:\n#{JSON.pretty_generate(tfvars)}" }
+        end
+      end
+
       def terraform
         return @terraform if defined?(@terraform)
 
@@ -233,6 +243,8 @@ module CemAcpt
         tfvars[:private_key] = private_key if private_key
         tfvars[:public_key] = public_key if public_key
         config.get('images').each do |image_name, image|
+          next if config.get('image_name_filter')&.respond_to?(:match?) && !config.get('image_name_filter').match?(image_name)
+
           platform = new_platform(config, **tfvars)
           tfvars.merge!(platform.platform_data)
           provision_commands = CemAcpt::ImageBuilder::ProvisionCommands.provision_commands(

data/lib/cem_acpt/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cem_acpt
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - puppetlabs
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-17 00:00:00.000000000 Z
+date: 2023-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-http