beaker-answers 0.16.0 → 0.17.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzJjYTUxYjY2MDk4NTc3YWQyODRiZTk1OWIzODg1OTY0MzY0ZjdhNw==
+    NzA5OTEzMmU0MDg4YWJmZGE3M2I2MjUwYmUxNjg2YmVlYjVhNjI3Nw==
   data.tar.gz: !binary |-
-    YTk3N2VkNjYxYWQxNGI2NGI0OTM3MTQ4MTM4YzNjNWI4ZGNiZTUzNw==
+    ZDBjZDcxNDFmZTQ5MWM3YjFhZjNkNWM5M2E4MTQwM2Y2Zjk5ZmQ2Yw==
 SHA512:
   metadata.gz: !binary |-
-    MjkwZWVhMTk4YmNiYTBmNDQyNDQ2MThhODhmYjlmZmVkMmNmNWM4NGQ1Yzg5
-    OGIwMzdhNDJkZDc2OGUwYjNjYWQ1NGNlNzRiMjk5OGE1YzQ3NzljNDVhNzg0
-    ZGY0MmFkNDQ4YTQ0NmZhNTZiZTQ4OTc5OTQxYzY1OWVhMWZiYmQ=
+    OWJlNzVmOGI0MDkwYWUxNDAwNTY4OTRmYzU1MjcwYTMyMjlhZDRhYjc0Nzg0
+    MjEyNDU0M2ZiMzdlZDcyNTQzZjk2NTk4MGZmNWU0NzQ4NWNhYjM3NjI4YmU3
+    ODY1M2MzMTI1MGY1ZjY1MGE3NzUwNGQzZDJlMjViZGU5ZWEyNmE=
   data.tar.gz: !binary |-
-    MTA3NjcwYjQwYmM5ZmVhOGRjYmRhODAwYTI0NjRiMjRhNmMzZTJjMTZlZGU4
-    ZjkwODYxMjlkZmU3NjU2YTc5MjdiMmFhNDAxYjczMWI5YTRjNDY4YTgzYTA1
-    MzcwOWQ3ZmNmNjM0MGVkZTA3N2M3YjFhOTVkZTY5OTM2NGQxZTg=
+    MDE1MDcwZTQ5ODEwMWUxMWQ3ODc3N2MwODk5ZjkzZjQyY2Q1MzdhY2M5YWMy
+    MjkyNWI5ZGNiOTlkNjQ1MDZmY2Q1NjUwYTNjN2E4NjdmMDA0YmM4NWNjZjdl
+    NWYxMGNjZTExNGQ5ZTFiNzgzODc0NDY1YWVmN2E4YjJiNDYzOWE=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # worker - History
 ## Tags
-* [LATEST - 7 Apr, 2017 (297e2195)](#LATEST)
+* [LATEST - 24 Apr, 2017 (41959c8b)](#LATEST)
+* [0.16.0 - 7 Apr, 2017 (98d08e5c)](#0.16.0)
 * [0.15.0 - 22 Mar, 2017 (9df229c3)](#0.15.0)
 * [0.14.0 - 19 Jan, 2017 (290c75b2)](#0.14.0)
 * [0.13.0 - 9 Nov, 2016 (729ddd0b)](#0.13.0)
@@ -27,7 +28,46 @@
 * [0.1.0 - 26 Aug, 2015 (ef47972d)](#0.1.0)
 
 ## Details
-### <a name = "LATEST">LATEST - 7 Apr, 2017 (297e2195)
+### <a name = "LATEST">LATEST - 24 Apr, 2017 (41959c8b)
+
+* (GEM) update beaker-answers version to 0.17.0 (41959c8b)
+
+* (maint) Do not flatten answers (598f8ce5)
+
+
+```
+(maint) Do not flatten answers
+
+When generating meep 2.0 answers.
+
+Changes in version20162.rb took an answers structure like:
+
+:answers
+  puppet_enterprise:
+    profile:
+      "master::foo": bar
+
+and produce a pe.conf with
+
+"puppet_enterprise::profile::master::foo": "bar"
+
+This might be a convenience for some kinds of parameter listing, but
+breaks your ability to submit actually structured data such as:
+
+:answers
+  feature_flags:
+    pe_modules_next: true
+
+Where feature_flags is supposed to be a hash, and not a parameter.
+
+This pr takes the approach of just fixing new behavior in Glisan, when
+using Meep 2.0 format (pe-modules-next), but it might be better to
+change the behavior altogether, although this is a breaking change for
+anyone relying on the previous 'helpful' collapsing of answer elements.
+```
+### <a name = "0.16.0">0.16.0 - 7 Apr, 2017 (98d08e5c)
+
+* (HISTORY) update beaker-answers history for gem release 0.16.0 (98d08e5c)
 
 * (GEM) update beaker-answers version to 0.16.0 (297e2195)
 

data/lib/beaker-answers/version.rb

@@ -1,5 +1,5 @@
 module BeakerAnswers
   module Version
-    STRING = '0.16.0'
+    STRING = '0.17.0'
   end
 end

data/lib/beaker-answers/versions/version20172.rb

@@ -10,6 +10,29 @@ module BeakerAnswers
       /\A2017\.2/
     end
 
+    def generate_hiera_config
+      hiera_hash = super
+
+      if hiera_hash.include?('meep_schema_version') && @options[:answers]
+        # The meep 2.0 schema format includes structured data, which you could
+        # conceivably overwrite in your :answers and not want flattened.
+        # We're removing the flattened keys added in the Version20162 and
+        # reading them here rather than breaking compatibilty with existing
+        # Version20162 behavior. We're sorry.
+        hiera_hash.reject! do |k,v|
+          flatten_keys_to_joined_string(@options[:answers]).include?(k)
+        end
+        stringified_answers = @options[:answers].inject({}) do |hash,entry|
+          key = entry[0]
+          value = entry[1]
+          hash[key.to_s] = value
+          hash
+        end
+        hiera_hash.merge!(stringified_answers)
+      end
+      hiera_hash
+    end
+
     # This is used to generate the profile host parameters, but now passes the
     # options[:meep_schema_version] to determine which form of pe.conf is to be
     # generated.

data/spec/shared/context.rb

@@ -131,15 +131,14 @@ RSpec.shared_examples 'pe.conf' do
     end
   end
 
+end
+
+RSpec.shared_examples "overriding answers" do
   context 'when overriding answers' do
     let( :options ) do
       {
         :format  => 'hiera',
-        :answers => {
-          'puppet_enterprise' =>  { 'certificate_authority_host' => 'enterpriseca.vm' },
-          'puppet_enterprise::console_host' => 'enterpriseconsole.vm',
-          'console_admin_password' => 'testing123',
-        }
+        :answers => answers_with_strings,
       }
     end
 
@@ -152,13 +151,7 @@ RSpec.shared_examples 'pe.conf' do
     let( :options ) do
       {
         :format  => 'hiera',
-        :answers => {
-          :puppet_enterprise =>  {
-            :certificate_authority_host => 'enterpriseca.vm',
-            :console_host => 'enterpriseconsole.vm',
-          },
-          :console_admin_password => 'testing123',
-        }
+        :answers => answers_with_symbols,
       }
     end
 
@@ -169,6 +162,39 @@ RSpec.shared_examples 'pe.conf' do
 end
 
 RSpec.shared_examples "valid MEEP 2.0 pe.conf" do
+  let(:answers_with_symbols) do
+    {
+      :"puppet_enterprise::certificate_authority_host" => 'enterpriseca.vm',
+      :"puppet_enterprise::console_host" => 'enterpriseconsole.vm',
+      :console_admin_password => 'testing123',
+      :feature_flags => {
+        'pe_modules_next' => true,
+      },
+    }
+  end
+  let(:answers_with_strings) do
+    {
+      'puppet_enterprise::certificate_authority_host' => 'enterpriseca.vm',
+      'puppet_enterprise::console_host' => 'enterpriseconsole.vm',
+      'console_admin_password' => 'testing123',
+      'feature_flags' => {
+        'pe_modules_next' => true,
+      },
+    }
+  end
+  let( :overridding_parameters ) do
+    {
+      'puppet_enterprise::certificate_authority_host' => 'enterpriseca.vm',
+      'puppet_enterprise::console_host' => 'enterpriseconsole.vm',
+      'console_admin_password' => 'testing123',
+      'feature_flags' => {
+        'pe_modules_next' => true,
+      }
+    }
+  end
+
+  include_examples "overriding answers"
+
   it 'generates valid MEEP 2.0 json if #answer_hiera is called' do
     expect(answer_hiera).not_to be_empty
     expect { JSON.load(answer_hiera) }.not_to raise_error
@@ -196,6 +222,25 @@ RSpec.shared_examples "valid MEEP 2.0 pe.conf" do
 end
 
 RSpec.shared_examples "valid MEEP 1.0 pe.conf" do
+  let(:answers_with_symbols) do
+    {
+      :puppet_enterprise =>  {
+        :certificate_authority_host => 'enterpriseca.vm',
+        :console_host => 'enterpriseconsole.vm',
+      },
+      :console_admin_password => 'testing123',
+    }
+  end
+  let(:answers_with_strings) do
+    {
+      'puppet_enterprise' =>  { 'certificate_authority_host' => 'enterpriseca.vm' },
+      'puppet_enterprise::console_host' => 'enterpriseconsole.vm',
+      'console_admin_password' => 'testing123',
+    }
+  end
+
+  include_examples "overriding answers"
+
   it 'generates valid MEEP 1.0 json if #answer_hiera is called' do
     expect(answer_hiera).not_to be_empty
     expect { JSON.load(answer_hiera) }.not_to raise_error

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker-answers
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Puppetlabs
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-07 00:00:00.000000000 Z
+date: 2017-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec