Merge branch 'master' into kpaulisse-frozen-string-literal

Author: kpaulisse

.version

@@ -1 +1 @@
-0.5.6
+0.5.7

doc/advanced-bootstrap.md

@@ -31,3 +31,28 @@ The [example configuration file](/examples/octocatalog-diff.cfg.rb) contains an
 # settings[:bootstrap_script] = '/etc/puppetlabs/repo-bootstrap.sh' # Absolute path
 # settings[:bootstrap_script] = 'script/bootstrap' # Relative path
 ```
+
+## Bootstrap environment
+
+When the bootstrap script runs, a limited set of environment variables are passed from the shell running octocatalog-diff. Only these variables are set:
+
+- `HOME`
+- `PATH`
+- `PWD` (set to the base directory of your Puppet checkout)
+- `BASEDIR` (as explicitly set with `--basedir` CLI option or `settings[:basedir]` setting)
+
+If you wish to set additional environment variables for your bootstrap script, you may do so via the `--bootstrap-environment VAR=value` command line flag, or by defining `settings[:bootstrap_environment] = { 'VAR' => 'value' }` in your configuration file.
+
+As an example, consider that your bootstrap script is written in Python, and needs the `PYTHONPATH` variable set to `/usr/local/lib/python-custom`. Even if this environment variable is set when octocatalog-diff is run, it will not be available to the bootstrap script. You may supply it via the command line:
+
+```
+octocatalog-diff --bootstrap-environment PYTHONPATH=/usr/local/lib/python-custom ...
+```
+
+Or you may specify it in your configuration file:
+
+```
+settings[:bootstrap_environment] = {
+  'PYTHONPATH' => '/usr/local/lib/python-custom'
+}
+```

doc/configuration-enc.md

@@ -67,3 +67,37 @@ For example, when compiling the catalog for `some-node.github.net`, Puppet will
   ```
 
 Sometimes the ENC script requires credentials or makes other assumptions about the system on which it is running. To be able to run the ENC script on systems other than your Puppet master, you will need to ensure that any such credentials are supplied and other assumptions are met.
+
+## Environment
+
+When the ENC is executed, the following environment variables are set to match the environment of the shell in which octocatalog-diff executes:
+
+- `HOME`
+- `PATH`
+- `PWD` (set to the temporary directory as previously described)
+
+No other environment variables are passed from the shell. If you wish to pass additional environment variables, you must explicitly list them with the `--pass-env-vars` CLI flag or `settings[:pass_env_vars]` array in your configuration file.
+
+As an example, consider that your ENC is written in Python, and needs the `PYTHONPATH` variable set to `/usr/local/lib/python-custom`. Even if this environment variable is set when octocatalog-diff is run, it will not be available to the ENC script. You may pass the variable via the command line:
+
+```
+octocatalog-diff --pass-env-vars PYTHONPATH ...
+```
+
+Or you may specify it in your configuration file:
+
+```
+settings[:pass_env_vars] = [ 'PYTHONPATH' ]
+```
+
+If you wish to specify multiple environment variables to pass:
+
+```
+octocatalog-diff --pass-env-vars PYTHONPATH,SECONDVAR,THIRDVAR ...
+```
+
+or
+
+```
+settings[:pass_env_vars] = [ 'PYTHONPATH', 'SECONDVAR', 'THIRDVAR' ]
+```

lib/octocatalog-diff/catalog-util/builddir.rb

@@ -199,7 +199,7 @@ def install_hiera_config(logger, options)
 
         # Munge datadir in hiera config file
         obj = YAML.load_file(file_src)
-        %w(yaml json).each do |key|
+        (obj[:backends] || %w(yaml json)).each do |key|
           next unless obj.key?(key.to_sym)
           if options[:hiera_path_strip].is_a?(String)
             next if obj[key.to_sym][:datadir].nil?

lib/octocatalog-diff/catalog/puppetmaster.rb

@@ -70,13 +70,17 @@ def build(logger = Logger.new(StringIO.new))
 
       # Returns a hash of parameters for each supported version of the Puppet Server Catalog API.
       # @return [Hash] Hash of parameters
+      #
+      # Note: The double escaping of the facts here is implemented to correspond to a long standing
+      # bug in the Puppet code. See https://github.com/puppetlabs/puppet/pull/1818 and
+      # https://docs.puppet.com/puppet/latest/http_api/http_catalog.html#parameters for explanation.
       def puppet_catalog_api
         {
           2 => {
             url: "https://#{@options[:puppet_master]}/#{@options[:branch]}/catalog/#{@node}",
             parameters: {
               'facts_format' => 'pson',
-              'facts' => @facts.fudge_timestamp.without('trusted').to_pson,
+              'facts' => CGI.escape(@facts.fudge_timestamp.without('trusted').to_pson),
               'transaction_uuid' => SecureRandom.uuid
             }
           },
@@ -85,7 +89,7 @@ def puppet_catalog_api
             parameters: {
               'environment' => @options[:branch],
               'facts_format' => 'pson',
-              'facts' => @facts.fudge_timestamp.without('trusted').to_pson,
+              'facts' => CGI.escape(@facts.fudge_timestamp.without('trusted').to_pson),
               'transaction_uuid' => SecureRandom.uuid
             }
           }

spec/octocatalog-diff/fixtures/facts/facts_esc.json

@@ -0,0 +1,9 @@
+{
+  "apt_update_last_success":1458162123,
+  "architecture":"amd64",
+  "datacenter":"xyz",
+  "fqdn":"rspec-node.xyz.github.net",
+  "math":"1+2=3",
+  "percent":"25%20=5",
+  "_timestamp":"2014-12-02 14:56:20 -0600"
+}

spec/octocatalog-diff/fixtures/facts/facts_esc.yaml

@@ -0,0 +1,11 @@
+#--- !ruby/object:Puppet::Node::Facts
+name: rspec-node.xyz.github.net
+values:
+  apt_update_last_success: 1458162123
+  architecture: amd64
+  datacenter: xyz
+  fqdn: rspec-node.xyz.github.net
+  math: "1+2=3"
+  percent: "25%20=5"
+  "_timestamp": 2014-12-02 12:56:20.865795 -08:00
+expiration: 2014-12-02 13:11:20.521667 -08:00

spec/octocatalog-diff/fixtures/repos/default/config/hiera-other-backends.yaml

@@ -0,0 +1,20 @@
+---
+:backends:
+  - eyaml
+  - yaml
+  - json
+:yaml:
+  :datadir: /var/lib/puppet/environments/%{::environment}/hieradata
+:eyaml:
+  :datadir: /var/lib/puppet/environments/%{::environment}/hieradata
+:json:
+  :datadir: /var/lib/puppet/environments/%{::environment}/hieradata
+:hierarchy:
+  - servers/%{::fqdn}
+  - datacenter/%{::datacenter}
+  - platform/%{::virtual}
+  - os/%{::operatingsystem}/%{::lsbdistcodename}
+  - os/%{::operatingsystem}
+  - common
+:merge_behavior: deeper
+:logger: console

spec/octocatalog-diff/integration/puppetmaster_spec.rb

@@ -47,7 +47,7 @@ def self.parse_body(body)
       end
 
       def self.facts_match(body)
-        facts = JSON.parse(parse_body(body)['facts'])
+        facts = JSON.parse(CGI.unescape(parse_body(body)['facts']))
         facts.delete('_timestamp')
         desired_facts = {
           'name' => 'rspec-node.xyz.github.net',

spec/octocatalog-diff/tests/catalog-util/builddir_spec.rb

@@ -233,6 +233,27 @@
         expect(logger_str.string).to match(%r{WARNING: Hiera datadir for yaml.+/environments/production/aksdfjlkfjk})
       end
     end
+
+    context 'using other backends' do
+      it 'should rewrite all datadir' do
+        options = default_options.merge(
+          hiera_config: OctocatalogDiff::Spec.fixture_path('repos/default/config/hiera-other-backends.yaml'),
+          hiera_path: 'hieradata'
+        )
+        logger, logger_str = OctocatalogDiff::Spec.setup_logger
+        testobj = OctocatalogDiff::CatalogUtil::BuildDir.new(options, logger)
+        hiera_yaml = File.join(testobj.tempdir, 'hiera.yaml')
+        expect(File.file?(hiera_yaml)).to eq(true)
+        hiera_cfg = YAML.load_file(hiera_yaml)
+        expect(hiera_cfg[:backends]).to eq(%w(eyaml yaml json))
+        expect(hiera_cfg[:yaml]).to eq(datadir: File.join(testobj.tempdir, 'environments', 'production', 'hieradata'))
+        expect(hiera_cfg[:eyaml]).to eq(datadir: File.join(testobj.tempdir, 'environments', 'production', 'hieradata'))
+        expect(hiera_cfg[:json]).to eq(datadir: File.join(testobj.tempdir, 'environments', 'production', 'hieradata'))
+        expect(logger_str.string).not_to match(/Hiera datadir for yaml doesn't seem to exist/)
+        expect(logger_str.string).not_to match(/Hiera datadir for eyaml doesn't seem to exist/)
+        expect(logger_str.string).not_to match(/Hiera datadir for json doesn't seem to exist/)
+      end
+    end
   end
 
   describe '#install_fact_file' do