Merge pull request #467 from jarro2783/master

Don't write out meta parameter when unset
voxpupuli · Feb 4, 2019 · f181170 · f181170
2 parents 51d2fbe + e9af0fe
commit f181170
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/manifests/service.pp b/manifests/service.pp
@@ -61,17 +61,17 @@
 #  }
 #
 define consul::service(
-  $address                         = undef,
-  $checks                          = [],
-  $enable_tag_override             = false,
-  $ensure                          = present,
-  $id                              = $title,
-  $port                            = undef,
-  $service_name                    = $title,
-  Hash $service_config_hash        = {},
-  $tags                            = [],
-  $token                           = undef,
-  Hash[String[1], String[1]] $meta = {},
+  $address                                   = undef,
+  $checks                                    = [],
+  $enable_tag_override                       = false,
+  $ensure                                    = present,
+  $id                                        = $title,
+  $port                                      = undef,
+  $service_name                              = $title,
+  Hash $service_config_hash                  = {},
+  $tags                                      = [],
+  $token                                     = undef,
+  Optional[Hash[String[1], String[1]]] $meta = undef,
 ) {
 
   include consul

diff --git a/spec/defines/consul_service_spec.rb b/spec/defines/consul_service_spec.rb
@@ -14,7 +14,6 @@
         it {
           should contain_file("/etc/consul/service_my_service.json") \
             .with_content(/"service" *: *\{/) \
-            .with_content(/"meta" *: *\{\}/) \
             .with_content(/"id" *: *"my_service"/) \
             .with_content(/"name" *: *"my_service"/) \
             .with_content(/"enable_tag_override" *: *false/)
@@ -28,7 +27,6 @@
         it {
           should contain_file("/etc/consul/service_my_service.json") \
             .with_content(/"service" *: *\{/) \
-            .with_content(/"meta" *: *\{\}/) \
             .with_content(/"id" *: *"my_service"/) \
             .with_content(/"name" *: *"my_service"/) \
             .with_content(/"enable_tag_override" *: *false/)