Merge pull request voxpupuli#418 from hfm/consul110

Change enableTagOverride to enable_tag_override in Consul 1.1.0 and later

manifests/service.pp

@@ -12,7 +12,7 @@
 #   If provided an array of checks that will be added to this service
 #
 # [*enable_tag_override*]
-#   enableTagOverride support for service. Defaults to False.
+#   enable_tag_override support for service. Defaults to False.
 #
 # [*ensure*]
 #   Define availability of service. Use 'absent' to remove existing services.
@@ -48,6 +48,12 @@
 
   consul_validate_checks($checks)
 
+  if versioncmp(getvar('::consul_version'), '1.1.0') >= 0 {
+    $override_key = 'enable_tag_override'
+  } else {
+    $override_key = 'enableTagOverride'
+  }
+
   $basic_hash = {
     'id'                => $id,
     'name'              => $service_name,
@@ -56,7 +62,7 @@
     'tags'              => $tags,
     'checks'            => $checks,
     'token'             => $token,
-    'enableTagOverride' => $enable_tag_override,
+    $override_key       => $enable_tag_override,
   }
 
   $service_hash = {

spec/defines/consul_service_spec.rb

@@ -6,6 +6,17 @@
 
   describe 'with no args' do
     let(:params) {{}}
+    it {
+      should contain_file("/etc/consul/service_my_service.json") \
+        .with_content(/"service" *: *\{/) \
+        .with_content(/"id" *: *"my_service"/) \
+        .with_content(/"name" *: *"my_service"/) \
+        .with_content(/"enable_tag_override" *: *false/)
+    }
+  end
+  describe 'with no args ( consul version less than 1.1.0 )' do
+    let(:params) {{}}
+    let(:facts) {{ :consul_version => '1.0.1' }}
 
     it {
       should contain_file("/etc/consul/service_my_service.json") \
@@ -52,7 +63,7 @@
         .with_content(/"service" *: *\{/) \
         .with_content(/"id" *: *"my_service"/) \
         .with_content(/"name" *: *"my_service"/) \
-        .with_content(/"enableTagOverride" *: *true/)
+        .with_content(/"enable_tag_override" *: *true/)
     }
   end
   describe 'with service name and address' do