Puppet 6 support (#375)

* in puppet 6 undef values are now nil - fixes #334

these changes are puppet 5 & 6 compatible.

* Fix tests for puppet 6

Author: florindragos

.fixtures.yml

@@ -5,5 +5,9 @@ fixtures:
     translate: 'puppetlabs-translate'
     powershell: 'puppetlabs-powershell'
     reboot: 'puppetlabs-reboot'
+  repositories:
+    yumrepo_core: 
+      repo: https://github.com/puppetlabs/puppetlabs-yumrepo_core.git
+      puppet_version: ">= 6.0.0"
   symlinks:
     docker: "#{source_dir}"

.travis.yml

@@ -13,5 +13,9 @@ script:
 env:
   - PUPPET_GEM_VERSION="~> 4.0"
   - PUPPET_GEM_VERSION="~> 5.0"
+  - PUPPET_GEM_VERSION="~> 6.0"
 matrix:
   fast_finish: true
+  exclude:
+  - rvm: 2.2.5
+    env: PUPPET_GEM_VERSION="~> 6.0"

Gemfile

@@ -7,7 +7,7 @@ group :test do
   elsif puppet_git_url = ENV['PUPPET_GIT_URL']
     gem "puppet", :git => puppet_git_url
   else
-    gem "puppet", "5.5.6"
+    gem "puppet", "6.0.3"
   end
   gem "puppet-lint", "2.3.3"
   gem "puppet-lint-unquoted_string-check", "0.3.0"

lib/puppet/parser/functions/docker_plugin_enable_flags.rb

@@ -8,7 +8,7 @@ module Puppet::Parser::Functions
     opts = args[0] || {}
     flags = []
     flags << '--force' if opts['force_remove'] == true
-    flags << "'#{opts['plugin_name']}'" if opts['plugin_name'].to_s != 'undef'
+    flags << "'#{opts['plugin_name']}'" if opts['plugin_name'] && opts['plugin_name'].to_s != 'undef'
     flags.flatten.join(' ')
   end
 end

lib/puppet/parser/functions/docker_plugin_install_flags.rb

@@ -7,11 +7,11 @@ module Puppet::Parser::Functions
   newfunction(:docker_plugin_install_flags, :type => :rvalue) do |args|
     opts = args[0] || {}
     flags = []
-    flags << "--alias #{opts['plugin_alias']}" if opts['plugin_alias'].to_s != 'undef'
+    flags << "--alias #{opts['plugin_alias']}" if opts['plugin_alias'] && opts['plugin_alias'].to_s != 'undef'
     flags << '--disable' if opts['disable_on_install'] == true
     flags << '--disable-content-trust' if opts['disable_content_trust'] == true
     flags << '--grant-all-permissions' if opts['grant_all_permissions'] == true
-    flags << "'#{opts['plugin_name']}'" if opts['plugin_name'].to_s != 'undef'
+    flags << "'#{opts['plugin_name']}'" if opts['plugin_name'] && opts['plugin_name'].to_s != 'undef'
     if opts['settings'].is_a? Array
       opts['settings'].each do |setting|
         flags << setting.to_s

lib/puppet/parser/functions/docker_plugin_remove_flags.rb

@@ -8,7 +8,7 @@ module Puppet::Parser::Functions
     opts = args[0] || {}
     flags = []
     flags << '--force' if opts['force_remove'] == true
-    flags << "'#{opts['plugin_name']}'" if opts['plugin_name'].to_s != 'undef'
+    flags << "'#{opts['plugin_name']}'" if opts['plugin_name'] && opts['plugin_name'].to_s != 'undef'
     flags.flatten.join(' ')
   end
 end

lib/puppet/parser/functions/docker_run_flags.rb

@@ -46,11 +46,11 @@ module Puppet::Parser::Functions
       flags << '--detach=true'
     end
 
-    if opts['health_check_cmd'].to_s != 'undef'
+    if opts['health_check_cmd'] && opts['health_check_cmd'].to_s != 'undef'
       flags << "--health-cmd='#{opts['health_check_cmd']}'"
     end
 
-    if opts['health_check_interval'].to_s != 'undef'
+    if opts['health_check_interval'] && opts['health_check_interval'].to_s != 'undef'
       flags << "--health-interval=#{opts['health_check_interval']}s"
     end
 
@@ -62,7 +62,7 @@ module Puppet::Parser::Functions
       flags << '--read-only=true'
     end
 
-    params_join_char = if opts['osfamily'].to_s != 'undef'
+    params_join_char = if opts['osfamily'] && opts['osfamily'].to_s != 'undef'
                          opts['osfamily'].casecmp('windows').zero? ? " `\n" : " \\\n"
                        else
                          " \\\n"

lib/puppet/parser/functions/docker_secrets_flags.rb

@@ -12,11 +12,11 @@ module Puppet::Parser::Functions
       flags << 'create'
     end
 
-    if opts['secret_name'].to_s != 'undef'
+    if opts['secret_name'] && opts['secret_name'].to_s != 'undef'
       flags << "'#{opts['secret_name']}'"
     end
 
-    if opts['secret_path'].to_s != 'undef'
+    if opts['secret_path'] && opts['secret_path'].to_s != 'undef'
       flags << "'#{opts['secret_path']}'"
     end
 

lib/puppet/parser/functions/docker_service_flags.rb

@@ -12,7 +12,7 @@ module Puppet::Parser::Functions
       flags << '--detach'
     end
 
-    if opts['service_name'].to_s != 'undef'
+    if opts['service_name'] && opts['service_name'].to_s != 'undef'
       flags << "'#{opts['service_name']}'"
     end
 
@@ -28,23 +28,23 @@ module Puppet::Parser::Functions
       end
     end
 
-    if opts['publish'].to_s != 'undef'
+    if opts['publish'] && opts['publish'].to_s != 'undef'
       flags << "--publish '#{opts['publish']}'"
     end
 
-    if opts['replicas'].to_s != 'undef'
+    if opts['replicas'] && opts['replicas'].to_s != 'undef'
       flags << "--replicas '#{opts['replicas']}'"
     end
 
     if opts['tty'].to_s != 'false'
       flags << '--tty'
     end
 
-    if opts['user'].to_s != 'undef'
+    if opts['user'] && opts['user'].to_s != 'undef'
       flags << "--user '#{opts['publish']}'"
     end
 
-    if opts['workdir'].to_s != 'undef'
+    if opts['workdir'] && opts['workdir'].to_s != 'undef'
       flags << "--workdir '#{opts['workdir']}'"
     end
 
@@ -54,19 +54,19 @@ module Puppet::Parser::Functions
       end
     end
 
-    if opts['host_socket'].to_s != 'undef'
+    if opts['host_socket'] && opts['host_socket'].to_s != 'undef'
       flags << "-H '#{opts['host_socket']}'"
     end
 
-    if opts['registry_mirror'].to_s != 'undef'
+    if opts['registry_mirror'] && opts['registry_mirror'].to_s != 'undef'
       flags << "--registry-mirror='#{opts['registry_mirror']}'"
     end
 
-    if opts['image'].to_s != 'undef'
+    if opts['image'] && opts['image'].to_s != 'undef'
       flags << "'#{opts['image']}'"
     end
 
-    if opts['command'].to_s != 'undef'
+    if opts['command'] && opts['command'].to_s != 'undef'
       flags << opts['command'].to_s
     end
 

lib/puppet/parser/functions/docker_stack_flags.rb

@@ -8,25 +8,25 @@ module Puppet::Parser::Functions
     opts = args[0] || {}
     flags = []
 
-    if opts['bundle_file'].to_s != 'undef'
+    if opts['bundle_file'] && opts['bundle_file'].to_s != 'undef'
       flags << "--bundle-file '#{opts['bundle_file']}'"
     end
 
-    if opts['compose_files'].to_s != 'undef'
+    if opts['compose_files'] && opts['compose_files'].to_s != 'undef'
       opts['compose_files'].each do |file|
         flags << "--compose-file '#{file}'"
       end
     end
 
-    if opts['resolve_image'].to_s != 'undef'
+    if opts['resolve_image'] && opts['resolve_image'].to_s != 'undef'
       flags << "--resolve-image '#{opts['resolve_image']}'"
     end
 
-    if opts['prune'].to_s != 'undef'
+    if opts['prune'] && opts['prune'].to_s != 'undef'
       flags << "--prune '#{opts['prune']}'"
     end
 
-    if opts['with_registry_auth']
+    if opts['with_registry_auth'] && opts['with_registry_auth'].to_s != 'undef'
       flags << '--with-registry-auth'
     end
 

lib/puppet/parser/functions/docker_swarm_init_flags.rb

@@ -12,39 +12,39 @@ module Puppet::Parser::Functions
       flags << 'init'
     end
 
-    if opts['advertise_addr'].to_s != 'undef'
+    if opts['advertise_addr'] && opts['advertise_addr'].to_s != 'undef'
       flags << "--advertise-addr '#{opts['advertise_addr']}'"
     end
 
     if opts['autolock'].to_s != 'false'
       flags << '--autolock'
     end
 
-    if opts['cert_expiry'].to_s != 'undef'
+    if opts['cert_expiry'] && opts['cert_expiry'].to_s != 'undef'
       flags << "--cert-expiry '#{opts['cert_expiry']}'"
     end
 
-    if opts['dispatcher_heartbeat'].to_s != 'undef'
+    if opts['dispatcher_heartbeat'] && opts['dispatcher_heartbeat'].to_s != 'undef'
       flags << "--dispatcher-heartbeat '#{opts['dispatcher_heartbeat']}'"
     end
 
-    if opts['external_ca'].to_s != 'undef'
+    if opts['external_ca'] && opts['external_ca'].to_s != 'undef'
       flags << "--external-ca '#{opts['external_ca']}'"
     end
 
     if opts['force_new_cluster'].to_s != 'false'
       flags << '--force-new-cluster'
     end
 
-    if opts['listen_addr'].to_s != 'undef'
+    if opts['listen_addr'] && opts['listen_addr'].to_s != 'undef'
       flags << "--listen-addr '#{opts['listen_addr']}'"
     end
 
-    if opts['max_snapshots'].to_s != 'undef'
+    if opts['max_snapshots'] && opts['max_snapshots'].to_s != 'undef'
       flags << "--max-snapshots '#{opts['max_snapshots']}'"
     end
 
-    if opts['snapshot_interval'].to_s != 'undef'
+    if opts['snapshot_interval'] && opts['snapshot_interval'].to_s != 'undef'
       flags << "--snapshot-interval '#{opts['snapshot_interval']}'"
     end
 

lib/puppet/parser/functions/docker_swarm_join_flags.rb

@@ -12,15 +12,15 @@ module Puppet::Parser::Functions
       flags << 'join'
     end
 
-    if opts['advertise_addr'].to_s != 'undef'
+    if opts['advertise_addr'] && opts['advertise_addr'].to_s != 'undef'
       flags << "--advertise-addr '#{opts['advertise_addr']}'"
     end
 
-    if opts['listen_addr'].to_s != 'undef'
+    if opts['listen_addr'] && opts['listen_addr'].to_s != 'undef'
       flags << "--listen-addr \"#{opts['listen_addr']}\""
     end
 
-    if opts['token'].to_s != 'undef'
+    if opts['token'] && opts['token'].to_s != 'undef'
       flags << "--token '#{opts['token']}'"
     end
 

spec/acceptance/compose_v3_spec.rb

@@ -7,9 +7,13 @@
   tmp_path = 'C:/cygwin64/tmp'
   test_container = 'nanoserver-sac2016'
 else
+  if fact('osfamily') == 'RedHat'
+    docker_args = "repo_opt => '--enablerepo=localmirror-extras'"
+  else
+    docker_args = ''
+  end
   install_dir = '/usr/local/bin'
   file_extension = ''
-  docker_args = ''
   tmp_path = '/tmp'
   test_container = 'debian'
 end

spec/acceptance/stack_spec.rb

@@ -80,14 +80,15 @@ class { 'docker': #{docker_args} }
         end
 
         it 'should not find a docker stack' do
+            sleep 5
             shell('docker stack ls') do |r|
                expect(r.stdout).to_not match(/web/)
             end
         end
     end
 
     context 'creating stack with multi compose files' do
-        
+
         before(:all) do
             @install_code = <<-code
             docker::stack { 'web':
@@ -127,7 +128,7 @@ class { 'docker': #{docker_args} }
             code
 
             apply_manifest(@destroy_code, :catch_failures=>true)
-            sleep 5 # wait for containers to stop
+            sleep 10 # wait for containers to stop
         end
 
         it 'should be idempotent' do

spec/spec_helper_acceptance.rb

@@ -144,7 +144,9 @@ def retry_on_error_matching(max_retry_count = 3, retry_wait_interval_secs = 5, e
 
         if fact_on(host, 'osfamily') == 'windows'
           win_host = only_host_with_role(hosts, 'default')
-          @windows_ip = win_host.ip
+          retry_on_error_matching(60, 5, /connection failure running/) do
+            @windows_ip = win_host.ip
+          end
           apply_manifest_on(host, "class { 'docker': docker_ee => true, extra_parameters => '\"insecure-registries\": [ \"#{@windows_ip}:5000\" ]' }")
           docker_path = "/cygdrive/c/Program Files/Docker"
           host.add_env_var('PATH', docker_path)