Merge pull request #398 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/pr_test.yml

@@ -4,6 +4,7 @@ on: [pull_request]
 
 
 env:
+ 
   HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
   HONEYCOMB_DATASET: litmus tests
 

.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,3 @@
 --relative
+--no-parameter_documentation-check
+--no-parameter_type-check

.sync.yml

@@ -29,3 +29,7 @@ spec/spec_helper.rb:
   unmanaged: false
 .travis.yml:
   delete: true
+Rakefile:
+  extra_disabled_lint_checks:
+    - parameter_documentation
+    - parameter_type

Rakefile

@@ -42,6 +42,8 @@ def changelog_future_release
 end
 
 PuppetLint.configuration.send('disable_relative')
+PuppetLint.configuration.send('disable_parameter_documentation')
+PuppetLint.configuration.send('disable_parameter_type')
 
 
 if Bundler.rubygems.find_name('github_changelog_generator').any?

lib/puppet/provider/java_ks/keytool.rb

@@ -280,7 +280,7 @@ def update
   end
 
   def certificate
-    return @resource[:certificate] if  @resource[:certificate]
+    return @resource[:certificate] if @resource[:certificate]
 
     # When no certificate file is specified, we infer the usage of
     # certificate content and create a tempfile containing this value.
@@ -296,20 +296,17 @@ def certificate
 
   def private_key
     return @resource[:private_key] if @resource[:private_key]
-    if @resource[:private_key_content]
-
-
-      # When no private key file is specified, we infer the usage of
-      # private key content and create a tempfile containing this value.
-      # we leave it to to the tempfile to clean it up after the pupet run exists.
-      file = Tempfile.new('private_key')
-      # Check if the specified value is a Sensitive data type. If so, unwrap it and use
-      # the value.
-      content = @resource[:private_key_content].respond_to?(:unwrap) ? @resource[:private_key_content].unwrap : @resource[:private_key_content]
-      file.write(content)
-      file.close
-      file.path
-    end
+    return unless @resource[:private_key_content]
+    # When no private key file is specified, we infer the usage of
+    # private key content and create a tempfile containing this value.
+    # we leave it to to the tempfile to clean it up after the pupet run exists.
+    file = Tempfile.new('private_key')
+    # Check if the specified value is a Sensitive data type. If so, unwrap it and use
+    # the value.
+    content = @resource[:private_key_content].respond_to?(:unwrap) ? @resource[:private_key_content].unwrap : @resource[:private_key_content]
+    file.write(content)
+    file.close
+    file.path
   end
 
   def private_key_type

lib/puppet/type/java_ks.rb

@@ -86,7 +86,7 @@ def insync?(is)
     desc 'If you want an application to be a server and encrypt traffic,
       you will need a private key.  Private key entries in a keystore must be
       accompanied by a signed certificate for the keytool provider. This parameter
-      allows you to specify the file name containing the private key. This will autorequire 
+      allows you to specify the file name containing the private key. This will autorequire
       the specified file.'
   end
 

manifests/config.pp

@@ -2,7 +2,7 @@
 #   java_ks configuration
 #
 class java_ks::config (
-    $params = {},
-){
-    create_resources('java_ks', $params )
+  $params = {},
+) {
+  create_resources('java_ks', $params )
 }

metadata.json

@@ -109,6 +109,6 @@
   ],
   "description": "Uses a combination of keytool and Ruby openssl library to manage entries in a Java keystore.",
   "template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
-  "template-ref": "heads/main-0-gf3911d3",
-  "pdk-version": "2.3.0"
+  "template-ref": "heads/main-0-g806810b",
+  "pdk-version": "2.4.0"
 }