Merge pull request #473 from voxpupuli/modulesync

modulesync 10.6.0

Author: bastelfreak

.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/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.7.0'

.rubocop.yml

@@ -1,4 +1,6 @@
 ---
+inherit_from: .rubocop_todo.yml
+
 # Managed by modulesync - DO NOT EDIT
 # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
 

.rubocop_todo.yml

@@ -0,0 +1,13 @@
+# 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: 8
+RSpec/LeakyLocalVariable:
+  Exclude:
+    - 'spec/acceptance/define_configfile_spec.rb'
+    - 'spec/acceptance/define_patternfile_spec.rb'

Gemfile

@@ -4,7 +4,7 @@
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 group :test do
-  gem 'voxpupuli-test', '~> 13.0',  :require => false
+  gem 'voxpupuli-test', '~> 14.0',  :require => false
   gem 'puppet_metadata', '~> 6.0',  :require => false
 end
 
@@ -18,7 +18,7 @@ group :system_tests do
 end
 
 group :release do
-  gem 'voxpupuli-release', '~> 5.0',  :require => false
+  gem 'voxpupuli-release', '~> 5.3',  :require => false
 end
 
 gem 'rake', :require => false

spec/acceptance/class_logstash_spec.rb

@@ -219,7 +219,7 @@
       context 'when the option is changed' do
         it 'restarts logstash' do
           puppet_log = install_logstash_from_local_file(
-            "jvm_options => [ '-Xms512m' ]"
+            "jvm_options => [ '-Xms512m' ]",
           ).stdout
           expect(puppet_log).to include(service_restart_message)
         end
@@ -228,7 +228,7 @@
           it 'does not restart logstash' do
             puppet_log = install_logstash_from_local_file(
               "jvm_options       => [ '-Xms256m' ],
-               restart_on_change => false"
+               restart_on_change => false",
             ).stdout
             expect(puppet_log).not_to include(service_restart_message)
           end

spec/acceptance/class_plugin_spec.rb

@@ -36,7 +36,7 @@ def remove(plugin)
       remove('logstash-input-sqs')
     end
 
-    it 'will not remove it again' do
+    it 'does not remove it again' do
       log = ensure_plugin('absent', 'logstash-input-sqs').stdout
       expect(log).not_to contain('remove-logstash-input-sqs')
     end
@@ -48,11 +48,11 @@ def remove(plugin)
   end
 
   context 'when a plugin is installed' do
-    it 'will contain the required plugin' do
+    it 'contains the required plugin' do
       expect(installed_plugins).to contain('logstash-input-file')
     end
 
-    it 'will not install it again' do
+    it 'does not install it again' do
       log = ensure_plugin('present', 'logstash-input-file').stdout
       expect(log).not_to contain('install-logstash-input-file')
     end