Skip to content

(PE-40508) Add infra-assistant to add_database plan #580

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 28, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 18 additions & 16 deletions .fixtures.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
---
fixtures:
forge_modules:
ruby_task_helper: "puppetlabs/ruby_task_helper"
service: "puppetlabs/service"
package: "puppetlabs/package"
reboot: "puppetlabs/reboot"
inifile: "puppetlabs/inifile"
ruby_task_helper: puppetlabs/ruby_task_helper
service: puppetlabs/service
package: puppetlabs/package
reboot: puppetlabs/reboot
inifile: puppetlabs/inifile
repositories:
facts: "https://github.com/puppetlabs/puppetlabs-facts.git"
puppet_agent: "https://github.com/puppetlabs/puppetlabs-puppet_agent.git"
provision: "https://github.com/puppetlabs/provision.git"
stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib.git"
apply_helpers: "https://github.com/puppetlabs/puppetlabs-apply_helpers"
bolt_shim: "https://github.com/puppetlabs/puppetlabs-bolt_shim"
format: "https://github.com/voxpupuli/puppet-format"
container_inventory: "https://gitlab.com/nwops/bolt-container_inventory.git"
node_manager: "https://github.com/puppetlabs/puppetlabs-node_manager.git"
facts: https://github.com/puppetlabs/puppetlabs-facts.git
puppet_agent: https://github.com/puppetlabs/puppetlabs-puppet_agent.git
provision:
repo: https://github.com/puppetlabs/provision.git
ref: v3.0.1
stdlib: https://github.com/puppetlabs/puppetlabs-stdlib.git
apply_helpers: https://github.com/puppetlabs/puppetlabs-apply_helpers
bolt_shim: https://github.com/puppetlabs/puppetlabs-bolt_shim
format: https://github.com/voxpupuli/puppet-format
container_inventory: https://gitlab.com/nwops/bolt-container_inventory.git
node_manager: https://github.com/puppetlabs/puppetlabs-node_manager.git
symlinks:
"peadm": "#{source_dir}"
"peadm_spec": "#{source_dir}/spec/acceptance/peadm_spec"
peadm: '#{source_dir}'
peadm_spec: '#{source_dir}/spec/acceptance/peadm_spec'
10 changes: 10 additions & 0 deletions functions/pe_db_names.pp
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,20 @@ function peadm::pe_db_names (
'pe-rbac',
]

$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 infra-assistant was added in 2025.3.0
$pe_2025_3_or_later: {
$original_db_names + [
'pe-hac',
'pe-patching',
'pe-infra-assistant',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Puppet case statements don't fall through so I think you need to include all of the previous dbs: pe-hac and pe-patching here as well.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah crap, thanks for catching that.

]
}

# The patching service was added in 2025.0.0
$pe_2025_or_later: {
$original_db_names + [
Expand Down