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

pdksync - (Maint) PDK Update

Author: LukasAud

.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,6 @@
 --relative
+--no-parameter_types-check
+--no-legacy_facts-check
+--no-top_scope_facts-check
+--no-parameter_documentation-check
+--no-topscope_variable-check

.sync.yml

@@ -35,3 +35,10 @@ spec/spec_helper.rb:
   unmanaged: false
 .travis.yml:
   delete: true
+Rakefile:
+  extra_disabled_lint_checks:
+    - parameter_types
+    - legacy_facts
+    - top_scope_facts
+    - parameter_documentation
+    - topscope_variable

Rakefile

@@ -42,14 +42,18 @@ def changelog_future_release
 end
 
 PuppetLint.configuration.send('disable_relative')
+PuppetLint.configuration.send('disable_parameter_types')
+PuppetLint.configuration.send('disable_legacy_facts')
+PuppetLint.configuration.send('disable_top_scope_facts')
+PuppetLint.configuration.send('disable_parameter_documentation')
+PuppetLint.configuration.send('disable_topscope_variable')
 
 
 if Bundler.rubygems.find_name('github_changelog_generator').any?
   GitHubChangelogGenerator::RakeTask.new :changelog do |config|
     raise "Set CHANGELOG_GITHUB_TOKEN environment variable eg 'export CHANGELOG_GITHUB_TOKEN=valid_token_here'" if Rake.application.top_level_tasks.include? "changelog" and ENV['CHANGELOG_GITHUB_TOKEN'].nil?
     config.user = "#{changelog_user}"
     config.project = "#{changelog_project}"
-    config.since_tag = "3.5.0"
     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)."

functions/sanitised_name.pp

@@ -7,6 +7,6 @@
 # [*name*]
 #   Name to sanitise
 #
-function docker::sanitised_name($name){
+function docker::sanitised_name($name) {
   regsubst($name, '[^0-9A-Za-z.\-_]', '-', 'G')
 }

manifests/compose.pp

@@ -32,8 +32,8 @@
 # @param curl_ensure
 #   Whether or not the curl package is ensured by this module.
 #
-class docker::compose(
-  Optional[Enum[present,absent]] $ensure       = 'present',
+class docker::compose (
+  Enum[present,absent] $ensure                 = present,
   Optional[String]               $version      = $docker::params::compose_version,
   Optional[String]               $install_path = $docker::params::compose_install_path,
   Optional[String]               $symlink_name = $docker::params::compose_symlink_name,

manifests/exec.pp

@@ -12,17 +12,17 @@
 # @param refreshonly
 # @param onlyif
 #
-define docker::exec(
-  Optional[Boolean] $detach        = false,
-  Optional[Boolean] $interactive   = false,
-  Optional[Array]   $env           = [],
-  Optional[Boolean] $tty           = false,
-  Optional[String]  $container     = undef,
-  Optional[String]  $command       = undef,
-  Optional[String]  $unless        = undef,
-  Optional[Boolean] $sanitise_name = true,
-  Optional[Boolean] $refreshonly   = false,
-  Optional[String]  $onlyif        = undef,
+define docker::exec (
+  Boolean $detach               = false,
+  Boolean $interactive          = false,
+  Array   $env                  = [],
+  Boolean $tty                  = false,
+  Optional[String]  $container  = undef,
+  Optional[String]  $command    = undef,
+  Optional[String]  $unless     = undef,
+  Boolean $sanitise_name        = true,
+  Boolean $refreshonly          = false,
+  Optional[String]  $onlyif     = undef,
 ) {
   include docker::params
 
@@ -31,25 +31,23 @@
   if $facts['os']['family'] == 'windows' {
     $exec_environment = "PATH=${::docker_program_files_path}/Docker/"
     $exec_timeout     = 3000
-    $exec_path        = [ "${::docker_program_files_path}/Docker/", ]
+    $exec_path        = ["${::docker_program_files_path}/Docker/",]
     $exec_provider    = 'powershell'
   } else {
     $exec_environment = 'HOME=/root'
-    $exec_path        = [ '/bin', '/usr/bin', ]
+    $exec_path        = ['/bin', '/usr/bin',]
     $exec_timeout     = 0
     $exec_provider    = undef
   }
 
-  $docker_exec_flags = docker_exec_flags(
-    {
+  $docker_exec_flags = docker_exec_flags( {
       detach      => $detach,
       interactive => $interactive,
       tty         => $tty,
       env         => any2array($env),
     }
   )
 
-
   if $sanitise_name {
     $sanitised_container = regsubst($container, '[^0-9A-Za-z.\-_]', '-', 'G')
   } else {

manifests/image.pp

@@ -25,15 +25,15 @@
 #
 # @param docker_dir
 #
-define docker::image(
-  Optional[Enum[present,absent,latest]] $ensure       = 'present',
-  Optional[Pattern[/^[\S]*$/]]          $image        = $title,
-  Optional[String]                      $image_tag    = undef,
-  Optional[String]                      $image_digest = undef,
-  Optional[Boolean]                     $force        = false,
-  Optional[String]                      $docker_file  = undef,
-  Optional[String]                      $docker_dir   = undef,
-  Optional[String]                      $docker_tar   = undef,
+define docker::image (
+  Enum[present,absent,latest]   $ensure       = 'present',
+  Optional[Pattern[/^[\S]*$/]]  $image        = $title,
+  Optional[String]              $image_tag    = undef,
+  Optional[String]              $image_digest = undef,
+  Boolean                       $force        = false,
+  Optional[String]              $docker_file  = undef,
+  Optional[String]              $docker_dir   = undef,
+  Optional[String]              $docker_tar   = undef,
 ) {
   include docker::params
 
@@ -45,14 +45,14 @@
     $exec_environment             = "PATH=${::docker_program_files_path}/Docker/"
     $exec_timeout                 = 3000
     $update_docker_image_owner    = undef
-    $exec_path                    = [ "${::docker_program_files_path}/Docker/", ]
+    $exec_path                    = ["${::docker_program_files_path}/Docker/",]
     $exec_provider                = 'powershell'
   } else {
     $update_docker_image_template = 'docker/update_docker_image.sh.erb'
     $update_docker_image_path     = '/usr/local/bin/update_docker_image.sh'
     $update_docker_image_owner    = 'root'
     $exec_environment             = 'HOME=/root'
-    $exec_path                    = [ '/bin', '/usr/bin', ]
+    $exec_path                    = ['/bin', '/usr/bin',]
     $exec_timeout                 = 0
     $exec_provider                = undef
   }

manifests/images.pp

@@ -2,7 +2,7 @@
 #
 # @param images
 #
-class docker::images(
+class docker::images (
   $images
 ) {
   create_resources(docker::image, $images)

manifests/init.pp

@@ -357,7 +357,7 @@
 # @param service_hasrestart
 # @param acknowledge_unsupported_os
 #
-class docker(
+class docker (
   Optional[String]                        $version                           = $docker::params::version,
   String                                  $ensure                            = $docker::params::ensure,
   Variant[Array[String], Hash]            $prerequired_packages              = $docker::params::prerequired_packages,
@@ -525,8 +525,8 @@
   }
 
   if ($bridge) and ($facts['os']['family'] == 'windows') {
-      assert_type(Pattern[/^(none|nat|transparent|overlay|l2bridge|l2tunnel)$/], $bridge) |$a, $b| {
-        fail('bridge must be one of none, nat, transparent, overlay, l2bridge or l2tunnel on Windows.')
+    assert_type(Pattern[/^(none|nat|transparent|overlay|l2bridge|l2tunnel)$/], $bridge) |$a, $b| {
+      fail('bridge must be one of none, nat, transparent, overlay, l2bridge or l2tunnel on Windows.')
     }
   }
 
@@ -631,7 +631,6 @@
     $root_dir_flag = '--data-root'
   }
 
-
   if $ensure != 'absent' {
     contain docker::repos
     contain docker::install