cem_acpt 0.7.3 → 0.8.0

data/lib/cem_acpt.rb

@@ -22,6 +22,7 @@ module CemAcpt
     end
 
     def run(command, original_command, options)
+      set_up_signal_handlers
       case command
       when :version
         puts "#{original_command} v#{CemAcpt::VERSION}"
@@ -30,9 +31,9 @@ module CemAcpt
       when :print_explain_config
         print_config(options, command: original_command.to_sym, format: :explain)
       when :cem_acpt
-        run_cem_acpt(options)
+        trace_it(options[:trace], options[:trace_events]) { run_cem_acpt(options) }
       when :cem_acpt_image
-        run_cem_acpt_image(options)
+        trace_it(options[:trace], options[:trace_events]) { run_cem_acpt_image(options) }
       else
         raise "Command #{command} does not exist"
       end
@@ -78,41 +79,70 @@ module CemAcpt
       new_log
     end
 
+    TRACE_EVENTS = %i[line call b_call thread_begin thread_end].freeze
+
+    def trace_it(should_trace = false, trace_events = nil)
+      if should_trace
+        trace_events ||= TRACE_EVENTS
+        tracer = TracePoint.new(*trace_events.map(&:to_sym)) do |tp|
+          if tp&.path&.include?('lib/cem_acpt') && !tp&.path&.include?('lib/cem_acpt/logging')
+            begin
+              logger << "## TRACE ## #{tp.path}:#{tp.lineno}: #{tp.event} #{tp.method_id}\n"
+            rescue StandardError
+              # Trace will often run into the trap context problem before the signal handler call back
+              logger.trap_context = true
+              logger << "## TRACE ## #{tp.path}:#{tp.lineno}: #{tp.event}\n"
+            end
+          end
+        end
+        tracer.enable do
+          yield
+        end
+      else
+        yield
+      end
+    end
+
+    def signal_handlers
+      {
+        'INT' => proc do
+          @trap_context = true
+          logger.trap_context = @trap_context
+          logger.fatal('CemAcpt') { 'Received interrupt signal. Exiting.' }
+          exit 1
+        end,
+      }
+    end
+
+    def set_up_signal_handlers
+      signal_handlers.each do |signal, handler|
+        Signal.trap(signal, &handler)
+        logger.debug('CemAcpt') { "Signal handler set for #{signal}" }
+      end
+    end
+
     def run_cem_acpt(options)
       # Set up config, logger, and helper
       @config = new_config(options)
       initialize_logger!
+      logger.debug('CemAcpt') { 'Config set and logger initialized...' }
       runner = new_runner
-
-      # Set up signal handlers
-      Signal.trap('INT') do
-        @trap_context = true
-        logger.trap_context = @trap_context
-        logger.fatal('Signal Handler') { 'Received interrupt signal. Cleaning up test suite...' }
-        runner.clean_up(@trap_context)
-        logger.fatal('Signal Handler') { 'Exiting due to interrupt signal' }
-        exit 1
-      end
+      logger.debug('CemAcpt') { 'Runner initialized...' }
 
       # Run the test suite
+      logger.debug('CemAcpt') { 'Running test suite...' }
       runner.run
-
+      logger.debug('CemAcpt') { "Test suite run complete, exiting with code #{runner.exit_code}" }
       exit runner.exit_code
     end
 
     def run_cem_acpt_image(options)
       @config = new_config(options, command: :cem_acpt_image)
       initialize_logger!
-
-      # Set up signal handlers
-      Signal.trap('INT') do
-        @trap_context = true
-        logger.trap_context = @trap_context
-        logger.fatal('Signal Handler') { 'Received interrupt signal. Cleaning up test suite...' }
-        exit 1
-      end
+      logger.debug('CemAcptImage') { 'Config set and logger initialized...' }
 
       # Build the images
+      logger.debug('CemAcptImage') { 'Building images...' }
       CemAcpt::ImageBuilder.build_images(@config)
     end
   end

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

@@ -27,6 +27,27 @@ variable "subnetwork" {
     type = string
 }
 
+# Just stub this out for now
+variable "username" {
+    type = string
+}
+
+# Just stub this out for now
+variable "private_key" {
+    type = string
+    sensitive = true
+}
+
+# Just stub this out for now
+variable "public_key" {
+    type = string
+}
+
+# Just stub this out for now
+variable "puppet_module_package" {
+    type = string
+}
+
 variable "node_data" {
     type = map(object({
         machine_type = string
@@ -71,6 +92,11 @@ resource "google_compute_instance" "acpt-test-node" {
         }
     }
 
+    service_account {
+        email = "cem-windows-acpt-test@team-sse.iam.gserviceaccount.com"
+        scopes = ["cloud-platform"]
+    }
+
     metadata = {
         "enable-oslogin" = "TRUE"
         "cem-acpt-test" = each.value.test_name

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cem_acpt
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.8.0
 platform: ruby
 authors:
 - puppetlabs
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-18 00:00:00.000000000 Z
+date: 2023-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-http
@@ -105,19 +105,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.0.1
 - !ruby/object:Gem::Dependency
-  name: ruby-terraform
+  name: winrm
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.3'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -146,6 +152,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Litmus-like library focusing on CEM Acceptance Tests
 email:
 - abide-team@puppet.com
@@ -170,6 +204,7 @@ files:
 - exe/cem_acpt
 - exe/cem_acpt_image
 - lib/cem_acpt.rb
+- lib/cem_acpt/action_result.rb
 - lib/cem_acpt/cli.rb
 - lib/cem_acpt/config.rb
 - lib/cem_acpt/config/base.rb
@@ -192,16 +227,19 @@ files:
 - lib/cem_acpt/provision/terraform.rb
 - lib/cem_acpt/provision/terraform/linux.rb
 - lib/cem_acpt/provision/terraform/os_data.rb
+- lib/cem_acpt/provision/terraform/terraform_cmd.rb
 - lib/cem_acpt/provision/terraform/windows.rb
 - lib/cem_acpt/puppet_helpers.rb
 - lib/cem_acpt/test_data.rb
 - lib/cem_acpt/test_runner.rb
 - lib/cem_acpt/test_runner/log_formatter.rb
+- lib/cem_acpt/test_runner/log_formatter/error_formatter.rb
 - lib/cem_acpt/test_runner/log_formatter/goss_action_response.rb
 - lib/cem_acpt/utils.rb
 - lib/cem_acpt/utils/puppet.rb
 - lib/cem_acpt/utils/ssh.rb
 - lib/cem_acpt/utils/terminal.rb
+- lib/cem_acpt/utils/winrm_runner.rb
 - lib/cem_acpt/version.rb
 - lib/terraform/gcp/linux/goss/puppet_idempotent.yaml
 - lib/terraform/gcp/linux/goss/puppet_noop.yaml
@@ -238,7 +276,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.18
 signing_key:
 specification_version: 4
 summary: CEM Acceptance Tests