beaker-answers 0.26.0 → 0.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3b94651c5a5b71218cfc354ec829a75855b091ed
-  data.tar.gz: 329a134d15678b5673c62d9c3fd0bc9511ee9bb4
+SHA256:
+  metadata.gz: b9abe49b1810724c5ba81b237f7054c3a2dbd943b3d8cb163c29b449bffb400b
+  data.tar.gz: 1800e262631673dbca74b93b358a413277dcbd5fdcf4540f20507b39a3bd522c
 SHA512:
-  metadata.gz: 985a8a3cd19b932102c97802cc4c0affeb7452ebadd65b71344718a1b4e41aea978b5ac8065e8f45cb5699e3c5e5cfa5110feb41f12f0ac533b8679a8ee06d30
-  data.tar.gz: 9512f0ff0648c54d9f89e9b150b395c275245dafdcd70763163a5b40be8dd3b880ab97b62ae7864f1abcfe9d89a5590f04189e8db3864176dbf75b864e3c4b79
+  metadata.gz: 6dc2177d7e5fa41bf3592b0bbc5efc2ecaeca5ccc6db0cd44b8b319fba3b059ee97a663dd482fbfbe11e64d56eec53a93a0c5fc633c48367d16cb5841985d3ee
+  data.tar.gz: e31d1fcb50055a0492d64ca0949e61c51065f1542f1a459d4b4bf60abc598173bd62c0e5ce8a3da5d4c800efbbf12c719dfddf6a149cb5cd2afc6d1906ee12d6

data/.github/dependabot.yml

@@ -0,0 +1,8 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "13:00"
+  open-pull-requests-limit: 10

data/CODEOWNERS

@@ -0,0 +1,2 @@
+# This repo is owned by the Installer team
+* @puppetlabs/installer-and-management

data/README.md

@@ -13,10 +13,10 @@ key concepts.
 # Release
 
 To release a new version, we use a
-[Jenkins job](https://jenkins-qe.delivery.puppetlabs.net/job/qe_beaker-answers_btc-rls/)
+[Jenkins job](https://cinext-jenkinsmaster-sre-prod-1.delivery.puppetlabs.net/view/beaker%20Release%20Jobs/job/qe_beaker-answers_init-multijob_main/)
 (access to internal infrastructure will be required to view job).
 
-To release a new version (from the master branch), you'll need to just provide
+To release a new version (from the main branch), you'll need to just provide
 a new beaker-answers version number to the job, and you're off to the races.
 
 # Questions

data/beaker-answers.gemspec

@@ -29,7 +29,6 @@ Gem::Specification.new do |s|
 
   # Documentation dependencies
   s.add_development_dependency 'yard'
-  s.add_development_dependency 'markdown'
   s.add_development_dependency 'thin'
 
   # Run time dependencies

data/lib/beaker-answers/pe_conf.rb

@@ -91,7 +91,7 @@ module BeakerAnswers
             postgres_password_answers(pe_conf, '1.0')
           end
         else
-          postgres_password_answers(pe_conf, '1.0')
+          postgres_cert_answers(pe_conf, '1.0')
         end
       end
 

data/lib/beaker-answers/version.rb

@@ -1,5 +1,5 @@
 module BeakerAnswers
   module Version
-    STRING = '0.26.0'
+    STRING = '0.28.0'
   end
 end

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

@@ -1,13 +1,13 @@
 require 'beaker-answers/versions/version20172'
 
 module BeakerAnswers
-  # This class provides answer file information for PE version 2017.3
+  # This class provides answer file information for PE version 2017.3 AND BEYOND
   #
   # @api private
-  class Version20173 < Version20172
+  class Version20173to9999 < Version20172
     # The version of PE that this set of answers is appropriate for
     def self.pe_version_matcher
-      /\A2017\.3/
+      /\A(2017\.3|2018\.[1-2]|2019\.[0-9]|20[2-9][1-9]\.[0-9])/
     end
   end
 end

data/spec/beaker-answers/versions/version20173_spec.rb

@@ -1,53 +1,81 @@
 require 'spec_helper'
 require 'json'
 
-describe BeakerAnswers::Version20173 do
-  let(:ver)         { '2017.3.0' }
-  let(:options)     { StringifyHash.new }
-  let(:mono_hosts) do
-    basic_hosts = make_hosts({'pe_ver' => ver }, 1)
-    basic_hosts[0]['roles'] = ['master', 'agent', 'dashboard', 'database']
-    basic_hosts[0]['platform'] = 'el-7-x86_64'
-    basic_hosts
-  end
-  let(:answers)     { BeakerAnswers::Answers.create(ver, hosts, options) }
-  let(:answer_hash) { answers.answers }
-
-  context 'when generating a default 1.0 config' do
-    context 'for a monolithic install' do
-      let(:hosts) { mono_hosts }
-      let(:gold_role_answers) do
-        {
-          "console_admin_password" => default_password,
-          "puppet_enterprise::puppet_master_host" => hosts[0].hostname,
-        }
-      end
+describe BeakerAnswers::Version20173to9999 do
+  versions = [
+    '2017.3.0',
+    '2017.3.9999',
+    '2018.1.0',
+    '2018.1.9999',
+    '2018.2.0',
+    '2019.0.0',
+    '2019.1.0',
+    '2019.2.0',
+    '2019.3.0',
+    '2019.3.99',
+    '2019.9.99',
+    '2020.0.0',
+    '2029.0.0',
+    '2099.0.0',
+    '2099.99.99',
+  ]
 
-      include_examples 'pe.conf'
-      include_examples 'valid MEEP 1.0 pe.conf'
+  versions.each do | version |
+    let(:ver)         { version }
+    let(:options)     { StringifyHash.new }
+    let(:mono_hosts) do
+      basic_hosts = make_hosts({'pe_ver' => ver }, 1)
+      basic_hosts[0]['roles'] = ['master', 'agent', 'dashboard', 'database']
+      basic_hosts[0]['platform'] = 'el-7-x86_64'
+      basic_hosts
     end
-  end
+    let(:answers)     { BeakerAnswers::Answers.create(ver, hosts, options) }
+    let(:answer_hash) { answers.answers }
+
+    context 'when generating a default 1.0 config' do
+      context 'for a monolithic install' do
+        let(:hosts) { mono_hosts }
+        let(:gold_role_answers) do
+          {
+            "console_admin_password" => default_password,
+            "puppet_enterprise::puppet_master_host" => hosts[0].hostname,
+          }
+        end
+
+        it "is testing version #{version}" do
+          expect(version).not_to be_empty
+        end
 
-  context 'when generating a meep 2.0 config' do
-    before(:each) do
-      options[:meep_schema_version] = '2.0'
+        include_examples 'pe.conf'
+        include_examples 'valid MEEP 1.0 pe.conf'
+      end
     end
 
-    context 'for a monolithic install' do
-      let(:hosts) { mono_hosts }
-      let(:gold_role_answers) do
-        {
-          "console_admin_password" => default_password,
-          "node_roles" => {
-            "pe_role::monolithic::primary_master" => [hosts[0].hostname],
-          },
-          "agent_platforms" => match_array(['el_7_x86_64']),
-          "meep_schema_version" => "2.0",
-        }
+    context 'when generating a meep 2.0 config' do
+      before(:each) do
+        options[:meep_schema_version] = '2.0'
       end
 
-      include_examples 'pe.conf'
-      include_examples 'valid MEEP 2.0 pe.conf'
+      context 'for a monolithic install' do
+        let(:hosts) { mono_hosts }
+        let(:gold_role_answers) do
+          {
+            "console_admin_password" => default_password,
+            "node_roles" => {
+              "pe_role::monolithic::primary_master" => [hosts[0].hostname],
+            },
+            "agent_platforms" => match_array(['el_7_x86_64']),
+            "meep_schema_version" => "2.0",
+          }
+        end
+
+        it "is testing version #{version}" do
+          expect(version).not_to be_empty
+        end
+
+        include_examples 'pe.conf'
+        include_examples 'valid MEEP 2.0 pe.conf'
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker-answers
 version: !ruby/object:Gem::Version
-  version: 0.26.0
+  version: 0.28.0
 platform: ruby
 authors:
 - Puppetlabs
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-18 00:00:00.000000000 Z
+date: 2020-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fakefs
@@ -137,20 +137,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: markdown
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
@@ -215,16 +201,17 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - ".simplecov"
 - ".travis.yml"
+- CODEOWNERS
 - Gemfile
 - HISTORY.md
 - LICENSE
-- MAINTAINERS
 - README.md
 - Rakefile
 - beaker-answers.gemspec
@@ -246,11 +233,6 @@ files:
 - lib/beaker-answers/versions/version20171.rb
 - lib/beaker-answers/versions/version20172.rb
 - lib/beaker-answers/versions/version20173.rb
-- lib/beaker-answers/versions/version20181.rb
-- lib/beaker-answers/versions/version20182.rb
-- lib/beaker-answers/versions/version20190.rb
-- lib/beaker-answers/versions/version20191.rb
-- lib/beaker-answers/versions/version20192.rb
 - lib/beaker-answers/versions/version28.rb
 - lib/beaker-answers/versions/version30.rb
 - lib/beaker-answers/versions/version32.rb
@@ -266,11 +248,6 @@ files:
 - spec/beaker-answers/versions/version20171_spec.rb
 - spec/beaker-answers/versions/version20172_spec.rb
 - spec/beaker-answers/versions/version20173_spec.rb
-- spec/beaker-answers/versions/version20181_spec.rb
-- spec/beaker-answers/versions/version20182_spec.rb
-- spec/beaker-answers/versions/version20190_spec.rb
-- spec/beaker-answers/versions/version20191_spec.rb
-- spec/beaker-answers/versions/version20192_spec.rb
 - spec/helpers.rb
 - spec/shared/context.rb
 - spec/spec_helper.rb
@@ -293,8 +270,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Answer generation for PE Installation!

data/MAINTAINERS

@@ -1,33 +0,0 @@
-{
-  "version": 1,
-  "file_format": "This MAINTAINERS file format is described at http://pup.pt/maintainers",
-  "issues": "https://tickets.puppet.com/browse/PE",
-  "internal_list": "https://groups.google.com/a/puppet.com/forum/?hl=en#!forum/discuss-organizational-scale",
-  "people": [
-    {
-      "github": "kevpl",
-      "email": "ki@puppet.com",
-      "name": "Kevin Imber"
-    },
-    {
-      "github": "tvpartytonight",
-      "email": "tv@puppet.com",
-      "name": "Tony Vu"
-    },
-    {
-      "github": "jpartlow",
-      "email": "joshua.partlow@puppet.com",
-      "name": "Josh Partlow"
-    },
-    {
-      "github": "demophoon",
-      "email": "britt@puppet.com",
-      "name": "Britt Gresham"
-    },
-    {
-      "github": "highb",
-      "email": "brandon.high@puppet.com",
-      "name": "Brandon High"
-    }
-  ]
-}

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

@@ -1,14 +0,0 @@
-require 'beaker-answers/versions/version20173'
-
-module BeakerAnswers
-  # This class provides answer file information for PE version 2018.1
-  #
-  # @api private
-  class Version20181 < Version20173
-    # The version of PE that this set of answers is appropriate for
-    def self.pe_version_matcher
-      /\A2018\.1/
-    end
-
-  end
-end

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

@@ -1,14 +0,0 @@
-require 'beaker-answers/versions/version20181'
-
-module BeakerAnswers
-  # This class provides answer file information for PE version 2018.2
-  #
-  # @api private
-  class Version20182 < Version20181
-    # The version of PE that this set of answers is appropriate for
-    def self.pe_version_matcher
-      /\A2018\.2/
-    end
-
-  end
-end

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

@@ -1,14 +0,0 @@
-require 'beaker-answers/versions/version20181'
-
-module BeakerAnswers
-  # This class provides answer file information for PE version 2019.0
-  #
-  # @api private
-  class Version20190 < Version20181
-    # The version of PE that this set of answers is appropriate for
-    def self.pe_version_matcher
-      /\A2019\.0/
-    end
-
-  end
-end

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

@@ -1,13 +0,0 @@
-require 'beaker-answers/versions/version20190'
-
-module BeakerAnswers
-    # This class provides answer file information for PE version 2019.1
-    #
-    # @api private
-    class Version20191 < Version20190
-        # The version of PE that this set of answers is appropriate for
-        def self.pe_version_matcher
-            /\A2019\.1/
-        end
-    end
-end

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

@@ -1,13 +0,0 @@
-require 'beaker-answers/versions/version20191'
-
-module BeakerAnswers
-  # This class provides answer file information for PE version 2019.1
-  #
-  # @api private
-  class Version20192 < Version20191
-    # The version of PE that this set of answers is appropriate for
-    def self.pe_version_matcher
-      /\A2019\.2/
-    end
-  end
-end

data/spec/beaker-answers/versions/version20181_spec.rb

@@ -1,53 +0,0 @@
-require 'spec_helper'
-require 'json'
-
-describe BeakerAnswers::Version20181 do
-  let(:ver)         { '2018.1.0' }
-  let(:options)     { StringifyHash.new }
-  let(:mono_hosts) do
-    basic_hosts = make_hosts({'pe_ver' => ver }, 1)
-    basic_hosts[0]['roles'] = ['master', 'agent', 'dashboard', 'database']
-    basic_hosts[0]['platform'] = 'el-7-x86_64'
-    basic_hosts
-  end
-  let(:answers)     { BeakerAnswers::Answers.create(ver, hosts, options) }
-  let(:answer_hash) { answers.answers }
-
-  context 'when generating a default 1.0 config' do
-    context 'for a monolithic install' do
-      let(:hosts) { mono_hosts }
-      let(:gold_role_answers) do
-        {
-          "console_admin_password" => default_password,
-          "puppet_enterprise::puppet_master_host" => hosts[0].hostname,
-        }
-      end
-
-      include_examples 'pe.conf'
-      include_examples 'valid MEEP 1.0 pe.conf'
-    end
-  end
-
-  context 'when generating a meep 2.0 config' do
-    before(:each) do
-      options[:meep_schema_version] = '2.0'
-    end
-
-    context 'for a monolithic install' do
-      let(:hosts) { mono_hosts }
-      let(:gold_role_answers) do
-        {
-          "console_admin_password" => default_password,
-          "node_roles" => {
-            "pe_role::monolithic::primary_master" => [hosts[0].hostname],
-          },
-          "agent_platforms" => match_array(['el_7_x86_64']),
-          "meep_schema_version" => "2.0",
-        }
-      end
-
-      include_examples 'pe.conf'
-      include_examples 'valid MEEP 2.0 pe.conf'
-    end
-  end
-end

data/spec/beaker-answers/versions/version20182_spec.rb

@@ -1,53 +0,0 @@
-require 'spec_helper'
-require 'json'
-
-describe BeakerAnswers::Version20182 do
-  let(:ver)         { '2018.2.0' }
-  let(:options)     { StringifyHash.new }
-  let(:mono_hosts) do
-    basic_hosts = make_hosts({'pe_ver' => ver }, 1)
-    basic_hosts[0]['roles'] = ['master', 'agent', 'dashboard', 'database']
-    basic_hosts[0]['platform'] = 'el-7-x86_64'
-    basic_hosts
-  end
-  let(:answers)     { BeakerAnswers::Answers.create(ver, hosts, options) }
-  let(:answer_hash) { answers.answers }
-
-  context 'when generating a default 1.0 config' do
-    context 'for a monolithic install' do
-      let(:hosts) { mono_hosts }
-      let(:gold_role_answers) do
-        {
-          "console_admin_password" => default_password,
-          "puppet_enterprise::puppet_master_host" => hosts[0].hostname,
-        }
-      end
-
-      include_examples 'pe.conf'
-      include_examples 'valid MEEP 1.0 pe.conf'
-    end
-  end
-
-  context 'when generating a meep 2.0 config' do
-    before(:each) do
-      options[:meep_schema_version] = '2.0'
-    end
-
-    context 'for a monolithic install' do
-      let(:hosts) { mono_hosts }
-      let(:gold_role_answers) do
-        {
-          "console_admin_password" => default_password,
-          "node_roles" => {
-            "pe_role::monolithic::primary_master" => [hosts[0].hostname],
-          },
-          "agent_platforms" => match_array(['el_7_x86_64']),
-          "meep_schema_version" => "2.0",
-        }
-      end
-
-      include_examples 'pe.conf'
-      include_examples 'valid MEEP 2.0 pe.conf'
-    end
-  end
-end

data/spec/beaker-answers/versions/version20190_spec.rb

@@ -1,53 +0,0 @@
-require 'spec_helper'
-require 'json'
-
-describe BeakerAnswers::Version20190 do
-  let(:ver)         { '2019.0.0' }
-  let(:options)     { StringifyHash.new }
-  let(:mono_hosts) do
-    basic_hosts = make_hosts({'pe_ver' => ver }, 1)
-    basic_hosts[0]['roles'] = ['master', 'agent', 'dashboard', 'database']
-    basic_hosts[0]['platform'] = 'el-7-x86_64'
-    basic_hosts
-  end
-  let(:answers)     { BeakerAnswers::Answers.create(ver, hosts, options) }
-  let(:answer_hash) { answers.answers }
-
-  context 'when generating a default 1.0 config' do
-    context 'for a monolithic install' do
-      let(:hosts) { mono_hosts }
-      let(:gold_role_answers) do
-        {
-          "console_admin_password" => default_password,
-          "puppet_enterprise::puppet_master_host" => hosts[0].hostname,
-        }
-      end
-
-      include_examples 'pe.conf'
-      include_examples 'valid MEEP 1.0 pe.conf'
-    end
-  end
-
-  context 'when generating a meep 2.0 config' do
-    before(:each) do
-      options[:meep_schema_version] = '2.0'
-    end
-
-    context 'for a monolithic install' do
-      let(:hosts) { mono_hosts }
-      let(:gold_role_answers) do
-        {
-          "console_admin_password" => default_password,
-          "node_roles" => {
-            "pe_role::monolithic::primary_master" => [hosts[0].hostname],
-          },
-          "agent_platforms" => match_array(['el_7_x86_64']),
-          "meep_schema_version" => "2.0",
-        }
-      end
-
-      include_examples 'pe.conf'
-      include_examples 'valid MEEP 2.0 pe.conf'
-    end
-  end
-end

data/spec/beaker-answers/versions/version20191_spec.rb

@@ -1,53 +0,0 @@
-require 'spec_helper'
-require 'json'
-
-describe BeakerAnswers::Version20191 do
-  let(:ver)         { '2019.1.0' }
-  let(:options)     { StringifyHash.new }
-  let(:mono_hosts) do
-    basic_hosts = make_hosts({'pe_ver' => ver }, 1)
-    basic_hosts[0]['roles'] = ['master', 'agent', 'dashboard', 'database']
-    basic_hosts[0]['platform'] = 'el-7-x86_64'
-    basic_hosts
-  end
-  let(:answers)     { BeakerAnswers::Answers.create(ver, hosts, options) }
-  let(:answer_hash) { answers.answers }
-
-  context 'when generating a default 1.0 config' do
-    context 'for a monolithic install' do
-      let(:hosts) { mono_hosts }
-      let(:gold_role_answers) do
-        {
-          "console_admin_password" => default_password,
-          "puppet_enterprise::puppet_master_host" => hosts[0].hostname,
-        }
-      end
-
-      include_examples 'pe.conf'
-      include_examples 'valid MEEP 1.0 pe.conf'
-    end
-  end
-
-  context 'when generating a meep 2.0 config' do
-    before(:each) do
-      options[:meep_schema_version] = '2.0'
-    end
-
-    context 'for a monolithic install' do
-      let(:hosts) { mono_hosts }
-      let(:gold_role_answers) do
-        {
-          "console_admin_password" => default_password,
-          "node_roles" => {
-            "pe_role::monolithic::primary_master" => [hosts[0].hostname],
-          },
-          "agent_platforms" => match_array(['el_7_x86_64']),
-          "meep_schema_version" => "2.0",
-        }
-      end
-
-      include_examples 'pe.conf'
-      include_examples 'valid MEEP 2.0 pe.conf'
-    end
-  end
-end

data/spec/beaker-answers/versions/version20192_spec.rb

@@ -1,53 +0,0 @@
-require 'spec_helper'
-require 'json'
-
-describe BeakerAnswers::Version20192 do
-  let(:ver)         { '2019.2.0' }
-  let(:options)     { StringifyHash.new }
-  let(:mono_hosts) do
-    basic_hosts = make_hosts({'pe_ver' => ver }, 1)
-    basic_hosts[0]['roles'] = ['master', 'agent', 'dashboard', 'database']
-    basic_hosts[0]['platform'] = 'el-7-x86_64'
-    basic_hosts
-  end
-  let(:answers)     { BeakerAnswers::Answers.create(ver, hosts, options) }
-  let(:answer_hash) { answers.answers }
-
-  context 'when generating a default 1.0 config' do
-    context 'for a monolithic install' do
-      let(:hosts) { mono_hosts }
-      let(:gold_role_answers) do
-        {
-          "console_admin_password" => default_password,
-          "puppet_enterprise::puppet_master_host" => hosts[0].hostname,
-        }
-      end
-
-      include_examples 'pe.conf'
-      include_examples 'valid MEEP 1.0 pe.conf'
-    end
-  end
-
-  context 'when generating a meep 2.0 config' do
-    before(:each) do
-      options[:meep_schema_version] = '2.0'
-    end
-
-    context 'for a monolithic install' do
-      let(:hosts) { mono_hosts }
-      let(:gold_role_answers) do
-        {
-          "console_admin_password" => default_password,
-          "node_roles" => {
-            "pe_role::monolithic::primary_master" => [hosts[0].hostname],
-          },
-          "agent_platforms" => match_array(['el_7_x86_64']),
-          "meep_schema_version" => "2.0",
-        }
-      end
-
-      include_examples 'pe.conf'
-      include_examples 'valid MEEP 2.0 pe.conf'
-    end
-  end
-end