Fixed spec tests. Updated tp::dir for edge cases

alvagante · alvagante · commit a2fe3949af11 · 2020-03-02T20:00:53.000+01:00
diff --git a/manifests/dir.pp b/manifests/dir.pp
@@ -131,7 +131,7 @@
   String[1]              $ensure             = 'present',
 
   Variant[Undef,String,Array] $source        = undef,
-  Variant[Undef,String]  $vcsrepo            = undef,
+  Variant[Undef,Boolean,String] $vcsrepo     = false,
   Hash                   $vcsrepo_options    = {},
   String[1]              $base_dir           = 'config',
 
@@ -208,13 +208,11 @@
     default   => $config_dir_notify,
   }
 
-  $manage_ensure = $ensure ? {
-    'present' => $vcsrepo ? {
-      undef   => 'directory',
-      default => 'present',
-    },
-    default => $ensure,
+  $ensure_vcsrepo = $ensure ? {
+    'directory' => 'present',
+    default     => $ensure,
   }
+  $ensure_dir = tp::ensure2dir($ensure)
 
   # Finally, the resources managed
   if $path_parent_create {
@@ -232,7 +230,7 @@
 
   if $vcsrepo {
     $vcsrepo_defaults = {
-      ensure   => $manage_ensure,
+      ensure   => $ensure_vcsrepo,
       source   => $source,
       provider => $vcsrepo,
       owner    => $manage_owner,
@@ -243,7 +241,7 @@
     }
   } else {
     $file_params = {
-      ensure  => $manage_ensure,
+      ensure  => $ensure_dir,
       source  => $source,
       path    => $manage_path,
       mode    => $manage_mode,
diff --git a/spec/tpdata/centos-7-x86_64/elasticsearch b/spec/tpdata/centos-7-x86_64/elasticsearch
@@ -1,4 +1,5 @@
 ---
+upstream_repo: false
 package_ensure: present
 service_ensure: running
 service_enable: true
diff --git a/spec/tpdata/centos-7-x86_64/gitlab-runner b/spec/tpdata/centos-7-x86_64/gitlab-runner
@@ -1,4 +1,5 @@
 ---
+upstream_repo: false
 package_ensure: present
 service_ensure: running
 service_enable: true
diff --git a/spec/tpdata/centos-7-x86_64/icinga2 b/spec/tpdata/centos-7-x86_64/icinga2
@@ -1,4 +1,5 @@
 ---
+upstream_repo: false
 package_ensure: present
 service_ensure: running
 service_enable: true
diff --git a/spec/tpdata/centos-7-x86_64/openssh b/spec/tpdata/centos-7-x86_64/openssh
@@ -1,4 +1,5 @@
 ---
+upstream_repo: false
 package_ensure: present
 service_ensure: running
 service_enable: true
diff --git a/spec/tpdata/centos-7-x86_64/postfix b/spec/tpdata/centos-7-x86_64/postfix
@@ -1,4 +1,5 @@
 ---
+upstream_repo: false
 package_ensure: present
 service_ensure: running
 service_enable: true
diff --git a/spec/tpdata/centos-7-x86_64/puppet-agent b/spec/tpdata/centos-7-x86_64/puppet-agent
@@ -1,4 +1,5 @@
 ---
+upstream_repo: false
 package_ensure: present
 service_ensure: running
 service_enable: true
diff --git a/spec/tpdata/centos-7-x86_64/puppetserver b/spec/tpdata/centos-7-x86_64/puppetserver
@@ -1,4 +1,5 @@
 ---
+upstream_repo: false
 package_ensure: present
 service_ensure: running
 service_enable: true
diff --git a/spec/tpdata/centos-7-x86_64/rsyslog b/spec/tpdata/centos-7-x86_64/rsyslog
@@ -1,4 +1,5 @@
 ---
+upstream_repo: false
 package_ensure: present
 service_ensure: running
 service_enable: true
diff --git a/spec/tpdata/centos-7-x86_64/sysdig b/spec/tpdata/centos-7-x86_64/sysdig
@@ -1,4 +1,5 @@
 ---
+upstream_repo: false
 package_ensure: present
 service_ensure: running
 service_enable: true
diff --git a/spec/tpdata/ubuntu-16.04-x86_64/elasticsearch b/spec/tpdata/ubuntu-16.04-x86_64/elasticsearch
@@ -1,4 +1,5 @@
 ---
+upstream_repo: false
 package_ensure: present
 service_ensure: running
 service_enable: true
diff --git a/spec/tpdata/ubuntu-16.04-x86_64/icinga2 b/spec/tpdata/ubuntu-16.04-x86_64/icinga2
@@ -1,4 +1,5 @@
 ---
+upstream_repo: false
 package_ensure: present
 service_ensure: running
 service_enable: true
diff --git a/spec/tpdata/ubuntu-16.04-x86_64/openssh b/spec/tpdata/ubuntu-16.04-x86_64/openssh
@@ -1,4 +1,5 @@
 ---
+upstream_repo: false
 package_ensure: present
 service_ensure: running
 service_enable: true
diff --git a/spec/tpdata/ubuntu-16.04-x86_64/postfix b/spec/tpdata/ubuntu-16.04-x86_64/postfix
@@ -1,4 +1,5 @@
 ---
+upstream_repo: false
 package_ensure: present
 service_ensure: running
 service_enable: true
diff --git a/spec/tpdata/ubuntu-16.04-x86_64/puppet-agent b/spec/tpdata/ubuntu-16.04-x86_64/puppet-agent
@@ -1,4 +1,5 @@
 ---
+upstream_repo: false
 package_ensure: present
 service_ensure: running
 service_enable: true
diff --git a/spec/tpdata/ubuntu-16.04-x86_64/rsyslog b/spec/tpdata/ubuntu-16.04-x86_64/rsyslog
@@ -1,4 +1,5 @@
 ---
+upstream_repo: false
 package_ensure: present
 service_ensure: running
 service_enable: true
diff --git a/spec/tpdata/ubuntu-16.04-x86_64/sysdig b/spec/tpdata/ubuntu-16.04-x86_64/sysdig
@@ -1,4 +1,5 @@
 ---
+upstream_repo: false
 package_ensure: present
 service_ensure: running
 service_enable: true
@@ -10,12 +11,10 @@ config_dir_group: root
 config_dir_mode: '0755'
 config_dir_purge: false
 config_dir_recurse: true
+repo_package_provider: dpkg
 package_name: sysdig
-tp_prerequisites:
-- dkms
 repo_url: http://download.draios.com/stable/deb
-key: F1C3BD80
+key: 'D27A 72F3 2D86 7DF9 300A  2415 7449 0FD6 EC51 E8C4'
 key_url: https://s3.amazonaws.com/download.draios.com/DRAIOS-GPG-KEY.public
 apt_release: stable-$(ARCH)/
-repo_package_provider: dpkg
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`---`
	`2`	`+upstream_repo: false`
`2`	`3`	`package_ensure: present`
`3`	`4`	`service_ensure: running`
`4`	`5`	`service_enable: true`