diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5b71bfcff..a816d11d4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,6 +13,4 @@ jobs: if: ${{ github.repository_owner == 'puppetlabs' }} needs: Spec uses: puppetlabs/cat-github-actions/.github/workflows/module_acceptance.yml@main - with: - flags: --provision-service secrets: inherit diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index d1d53a215..cd5a5d3aa 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -13,6 +13,4 @@ jobs: if: ${{ github.repository_owner == 'puppetlabs' }} needs: Spec uses: puppetlabs/cat-github-actions/.github/workflows/module_acceptance.yml@main - with: - flags: --provision-service secrets: inherit diff --git a/.github/workflows/test-add-compiler-matrix.yml b/.github/workflows/test-add-compiler-matrix.yml index 5a5665bf2..3caf6071a 100644 --- a/.github/workflows/test-add-compiler-matrix.yml +++ b/.github/workflows/test-add-compiler-matrix.yml @@ -36,7 +36,7 @@ jobs: fail-fast: false matrix: architecture: [standard, large, extra-large] - version: [2021.7.9, 2023.8.4, 2025.4.0] + version: [2021.7.9, 2023.8.5, 2025.5.0] image: [almalinux-cloud/almalinux-8] steps: - name: Checkout Source diff --git a/.github/workflows/test-add-compiler.yaml b/.github/workflows/test-add-compiler.yaml index 22002a7c3..629ac3156 100644 --- a/.github/workflows/test-add-compiler.yaml +++ b/.github/workflows/test-add-compiler.yaml @@ -14,7 +14,7 @@ on: version: description: PE version to install required: true - default: 2023.8.4 + default: 2023.8.5 ssh-debugging: description: Boolean; whether or not to pause for ssh debugging required: true diff --git a/.github/workflows/test-add-replica-matrix.yaml b/.github/workflows/test-add-replica-matrix.yaml index 17a22dbe0..c01b89991 100644 --- a/.github/workflows/test-add-replica-matrix.yaml +++ b/.github/workflows/test-add-replica-matrix.yaml @@ -36,7 +36,7 @@ jobs: fail-fast: false matrix: architecture: [standard, standard-with-dr, large, extra-large] - version: [2023.8.4, 2025.4.0] + version: [2023.8.5, 2025.5.0] image: [almalinux-cloud/almalinux-8] steps: - name: Checkout Source diff --git a/.github/workflows/test-add-replica.yaml b/.github/workflows/test-add-replica.yaml index 1420e5217..5fc5746d6 100644 --- a/.github/workflows/test-add-replica.yaml +++ b/.github/workflows/test-add-replica.yaml @@ -14,7 +14,7 @@ on: version: description: PE version to install required: true - default: 2023.8.4 + default: 2023.8.5 ssh-debugging: description: Boolean; whether or not to pause for ssh debugging required: true diff --git a/.github/workflows/test-backup-restore.yaml b/.github/workflows/test-backup-restore.yaml index 0e71c37bd..ee4117d6b 100644 --- a/.github/workflows/test-backup-restore.yaml +++ b/.github/workflows/test-backup-restore.yaml @@ -24,14 +24,14 @@ on: version: description: PE version to install required: true - default: 2025.4.0 + default: 2025.5.0 ssh-debugging: description: Boolean; whether or not to pause for ssh debugging required: true default: 'false' jobs: backup-restore-test: - name: "Backup, break and restore cluster: PE ${{ github.event.inputs.version || '2025.4.0' }}\ + name: "Backup, break and restore cluster: PE ${{ github.event.inputs.version || '2025.5.0' }}\ \ ${{ github.event.inputs.architecture || 'extra-large' }} on ${{ github.event.inputs.image || 'almalinux-cloud/almalinux-8' }}" runs-on: ubuntu-latest env: diff --git a/.github/workflows/test-failover.yaml b/.github/workflows/test-failover.yaml index f0a50ae23..52412f7b6 100644 --- a/.github/workflows/test-failover.yaml +++ b/.github/workflows/test-failover.yaml @@ -14,7 +14,7 @@ on: version_to_upgrade: description: PE version to upgrade to required: false - default: 2023.8.4 + default: 2023.8.5 ssh-debugging: description: Boolean; whether or not to pause for ssh debugging required: true diff --git a/.github/workflows/test-fips-install-matrix.yaml b/.github/workflows/test-fips-install-matrix.yaml index 9f003626c..16c97560b 100644 --- a/.github/workflows/test-fips-install-matrix.yaml +++ b/.github/workflows/test-fips-install-matrix.yaml @@ -37,7 +37,7 @@ jobs: fail-fast: false matrix: architecture: [standard-with-dr, large, extra-large-with-dr] - version: [2021.7.9, 2023.8.4, 2025.4.0] + version: [2021.7.9, 2023.8.5, 2025.5.0] image: [rhel-8] fips: [enable] steps: diff --git a/.github/workflows/test-install-matrix.yaml b/.github/workflows/test-install-matrix.yaml index 7c4d51974..c4afb2556 100644 --- a/.github/workflows/test-install-matrix.yaml +++ b/.github/workflows/test-install-matrix.yaml @@ -36,7 +36,7 @@ jobs: fail-fast: false matrix: architecture: [standard-with-dr, large, extra-large-with-dr] - version: [2021.7.9, 2023.8.4, 2025.4.0] + version: [2021.7.9, 2023.8.5, 2025.5.0] image: [almalinux-cloud/almalinux-8] steps: - name: Checkout Source diff --git a/.github/workflows/test-install-rhel-9.yaml b/.github/workflows/test-install-rhel-9.yaml index b6ed1d229..c5b76487f 100644 --- a/.github/workflows/test-install-rhel-9.yaml +++ b/.github/workflows/test-install-rhel-9.yaml @@ -36,7 +36,7 @@ jobs: fail-fast: false matrix: architecture: [standard-with-dr, large, extra-large-with-dr] - version: [2021.7.9, 2023.8.4, 2025.4.0] + version: [2021.7.9, 2023.8.5, 2025.5.0] image: [rhel-9] steps: - name: Checkout Source diff --git a/.github/workflows/test-install.yaml b/.github/workflows/test-install.yaml index d4f17d928..0ab2f7acb 100644 --- a/.github/workflows/test-install.yaml +++ b/.github/workflows/test-install.yaml @@ -14,7 +14,7 @@ on: version: description: PE version to install required: true - default: 2023.8.4 + default: 2023.8.5 ssh-debugging: description: Boolean; whether or not to pause for ssh debugging required: true diff --git a/.github/workflows/test-legacy-compilers.yaml b/.github/workflows/test-legacy-compilers.yaml index 4972db63c..07f6c017a 100644 --- a/.github/workflows/test-legacy-compilers.yaml +++ b/.github/workflows/test-legacy-compilers.yaml @@ -99,7 +99,7 @@ jobs: --modulepath spec/fixtures/modules \ architecture=large-with-dr \ console_password=${{ secrets.CONSOLE_PASSWORD }} \ - version=2025.4.0 + version=2025.5.0 - name: Wait as long as the file ${HOME}/pause file is present if: ${{ always() && github.event.inputs.ssh-debugging == 'true' }} run: | diff --git a/.github/workflows/test-legacy-upgrade.yaml b/.github/workflows/test-legacy-upgrade.yaml index e4953ad6f..4ed832d0d 100644 --- a/.github/workflows/test-legacy-upgrade.yaml +++ b/.github/workflows/test-legacy-upgrade.yaml @@ -152,7 +152,7 @@ jobs: compiler=$(yq '.groups[].targets[] | select(.vars.role == "compiler") | .name' spec/fixtures/litmus_inventory.yaml | head -n 1) legacy_compiler=$(yq '.groups[].targets[] | select(.vars.role == "compiler") | .name' spec/fixtures/litmus_inventory.yaml | sed -n 2p) replica=$(yq '.groups[].targets[] | select(.vars.role == "replica") | .name' spec/fixtures/litmus_inventory.yaml) - echo -n '{ "primary_host": "'$primary'", "replica_host": "'$replica'", "compiler_hosts": ["'$compiler'", "'$legacy_compiler'"], "version": "2025.4.0"}' > upgrade_params.json + echo -n '{ "primary_host": "'$primary'", "replica_host": "'$replica'", "compiler_hosts": ["'$compiler'", "'$legacy_compiler'"], "version": "2025.5.0"}' > upgrade_params.json - name: Upgrade PE with legacy compilers run: | echo ::group::upgrade_params.json diff --git a/.github/workflows/test-migration.yaml b/.github/workflows/test-migration.yaml index 5d7d9d14d..69cadf655 100644 --- a/.github/workflows/test-migration.yaml +++ b/.github/workflows/test-migration.yaml @@ -43,30 +43,30 @@ jobs: - extra-large - large-with-dr - extra-large-with-dr - version: [2021.7.9, 2023.8.4, 2025.4.0] + version: [2021.7.9, 2023.8.5, 2025.5.0] image: [almalinux-cloud/almalinux-8] include: - architecture: standard - version: 2023.8.4 + version: 2023.8.5 image: almalinux-cloud/almalinux-8 - new_pe_version: 2025.4.0 + new_pe_version: 2025.5.0 - architecture: large - version: 2023.8.4 + version: 2023.8.5 image: almalinux-cloud/almalinux-8 - new_pe_version: 2025.4.0 + new_pe_version: 2025.5.0 - architecture: extra-large - version: 2023.8.4 + version: 2023.8.5 image: almalinux-cloud/almalinux-8 - new_pe_version: 2025.4.0 + new_pe_version: 2025.5.0 # excluding the following combinations as due to their long running nature they always fail due to # the test nodes in GCP that litmus provisions becoming unreachable after a time. If we address PE-40902 # to change how we provision test nodes in CI then we will hopefully be able to include these exclude: - architecture: extra-large-with-dr - version: 2023.8.4 + version: 2023.8.5 image: almalinux-cloud/almalinux-8 - architecture: extra-large-with-dr - version: 2025.4.0 + version: 2025.5.0 image: almalinux-cloud/almalinux-8 steps: - name: Checkout Source diff --git a/.github/workflows/test-replace-failed-postgresql.yaml b/.github/workflows/test-replace-failed-postgresql.yaml index bf99f390e..bb677db51 100644 --- a/.github/workflows/test-replace-failed-postgresql.yaml +++ b/.github/workflows/test-replace-failed-postgresql.yaml @@ -37,7 +37,7 @@ jobs: matrix: architecture: [extra-large-with-dr-and-spare-replica] install_architecture: [extra-large-with-dr] - version: [2021.7.9, 2023.8.4, 2025.4.0] + version: [2021.7.9, 2023.8.5, 2025.5.0] image: [almalinux-cloud/almalinux-8] steps: - name: Checkout Source diff --git a/.github/workflows/test-upgrade-latest-dev.yaml b/.github/workflows/test-upgrade-latest-dev.yaml index 057191851..254ba4c57 100644 --- a/.github/workflows/test-upgrade-latest-dev.yaml +++ b/.github/workflows/test-upgrade-latest-dev.yaml @@ -23,7 +23,7 @@ on: type: string required: true description: The initial version of PE to install before upgrade - default: 2023.8.4 + default: 2023.8.5 ssh-debugging: description: Boolean; whether or not to pause for ssh debugging required: true diff --git a/.github/workflows/test-upgrade-latest-xlarge-dev-nightly.yaml b/.github/workflows/test-upgrade-latest-xlarge-dev-nightly.yaml index 83743f383..280f2a198 100644 --- a/.github/workflows/test-upgrade-latest-xlarge-dev-nightly.yaml +++ b/.github/workflows/test-upgrade-latest-xlarge-dev-nightly.yaml @@ -16,7 +16,7 @@ jobs: fail-fast: false matrix: architecture: [extra-large-with-dr] - version: [2023.8.4] + version: [2023.8.5] image: [almalinux-cloud/almalinux-8] steps: - name: Checkout Source diff --git a/.github/workflows/test-upgrade-matrix.yaml b/.github/workflows/test-upgrade-matrix.yaml index 5335b4485..27d7644a7 100644 --- a/.github/workflows/test-upgrade-matrix.yaml +++ b/.github/workflows/test-upgrade-matrix.yaml @@ -37,19 +37,19 @@ jobs: fail-fast: false matrix: architecture: [standard, extra-large] # removing xl-with dr until PE-40902 is addressed - version: [2021.7.9, 2023.8.4] - version_to_upgrade: [2021.7.9, 2023.8.4, 2025.4.0] + version: [2021.7.9, 2023.8.5] + version_to_upgrade: [2021.7.9, 2023.8.5, 2025.5.0] image: [almalinux-cloud/almalinux-8] download_mode: [direct] exclude: - version: 2021.7.9 version_to_upgrade: 2021.7.9 - version: 2021.7.9 - version_to_upgrade: 2025.4.0 - - version: 2023.8.4 + version_to_upgrade: 2025.5.0 + - version: 2023.8.5 version_to_upgrade: 2021.7.9 - - version: 2023.8.4 - version_to_upgrade: 2023.8.4 + - version: 2023.8.5 + version_to_upgrade: 2023.8.5 steps: - name: Start SSH session if: ${{ github.event.inputs.ssh-debugging == 'true' }} diff --git a/.github/workflows/test-upgrade.yaml b/.github/workflows/test-upgrade.yaml index 4ea535a55..9f0b47b27 100644 --- a/.github/workflows/test-upgrade.yaml +++ b/.github/workflows/test-upgrade.yaml @@ -26,7 +26,7 @@ on: upgrade_version: description: PE version to upgrade to required: true - default: 2023.8.4 + default: 2023.8.5 ssh-debugging: description: Boolean; whether or not to pause for ssh debugging required: true diff --git a/.rubocop.yml b/.rubocop.yml index 36bb3ab1d..950780ef5 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,40 +1,40 @@ --- -require: -- rubocop-performance -- rubocop-rspec +plugins: + - rubocop-performance + - rubocop-rspec + - rubocop-rspec_rails + - rubocop-factory_bot + - rubocop-capybara AllCops: Newcops: enable ExtraDetails: true DisplayStyleGuide: true DisplayCopNames: true TargetRubyVersion: '2.7' - Include: - - "**/*.rb" + Include: ['**/*.rb'] Exclude: - - bin/* - - ".vendor/**/*" - - "**/Gemfile" - - "**/Rakefile" - - pkg/**/* - - spec/fixtures/**/* - - vendor/**/* - - "**/Puppetfile" - - "**/Vagrantfile" - - "**/Guardfile" + - bin/* + - .vendor/**/* + - '**/Gemfile' + - '**/Rakefile' + - pkg/**/* + - spec/fixtures/**/* + - vendor/**/* + - '**/Puppetfile' + - '**/Vagrantfile' + - '**/Guardfile' Layout/LineLength: Description: People have wide screens, use them. Max: 200 RSpec/BeforeAfterAll: Description: Beware of using after(:all) as it may cause state to leak between tests. A necessary evil in acceptance testing. - Exclude: - - spec/acceptance/**/*.rb + Exclude: [spec/acceptance/**/*.rb] RSpec/HookArgument: Description: Prefer explicit :each argument, matching existing module's style EnforcedStyle: each RSpec/DescribeSymbol: - Exclude: - - spec/unit/facter/**/*.rb + Exclude: [spec/unit/facter/**/*.rb] Style/BlockDelimiters: Description: Prefer braces for chaining. Mostly an aesthetical choice. Better to be consistent then. @@ -77,9 +77,7 @@ Style/SymbolArray: RSpec/MessageSpies: EnforcedStyle: receive Style/Documentation: - Exclude: - - lib/puppet/parser/functions/**/* - - spec/**/* + Exclude: [lib/puppet/parser/functions/**/*, spec/**/*] Style/WordArray: EnforcedStyle: brackets Performance/AncestorsInclude: @@ -296,7 +294,7 @@ Performance/UriDefaultParser: Enabled: false RSpec/Be: Enabled: false -RSpec/Capybara/FeatureMethods: +RSpec/Dialect: Enabled: false RSpec/ContainExactly: Enabled: false @@ -318,15 +316,17 @@ RSpec/ExampleLength: Enabled: false RSpec/ExampleWithoutDescription: Enabled: false +RSpec/ExampleWording: + Enabled: false RSpec/ExpectChange: Enabled: false RSpec/ExpectInHook: Enabled: false -RSpec/FactoryBot/AttributeDefinedStatically: +FactoryBot/AttributeDefinedStatically: Enabled: false -RSpec/FactoryBot/CreateList: +FactoryBot/CreateList: Enabled: false -RSpec/FactoryBot/FactoryClassName: +FactoryBot/FactoryClassName: Enabled: false RSpec/HooksBeforeExamples: Enabled: false @@ -464,6 +464,8 @@ Style/RedundantSelfAssignment: Enabled: false Style/RedundantSort: Enabled: false +Style/RedundantReturn: + Enabled: false Style/RescueStandardError: Enabled: false Style/SingleArgumentDig: @@ -598,13 +600,15 @@ RSpec/ClassCheck: Enabled: false RSpec/DuplicatedMetadata: Enabled: false +RSpec/MetadataStyle: + Enabled: false RSpec/ExcessiveDocstringSpacing: Enabled: false -RSpec/FactoryBot/ConsistentParenthesesStyle: +FactoryBot/ConsistentParenthesesStyle: Enabled: false -RSpec/FactoryBot/FactoryNameStyle: +FactoryBot/FactoryNameStyle: Enabled: false -RSpec/FactoryBot/SyntaxMethods: +FactoryBot/SyntaxMethods: Enabled: false RSpec/IdenticalEqualityAssertion: Enabled: false @@ -612,15 +616,15 @@ RSpec/NoExpectationExample: Enabled: false RSpec/PendingWithoutReason: Enabled: false -RSpec/Rails/AvoidSetupHook: +RSpecRails/AvoidSetupHook: Enabled: false -RSpec/Rails/HaveHttpStatus: +RSpecRails/HaveHttpStatus: Enabled: false -RSpec/Rails/InferredSpecType: +RSpecRails/InferredSpecType: Enabled: false -RSpec/Rails/MinitestAssertions: +RSpecRails/MinitestAssertions: Enabled: false -RSpec/Rails/TravelAround: +RSpecRails/TravelAround: Enabled: false RSpec/RedundantAround: Enabled: false @@ -724,3 +728,145 @@ Style/StringChars: Enabled: false Style/SwapValues: Enabled: false +Gemspec/AddRuntimeDependency: # new in 1.65 + Enabled: false +Gemspec/AttributeAssignment: # new in 1.77 + Enabled: false +Layout/EmptyLinesAfterModuleInclusion: # new in 1.79 + Enabled: false +Lint/ArrayLiteralInRegexp: # new in 1.71 + Enabled: false +Lint/ConstantReassignment: # new in 1.70 + Enabled: false +Lint/CopDirectiveSyntax: # new in 1.72 + Enabled: false +Lint/DuplicateMatchPattern: # new in 1.50 + Enabled: false +Lint/DuplicateSetElement: # new in 1.67 + Enabled: false +Lint/HashNewWithKeywordArgumentsAsDefault: # new in 1.69 + Enabled: false +Lint/ItWithoutArgumentsInBlock: # new in 1.59 + Enabled: false +Lint/LiteralAssignmentInCondition: # new in 1.58 + Enabled: false +Lint/MixedCaseRange: # new in 1.53 + Enabled: false +Lint/NumericOperationWithConstantResult: # new in 1.69 + Enabled: false +Lint/RedundantRegexpQuantifiers: # new in 1.53 + Enabled: false +Lint/RedundantTypeConversion: # new in 1.72 + Enabled: false +Lint/SharedMutableDefault: # new in 1.70 + Enabled: false +Lint/SuppressedExceptionInNumberConversion: # new in 1.72 + Enabled: false +Lint/UnescapedBracketInRegexp: # new in 1.68 + Enabled: false +Lint/UselessConstantScoping: # new in 1.72 + Enabled: false +Lint/UselessDefaultValueArgument: # new in 1.76 + Enabled: false +Lint/UselessDefined: # new in 1.69 + Enabled: false +Lint/UselessNumericOperation: # new in 1.66 + Enabled: false +Lint/UselessOr: # new in 1.76 + Enabled: false +Naming/PredicateMethod: # new in 1.76 + Enabled: false +Style/AmbiguousEndlessMethodDefinition: # new in 1.68 + Enabled: false +Style/BitwisePredicate: # new in 1.68 + Enabled: false +Style/CollectionQuerying: # new in 1.77 + Enabled: false +Style/CombinableDefined: # new in 1.68 + Enabled: false +Style/ComparableBetween: # new in 1.74 + Enabled: false +Style/DataInheritance: # new in 1.49 + Enabled: false +Style/DigChain: # new in 1.69 + Enabled: false +Style/EmptyStringInsideInterpolation: # new in 1.76 + Enabled: false +Style/ExactRegexpMatch: # new in 1.51 + Enabled: false +Style/FileNull: # new in 1.69 + Enabled: false +Style/FileTouch: # new in 1.69 + Enabled: false +Style/HashFetchChain: # new in 1.75 + Enabled: false +Style/HashSlice: # new in 1.71 + Enabled: false +Style/ItAssignment: # new in 1.70 + Enabled: false +Style/ItBlockParameter: # new in 1.75 + Enabled: false +Style/KeywordArgumentsMerging: # new in 1.68 + Enabled: false +Style/MapIntoArray: # new in 1.63 + Enabled: false +Style/RedundantArrayConstructor: # new in 1.52 + Enabled: false +Style/RedundantArrayFlatten: # new in 1.76 + Enabled: false +Style/RedundantCurrentDirectoryInPath: # new in 1.53 + Enabled: false +Style/RedundantFilterChain: # new in 1.52 + Enabled: false +Style/RedundantFormat: # new in 1.72 + Enabled: false +Style/RedundantInterpolationUnfreeze: # new in 1.66 + Enabled: false +Style/RedundantLineContinuation: # new in 1.49 + Enabled: false +Style/RedundantRegexpArgument: # new in 1.53 + Enabled: false +Style/RedundantRegexpConstructor: # new in 1.52 + Enabled: false +Style/ReturnNilInPredicateMethodDefinition: # new in 1.53 + Enabled: false +Style/SafeNavigationChainLength: # new in 1.68 + Enabled: false +Style/SendWithLiteralMethodName: # new in 1.64 + Enabled: false +Style/SingleLineDoEndBlock: # new in 1.57 + Enabled: false +Style/SuperArguments: # new in 1.64 + Enabled: false +Style/SuperWithArgsParentheses: # new in 1.58 + Enabled: false +Style/YAMLFileRead: # new in 1.53 + Enabled: false +Performance/MapMethodChain: # new in 1.19 + Enabled: false +Performance/StringBytesize: # new in 1.23 + Enabled: false +Performance/ZipWithoutBlock: # new in 1.24 + Enabled: false +RSpec/IncludeExamples: # new in 3.6 + Enabled: false +RSpecRails/NegationBeValid: # new in 2.23 + Enabled: false +FactoryBot/AssociationStyle: # new in 2.23 + Enabled: false +FactoryBot/ExcessiveCreateList: # new in 2.25 + Enabled: false +FactoryBot/FactoryAssociationWithStrategy: # new in 2.23 + Enabled: false +FactoryBot/IdSequence: # new in 2.24 + Enabled: false +FactoryBot/RedundantFactoryOption: # new in 2.23 + Enabled: false +Capybara/FindAllFirst: # new in 2.22 + Enabled: false +Capybara/NegationMatcherAfterVisit: # new in 2.22 + Enabled: false +Capybara/RedundantWithinFind: # new in 2.20 + Enabled: false +Capybara/RSpec/HaveSelector: # new in 2.19 + Enabled: false diff --git a/CHANGELOG.md b/CHANGELOG.md index 0cf38b661..c7a47e963 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,18 @@ 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.31.0](https://github.com/puppetlabs/puppetlabs-peadm/tree/v3.31.0) - 2025-08-06 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-peadm/compare/v3.30.0...v3.31.0) + +### Added + +- (PE-41949) Add PE 2023.8.5 and 2025.5.0 support [#609](https://github.com/puppetlabs/puppetlabs-peadm/pull/609) ([davidmalloncares](https://github.com/davidmalloncares)) + +### Other + +- (PE-42025) addressing rexml CVE [#607](https://github.com/puppetlabs/puppetlabs-peadm/pull/607) ([davidmalloncares](https://github.com/davidmalloncares)) + ## [v3.30.0](https://github.com/puppetlabs/puppetlabs-peadm/tree/v3.30.0) - 2025-06-27 [Full Changelog](https://github.com/puppetlabs/puppetlabs-peadm/compare/v3.29.0...v3.30.0) diff --git a/Gemfile b/Gemfile index a9b8edbae..baa66333d 100644 --- a/Gemfile +++ b/Gemfile @@ -31,11 +31,14 @@ group :development do gem "pry", '~> 0.10', require: false gem "simplecov-console", '~> 0.5', require: false gem "puppet-debugger", '~> 1.0', require: false - gem "rubocop", '= 1.48.1', require: false - gem "rubocop-performance", '= 1.16.0', require: false - gem "rubocop-rspec", '= 2.19.0', require: false + gem "rubocop", '= 1.79.0', require: false + gem "rubocop-performance", '= 1.25.0', require: false + gem "rubocop-rspec", '= 3.6.0', require: false + gem "rubocop-rspec_rails", '~> 2.31.0', require: false + gem "rubocop-factory_bot", '~> 2.27.1', require: false + gem "rubocop-capybara", '~> 2.22.1', require: false gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw] - gem "bolt", '>= 3.27.2', require: false + gem "bolt", '>= 4.0.0', require: false gem "github_changelog_generator", '1.16.4', require: false gem "octokit", '4.21.0', require: false gem "orchestrator_client", '< 0.7.1', require: false diff --git a/REFERENCE.md b/REFERENCE.md index 3adadb731..0923a5804 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -2287,7 +2287,7 @@ Data type: `Peadm::Pe_version` -Default value: `'2023.8.4'` +Default value: `'2023.8.5'` ##### `dns_alt_names` diff --git a/functions/assert_supported_pe_version.pp b/functions/assert_supported_pe_version.pp index b8f6ba3b9..11e97a827 100644 --- a/functions/assert_supported_pe_version.pp +++ b/functions/assert_supported_pe_version.pp @@ -6,7 +6,7 @@ function peadm::assert_supported_pe_version ( Boolean $permit_unsafe_versions = false, ) >> Struct[{ 'supported' => Boolean }] { $oldest = '2019.7' - $newest = '2025.4' + $newest = '2025.5' $supported = ($version =~ SemVerRange(">= ${oldest} <= ${newest}")) if $permit_unsafe_versions { diff --git a/functions/pe_db_names.pp b/functions/pe_db_names.pp index 514fcc6c6..ff0afa06e 100644 --- a/functions/pe_db_names.pp +++ b/functions/pe_db_names.pp @@ -9,11 +9,22 @@ function peadm::pe_db_names ( 'pe-rbac', ] + $pe_2025_6_or_later = SemVerRange('>=2025.6.0') $pe_2025_3_or_later = SemVerRange('>= 2025.3.0') $pe_2025_or_later = SemVerRange('>= 2025.0.0') $pe_2023_8_or_later = SemVerRange('>= 2023.8.0') case $pe_ver { + # The workflow service was added in 2025.6.0 + $pe_2025_6_or_later: { + $original_db_names + [ + 'pe-hac', + 'pe-patching', + 'pe-infra-assistant', + 'pe-workflow', + ] + } + # The infra-assistant was added in 2025.3.0 $pe_2025_3_or_later: { $original_db_names + [ diff --git a/metadata.json b/metadata.json index a93f6d45b..b56071a03 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "puppetlabs-peadm", - "version": "3.30.0", + "version": "3.31.0", "author": "puppetlabs", "summary": "Bolt plans used to deploy an at-scale Puppet Enterprise architecture", "license": "Apache-2.0", @@ -70,7 +70,8 @@ "operatingsystemrelease": [ "18.04", "20.04", - "22.04" + "22.04", + "24.04" ] }, { diff --git a/plans/install.pp b/plans/install.pp index 2765d1533..ca70f8703 100644 --- a/plans/install.pp +++ b/plans/install.pp @@ -46,7 +46,7 @@ # Common Configuration String $console_password, - Peadm::Pe_version $version = '2023.8.4', + Peadm::Pe_version $version = '2023.8.5', Optional[Stdlib::HTTPSUrl] $pe_installer_source = undef, Optional[Array[String]] $dns_alt_names = undef, Optional[String] $compiler_pool_address = undef, diff --git a/spec/plans/subplans/install_spec.rb b/spec/plans/subplans/install_spec.rb index 9b2986bde..9a110f917 100644 --- a/spec/plans/subplans/install_spec.rb +++ b/spec/plans/subplans/install_spec.rb @@ -26,7 +26,7 @@ ######### ## <🤮> - # rubocop:disable AnyInstance + # rubocop:disable RSpec/AnyInstance allow(Tempfile).to receive(:new).and_call_original allow(Pathname).to receive(:new).and_call_original allow(Puppet::FileSystem).to receive(:exist?).and_call_original @@ -40,7 +40,7 @@ allow_any_instance_of(BoltSpec::Plans::MockExecutor).to receive(:module_file_id).with('/mock').and_return('/mock') allow_upload('/mock') - # rubocop:enable AnyInstance + # rubocop:enable RSpec/AnyInstance ## ########## end @@ -87,11 +87,11 @@ expect(run_plan('peadm::subplans::install', params)).to be_ok end - it 'installs 2023.8.4 with legacy compilers' do + it 'installs 2023.8.5 with legacy compilers' do params = { 'primary_host' => 'primary', 'console_password' => 'puppetLabs123!', - 'version' => '2023.8.4', + 'version' => '2023.8.5', 'legacy_compilers' => ['compiler1', 'compiler2'], } expect(run_plan('peadm::subplans::install', params)).to be_ok diff --git a/spec/plans/util/retrieve_and_upload_spec.rb b/spec/plans/util/retrieve_and_upload_spec.rb index a13f45da3..211b7fc9e 100644 --- a/spec/plans/util/retrieve_and_upload_spec.rb +++ b/spec/plans/util/retrieve_and_upload_spec.rb @@ -15,7 +15,7 @@ ######### ## <🤮> - # rubocop:disable AnyInstance + # rubocop:disable RSpec/AnyInstance allow(Pathname).to receive(:new).and_call_original allow(Puppet::FileSystem).to receive(:exist?).and_call_original allow_any_instance_of(BoltSpec::Plans::MockExecutor).to receive(:module_file_id).and_call_original @@ -36,7 +36,7 @@ Bolt::ResultSet.new(results) end - # rubocop:enable AnyInstance + # rubocop:enable RSpec/AnyInstance ## ##########