simp-beaker-helpers 1.0.1 → 1.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTk1ZjQ3NGYyNTNhZDYyY2QyYzU2MTJiMDAxMWE1ZjBmOTMzZWRlNg==
+    ODM2YjI2ODAyMWI3MjEzOTY3YWRlNTUyYjRmMDcyOGM2YzlmOWU1YQ==
   data.tar.gz: !binary |-
-    MTcwMmM2MmY5NGU2MjkwYTE5MmMxMWQ3YTBjNTFlNzUzYzZkMzE5MA==
+    MmZhNDZiMGE2ODQ3YTAwNTA4OTE3Y2FjYzYxZjliNGM4NmE3NDZjZQ==
 SHA512:
   metadata.gz: !binary |-
-    MGNiZjU1ZmY0MDA5ODRhYzYxYWI0NTNiOTE2NWM5Yjk0YjM1ODFjMmQ4MDEz
-    OTg4ZWZiYmU5NzgxYmQ4ZTAzNWU3Y2M1NDE1ZjgxY2ViODRiY2FiZWU4ODM4
-    NzhkZTkxZjc3OWU1YWU2Njg1MzQ2MTJiYzA3MGE1MDVkODVmZGU=
+    ZjM1MGNkZWQ0Nzg0N2M2YmY2MTk1YjI0ZmZkYzVlMWU5OGVmZDJmMDQ1NjU4
+    NWQ5MmU5ODE0OTAyN2NjNjRhNmE1NDM5OGY4NjM1NTMwNDc4MzNlNTg3ZjNl
+    ODBjYjgwNmU3YWE1MzFiN2NmZGM0OGRjNmFlMWJhYTQwOWUwYjU=
   data.tar.gz: !binary |-
-    YWJlNGM4ZjFmZDI0ZDIxYTA0OTI2NThjMzk5NWZmNzZhZDA2NTI5ZGExMjM2
-    MjE1YzBkMGVhYmZiNTc3NzViM2RjOWVhN2Q1NTMwOGJjY2JiOTgxMjVjYTU1
-    N2E2OTU0YjU1Y2JlN2ZiMmYwMDBhYjU5MDVlZTlmMTcxZWZlMGY=
+    MGEzZTk1ZWZhOTQyNjczY2YzYTZmZDUzNGQwNTViMTFjYjlmMjAyZGU0Zjk5
+    YzQwM2UxNmRlNGM4M2M3NTBkMGY0NTgxOTJkOWUyYzM2NTFhMmJiNzQ4N2Y2
+    MmE1YzcyMmIwM2JjYTdjNzBiYmI2ZTllYjNiOWQ1Y2Y3YThiZTY=

data/README.md

@@ -12,6 +12,8 @@ Methods to assist beaker acceptance tests for SIMP.
     * [`run_fake_pki_ca_on`](#run_fake_pki_ca_on)
     * [`copy_pki_to`](#copy_pki_to)
     * [`copy_keydist_to`](#copy_keydist_to)
+    * [`set_hieradata_on`](#set_hieradata_on)
+    * [`clear_temp_hieradata`](#clear_temp_hieradata)
 4. [Examples](#examples)
     * [Prep OS, Generate and copy PKI certs to each SUT](#prep-os-generate-and-copy-pki-certs-to-each-sut)
 5. [License](#license)
@@ -82,13 +84,32 @@ The directory structure copied to the SUT is:
 
 #### `copy_keydist_to`
 
- Copy a CA keydist/ directory of CA+host certs into an SUT
+Copy a CA keydist/ directory of CA+host certs into an SUT
 
 This simulates the output of FakeCA's `gencerts_nopass.sh` into `keydist/` and is useful for constructing a Puppet master SUT that will distribute PKI keys via agent runs.
 
 `def copy_keydist_to( ca_sut = master )`
 
 
+#### `set_hieradata_on`
+
+Set the hiera data file on the provided host to the passed data structure
+
+**NOTE**: This is authoritative; you cannot mix this with other hieradata copies
+
+`set_hieradata_on(host, hieradata, data_file='default')`
+
+ -  **host**      = _(Array,String,Symbol)_ One or more hosts to act upon
+ -  **hieradata** = _(Hash)_ The full hiera data structure to write to the system
+ -  **data_file** = _(String)_ The filename (not path) of the hiera data
+
+####  `clear_temp_hieradata`
+
+Clean up all temporary hiera data files; meant to be called from `after(:all)`
+
+`clear_temp_hieradata`
+
+
 ## Examples
 
 ### Prep OS, Generate and copy PKI certs to each SUT

data/lib/simp/beaker_helpers.rb

@@ -1,7 +1,7 @@
 module Simp; end
 
 module Simp::BeakerHelpers
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 
   # Locates .fixture.yml in or above this directory.
   def fixtures_yml_path
@@ -68,6 +68,11 @@ module Simp::BeakerHelpers
 
   # Apply known OS fixes we need to run Beaker on each SUT
   def fix_errata_on( suts = hosts )
+    # SIMP uses structured facts, therefore stringify_facts must be disabled
+    unless ENV['BEAKER_stringify_facts'] == 'yes'
+      on suts, 'puppet config set stringify_facts false'
+    end
+
     suts.each do |sut|
       # net-tools required for netstat utility being used by be_listening
       if fact_on(sut, 'osfamily') == 'RedHat' && fact_on(sut, 'operatingsystemmajrelease') == '7'
@@ -144,4 +149,69 @@ module Simp::BeakerHelpers
     on ca_sut, "cp -a /root/pki/keydist/ #{modulepath.first}/pki/files/"
     on ca_sut, "chgrp -R puppet #{modulepath.first}/pki/files/keydist"
   end
+
+  ## Inline Hiera Helpers ##
+  ## These will be integrated into core Beaker at some point ##
+
+  # Set things up for the inline hieradata functions 'set_hieradata_on'
+  # and 'clear_temp_hieradata'
+  #
+  #
+  require 'rspec'
+  RSpec.configure do |c|
+    c.before(:all) do
+      @temp_hieradata_dirs = @temp_hieradata_dirs || []
+    end
+
+    c.after(:all) do
+      clear_temp_hieradata
+    end
+  end
+
+  # Set the hiera data file on the provided host to the passed data structure
+  #
+  # Note: This is authoritative, you cannot mix this with other hieradata copies
+  #
+  # @param[Host, Array<Host>, String, Symbol] One or more hosts to act upon.
+  #
+  # @param[Hieradata, Hash] The full hiera data structure to write to the system.
+  #
+  # @param[Data_file, String] The filename (not path) of the hiera data
+  #                           YAML file to write to the system.
+  #
+  # @param[Hiera_config, Array<String>] The hiera config array to write
+  #                                     to the system. Must contain the
+  #                                     Data_file name as one element.
+  def set_hieradata_on(host, hieradata, data_file='default')
+    # Keep a record of all temporary directories that are created
+    #
+    # Should be cleaned by calling `clear_temp_hiera data` in after(:all)
+    #
+    # Omit this call to be able to delve into the hiera data that is
+    # being created
+    @temp_hieradata_dirs = @temp_hieradata_dirs || []
+
+    data_dir = Dir.mktmpdir('hieradata')
+    @temp_hieradata_dirs << data_dir
+
+    fh = File.open(File.join(data_dir,"#{data_file}.yaml"),'w')
+    fh.puts(hieradata.to_yaml)
+    fh.close
+
+    copy_hiera_data_to(host, data_dir)
+    write_hiera_config_on(host, Array(data_file))
+  end
+
+  # Clean up all temporary hiera data files.
+  #
+  # Meant to be called from after(:all)
+  def clear_temp_hieradata
+    if @temp_hieradata_dirs && !@temp_hieradata_dirs.empty?
+      @temp_hieradata_dirs.each do |data_dir|
+        if File.exists?(data_dir)
+          FileUtils.rm_r(data_dir)
+        end
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simp-beaker-helpers
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Chris Tessmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-08 00:00:00.000000000 Z
+date: 2015-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker