Skip to content
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
6 changes: 0 additions & 6 deletions .devcontainer/Dockerfile

This file was deleted.

17 changes: 0 additions & 17 deletions .devcontainer/devcontainer.json

This file was deleted.

4 changes: 3 additions & 1 deletion .rspec_parallel → .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
---
# Managed by modulesync - DO NOT EDIT
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/

--format progress
skip-changelog:
- head-branch: ['^release-*', 'release']
42 changes: 42 additions & 0 deletions .github/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
---
# Managed by modulesync - DO NOT EDIT
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/

# https://docs.github.com/en/repositories/releasing-projects-on-github/automatically-generated-release-notes

changelog:
exclude:
labels:
- duplicate
- invalid
- modulesync
- question
- skip-changelog
- wont-fix
- wontfix

categories:
- title: Breaking Changes 🛠
labels:
- backwards-incompatible

- title: New Features 🎉
labels:
- enhancement

- title: Bug Fixes 🐛
labels:
- bug

- title: Documentation Updates 📚
labels:
- documentation
- docs

- title: Dependency Updates ⬆️
labels:
- dependencies

- title: Other Changes
labels:
- "*"
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ jobs:
name: Puppet
uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v4
with:
beaker_hosts: master;replica;client
beaker_hosts: 'master;replica;client'
22 changes: 22 additions & 0 deletions .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
# Managed by modulesync - DO NOT EDIT
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/

name: "Pull Request Labeler"

# yamllint disable-line rule:truthy
on:
pull_request_target: {}

permissions:
contents: read
pull-requests: write

jobs:
labeler:
permissions:
contents: read
pull-requests: write
runs-on: ubuntu-latest
steps:
- uses: actions/labeler@v6
4 changes: 2 additions & 2 deletions .github/workflows/pr_labels.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ jobs:
label:
runs-on: "ubuntu-latest"
steps:
- uses: "mheap/github-action-required-labels@v3"
- uses: "mheap/github-action-required-labels@v5"
with:
mode: "exactly"
count: 1
labels: "enhancement, bug, skip-changelog"
labels: "enhancement, bug, skip-changelog, backwards-incompatible, modulesync"
27 changes: 27 additions & 0 deletions .github/workflows/prepare_release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
---
# Managed by modulesync - DO NOT EDIT
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/

name: 'Prepare Release'

on:
workflow_dispatch:
inputs:
version:
description: 'Module version to be released. Must be a valid semver string without leading v. (1.2.3)'
required: false

permissions:
contents: write
pull-requests: write

jobs:
release_prep:
uses: 'voxpupuli/gha-puppet/.github/workflows/prepare_release.yml@v3'
with:
version: ${{ github.event.inputs.version }}
allowed_owner: 'lsst-it'
secrets:
# Configure secrets here:
# https://docs.github.com/en/actions/security-guides/encrypted-secrets
github_pat: '${{ secrets.PCCI_PAT_RELEASE_PREP }}'
8 changes: 6 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,19 @@

name: Release

"on":
# yamllint disable-line rule:truthy
on:
push:
tags:
- '*'

permissions:
contents: write

jobs:
release:
name: Release
uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v2
uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v3
with:
allowed_owner: 'lsst-it'
secrets:
Expand Down
15 changes: 0 additions & 15 deletions .github/workflows/shellcheck.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/yamllint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
yamllint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v5

- name: Run yamllint
uses: bewuethr/yamllint-action@v1
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,5 @@
.*.sw?
/.yardoc/
/Guardfile
bolt-debug.log
.rerun.json
3 changes: 2 additions & 1 deletion .mdl_style.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@
rule "MD013", :code_blocks => false
exclude_rule "MD003"
exclude_rule "MD013"
exclude_rule "MD036"
exclude_rule "MD024"
exclude_rule "MD034"
exclude_rule "MD036"
2 changes: 1 addition & 1 deletion .msync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# Managed by modulesync - DO NOT EDIT
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/

modulesync_config_version: '7.1.0'
modulesync_config_version: '10.4.0'
8 changes: 5 additions & 3 deletions .overcommit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,12 @@ PreCommit:
enabled: true
description: 'Runs rubocop on modified files only'
command: ['bundle', 'exec', 'rubocop']
PuppetLint:
RakeTarget:
enabled: true
description: 'Runs puppet-lint on modified files only'
command: ['bundle', 'exec', 'puppet-lint']
description: 'Runs lint on modified files only'
targets:
- 'lint'
command: ['bundle', 'exec', 'rake']
YamlSyntax:
enabled: true
JsonSyntax:
Expand Down
2 changes: 2 additions & 0 deletions .pmtignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
/.github/
/.librarian/
/Puppetfile.lock
/Puppetfile
*.iml
/.editorconfig
/.fixtures.yml
Expand All @@ -35,3 +36,4 @@
/.yardoc/
/.yardopts
/Dockerfile
/HISTORY.md
3 changes: 3 additions & 0 deletions .puppet-lint.rc
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
# Managed by modulesync - DO NOT EDIT
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/

--fail-on-warnings
6 changes: 0 additions & 6 deletions .rspec

This file was deleted.

6 changes: 0 additions & 6 deletions .vscode/extensions.json

This file was deleted.

12 changes: 4 additions & 8 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
source ENV['GEM_SOURCE'] || 'https://rubygems.org'

group :test do
gem 'voxpupuli-test', '~> 7.0', :require => false
gem 'coveralls', :require => false
gem 'simplecov-console', :require => false
gem 'voxpupuli-test', '~> 13.0', :require => false
gem 'puppet_metadata', '~> 5.0', :require => false
end

Expand All @@ -16,17 +14,15 @@ group :development do
end

group :system_tests do
gem 'voxpupuli-acceptance', '~> 2.2', :require => false
gem 'voxpupuli-acceptance', '~> 4.0', :require => false
end

group :release do
gem 'voxpupuli-release', '~> 3.0', :require => false
gem 'voxpupuli-release', '~> 5.0', :require => false
end

gem 'rake', :require => false
gem 'facter', ENV['FACTER_GEM_VERSION'], :require => false, :groups => [:test]

puppetversion = ENV['PUPPET_GEM_VERSION'] || '~> 7.24'
gem 'puppet', puppetversion, :require => false, :groups => [:test]
gem 'openvox', ENV.fetch('OPENVOX_GEM_VERSION', [">= 7", "< 9"]), :require => false, :groups => [:test]

# vim: syntax=ruby
2 changes: 1 addition & 1 deletion REFERENCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ Default value: `(fqdn_rand('10737') + 10000`

##### <a name="-ipa--idmax"></a>`idmax`

Data type: `Variant[Integer,Undef]`
Data type: `Optional[Variant[Integer,Undef]]`

(integer) From the IPA man pages: "The max value for the IDs range (default: idstart+199999)".

Expand Down
14 changes: 3 additions & 11 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -1,30 +1,22 @@
# Managed by modulesync - DO NOT EDIT
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/

# Attempt to load voxpupuli-test (which pulls in puppetlabs_spec_helper),
# otherwise attempt to load it directly.
begin
require 'voxpupuli/test/rake'
rescue LoadError
begin
require 'puppetlabs_spec_helper/rake_tasks'
rescue LoadError
end
# only available if gem group test is installed
end

# load optional tasks for acceptance
# only available if gem group releases is installed
begin
require 'voxpupuli/acceptance/rake'
rescue LoadError
# only available if gem group acceptance is installed
end

# load optional tasks for releases
# only available if gem group releases is installed
begin
require 'voxpupuli/release/rake_tasks'
rescue LoadError
# voxpupuli-release not present
# only available if gem group releases is installed
else
GCGConfig.user = 'lsst-it'
GCGConfig.project = 'puppet-ipa'
Expand Down
2 changes: 1 addition & 1 deletion manifests/client.pp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#
# @api private
class ipa::client (
Array[String] $package_name = undef,
Optional[Array[String]] $package_name = undef,
Boolean $force_join = false,
) {
assert_private()
Expand Down
8 changes: 4 additions & 4 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
Boolean $enable_ip_address = false,
Boolean $fixed_primary = false,
Integer[10000] $idstart = (fqdn_rand('10737') + 10000),
Variant[Integer,Undef] $idmax = undef,
Optional[Variant[Integer,Undef]] $idmax = undef,
Optional[Stdlib::IP::Address] $ip_address = undef,
String $ipa_server_fqdn = fact('networking.fqdn'),
Optional[Stdlib::Fqdn] $ipa_master_fqdn = undef,
Expand Down Expand Up @@ -159,15 +159,15 @@
default:
path => '/etc/login.defs',
replace => true,
;
;
'adjust uid max':
line => "UID_MAX\t${uid_max_value}",
match => '^UID_MAX.*$',
;
;
'adjust gid max':
line => "GID_MAX\t${gid_max_value}",
match => '^GID_MAX.*$',
;
;
}
}

Expand Down
2 changes: 1 addition & 1 deletion manifests/server.pp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
# @api private
class ipa::server (
Array[String] $package_name = undef,
Optional[Array[String]] $package_name = undef,
) {
assert_private()

Expand Down
7 changes: 7 additions & 0 deletions renovate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:recommended"
],
"labels": ["enhancement"]
}
4 changes: 4 additions & 0 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@

require 'voxpupuli/test/spec_helper'

RSpec.configure do |c|
c.facterdb_string_keys = false
end

add_mocked_facts!

if File.exist?(File.join(__dir__, 'default_module_facts.yml'))
Expand Down