Merge pull request #537 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

examples/git/shallow-clone-with-just-one-commit.pp

@@ -1,7 +1,7 @@
 vcsrepo { '/tmp/git':
-    ensure   => 'present',
-    provider => 'git',
-    source   => 'https://github.com/git/git.git',
-    branch   => 'v2.2.0',
-    depth    => 1,
+  ensure   => 'present',
+  provider => 'git',
+  source   => 'https://github.com/git/git.git',
+  branch   => 'v2.2.0',
+  depth    => 1,
 }

lib/facter/vcsrepo_svn_ver.rb

@@ -2,19 +2,17 @@
 
 Facter.add(:vcsrepo_svn_ver) do
   setcode do
-    begin
-      if Facter.value(:operatingsystem) == 'Darwin' && !File.directory?(Facter::Core::Execution.execute('xcode-select -p'))
-        ''
+    if Facter.value(:operatingsystem) == 'Darwin' && !File.directory?(Facter::Core::Execution.execute('xcode-select -p'))
+      ''
+    else
+      version = Facter::Core::Execution.execute('svn --version --quiet')
+      if Gem::Version.new(version) > Gem::Version.new('0.0.1')
+        version
       else
-        version = Facter::Core::Execution.execute('svn --version --quiet')
-        if Gem::Version.new(version) > Gem::Version.new('0.0.1')
-          version
-        else
-          ''
-        end
+        ''
       end
-    rescue StandardError
-      ''
     end
+  rescue StandardError
+    ''
   end
 end

lib/puppet/provider/vcsrepo/bzr.rb

@@ -55,11 +55,9 @@ def revision
 
   def revision=(desired)
     at_path do
-      begin
-        bzr('update', '-r', desired)
-      rescue Puppet::ExecutionFailure
-        bzr('update', '-r', desired, ':parent')
-      end
+      bzr('update', '-r', desired)
+    rescue Puppet::ExecutionFailure
+      bzr('update', '-r', desired, ':parent')
     end
     update_owner
   end

lib/puppet/provider/vcsrepo/git.rb

@@ -280,12 +280,10 @@ def convert_bare_to_working_copy
 
   def mirror?
     at_path do
-      begin
-        git_with_identity('config', '--get-regexp', 'remote\..*\.mirror')
-        return true
-      rescue Puppet::ExecutionFailure
-        return false
-      end
+      git_with_identity('config', '--get-regexp', 'remote\..*\.mirror')
+      return true
+    rescue Puppet::ExecutionFailure
+      return false
     end
   end
 
@@ -311,11 +309,9 @@ def set_no_mirror
         end
       else
         @resource.value(:source).each_key do |remote|
-          begin
-            exec_git('config', '--unset', "remote.#{remote}.mirror")
-          rescue Puppet::ExecutionFailure
-            next
-          end
+          exec_git('config', '--unset', "remote.#{remote}.mirror")
+        rescue Puppet::ExecutionFailure
+          next
         end
       end
     end

lib/puppet/provider/vcsrepo/hg.rb

@@ -45,12 +45,10 @@ def latest?
 
   def latest
     at_path do
-      begin
-        hg_wrapper('incoming', '--branch', '.', '--newest-first', '--limit', '1', remote: true)[%r{^changeset:\s+(?:-?\d+):(\S+)}m, 1]
-      rescue Puppet::ExecutionFailure
-        # If there are no new changesets, return the current nodeid
-        revision
-      end
+      hg_wrapper('incoming', '--branch', '.', '--newest-first', '--limit', '1', remote: true)[%r{^changeset:\s+(?:-?\d+):(\S+)}m, 1]
+    rescue Puppet::ExecutionFailure
+      # If there are no new changesets, return the current nodeid
+      revision
     end
   end
 

metadata.json

@@ -82,6 +82,6 @@
     }
   ],
   "template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
-  "template-ref": "heads/main-0-gf3911d3",
+  "template-ref": "heads/main-0-g806810b",
   "pdk-version": "2.3.0"
 }