cem_acpt 0.2.5 → 0.6.0

data/lib/terraform/gcp/linux/systemd/goss-acpt.service

@@ -0,0 +1,8 @@
+[Unit]
+Description=unit file for goss server acpt endpoint service
+
+[Service]
+ExecStart=/usr/local/bin/goss -g /opt/cem_acpt/goss.yaml serve -f json --endpoint "/acpt" --cache "10m"
+
+[Install]
+WantedBy=multi-user.target

data/lib/terraform/gcp/linux/systemd/goss-idempotent.service

@@ -0,0 +1,8 @@
+[Unit]
+Description=unit file for goss server acpt endpoint service
+
+[Service]
+ExecStart=/usr/local/bin/goss -g /opt/cem_acpt/goss/puppet_idempotent.yaml serve -f json -l ":8081" --endpoint "/idempotent" --cache "10m"
+
+[Install]
+WantedBy=multi-user.target

data/lib/terraform/gcp/linux/systemd/goss-noop.service

@@ -0,0 +1,8 @@
+[Unit]
+Description=unit file for goss server acpt endpoint service
+
+[Service]
+ExecStart=/usr/local/bin/goss -g /opt/cem_acpt/goss/puppet_noop.yaml serve -f json -l ":8082" --endpoint "/noop" --cache "10m"
+
+[Install]
+WantedBy=multi-user.target

data/sample_config.yaml

@@ -1,7 +1,6 @@
 test_data:
   for_each:
     collection:
-      - puppet6
       - puppet7
   vars:
     test_static_var: 'static_var_value'
@@ -21,24 +20,24 @@ test_data:
     delete_vars:
       - 'framework_vars'
 
-platform: gcp
+platform:
+  name: gcp
+  project: 'team-sse'
+  region: 'us-west1'
+  zone: 'us-west1-b'
+  subnetwork: 'cem-acpt-subnet'
+
+# terraform:
+#   environment:
+#     TF_LOG: 'DEBUG'
+
+actions:
+  only:
+    - 'acpt'
 
 node_data:
   machine_type: 'e2-small'
-  project:
-    name: 'some-project'
-    zone: 'us-west1-b'
-  disk:
-    name: 'disk-1'
-    size: 20
-    type: 'pd-standard'
-  network_interface:
-    tier: 'STANDARD'
-    subnetwork: 'some-subnet'
-  metadata:
-    ephemeral_ssh_key:
-      lifetime: 2
-      keydir: '/tmp/acpt_test_keys'
+  disk_size: 40
 
 image_name_builder:
   character_substitutions:
@@ -48,11 +47,13 @@ image_name_builder:
     - '$image_fam'
     - '$collection'
     - '$firewall'
-  join_with: '-'    
+  join_with: '-'
 
 tests:
-  - cis_rhel-7_firewalld_server_1  
-  - cis_rhel-7_iptables_server_1
-  - cis_rhel-8_firewalld_server_1
+  # - cis_rhel-7_firewalld_server_2
   - cis_rhel-8_firewalld_server_2
-  - cis_rhel-8_iptables_server_1
+  # - cis_oel-7_firewalld_server_2
+  # - cis_oel-8_firewalld_server_2
+  # - cis_alma-8_firewalld_server_2
+  # - stig_rhel-7_firewalld_public_3
+  # - stig_rhel-8_firewalld_public_3

metadata

@@ -1,122 +1,214 @@
 --- !ruby/object:Gem::Specification
 name: cem_acpt
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.6.0
 platform: ruby
 authors:
 - puppetlabs
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-27 00:00:00.000000000 Z
+date: 2023-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: async-http
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.9
-  name: concurrent-ruby
-  prerelease: false
+        version: '0.60'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.70'
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.60'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.1.9
+        version: '0.70'
 - !ruby/object:Gem::Dependency
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
   name: deep_merge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: ed25519
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: '2.0'
 - !ruby/object:Gem::Dependency
+  name: bcrypt_pbkdf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.0.beta1
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
   name: net-ssh
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.2'
+  type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.2'
+- !ruby/object:Gem::Dependency
+  name: parallel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.22'
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.0.0.beta1
+        version: '1.22'
 - !ruby/object:Gem::Dependency
+  name: puppet-modulebuilder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.1
-  name: puppet-modulebuilder
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.1
 - !ruby/object:Gem::Dependency
+  name: ruby-terraform
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  name: rake
-  prerelease: false
+        version: '1.7'
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
+  name: serverspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  name: rspec
-  prerelease: false
+        version: '2.42'
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.42'
 - !ruby/object:Gem::Dependency
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: serverspec-cem-acpt
+  type: :development
   prerelease: false
-  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: rubocop
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -130,6 +222,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/spec.yml"
 - ".gitignore"
 - ".rspec"
 - CODEOWNERS
@@ -142,32 +235,39 @@ files:
 - cem_acpt.gemspec
 - exe/cem_acpt
 - lib/cem_acpt.rb
-- lib/cem_acpt/bootstrap.rb
-- lib/cem_acpt/bootstrap/bootstrapper.rb
-- lib/cem_acpt/bootstrap/operating_system.rb
-- lib/cem_acpt/bootstrap/operating_system/rhel_family.rb
-- lib/cem_acpt/context.rb
+- lib/cem_acpt/config.rb
 - lib/cem_acpt/core_extensions.rb
+- lib/cem_acpt/goss.rb
+- lib/cem_acpt/goss/api.rb
+- lib/cem_acpt/goss/api/action_response.rb
 - lib/cem_acpt/image_name_builder.rb
 - lib/cem_acpt/logging.rb
+- lib/cem_acpt/logging/formatter.rb
 - lib/cem_acpt/platform.rb
 - lib/cem_acpt/platform/base.rb
-- lib/cem_acpt/platform/base/cmd.rb
 - lib/cem_acpt/platform/gcp.rb
-- lib/cem_acpt/platform/gcp/cmd.rb
-- lib/cem_acpt/platform/gcp/compute.rb
-- lib/cem_acpt/platform/vmpooler.rb
+- lib/cem_acpt/provision.rb
+- 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/windows.rb
 - lib/cem_acpt/puppet_helpers.rb
-- lib/cem_acpt/rspec_utils.rb
-- lib/cem_acpt/shared_objects.rb
-- lib/cem_acpt/spec_helper_acceptance.rb
 - lib/cem_acpt/test_data.rb
 - lib/cem_acpt/test_runner.rb
-- lib/cem_acpt/test_runner/run_handler.rb
-- lib/cem_acpt/test_runner/runner.rb
-- lib/cem_acpt/test_runner/runner_result.rb
+- lib/cem_acpt/test_runner/log_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/version.rb
+- lib/terraform/gcp/linux/goss/puppet_idempotent.yaml
+- lib/terraform/gcp/linux/goss/puppet_noop.yaml
+- lib/terraform/gcp/linux/main.tf
+- lib/terraform/gcp/linux/systemd/goss-acpt.service
+- lib/terraform/gcp/linux/systemd/goss-idempotent.service
+- lib/terraform/gcp/linux/systemd/goss-noop.service
+- lib/terraform/gcp/windows/.keep
 - sample_config.yaml
 homepage: https://github.com/puppetlabs/cem_acpt
 licenses:
@@ -191,7 +291,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.29
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: CEM Acceptance Tests

data/lib/cem_acpt/bootstrap/bootstrapper.rb

@@ -1,206 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'operating_system'
-
-# Currently unused in this implementation.
-module CemAcpt::Bootstrap
-  # This class runs bootstrapping commands on the VM after it
-  # is provisioned. This can include installing repos,
-  # installing Puppet, installing other programs,
-  # starting services, and running other commands.
-  class Bootstrapper
-    STATE_ORDER = [:repo, :package, :service, :command, :complete].freeze
-    STATE_ACTIONS = {
-      repo: :run_repo_installs,
-      package: :run_package_installs,
-      service: :run_service_starts,
-      command: :run_commands,
-    }.freeze
-    UNIVERSAL_DEPS = [
-      'git',
-      'curl',
-      'puppet-agent',
-    ].freeze
-    include CemAcpt::Bootstrap::OperatingSystem
-
-    def initialize(instance_name, instance_image, cmd, collection: 'puppet7', repos: [], packages: [], services: [], commands: [])
-      os, major_version = instance_image.split('-')
-      use_os(os)
-      @instance_name = instance_name.split('.').first
-      @cmd_provider = cmd
-      @collection = collection
-      @os = os
-      @major_version = major_version
-      @repos = repos
-      @packages = packages
-      @services = services
-      @commands = commands
-      @logfile = '/var/log/bootstrap.log'
-      @state = 0
-      @retries = 0
-      @results = {}
-    end
-
-    def ruby_version
-      return @ruby_version if defined?(@ruby_version)
-
-      @ruby_version = determine_ruby_version(@collection)
-      @ruby_version
-    end
-
-    def repos
-      @repos.push(puppet_agent_repo).uniq
-    end
-
-    def packages
-      (@packages + UNIVERSAL_DEPS).uniq
-    end
-
-    def services
-      @services.uniq
-    end
-
-    def commands
-      @commands + ruby_install_commands
-    end
-
-    def instance_available?
-      @instance_available ||= test_connection
-    end
-
-    def run
-      raise 'Instance is not available' unless instance_available?
-
-      @results = {}
-      transition_state
-      @results
-    rescue StandardError => e
-      return_results_with_error(e)
-    end
-
-    private
-
-    def return_results_with_error(error)
-      @results[:_error] = {
-        error: error,
-        details: {
-          instance_name: @instance_name,
-          instance_image: @instance_image,
-          collection: @collection,
-          os: @os,
-          major_version: @major_version,
-          repos: repos,
-          packages: packages,
-          services: services,
-          commands: commands,
-          state: @state,
-          retries: @retries,
-        },
-      }
-      @results
-    end
-
-    def execute_state_action
-      state_sym = STATE_ORDER[@state]
-      send(STATE_ACTIONS[state_sym])
-    end
-
-    def transition_state
-      raise @last_error if @results.key?(:_error)
-      return if @state == STATE_ORDER.length - 1
-
-      begin
-        execute_state_action
-      rescue StandardError => e
-        @last_error_time = Time.now
-        @last_errored_state = @state
-        @last_error = e
-        handle_state_error
-      end
-      @state += 1
-      transition_state
-    end
-
-    def run_repo_installs
-      raise 'Instance is not available' unless instance_available?
-
-      run_ssh_command_with_formatting(repo_install_cmd(repos), :repo_installs)
-    end
-
-    def run_package_installs
-      raise 'Instance is not available' unless instance_available?
-
-      run_ssh_command_with_formatting(package_install_cmd(packages), :package_installs)
-    end
-
-    def run_service_starts
-      raise 'Instance is not available' unless instance_available?
-
-      run_ssh_command_with_formatting(service_start_cmd(services), :service_starts)
-    end
-
-    def run_commands
-      raise 'Instance is not available' unless instance_available?
-
-      run_ssh_command_with_formatting(commands.join(';'), :command_runs)
-    end
-
-    def handle_state_error
-      @retries = 0 unless @last_errored_state == @state
-
-      raise @last_error unless @retries < 3
-
-      @retries += 1
-      @state = @last_errored_state
-      transition_state
-    end
-
-    def run_ssh_command_with_formatting(cmd, results_key, log_file: '/tmp/puppet-bootstrap.log')
-      key = results_key.to_sym
-      @results[key] = {}
-      @results[key][:started] = Time.now
-      if cmd.nil? || cmd.empty?
-        @results[key][:results] = 'No command(s) to run'
-        @results[key][:finished] = Time.now
-        return
-      end
-      cmd = "#{cmd} | tee -a #{log_file}"
-      ssh_results = @cmd_provider.ssh(@instance_name, cmd)
-      @results[key][:results] = ssh_results.gsub(%r{\s+}, ' ').split('\n')
-      @results[key][:finished] = Time.now
-    end
-
-    def verify_command(results_key)
-      send("verify_#{results_key}".to_sym)
-    end
-
-    def test_connection
-      return true if @cmd_provider.ssh_ready?(@instance_name)
-
-      raise "Connection test failed for #{@instance_name}"
-    end
-
-    def determine_ruby_version(collection)
-      case collection
-      when 'puppet7'
-        '2.7'
-      when 'puppet6'
-        '2.5'
-      else
-        raise "Cannot determine Ruby version, unsupported collection: #{collection}"
-      end
-    end
-
-    def ruby_install_commands
-      [
-        'curl -sSL https://raw.githubusercontent.com/rvm/rvm/stable/binscripts/rvm-installer -o rvm-installer',
-        'curl -sSL https://raw.githubusercontent.com/rvm/rvm/stable/binscripts/rvm-installer.asc -o rvm-installer.asc',
-        'chmod +x rvm-installer',
-        'gpg --verify rvm-installer.asc rvm-installer && sudo ./rvm-installer',
-        "sudo rvm install #{ruby_version} && sudo rvm use #{ruby_version} --default",
-        'gem install bundler',
-        '[[ -f ./Gemfile ]] && bundle install',
-      ]
-    end
-  end
-end