modulesync 10.6.0

.devcontainer/devcontainer.json

@@ -1,4 +1,3 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the
 {
 	"name": "VoxBox",
 	"image": "ghcr.io/voxpupuli/voxbox:latest"

.github/workflows/ci.yml

@@ -11,6 +11,29 @@ on:
     branches:
       - main
       - master
+  workflow_dispatch:
+    inputs:
+      beaker_staging_url:
+        description: |-
+          URL to a staging Server to test unreleased packages.
+          We will append the version to the Server and assume all packages are in the same directory.
+          Only supported for AIO packages.
+        required: false
+        type: string
+        default: 'https://artifacts.voxpupuli.org/openvox-agent'
+      beaker_collection:
+        description: |-
+          When set to staging, we will download the packages from staging_url.
+          Otherwise we will use the official repos. Supported values: puppet7, puppet8, openvox7, openvox8, staging.
+          When unset, we will generate a list of supported collections based on metadata.json.
+        required: false
+        type: string
+      beaker_staging_version:
+        description: |-
+          The package version we want to test.
+          Only used for beaker_collection = staging
+        required: false
+        type: string
 
 concurrency:
   group: ${{ github.ref_name }}
@@ -23,3 +46,7 @@ jobs:
   puppet:
     name: Puppet
     uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v4
+    with:
+      beaker_staging_url: ${{ inputs.beaker_staging_url }}
+      beaker_collection: ${{ inputs.beaker_collection }}
+      beaker_staging_version: ${{ inputs.beaker_staging_version }}

.github/workflows/create_tag.yml

@@ -0,0 +1,22 @@
+---
+# Managed by modulesync - DO NOT EDIT
+# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
+
+name: Create Git tag
+
+on:
+  workflow_dispatch:
+
+permissions: {}
+
+jobs:
+  create_tag:
+    uses: 'voxpupuli/gha-puppet/.github/workflows/create_tag.yml@v4'
+    with:
+      allowed_owner: 'voxpupuli'
+      git_name: 'pccibot'
+      git_email: '12855858+pccibot@users.noreply.github.com'
+    secrets:
+      # Configure secrets here:
+      #  https://docs.github.com/en/actions/security-guides/encrypted-secrets
+      ssh_private_key: ${{ secrets.PCCI_SSH_PRIVATE_KEY }}

.github/workflows/prepare_release.yml

@@ -17,11 +17,14 @@ permissions:
 
 jobs:
   release_prep:
-    uses: 'voxpupuli/gha-puppet/.github/workflows/prepare_release.yml@v3'
+    uses: 'voxpupuli/gha-puppet/.github/workflows/prepare_release.yml@v4'
     with:
       version: ${{ github.event.inputs.version }}
       allowed_owner: 'voxpupuli'
+      git_name: 'pccibot'
+      git_email: '12855858+pccibot@users.noreply.github.com'
     secrets:
       # Configure secrets here:
       #  https://docs.github.com/en/actions/security-guides/encrypted-secrets
       github_pat: '${{ secrets.PCCI_PAT_RELEASE_PREP }}'
+      ssh_private_key: '${{ secrets.PCCI_SSH_PRIVATE_KEY }}'

.github/workflows/release.yml

@@ -8,15 +8,17 @@ name: Release
 on:
   push:
     tags:
-      - '*'
+      # https://docs.github.com/en/actions/reference/workflows-and-actions/workflow-syntax#onpushbranchestagsbranches-ignoretags-ignore
+      # https://docs.github.com/en/actions/reference/workflows-and-actions/workflow-syntax#filter-pattern-cheat-sheet
+      - 'v[0-9]+.[0-9]+.[0-9]+'
 
 permissions:
   contents: write
 
 jobs:
   release:
     name: Release
-    uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v3
+    uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v4
     with:
       allowed_owner: 'voxpupuli'
     secrets:

.msync.yml

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

.rubocop.yml

@@ -2,5 +2,6 @@
 # Managed by modulesync - DO NOT EDIT
 # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
 
+inherit_from: .rubocop_todo.yml
 inherit_gem:
   voxpupuli-test: rubocop.yml

.rubocop_todo.yml

@@ -0,0 +1,34 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config --no-auto-gen-timestamp`
+# using RuboCop version 1.85.1.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 5
+# This cop supports unsafe autocorrection (--autocorrect-all).
+RSpec/IncludeExamples:
+  Exclude:
+    - 'spec/acceptance/tests/class_v5_spec.rb'
+    - 'spec/acceptance/tests/snapshot.rb'
+    - 'spec/helpers/acceptance/tests/class_shared_examples.rb'
+    - 'spec/unit/provider/kibana_plugin/kibana_plugin_spec.rb'
+    - 'spec/unit/provider/kibana_plugin/kibana_spec.rb'
+
+# Offense count: 1
+RSpec/LeakyLocalVariable:
+  Exclude:
+    - 'spec/helpers/acceptance/tests/basic_shared_examples.rb'
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+RSpec/Output:
+  Exclude:
+    - 'spec/spec_utilities.rb'
+
+# Offense count: 2
+RSpec/SpecFilePathSuffix:
+  Exclude:
+    - 'spec/acceptance/tests/snapshot.rb'
+    - 'spec/functions/kibana_hash2yaml.rb'

Gemfile

@@ -4,8 +4,8 @@
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 group :test do
-  gem 'voxpupuli-test', '~> 13.0',  :require => false
-  gem 'puppet_metadata', '~> 6.0',  :require => false
+  gem 'voxpupuli-test', '~> 14.0',  :require => false
+  gem 'puppet_metadata', '~> 6.1',  :require => false
 end
 
 group :development do
@@ -14,12 +14,12 @@ group :development do
 end
 
 group :system_tests do
-  gem 'voxpupuli-acceptance', '~> 4.0',  :require => false
+  gem 'voxpupuli-acceptance', '~> 4.4',  :require => false
   gem 'rspec-retry',                     :require => false
 end
 
 group :release do
-  gem 'voxpupuli-release', '~> 5.0',  :require => false
+  gem 'voxpupuli-release', '~> 5.3',  :require => false
 end
 
 gem 'rake', :require => false

lib/puppet/functions/kibana/hash2yaml.rb

@@ -16,7 +16,7 @@
 
   def yaml(input, options = {})
     settings = {
-      'header' => '# File managed by Puppet.'
+      'header' => '# File managed by Puppet.',
     }
 
     settings.merge!(options)

lib/puppet/provider/elastic_kibana.rb

@@ -35,7 +35,7 @@ def self.present_plugins
         name: File.basename(plugin),
         ensure: :present,
         provider: name,
-        version: j['version']
+        version: j['version'],
       }
     end
   end
@@ -146,7 +146,7 @@ def self.prefetch(resources)
 
   # Provider constructor
   def initialize(value = {})
-    super(value)
+    super
     @property_flush = {}
   end
 end

lib/puppet/provider/kibana_plugin/kibana.rb

@@ -9,7 +9,7 @@
   home_path: File.join(%w[/ opt kibana]),
   install_args: ['plugin', '--install'],
   plugin_directory: 'installedPlugins',
-  remove_args: ['plugin', '--remove']
+  remove_args: ['plugin', '--remove'],
 ) do
   desc 'Native command-line provider for Kibana v4 plugins.'
 

lib/puppet/provider/kibana_plugin/kibana_plugin.rb

@@ -8,7 +8,7 @@
   home_path: File.join(%w[/ usr share kibana]),
   install_args: ['install'],
   plugin_directory: 'plugins',
-  remove_args: ['remove']
+  remove_args: ['remove'],
 ) do
   desc 'Native command-line provider for Kibana v5 plugins.'
 

lib/puppet/type/kibana_plugin.rb

@@ -27,7 +27,7 @@
   end
 
   autorequire(:package) do
-    self[:ensure] == :absent ? [] : 'kibana'
+    (self[:ensure] == :absent) ? [] : 'kibana'
   end
 
   validate do

spec/acceptance/tests/class_v5_spec.rb

@@ -8,7 +8,7 @@
   let(:plugin)         { 'health_metric_vis' }
   let(:plugin_version) { '0.3.4' }
   let(:port)           { 5602 }
-  let(:version)        { fact('osfamily') == 'RedHat' ? '5.2.0-1' : '5.2.0' }
+  let(:version)        { (fact('osfamily') == 'RedHat') ? '5.2.0-1' : '5.2.0' }
 
   let(:manifest) do
     <<-MANIFEST