Merge pull request #599 from voxpupuli/modulesync

modulesync 5.3.0

.github/CONTRIBUTING.md

@@ -124,7 +124,7 @@ If you have Ruby 2.x or want a specific version of Puppet,
 you must set an environment variable such as:
 
 ```sh
-export PUPPET_VERSION="~> 5.5.6"
+export PUPPET_GEM_VERSION="~> 6.1.0"
 ```
 
 You can install all needed gems for spec tests into the modules directory by
@@ -232,17 +232,16 @@ simple tests against it after applying the module. You can run this
 with:
 
 ```sh
-BEAKER_setfile=debian10-x64 bundle exec rake beaker
+BEAKER_setfile=debian11-64 bundle exec rake beaker
 ```
 
 You can replace the string `debian10` with any common operating system.
 The following strings are known to work:
 
-* ubuntu1604
 * ubuntu1804
 * ubuntu2004
-* debian9
 * debian10
+* debian11
 * centos7
 * centos8
 

.github/workflows/ci.yml

@@ -4,7 +4,7 @@ name: CI
 on: pull_request
 
 concurrency:
-  group: ${{ github.head_ref }}
+  group: ${{ github.ref_name }}
   cancel-in-progress: true
 
 jobs:

.github/workflows/release.yml

@@ -9,26 +9,14 @@ on:
     tags:
       - '*'
 
-env:
-  BUNDLE_WITHOUT: development:test:system_tests
-
 jobs:
-  deploy:
-    name: 'deploy to forge'
-    runs-on: ubuntu-latest
-    if: github.repository_owner == 'voxpupuli'
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-      - name: Setup Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: '2.7'
-          bundler-cache: true
-      - name: Build and Deploy
-        env:
-          # Configure secrets here:
-          #  https://docs.github.com/en/free-pro-team@latest/actions/reference/encrypted-secrets
-          BLACKSMITH_FORGE_USERNAME: '${{ secrets.PUPPET_FORGE_USERNAME }}'
-          BLACKSMITH_FORGE_API_KEY: '${{ secrets.PUPPET_FORGE_API_KEY }}'
-        run: bundle exec rake module:push
+  release:
+    name: Release
+    uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v1
+    with:
+      allowed_owner: 'voxpupuli'
+    secrets:
+      # Configure secrets here:
+      #  https://docs.github.com/en/actions/security-guides/encrypted-secrets
+      username: ${{ secrets.PUPPET_FORGE_USERNAME }}
+      api_key: ${{ secrets.PUPPET_FORGE_API_KEY }}

.msync.yml

@@ -2,4 +2,4 @@
 # Managed by modulesync - DO NOT EDIT
 # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
 
-modulesync_config_version: '5.0.1'
+modulesync_config_version: '5.3.0'

.puppet-lint.rc

@@ -0,0 +1,3 @@
+--fail-on-warnings
+--no-parameter_documentation-check
+--no-parameter_types-check

Dockerfile

@@ -8,7 +8,7 @@ WORKDIR /opt/puppet
 # https://github.com/puppetlabs/puppet/blob/06ad255754a38f22fb3a22c7c4f1e2ce453d01cb/lib/puppet/provider/service/runit.rb#L39
 RUN mkdir -p /etc/sv
 
-ARG PUPPET_VERSION="~> 6.0"
+ARG PUPPET_GEM_VERSION="~> 6.0"
 ARG PARALLEL_TEST_PROCESSORS=4
 
 # Cache gems

Gemfile

@@ -1,10 +1,10 @@
 # Managed by modulesync - DO NOT EDIT
 # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
 
-source ENV['GEM_SOURCE'] || "https://rubygems.org"
+source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 group :test do
-  gem 'voxpupuli-test', '~> 4.0',   :require => false
+  gem 'voxpupuli-test', '~> 5.4',   :require => false
   gem 'coveralls',                  :require => false
   gem 'simplecov-console',          :require => false
   gem 'puppet_metadata', '~> 1.0',  :require => false
@@ -28,7 +28,7 @@ end
 gem 'rake', :require => false
 gem 'facter', ENV['FACTER_GEM_VERSION'], :require => false, :groups => [:test]
 
-puppetversion = ENV['PUPPET_VERSION'] || '>= 6.0'
+puppetversion = ENV['PUPPET_GEM_VERSION'] || '>= 6.0'
 gem 'puppet', puppetversion, :require => false, :groups => [:test]
 
 # vim: syntax=ruby

Rakefile

@@ -1,7 +1,7 @@
 # Managed by modulesync - DO NOT EDIT
 # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
 
-# Attempt to load voxupuli-test (which pulls in puppetlabs_spec_helper),
+# Attempt to load voxpupuli-test (which pulls in puppetlabs_spec_helper),
 # otherwise attempt to load it directly.
 begin
   require 'voxpupuli/test/rake'

manifests/bird_exporter.pp

@@ -67,7 +67,7 @@
 # @author Tim Meusel <tim@bastelfreak.de>
 #
 class prometheus::bird_exporter (
-  String $download_extension                                 = '',
+  String $download_extension                                 = '', # lint:ignore:params_empty_string_assignment
   Prometheus::Uri $download_url_base                         = 'https://github.com/czerwonk/bird_exporter/releases',
   Array[String] $extra_groups                                = ['bird'],
   String[1] $group                                           = 'bird-exporter',

manifests/daemon.pp

@@ -67,7 +67,7 @@
   Array $extra_groups                                        = [],
   Boolean $manage_group                                      = true,
   Boolean $purge                                             = true,
-  String $options                                            = '',
+  String $options                                            = '', # lint:ignore:params_empty_string_assignment
   Prometheus::Initstyle $init_style                          = $facts['service_provider'],
   Stdlib::Ensure::Service $service_ensure                    = 'running',
   Boolean $service_enable                                    = true,

manifests/dellhw_exporter.pp

@@ -80,7 +80,7 @@
   Boolean $export_scrape_job                                 = false,
   Optional[Stdlib::Host] $scrape_host                        = undef,
   Stdlib::Port $scrape_port                                  = 9137,
-  String $scrape_ipadress                                    = '',
+  String $scrape_ipadress                                    = '', # lint:ignore:params_empty_string_assignment
   String[1] $scrape_job_name                                 = 'dellhw',
   Optional[Hash] $scrape_job_labels                          = undef,
   Optional[String[1]] $bin_name                              = undef,

manifests/ipsec_exporter.pp

@@ -60,7 +60,7 @@
   String[1] $user                                            = 'ipsec-exporter',
   String[1] $version                                         = '0.3.2',
   String[1] $os                                              = downcase($facts['kernel']),
-  String $options                                            = '',
+  String $options                                            = '', # lint:ignore:params_empty_string_assignment
   Prometheus::Initstyle $init_style                          = $facts['service_provider'],
   Prometheus::Install $install_method                        = $prometheus::install_method,
   Optional[Prometheus::Uri] $download_url                    = undef,

manifests/nginx_vts_exporter.pp

@@ -72,7 +72,7 @@
   Boolean          $manage_service                           = true,
   Boolean          $manage_user                              = true,
   String           $os                                       = downcase($facts['kernel']),
-  String           $extra_options                            = '',
+  String           $extra_options                            = '', # lint:ignore:params_empty_string_assignment
   Optional[Prometheus::Uri] $download_url                    = undef,
   String           $arch                                     = $prometheus::real_arch,
   String           $bin_dir                                  = $prometheus::bin_dir,

manifests/openldap_exporter.pp

@@ -51,7 +51,7 @@
 # @param proxy_type
 #  Optional proxy server type (none|http|https|ftp)
 class prometheus::openldap_exporter (
-  String $download_extension                                 = '',
+  String $download_extension                                 = '', # lint:ignore:params_empty_string_assignment
   Array[String] $extra_groups                                = [],
   String[1] $group                                           = 'openldap-exporter',
   String[1] $package_ensure                                  = 'latest',
@@ -69,7 +69,7 @@
   Boolean $manage_service                                    = true,
   Boolean $manage_user                                       = true,
   String[1] $os                                              = downcase($facts['kernel']),
-  String $options                                            = '',
+  String $options                                            = '', # lint:ignore:params_empty_string_assignment
   Optional[Prometheus::Uri] $download_url                    = undef,
   Stdlib::Absolutepath $bin_dir                              = $prometheus::bin_dir,
   Boolean $export_scrape_job                                 = false,

manifests/openvpn_exporter.pp

@@ -52,7 +52,7 @@
 # @param proxy_type
 #  Optional proxy server type (none|http|https|ftp)
 class prometheus::openvpn_exporter (
-  String $download_extension                                 = '',
+  String $download_extension                                 = '', # lint:ignore:params_empty_string_assignment
   Prometheus::Uri $download_url_base                         = 'https://github.com/wandera/openvpn_exporter/releases',
   Array[String[1]] $extra_groups                             = [],
   String[1] $group                                           = 'openvpn-exporter',

manifests/postfix_exporter.pp

@@ -59,7 +59,7 @@
   Prometheus::Install $install_method                        = 'url',
   Optional[Stdlib::HTTPUrl] $download_url                    = undef,
   Stdlib::HTTPUrl $download_url_base                         = 'https://github.com/kumina/postfix_exporter/releases',
-  String $download_extension                                 = '',
+  String $download_extension                                 = '', # lint:ignore:params_empty_string_assignment
   String[1] $version                                         = '0.2.0',
   Optional[String[1]] $proxy_server                          = undef,
   Optional[Enum['none', 'http', 'https', 'ftp']] $proxy_type = undef,

manifests/postgres_exporter.pp

@@ -82,7 +82,7 @@
   Boolean $manage_service                                    = true,
   Boolean $manage_user                                       = true,
   String[1] $os                                              = downcase($facts['kernel']),
-  String $options                                            = '',
+  String $options                                            = '', # lint:ignore:params_empty_string_assignment
   Optional[Prometheus::Uri] $download_url                    = undef,
   Optional[String] $postgres_pass                            = undef,
   Optional[String] $postgres_user                            = undef,

manifests/unbound_exporter.pp

@@ -57,7 +57,7 @@
 # @author Tim Meusel <tim@bastelfreak.de>
 #
 class prometheus::unbound_exporter (
-  String $download_extension                                 = '',
+  String $download_extension                                 = '', # lint:ignore:params_empty_string_assignment
   Prometheus::Uri $download_url_base                         = 'https://github.com/kumina/unbound_exporter/releases',
   Array[String] $extra_groups                                = ['unbound'],
   String[1] $group                                           = 'unbound-exporter',

spec/spec_helper_acceptance.rb

@@ -5,8 +5,6 @@
 
 require 'voxpupuli/acceptance/spec_helper_acceptance'
 
-ENV['BEAKER_FACTER_SQUID_IP'] = File.read(File.expand_path('~/SQUID_IP')).chomp
-
 configure_beaker
 
 Dir['./spec/support/acceptance/**/*.rb'].sort.each { |f| require f }