voxpupuli-acceptance 0.3.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37915c6f478ecafc4e655b0b331e7187ded5de2f5d0759be3e1b91495e2fba8d
-  data.tar.gz: 7c9f0126fa4113ad3dba24a629a3450bf59eb2476ec1e3dbf9adabd1551229c6
+  metadata.gz: 18f700e3c94ea73c5ccb90021f06950463b965b412a02779b68685fd95e22ef2
+  data.tar.gz: 07fd8b5f34440869d96be25b0be77479fb49a01381ee4919eac0e4129e3c2c9c
 SHA512:
-  metadata.gz: 605dba3416c85639b1027063785a91cd2cc8bbc4fab71cf09f79cfd5bb6810ab498814416be7558a0450a6ef006f1cdb8b390ecd3da392d64c0c10eea385d1cb
-  data.tar.gz: 1f41ec9930bf790bb61bb7f3693484f5f32198f521d1e4c381055f6112bd6e67e51f7088d37041b3eaeac92a3a9837eb4d677c960202810f939251869ffc1491
+  metadata.gz: 330135466f41d8d37378cf09b57c500f598364cf67c0770ecbc38ac20602a41acedf15ea86ca89d935037f89d5a18b15ebca52374fd296129c4e90ff494faebb
+  data.tar.gz: 4b5bc3918ee3f1f5967474bce44025f30beac5da95932fbdc051364f69601fb7884734a492b9212e92f421ca5a0eac321afac0cfaece99950f9faa2edbd6dc46

data/lib/voxpupuli/acceptance/examples.rb

@@ -0,0 +1,21 @@
+shared_examples 'an idempotent resource' do |host|
+  host ||= default
+
+  it 'applies with no errors' do
+    apply_manifest_on(host, manifest, catch_failures: true)
+  end
+
+  it 'applies a second time without changes' do
+    apply_manifest_on(host, manifest, catch_changes: true)
+  end
+end
+
+shared_examples 'the example' do |name, host|
+  include_examples 'an idempotent resource', host do
+    let(:manifest) do
+      path = File.join(Dir.pwd, 'examples', name)
+      raise Exception, "Example '#{path}' does not exist" unless File.exist?(path)
+      File.read(path)
+    end
+  end
+end

data/lib/voxpupuli/acceptance/facts.rb

@@ -0,0 +1,34 @@
+module Voxpupuli
+  module Acceptance
+    class Facts
+      ENV_VAR_PREFIX = 'BEAKER_FACTER_'
+      FACT_FILE = '/etc/facter/facts.d/voxpupuli-acceptance-env.json'
+
+      class << self
+        def beaker_facts_from_env
+          facts = {}
+
+          ENV.each do |var, value|
+            next unless var.start_with?(ENV_VAR_PREFIX)
+
+            fact = var.sub(ENV_VAR_PREFIX, '').downcase
+            facts[fact] = value
+          end
+
+          facts
+        end
+
+        def write_beaker_facts_on(hosts)
+          beaker_facts = beaker_facts_from_env
+
+          if beaker_facts.any?
+            require 'json'
+            on(hosts, "mkdir -p #{File.dirname(FACT_FILE)} && cat <<VOXPUPULI_BEAKER_ENV_VARS > #{FACT_FILE}\n#{beaker_facts.to_json}\nVOXPUPULI_BEAKER_ENV_VARS")
+          else
+            on(hosts, "rm -f #{FACT_FILE}")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/voxpupuli/acceptance/fixtures.rb

@@ -1,7 +1,7 @@
 require 'tmpdir'
 require 'puppet/modulebuilder'
 
-module Voxpupupli
+module Voxpupuli
   module Acceptance
     class Fixtures
       class << self

data/lib/voxpupuli/acceptance/rake.rb

@@ -0,0 +1,7 @@
+begin
+  require 'puppetlabs_spec_helper/tasks/beaker'
+  # Fixtures can be needed because of spec_prep
+  require 'puppetlabs_spec_helper/tasks/fixtures'
+rescue LoadError
+  require 'beaker-rspec/rake_task'
+end

data/lib/voxpupuli/acceptance/spec_helper_acceptance.rb

@@ -1,36 +1,14 @@
-ENV_VAR_PREFIX = 'BEAKER_FACTER_'
-FACT_FILE = '/etc/facter/facts.d/voxpupuli-acceptance-env.json'
+require_relative 'examples'
 
-def beaker_facts_from_env
-  facts = {}
-
-  ENV.each do |var, value|
-    next unless var.start_with?(ENV_VAR_PREFIX)
-
-    fact = var.sub(ENV_VAR_PREFIX, '').downcase
-    facts[fact] = value
-  end
-
-  facts
-end
-
-def write_beaker_facts_on(hosts)
-  beaker_facts = beaker_facts_from_env
-
-  if beaker_facts.any?
-    require 'json'
-    on(hosts, "mkdir -p #{File.dirname(FACT_FILE)} && cat <<VOXPUPULI_BEAKER_ENV_VARS > #{FACT_FILE}\n#{beaker_facts.to_json}\nVOXPUPULI_BEAKER_ENV_VARS")
-  else
-    on(hosts, "rm -f #{FACT_FILE}")
-  end
-end
-
-def configure_beaker(modules: :metadata, configure_facts_from_env: true, &block)
+def configure_beaker(modules: :metadata, &block)
   ENV['PUPPET_INSTALL_TYPE'] ||= 'agent'
   ENV['BEAKER_PUPPET_COLLECTION'] ||= 'puppet6'
   ENV['BEAKER_debug'] ||= 'true'
   ENV['BEAKER_HYPERVISOR'] ||= 'docker'
 
+  # On Ruby 3 this doesn't appear to matter but on Ruby 2 beaker-hiera must be
+  # included before beaker-rspec so Beaker::DSL is final
+  require 'beaker-hiera'
   require 'beaker-rspec'
   require 'beaker-puppet'
   require 'beaker/puppet_install_helper'
@@ -57,16 +35,52 @@ def configure_beaker(modules: :metadata, configure_facts_from_env: true, &block)
         install_module_dependencies
       when :fixtures
         fixture_modules = File.join(Dir.pwd, 'spec', 'fixtures', 'modules')
-        Voxpupupli::Acceptance::Fixtures.install_fixture_modules_on(hosts, fixture_modules)
+        Voxpupuli::Acceptance::Fixtures.install_fixture_modules_on(hosts, fixture_modules)
       end
 
-      write_beaker_facts_on(hosts) if configure_facts_from_env
+      if RSpec.configuration.suite_configure_facts_from_env
+        require_relative 'facts'
+        Voxpupuli::Acceptance::Facts.write_beaker_facts_on(hosts)
+      end
+
+      if RSpec.configuration.suite_hiera?
+        hiera_data_dir = RSpec.configuration.suite_hiera_data_dir
+
+        if Dir.exist?(hiera_data_dir)
+          write_hiera_config_on(hosts, RSpec.configuration.suite_hiera_hierachy)
+          copy_hiera_data_to(hosts, hiera_data_dir)
+        end
+      end
 
-      if block
-        hosts.each do |host|
+      hosts.each do |host|
+        if block
           yield host
+
+          local_setup = RSpec.configuration.setup_acceptance_node
+          if local_setup && File.exist?(local_setup)
+            puts "Configuring #{host} by applying #{local_setup}"
+            apply_manifest_on(host, File.read(local_setup), catch_failures: true)
+          end
         end
       end
     end
   end
 end
+
+RSpec.configure do |c|
+  # Fact handling
+  c.add_setting :suite_configure_facts_from_env, default: true
+
+  # Hiera settings
+  c.add_setting :suite_hiera, default: true
+  c.add_setting :suite_hiera_data_dir, default: File.join('spec', 'acceptance', 'hieradata')
+  c.add_setting :suite_hiera_hierachy, default: [
+    'fqdn/%{fqdn}.yaml',
+    'os/%{os.family}/%{os.release.major}.yaml',
+    'os/%{os.family}.yaml',
+    'common.yaml',
+  ]
+
+  # Node setup
+  c.add_setting :setup_acceptance_node, default: File.join('spec', 'setup_acceptance_node.pp')
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: voxpupuli-acceptance
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Vox Pupuli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-09 00:00:00.000000000 Z
+date: 2021-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt_pbkdf
@@ -64,6 +64,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: beaker-hiera
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: beaker-hostgenerator
   requirement: !ruby/object:Gem::Requirement
@@ -176,6 +190,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rbnacl
   requirement: !ruby/object:Gem::Requirement
@@ -241,9 +269,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/voxpupuli/acceptance.rb
+- lib/voxpupuli/acceptance/examples.rb
+- lib/voxpupuli/acceptance/facts.rb
 - lib/voxpupuli/acceptance/fixtures.rb
+- lib/voxpupuli/acceptance/rake.rb
 - lib/voxpupuli/acceptance/spec_helper_acceptance.rb
-homepage: http://github.com/voxpupuli/voxpupuli-acceptance
+homepage: https://github.com/voxpupuli/voxpupuli-acceptance
 licenses:
 - Apache-2.0
 metadata: {}
@@ -255,14 +286,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.4'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Helpers for acceptance testing Vox Pupuli modules