rewrite rspec tests

puppetlabs · Jun 24, 2020 · 008a021 · 008a021
1 parent 8dc7536
commit 008a021
Show file tree

Hide file tree

Showing 64 changed files with 4,639 additions and 3,649 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -108,6 +108,8 @@ Metrics/AbcSize:
   Enabled: false
 Metrics/BlockLength:
   Enabled: false
+Metrics/BlockNesting:
+  Enabled: false
 Metrics/ClassLength:
   Enabled: false
 Metrics/CyclomaticComplexity:
@@ -136,3 +138,11 @@ Style/IfUnlessModifier:
   Enabled: false
 Style/SymbolProc:
   Enabled: false
+Style/IdenticalConditionalBranches:
+  Enabled: false
+Style/IfInsideElse:
+  Enabled: false
+Lint/UnderscorePrefixedVariableName:
+  Enabled: false
+Lint/UselessAssignment:
+  Enabled: false
diff --git a/lib/puppet/parser/functions/docker_service_flags.rb b/lib/puppet/parser/functions/docker_service_flags.rb
@@ -59,7 +59,7 @@ module Puppet::Parser::Functions
     end
 
     if opts['user'] && opts['user'].to_s != 'undef'
-      flags << "--user '#{opts['publish']}'"
+      flags << "--user '#{opts['user']}'"
     end
 
     if opts['workdir'] && opts['workdir'].to_s != 'undef'

diff --git a/manifests/config.pp b/manifests/config.pp
@@ -2,8 +2,12 @@
 #
 class docker::config {
   if $facts['os']['family'] != 'windows' {
-    docker::system_user { $docker::docker_users: }
+    $docker::docker_users.each |$user| {
+      docker::system_user { $user: }
+    }
   } else {
-    docker::windows_account { $docker::docker_users: }
+    $docker::docker_users.each |$user| {
+      docker::windows_account { $user: }
+    }
   }
 }
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -578,7 +578,7 @@
           $package_repos      = $docker_ce_channel
           $release            = $docker_ce_release
         }
-        'Redhat' : {
+        'RedHat' : {
           $package_location         = $docker_ce_source_location
           $package_key_source       = $docker_ce_key_source
           $package_key_check_source = true
@@ -598,25 +598,26 @@
     }
   } else {
     case $facts['os']['family'] {
-      'Debian' : {
+      'Debian': {
         $package_location         = $docker_package_location
         $package_key_source       = $docker_package_key_source
         $package_key_check_source = $docker_package_key_check_source
         $package_key              = $docker_package_key_id
         $package_repos            = 'main'
         $release                  = $docker_package_release
       }
-      'Redhat' : {
+      'RedHat': {
         $package_location         = $docker_package_location
         $package_key_source       = $docker_package_key_source
         $package_key_check_source = $docker_package_key_check_source
       }
-      default : {
+      default: {
         $package_location         = $docker_package_location
         $package_key_source       = $docker_package_key_source
         $package_key_check_source = $docker_package_key_check_source
       }
     }
+
     $docker_start_command = $docker_engine_start_command
     $docker_package_name  = $docker_engine_package_name
   }

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -86,25 +86,24 @@
   $os_lc                             = downcase($facts['os']['name'])
   $docker_msft_provider_version      = undef
   $nuget_package_provider_version    = undef
+  $docker_command                    = 'docker'
 
   if ($facts['os']['family'] == 'windows') {
+    $compose_install_path   = "${::docker_program_files_path}/Docker"
+    $compose_version        = '1.21.2'
     $docker_ee_package_name = 'Docker'
+    $machine_install_path   = "${::docker_program_files_path}/Docker"
     $tls_cacert             = "${::docker_program_data_path}/docker/certs.d/ca.pem"
     $tls_cert               = "${::docker_program_data_path}/docker/certs.d/server-cert.pem"
     $tls_key                = "${::docker_program_data_path}/docker/certs.d/server-key.pem"
-    $compose_version        = '1.21.2'
-    $compose_install_path   = "${::docker_program_files_path}/Docker"
-    $machine_install_path   = "${::docker_program_files_path}/Docker"
-    $docker_command         = 'docker'
   } else {
+    $compose_install_path   = '/usr/local/bin'
+    $compose_version        = '1.9.0'
     $docker_ee_package_name = 'docker-ee'
+    $machine_install_path   = '/usr/local/bin'
     $tls_cacert             = '/etc/docker/tls/ca.pem'
     $tls_cert               = '/etc/docker/tls/cert.pem'
     $tls_key                = '/etc/docker/tls/key.pem'
-    $compose_version        = '1.9.0'
-    $compose_install_path   = '/usr/local/bin'
-    $machine_install_path   = '/usr/local/bin'
-    $docker_command         = 'docker'
   }
 
   case $facts['os']['family'] {
@@ -114,16 +113,15 @@
           $package_release = "ubuntu-${facts['os']['distro']['codename']}"
 
           if (versioncmp($facts['os']['release']['full'], '15.04') >= 0) {
-            $service_provider           = 'systemd'
-            $storage_config             = '/etc/default/docker-storage'
+            $service_after_override     = undef
             $service_config_template    = 'docker/etc/sysconfig/docker.systemd.erb'
+            $service_hasrestart         = true
+            $service_hasstatus          = true
             $service_overrides_template = 'docker/etc/systemd/system/docker.service.d/service-overrides-debian.conf.erb'
-            $socket_overrides_template  = 'docker/etc/systemd/system/docker.socket.d/socket-overrides.conf.erb'
+            $service_provider           = 'systemd'
             $socket_override            = false
-            $service_after_override     = undef
-            $service_hasstatus          = true
-            $service_hasrestart         = true
-
+            $socket_overrides_template  = 'docker/etc/systemd/system/docker.socket.d/socket-overrides.conf.erb'
+            $storage_config             = '/etc/default/docker-storage'
             include docker::systemd_reload
           } else {
             $service_config_template    = 'docker/etc/default/docker.erb'
@@ -153,15 +151,15 @@
         }
       }
 
-      $service_name                  = $service_name_default
+      $apt_source_pin_level          = 500
       $docker_group                  = $docker_group_default
-      $socket_group                  = $socket_group_default
-      $use_upstream_package_source   = true
       $pin_upstream_package_source   = true
-      $apt_source_pin_level          = 500
       $repo_opt                      = undef
       $service_config                = undef
+      $service_name                  = $service_name_default
+      $socket_group                  = $socket_group_default
       $storage_setup_file            = undef
+      $use_upstream_package_source   = true
 
       $package_ce_source_location    = "https://download.docker.com/linux/${os_lc}"
       $package_ce_key_source         = "https://download.docker.com/linux/${os_lc}/gpg"
@@ -185,39 +183,38 @@
       }
     }
     'RedHat' : {
+      $service_after_override      = undef
       $service_config              = '/etc/sysconfig/docker'
-      $storage_config              = '/etc/sysconfig/docker-storage'
-      $storage_setup_file          = '/etc/sysconfig/docker-storage-setup'
-      $service_hasstatus           = true
-      $service_hasrestart          = true
-
-      $service_provider            = 'systemd'
       $service_config_template     = 'docker/etc/sysconfig/docker.systemd.erb'
+      $service_hasrestart          = true
+      $service_hasstatus           = true
       $service_overrides_template  = 'docker/etc/systemd/system/docker.service.d/service-overrides-rhel.conf.erb'
-      $socket_overrides_template   = 'docker/etc/systemd/system/docker.socket.d/socket-overrides.conf.erb'
+      $service_provider            = 'systemd'
       $socket_override             = false
-      $service_after_override      = undef
+      $socket_overrides_template   = 'docker/etc/systemd/system/docker.socket.d/socket-overrides.conf.erb'
+      $storage_config              = '/etc/sysconfig/docker-storage'
+      $storage_setup_file          = '/etc/sysconfig/docker-storage-setup'
       $use_upstream_package_source = true
 
-      $package_ce_source_location  = "https://download.docker.com/linux/centos/${facts['os']['release']['major']}/${facts['os']['architecture']}/${docker_ce_channel}"
-      $package_ce_key_source       = 'https://download.docker.com/linux/centos/gpg'
+      $apt_source_pin_level        = undef
+      $detach_service_in_init      = false
       $package_ce_key_id           = undef
+      $package_ce_key_source       = 'https://download.docker.com/linux/centos/gpg'
       $package_ce_release          = undef
-      $package_key_id              = undef
-      $package_release             = undef
-      $package_source_location     = "https://yum.dockerproject.org/repo/main/centos/${facts['os']['release']['major']}"
-      $package_key_source          = 'https://yum.dockerproject.org/gpg'
-      $package_key_check_source    = true
-      $package_ee_source_location  = $docker_ee_source_location
-      $package_ee_key_source       = $docker_ee_key_source
+      $package_ce_source_location  = "https://download.docker.com/linux/centos/${facts['os']['release']['major']}/${facts['os']['architecture']}/${docker_ce_channel}"
       $package_ee_key_id           = $docker_ee_key_id
+      $package_ee_key_source       = $docker_ee_key_source
+      $package_ee_package_name     = $docker_ee_package_name
       $package_ee_release          = undef
       $package_ee_repos            = $docker_ee_repos
-      $package_ee_package_name     = $docker_ee_package_name
+      $package_ee_source_location  = $docker_ee_source_location
+      $package_key_check_source    = true
+      $package_key_id              = undef
+      $package_key_source          = 'https://yum.dockerproject.org/gpg'
+      $package_release             = undef
+      $package_source_location     = "https://yum.dockerproject.org/repo/main/centos/${facts['os']['release']['major']}"
       $pin_upstream_package_source = undef
-      $apt_source_pin_level        = undef
       $service_name                = $service_name_default
-      $detach_service_in_init      = false
 
       if $use_upstream_package_source {
         $docker_group = $docker_group_default

diff --git a/manifests/registry.pp b/manifests/registry.pp
@@ -51,15 +51,15 @@
   $docker_command = $docker::params::docker_command
 
   if $facts['os']['family'] == 'windows' {
-    $exec_environment = ["PATH=${::docker_program_files_path}/Docker/"]
+    $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'
     $password_env     = '$env:password'
     $exec_user        = undef
   } else {
     $exec_environment = []
-    $exec_path        = ['/bin', '/usr/bin']
+    $exec_path        = [ '/bin', '/usr/bin', ]
     $exec_timeout     = 0
     $exec_provider    = undef
     $password_env     = "\${password}"
@@ -80,14 +80,14 @@
       $auth_cmd         = "${docker_command} login -u '${username}' -p \"${password_env}\" -e '${email}' ${server}"
       $auth_environment = "password=${password}"
     } elsif $username != undef and $password != undef {
-      $auth_cmd        = "${docker_command} login -u '${username}' -p \"${password_env}\" ${server}"
+      $auth_cmd         = "${docker_command} login -u '${username}' -p \"${password_env}\" ${server}"
       $auth_environment = "password=${password}"
     } else {
-      $auth_cmd = "${docker_command} login ${server}"
+      $auth_cmd         = "${docker_command} login ${server}"
       $auth_environment = ''
     }
   }  else {
-    $auth_cmd = "${docker_command} logout ${server}"
+    $auth_cmd         = "${docker_command} logout ${server}"
     $auth_environment = ''
   }
 

diff --git a/manifests/services.pp b/manifests/services.pp
@@ -100,14 +100,15 @@
   }
 
   if $facts['os']['family'] == 'windows' {
-    $exec_timeout  = 3000
-    $exec_path     = [ "${::docker_program_files_path}/Docker/", ]
-    $exec_provider = 'powershell'
+    $exec_environment = "PATH=${::docker_program_files_path}/Docker/;${::docker_systemroot}/System32/"
+    $exec_path        = [ "${::docker_program_files_path}/Docker/", ]
+    $exec_provider    = 'powershell'
+    $exec_timeout     = 3000
   } else {
     $exec_environment = 'HOME=/root'
     $exec_path        = [ '/bin', '/usr/bin', ]
-    $exec_timeout     = 0
     $exec_provider    = undef
+    $exec_timeout     = 0
   }
 
   if $create {