Merge pull request #2234 from puppetlabs/pdksync_maint/pdk_update_20-04

pdksync - (Maint) PDK Update

Author: LukasAud

.github/workflows/nightly.yml

@@ -200,5 +200,5 @@ jobs:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           slack_webhook_url: ${{ secrets.SLACK_WEBHOOK }}
           # Optional Input
-          channel: '#team-ia-bots'
+          channel: '#team-cat-bots'
           name: 'GABot'

.github/workflows/spec.yml

@@ -54,10 +54,10 @@ jobs:
           buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
           echo STEP_ID=Setup-Acceptance-Test-Matrix >> $GITHUB_ENV
           echo STEP_START=$(date +%s) >> $GITHUB_ENV
-      # - name: Run Static & Syntax Tests
-      #   if: ${{ github.repository_owner == 'puppetlabs' }}
-      #   run: |
-      #     buildevents cmd $TRACE_ID $STEP_ID 'static_syntax_checks' -- bundle exec rake syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop
+      - name: Run Static & Syntax Tests
+        if: ${{ github.repository_owner == 'puppetlabs' }}
+        run: |
+          buildevents cmd $TRACE_ID $STEP_ID 'static_syntax_checks' -- bundle exec rake syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop
 
       - name: Setup Spec Test Matrix
         id: get-matrix

.puppet-lint.rc

@@ -1 +1,10 @@
 --relative
+--no-parameter_types-check
+--no-parameter_documentation-check
+--no-top_scope_facts-check
+--no-legacy_facts-check
+--no-relative_classname_reference-check
+--no-relative_classname_inclusion-check
+--no-anchor_resource-check
+--no-version_comparison-check
+--no-manifest_whitespace_closing_bracket_after-check

.sync.yml

@@ -35,3 +35,15 @@ Rakefile:
 .travis.yml:
   delete: true
 changelog_since_tag: "3.2.0"
+Rakefile:
+  extra_disabled_lint_checks:
+    - parameter_types
+    - parameter_documentation
+    - top_scope_facts
+    - legacy_facts
+    - relative_classname_reference
+    - relative_classname_inclusion
+    - anchor_resource
+    - version_comparison
+    - manifest_whitespace_closing_bracket_after
+

Rakefile

@@ -42,6 +42,15 @@ def changelog_future_release
 end
 
 PuppetLint.configuration.send('disable_relative')
+PuppetLint.configuration.send('disable_parameter_types')
+PuppetLint.configuration.send('disable_parameter_documentation')
+PuppetLint.configuration.send('disable_top_scope_facts')
+PuppetLint.configuration.send('disable_legacy_facts')
+PuppetLint.configuration.send('disable_relative_classname_reference')
+PuppetLint.configuration.send('disable_relative_classname_inclusion')
+PuppetLint.configuration.send('disable_anchor_resource')
+PuppetLint.configuration.send('disable_version_comparison')
+PuppetLint.configuration.send('disable_manifest_whitespace_closing_bracket_after')
 
 
 if Bundler.rubygems.find_name('github_changelog_generator').any?
@@ -50,7 +59,6 @@ if Bundler.rubygems.find_name('github_changelog_generator').any?
     config.user = "#{changelog_user}"
     config.project = "#{changelog_project}"
     config.since_tag = "3.2.0"
-    config.max_issues = 500
     config.future_release = "#{changelog_future_release}"
     config.exclude_labels = ['maintenance']
     config.header = "# Change log\n\nAll notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org)."
@@ -89,4 +97,3 @@ EOM
   end
 end
 
-FastGettext.default_text_domain = 'default-text-domain'

manifests/mod/ldap.pp

@@ -52,7 +52,7 @@
   $apache_version                                  = undef,
   $package_name                                    = undef,
   $ldap_trusted_global_cert_file                   = undef,
-  Optional[String] $ldap_trusted_global_cert_type  = 'CA_BASE64',
+  String $ldap_trusted_global_cert_type            = 'CA_BASE64',
   $ldap_shared_cache_size                          = undef,
   $ldap_cache_entries                              = undef,
   $ldap_cache_ttl                                  = undef,

manifests/mod/security.pp

@@ -220,7 +220,7 @@
 
   if $custom_rules {
     # Template to add custom rule and included in security configuration
-    file {"${modsec_dir}/custom_rules":
+    file { "${modsec_dir}/custom_rules":
       ensure  => directory,
       owner   => $apache::params::user,
       group   => $apache::params::group,

manifests/vhost.pp

@@ -1835,8 +1835,8 @@
   $access_log_format                                                                = false,
   $access_log_env_var                                                               = false,
   Optional[Array] $access_logs                                                      = undef,
-  Optional[Boolean] $use_servername_for_filenames                                   = false,
-  Optional[Boolean] $use_port_for_filenames                                         = false,
+  Boolean $use_servername_for_filenames                                             = false,
+  Boolean $use_port_for_filenames                                                   = false,
   $aliases                                                                          = undef,
   Optional[Variant[Hash, Array[Variant[Array,Hash]]]] $directories                  = undef,
   Boolean $error_log                                                                = true,

metadata.json

@@ -89,7 +89,7 @@
     }
   ],
   "description": "Module for Apache configuration",
-  "pdk-version": "2.3.0",
+  "pdk-version": "2.4.0",
   "template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
-  "template-ref": "heads/main-0-gf3911d3"
+  "template-ref": "heads/main-0-g806810b"
 }

spec/acceptance/vhost_spec.rb

@@ -965,7 +965,7 @@ class { 'apache': }
           }
       MANIFEST
       it 'applies cleanly' do
-        result = apply_manifest(pp, catch_failures: true)
+        _result = apply_manifest(pp, catch_failures: true)
       end
       describe file("#{apache_hash['vhost_dir']}/25-test.servername.conf") do
         it { is_expected.to be_file }
@@ -984,7 +984,7 @@ class { 'apache': }
           }
       MANIFEST
       it 'applies cleanly' do
-        result = apply_manifest(pp, catch_failures: true)
+        _result = apply_manifest(pp, catch_failures: true)
       end
       describe file("#{apache_hash['vhost_dir']}/25-test.server.conf") do
         it { is_expected.to be_file }