.github/workflows/auto_release.yml → .github/workflows/release-prep.yml

@@ -1,12 +1,15 @@
-name: "Auto release"
+name: "Release Prep"
 
 on:
   workflow_dispatch:
+    inputs:
+      personal_access_token:
+        description: 'GitHub Personal Access Token'
+        required: true
 
 env:
   HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6 
   HONEYCOMB_DATASET: litmus tests
-  CHANGELOG_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
 jobs:
   auto_release:
@@ -38,7 +41,7 @@ jobs:
       with:
         args: 'release prep --force'
       env:
-        CHANGELOG_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        CHANGELOG_GITHUB_TOKEN: "${{ github.event.inputs.personal_access_token }}"
 
     - name: "Get Version"
       if: ${{ github.repository_owner == 'puppetlabs' }}

.sync.yml

@@ -9,6 +9,8 @@ Gemfile:
   optional:
     ':development':
       - gem: 'github_changelog_generator'
+      - gem: 'octokit'
+        version: '4.21.0' # Locked due to https://github.com/octokit/octokit.rb/issues/1391
 Rakefile:
   changelog_since_tag: '2.5.0'
   extras:

CHANGELOG.md

@@ -2,6 +2,21 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
+## [v3.5.0](https://github.com/puppetlabs/puppetlabs-peadm/tree/v3.5.0) (2022-04-13)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-peadm/compare/v3.4.0...v3.5.0)
+
+### Added
+
+- Add support for SLES 12 [\#245](https://github.com/puppetlabs/puppetlabs-peadm/pull/245) ([MartyEwings](https://github.com/MartyEwings))
+- Add `peadm::add_database` plan [\#241](https://github.com/puppetlabs/puppetlabs-peadm/pull/241) ([ody](https://github.com/ody))
+- Add experimental `peadm::util::code_sync_status` plan [\#221](https://github.com/puppetlabs/puppetlabs-peadm/pull/221) ([reidmv](https://github.com/reidmv))
+
+### Fixed
+
+- Fix json escaping in `bash_task_helper` [\#246](https://github.com/puppetlabs/puppetlabs-peadm/pull/246) ([reidmv](https://github.com/reidmv))
+- Fix load balancer bug in `peadm::get_peadm_config` task [\#244](https://github.com/puppetlabs/puppetlabs-peadm/pull/244) ([reidmv](https://github.com/reidmv))
+
 ## [v3.4.0](https://github.com/puppetlabs/puppetlabs-peadm/tree/v3.4.0) (2022-03-08)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-peadm/compare/v3.3.0...v3.4.0)

Gemfile

@@ -27,6 +27,7 @@ group :development do
   gem "puppet-debugger", '>= 0.18.0',                            require: false
   gem "bolt", '>= 3.17.0',                                       require: false
   gem "github_changelog_generator",                              require: false
+  gem "octokit", '4.21.0',                                       require: false
 end
 group :system_tests do
   gem "puppet-module-posix-system-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]

REFERENCE.md

@@ -76,6 +76,7 @@
 
 #### Public Plans
 
+* [`peadm::add_database`](#peadmadd_database)
 * [`peadm::backup`](#peadmbackup): Backup the core user settings for puppet infrastructure
 * [`peadm::convert`](#peadmconvert): Convert an existing PE cluster to a PEAdm-managed cluster
 * [`peadm::install`](#peadminstall): Install a new PE cluster
@@ -92,13 +93,21 @@ Supported use cases:
    The new replica should have the same certname as the broken one.
 * `peadm::misc::divert_code_manager`: This plan exists to account for a scenario where a PE XL
 * `peadm::modify_cert_extensions`
+* `peadm::subplans::component_install`: Install a new PEADM component
 * `peadm::subplans::configure`: Configure first-time classification and DR setup
+* `peadm::subplans::db_populate`: Destructively (re)populates a new or existing database with the contents or a known good source
 * `peadm::subplans::install`: Perform initial installation of Puppet Enterprise Extra Large
 * `peadm::subplans::modify_certificate`
+* `peadm::subplans::prepare_agent`
 * `peadm::uninstall`: Single-entry-point plan for uninstalling Puppet Enterprise
+* `peadm::util::code_sync_status`
+* `peadm::util::db_disable_pglogical`
+* `peadm::util::db_purge`
 * `peadm::util::insert_csr_extension_requests`
 * `peadm::util::retrieve_and_upload`
 * `peadm::util::sanitize_pg_pe_conf`
+* `peadm::util::update_classification`: Configure classification
+* `peadm::util::update_db_setting`: Make updates to PuppetDB database settings
 
 ## Classes
 
@@ -1226,6 +1235,53 @@ Which port to query the status API on
 
 ## Plans
 
+### <a name="peadmadd_database"></a>`peadm::add_database`
+
+The peadm::add_database class.
+
+#### Parameters
+
+The following parameters are available in the `peadm::add_database` plan:
+
+* [`targets`](#targets)
+* [`primary_host`](#primary_host)
+* [`mode`](#mode)
+* [`begin_at_step`](#begin_at_step)
+
+##### <a name="targets"></a>`targets`
+
+Data type: `Peadm::SingleTargetSpec`
+
+
+
+##### <a name="primary_host"></a>`primary_host`
+
+Data type: `Peadm::SingleTargetSpec`
+
+
+
+##### <a name="mode"></a>`mode`
+
+Data type: `Optional[Enum['init', 'pair']]`
+
+
+
+Default value: ``undef``
+
+##### <a name="begin_at_step"></a>`begin_at_step`
+
+Data type: `Optional[Enum[
+    'init-db-node',
+    'replicate-db',
+    'update-classification',
+    'update-db-settings',
+    'cleanup-db',
+    'finalize']]`
+
+
+
+Default value: ``undef``
+
 ### <a name="peadmbackup"></a>`peadm::backup`
 
 This plan can backup data as outlined at insert doc

files/task_helper.sh

@@ -165,10 +165,10 @@ task-json-escape() {
   # 6. Delete any remaining non-printable lines from the stream
   sed -e 's/\\/\\/g' \
     | { iconv -t ASCII --unicode-subst="\u%04x" || cat; } \
-    | sed -e 's/"/\\"/' \
+    | sed -e 's/"/\\"/g' \
           -e 's/\//\\\//g' \
-          -e "s/$(printf '\b')/\\\b/" \
-          -e "s/$(printf '\f')/\\\f/" \
+          -e "s/$(printf '\b')/\\\b/g" \
+          -e "s/$(printf '\f')/\\\f/g" \
           -e 's/\r/\\r/g' \
           -e 's/\t/\\t/g' \
           -e "s/$(printf "\x1b")/\\\u001b/g" \

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-peadm",
-  "version": "3.4.0",
+  "version": "3.5.0",
   "author": "puppetlabs",
   "summary": "Bolt plans used to deploy an at-scale Puppet Enterprise architecture",
   "license": "Apache-2.0",
@@ -31,6 +31,10 @@
     {
       "name": "puppetlabs/service",
       "version_requirement": ">= 1.3.0 < 3.0.0"
+    },
+    {
+      "name": "puppetlabs/inifile",
+      "version_requirement": ">= 5.2.0 < 6.0.0"
     }
   ],
   "operatingsystem_support": [
@@ -54,6 +58,12 @@
         "18.04",
         "20.04"
       ]
+    },
+    {
+      "operatingsystem": "SLES",
+      "operatingsystemrelease": [
+        "12"
+      ]
     }
   ],
   "requirements": [