beaker-answers 0.4.3 → 0.5.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjA5Nzc1NDk5NTY3Nzk2YTg3MWY5ZmM3MmEwZTE2NzI5MGU0Nzc1OQ==
+    YzAyMDhhMmFjNDQ5MGVmYTk4OWI4ZTE4NDI4YmE4OGU5YjkxYzRiYg==
   data.tar.gz: !binary |-
-    MDM1MTA5MmU3YWJjODQ2ODliNWIyNjk4MTBkMmJjYzBjNTRhYzdhMQ==
+    YTY3ZDI2ODU1OWY5NTdmNmYzMzdjMzgwN2JlNTEwZWIzMWRjNWM5OQ==
 SHA512:
   metadata.gz: !binary |-
-    MTkyNzFlNjdlNTE0YTJlMjc5ZjNkNjdlNjQyZmQ0YmZlZWJmODAxNWIzMWQ3
-    ODliZGI1NDgzMjBiMWI4MTUxNjU4OTc4M2Y5OTdjZTBmYjA2NmE5NjE5MTVh
-    Yzc0OWE3MzkzMjMzYjRjY2NiNzkyZGQzMGQ4YWZhY2U0ZmIzMzg=
+    MjQ3NTAwMjBlMjQzNmI3NDhjYjcyOWUyOTk5NGU2ODBmMGEwMDYxNTU4NzVk
+    YTExMzYzMGExMjkwNTIyNDgyZTk1MGI0Y2IzZTM3NTk2YTQ5ZjA2ODIxMzcy
+    ZmRiOTJhMjFmNTg1YzRmZTk2OTQwYWVkZGVhNmI2ZDg4NDRhYjI=
   data.tar.gz: !binary |-
-    YTZjNWYxMjIxYjM1NmJhMGQ0M2VhNTM3ZWZlNmJhZDlhYmE2MDQ5NDg5Y2Vh
-    ODRmMDAzODY4YjVmZWUwYzAzNGRlMDM4MWMwYWM2ZDNjNmExYTFiYjQyNGNj
-    YmE0ZmU5ZmY0M2RlMTllZjE2NzhkZWQ2ZGY1OGZjOTdjZmJlMmE=
+    NmM2MTZjYjYxZDUzYTI5NzM1M2FmN2M5YjJkMTJkZmUzZmIzZjNiZmIxMWM4
+    YWUzMGE3NTI0N2U0ZTFhNDJmOWViOTBkZGM0ZDU5MWE2MWYwZTFiZGE3NmQz
+    MDI2ZWIzM2NiZmZlY2ExYWUxYjYyMjJmZTNmZjI5YWM2MTEyNTE=

data/Gemfile

@@ -1,3 +1,7 @@
 source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 gemspec
+
+if File.exists? "#{__FILE__}.local"
+  eval(File.read("#{__FILE__}.local"), binding)
+end

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 10 May, 2016 (92edeb28)](#LATEST)
+* [LATEST - 26 May, 2016 (3045251c)](#LATEST)
+* [0.4.3 - 10 May, 2016 (5ffdb5f2)](#0.4.3)
 * [0.4.2 - 28 Apr, 2016 (79ccd5de)](#0.4.2)
 * [0.4.1 - 28 Apr, 2016 (d9d14510)](#0.4.1)
 * [0.4.0 - 12 Feb, 2016 (96d0d7cf)](#0.4.0)
@@ -13,7 +14,400 @@
 * [0.1.0 - 26 Aug, 2015 (ef47972d)](#0.1.0)
 
 ## Details
-### <a name = "LATEST">LATEST - 10 May, 2016 (92edeb28)
+### <a name = "LATEST">LATEST - 26 May, 2016 (3045251c)
+
+* (GEM) update beaker-answers version to 0.5.0 (3045251c)
+
+* Merge pull request #16 from highb/feature/master/pe-14996_add_hiera_answers (e724b683)
+
+
+```
+Merge pull request #16 from highb/feature/master/pe-14996_add_hiera_answers
+
+(PE-14996) Add hiera type answer/config generation
+```
+* (PE-14996) Ensure flatten_keys_to_joined_string generates strings (bdbd3c2a)
+
+
+```
+(PE-14996) Ensure flatten_keys_to_joined_string generates strings
+
+Prior to this commit I didn't ensure that keys being given in hashes
+to `flatten_keys_to_joined_string` were being converted to strings.
+This would result in keys that were passed in as symbols acting as a
+duplicate key to the string equivalent, which were then written out
+by the json/hocon parsers because it seems they do not have a uniqueness
+constraint on keys in hashes.
+This commit changes `flatten_keys_to_joined_string` to always convert
+the keys to strings, which should prevent this sort of duplicate key
+issue.
+```
+* (PE-15259) Only include legacy database user defaults if prompted (6748295e)
+
+
+```
+(PE-15259) Only include legacy database user defaults if prompted
+
+If beaker-pe initializes BeakerAnswers with an
+:include_legacy_database_defaults, then add custom database users from
+BeakerAnswers::DEFAULT_ANSWERS.  This is only necessary if we are
+upgrading from a pre-meep Beaker install of PE where BeakerAnswers
+changed the default user names.
+
+Setting the old legacy database password defaults is never required.
+
+To override any of these settings, they should be added directly to the
+:answers hash in the host.cfg file.
+```
+* (maint) Include Gemfile.local (af435a64)
+
+
+```
+(maint) Include Gemfile.local
+
+Allows addition gems (such as a debugger) to be included for development
+without accidentally commiting them.
+```
+* (PE-14996) Verify answers for default, cert auth and upgrade cases (fd1f8014)
+
+
+```
+(PE-14996) Verify answers for default, cert auth and upgrade cases
+
+Fixes a spec failure that occurred from
+c4556d8e455617c84ce3faf805a34fbee25bac92 given that database name/user
+were no longer present by default.  Also changes the specs to explicitly
+define hashes of expected values so we don't miss any changes
+(use_application_services wasn't being tested, for example), and hard
+codes expected constants so that we don't have false positives from both
+expectations and results coming indirectly from internal code references and
+accidentally matching.
+```
+* (PE-14996) Change upgrade answers spec to be literal strings (f996c1b5)
+
+
+```
+(PE-14996) Change upgrade answers spec to be literal strings
+
+Even though we reverted the DEFAULT_ANSWERS change to no longer have
+quotes within the answer values, the spec tests were still passing, even
+though they would generate erroneous answers for the
+puppetdb_database_password. This change makes it so that the tests are
+testing for literal strings, as opposed to just ensuring the calculation
+for the answer happens.
+```
+* (PE-14996) Guard addition of database_name, database_user by upgrade (c4556d8e)
+
+
+```
+(PE-14996) Guard addition of database_name, database_user by upgrade
+
+BeakerAnswers historically sets database user/name to non default
+values.  Typically a user will not do this, and it complicates our
+default workflow and subsequent upgrades.  For meep, with this commit,
+I'm ignoring the database name/user settings if we're not upgrading.
+The reason they are needed on upgrade (currently only from pre-meep
+versions), is that a legacy install laid down by Beaker will have these
+database settings, and we have to have them in pe.conf when upgrading,
+or database access fails.
+
+When upgrading from a meep install (2016.2.1+), a pe.conf should not be
+created, and beaker-pe should just call the installer-shim with no
+pe.conf file. https://tickets.puppetlabs.com/browse/PE-15351
+```
+* (PE-14996) Generate hiera host references from vm.hostname (f005f3f9)
+
+
+```
+(PE-14996) Generate hiera host references from vm.hostname
+
+...instead of name.  The later is simple the YAML key for the host from
+the Beaker hosts.cfg file, while the former, in the case of vmpooler
+hosts, is the actual hostname from the generated vm.  It is this
+hostname that is required for a working pe.conf.
+```
+* (PE-14996) Treat q_puppetdb_database_password default same as others (40b5f9a8)
+
+
+```
+(PE-14996) Treat q_puppetdb_database_password default same as others
+
+181305f6ba6116d05c8163eb2a18243df30098d0 changed beaker-answers so that
+the puppetdb default was referenced by its answer
+q_puppetdb_database_password, rather than the key q_puppetdb_password,
+which is not used in the legacy answer file.  Due to how answer_for()
+works, where an existing value looked up from DEFAULTS prevents the
+passed default override from being used, this caused the generated
+answer for puppetdb to added without quotes. To fix this, quotes were
+added to the default.  This worked, but it ran counter to how the later
+database answers for classifier, rbac, activity and orchestrator
+database passwords were handled.  These had defaults without quotes, and
+then explicitly quoted the derived answers generated for the
+answers_hash.
+
+When we began using answers for generating a hiera config for meep, this
+caused problems with the puppetdb password because the quotes in the
+puppetdb default ended up in the json value, causing an error in
+Postgres.
+
+To fix this, and to unify q_puppetdb_database_password's handling with
+that of the other db passwords, this commit removes the quoting in the
+defaults, and adds it to the generation of the final
+q_puppetdb_database_password answer.  It also modified a spec that was
+testing the generation of this answer to take into account that the
+quotes are added by the answer generation process.
+```
+* (PE-14996) Fix test for legacy answers in hiera_config to handle symbols (1e8d51f8)
+
+
+```
+(PE-14996) Fix test for legacy answers in hiera_config to handle symbols
+
+Beaker configs in this format:
+
+:answers:
+  :q_puppet_enterpriseconsole_auth_password: puppetlabs
+  :q_puppet_enterpriseconsole_auth_user_email: admin@puppetlabs.net
+CONFIG:
+  log_level: debug
+HOSTS:
+  master.vm:
+    platform: el-7-x86_64
+...
+
+where legacy answers are provided to be slurped into Beaker options and
+passed on to BeakerAnswers, were failing when BeakerAnswers was
+attempting to produce a 2016.2.x hiera config for meep.  This was just
+because the test was assuming strings for keys instead of symbols.  The
+patch converts to string before testing and adds a spec.
+```
+* (PE-14996) Prefer let() to instance variables (d8eec98d)
+
+
+```
+(PE-14996) Prefer let() to instance variables
+
+Makes use of rspec's let method instead of instance variables for
+consistency.  Also removes extraneous 'should' from spec names.
+```
+* (PE-14996) Update q_puppetdb_password to q_puppetdb_database_password (040601c1)
+
+
+```
+(PE-14996) Update q_puppetdb_password to q_puppetdb_database_password
+
+PR #15 changed the name of the puppetdb database password key in the
+default hash. This commit will update the hiera default hash (which
+reads values from the original defaults hash in order to reduce
+duplication) to use the correct key from the old default hash.
+```
+* (PE-14996) Remove duplicate default key (8a22b338)
+
+
+```
+(PE-14996) Remove duplicate default key
+
+There were two entries for `puppetdb_database_name` in the defaults
+array. This shouldn't cause any issues, but also doesn't do anything
+so I'm cleaning it up.
+```
+* Merge pull request #15 from tvpartytonight/BKR-763 (50589d17)
+
+
+```
+Merge pull request #15 from tvpartytonight/BKR-763
+
+(BKR-763) Add upgrade answers for PE 3.8.x
+```
+* (PE-14996) Provide a format agnostic method for configuration string (9209aa3b)
+
+
+```
+(PE-14996) Provide a format agnostic method for configuration string
+
+With the changes in installer configuration format, Version201620 now
+has an answer_hiera method.  However the component using beaker-answers
+shouldn't have to care about which output method it calls to get a
+configuration.  Ultimately it should just expect the correct
+configuration for a given PE version.  To assist with this, this commit
+adds an installer_configuration_string(host) method which will return
+either an answer file string or a hiera pe.conf string depending on the
+:format setting.
+
+Because no version prior to 2016.2.0 can work with a hiera pe.conf, I've
+moved the implementation into Version201620 and left an erroring stub in
+Answers.
+```
+* (PE-14996) Use :format in options instead of @type as param (0cf01296)
+
+
+```
+(PE-14996) Use :format in options instead of @type as param
+
+Prior to this commit I was adding a type param to the init/create
+methods of `Answers` in order to specify which answers file type
+to generate. Using the word type, which is already used to specify
+`:install` vs `:upgrade`, and creating a whole new param were
+somewhat counter-intuitive and confusing.
+
+This commit removes the type param, and instead reads the `:format`
+key from the `options` hash upon initialization, and if it cannot find
+a value at that key, it will default to `:bash`. I went back to using
+`:format` in order to reduce the chance of us later being confused
+by the `:type` option and decided to use the options hash because that
+is how we have typically interacted with the `Answers` library in the
+past. This should hopefully be a more intuitive and less error prone
+way of interacting with the library. Fingers crossed.
+```
+* (PE-14996) Use case for determining answer type (3b9838f3)
+
+
+```
+(PE-14996) Use case for determining answer type
+
+Prior to this commit we were using a series of if statements
+when checking if we support the answer `type` provided.
+This commit changes those checks to use a case statement in order
+to clean up the logic. Additionally, more exceptions will be raised
+if methods are called with an unknown `type`.
+```
+* (PE-14996) Move hocon/json include to base BeakerAnswers lib (60ae45b0)
+
+
+```
+(PE-14996) Move hocon/json include to base BeakerAnswers lib
+
+Prior to this commit we were requiring the json/hocon libs only
+in the `Answers` class.
+This commit moves those requires to the base `BeakerAnswers`, so
+we can re-use those libraries elsewhere without needing to require
+them.
+```
+* (PE-14996) Add specs for #answers_hiera and #answers_string (6a546add)
+
+
+```
+(PE-14996) Add specs for #answers_hiera and #answers_string
+
+Prior to this commit we were not spec testing `answers_hiera` or
+`answers_string`.
+
+This commit adds specs for both to the 20162 answers class, as well
+as resolving an issue found in code review/spec testing with
+the `answer_hiera` method.
+```
+* (PE-14996) Further refactor default config generation (37c76194)
+
+
+```
+(PE-14996) Further refactor default config generation
+
+Prior to this commit there was a large amount of duplicate code
+used for getting the `answer_for` for each key.
+
+This commit refactors that duplicate code out into a method on
+the Answers class that takes an array of desired defaults and
+returns an array with either the default from the Answers class
+or the user-provider override.
+
+Additionally, instead of them hiera answers, we should be calling
+them hiera config in order to be consistent with how we are documenting
+them and what they really are; persistent configuration that will be
+saved on the system.
+```
+* (PE-14996) Abstract bash vs hiera answer generation logic (86ea430b)
+
+
+```
+(PE-14996) Abstract bash vs hiera answer generation logic
+
+Prior to this commit the bash and hiera answer generation logic were
+all crammed into the `generate_answers` method on 20162.
+This commit abstracts the bash and hiera answer generation logic into
+two separate methods: `generate_bash_answers` and
+`generate_hiera_answers`. This should make the answers generation a
+little easier to follow.
+```
+* (PE-14996) Update format variable to type (ffcb41ec)
+
+
+```
+(PE-14996) Update format variable to type
+
+Prior to this commit I forgot to change all the instances of the
+variable I originally named `format` to `type`.
+This commit fixes one of the instances I missed and I grepped the
+project to ensure there were no others.
+```
+* (PE-14996) Add DB user/name to default hiera configs (5627a94a)
+
+
+```
+(PE-14996) Add DB user/name to default hiera configs
+
+Prior to this commit we were not specifying the old default
+DB user/names in the hiera configs, which could result in tests
+that depend on those names to fail. Additionally, it is a good
+idea to verify that specifying a non-default database name still
+works.
+This commit specifies puppetdb, classifier, activity, rbac and
+orchestrator database names by default for the 2016.2 hiera
+config/answer files. console/console_auth are omitted because
+those databases are deprecated in 2016.2.
+
+Also fixed a typo where `q_database_name` was specified in the
+defaults hash instead of `q_classifier_database_name` and fixed
+the only reference to that (from 3.4).
+```
+* (PE-14996) Prevent q_ answer overrides in hiera (8e9f4202)
+
+
+```
+(PE-14996) Prevent q_ answer overrides in hiera
+
+Prior to this commit if a user was still providing `q_` style
+answer overrides, we would still add them to the hash.
+This commit changes that behavior to raise an exception if a `q_`
+answer is provided when we are generating hiera style answers.
+```
+* (PE-14996) Allow overrides of 2016.2 hiera answers (3bee87d2)
+
+
+```
+(PE-14996) Allow overrides of 2016.2 hiera answers
+
+Prior to this commit there was not method for overriding the
+default answers given for the new 2016.2 hiera answer format.
+This commit adds a method of overriding those answers via providing
+a hash to `options[:answers]` containing all the hiera values that
+you wish to override or add.
+```
+* (PE-14996) Add initial work for 2016.2 hiera answers (2638e57a)
+
+
+```
+(PE-14996) Add initial work for 2016.2 hiera answers
+
+Initial commit based off @ericwilliamson prototype code for
+generating hiera answers for 2016.2 meep/idempotent installs.
+
+Added initial spec tests to verify hash generation is adding the
+correct values.
+```
+* (BKR-763) Add upgrade answers for PE 3.8.x (181305f6)
+
+
+```
+(BKR-763) Add upgrade answers for PE 3.8.x
+
+This PR specifically targets answers for upgrading to PE 3.8.x. It adds
+a new subclassed branch directly from `Answers` and looks for the
+`options[:type][:upgrade]` option from beaker. All other upgrade types
+will continue to create full answer sets.
+```
+### <a name = "0.4.3">0.4.3 - 10 May, 2016 (5ffdb5f2)
+
+* (HISTORY) update beaker-answers history for gem release 0.4.3 (5ffdb5f2)
 
 * (GEM) update beaker-answers version to 0.4.3 (92edeb28)
 

data/beaker-answers.gemspec

@@ -33,6 +33,6 @@ Gem::Specification.new do |s|
   # Run time dependencies
   s.add_runtime_dependency 'stringify-hash', '~> 0.0.0'
   s.add_runtime_dependency 'require_all', '~> 1.3.2'
+  s.add_runtime_dependency 'hocon', '~> 0.9.5'
 
 end
-