From ea4c9abc2e6d60fcc7509a60141fb1b35e4809af Mon Sep 17 00:00:00 2001
From: Bogdan Katishev <bogdan_katishev@hotmail.com>
Date: Fri, 8 Jan 2021 14:36:32 +0100
Subject: [PATCH] Add config_name parameter to define the name of the consul
 config

---
 manifests/config.pp       |  4 ++--
 manifests/init.pp         |  4 ++++
 spec/classes/init_spec.rb | 34 +++++++++++++++++-----------------
 3 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/manifests/config.pp b/manifests/config.pp
index 22b6d77a..e2d3af84 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -123,9 +123,9 @@
     recurse => $purge,
   }
 
-  file { 'consul config.json':
+  file { 'consul config':
     ensure  => present,
-    path    => "${consul::config_dir}/config.json",
+    path    => "${consul::config_dir}/${consul::config_name}",
     owner   => $consul::user_real,
     group   => $consul::group_real,
     mode    => $consul::config_mode,
diff --git a/manifests/init.pp b/manifests/init.pp
index bd5fa31a..a2ebfeb5 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -58,6 +58,9 @@
 # [*config_dir*]
 #   Directory to place consul configuration files in.
 #
+# [*config_name*]
+#   Name of the consul configuration file.
+#
 # [*config_hash*]
 #   Use this to populate the JSON config file for consul.
 #
@@ -202,6 +205,7 @@
   Hash                                  $checks                      = {},
   Hash                                  $config_defaults             = $consul::params::config_defaults,
   Stdlib::Absolutepath                  $config_dir                  = $consul::params::config_dir,
+  String[1]                             $config_name                 = 'config.json',
   Hash                                  $config_hash                 = {},
   String[1]                             $config_mode                 = '0664',
   String[1]                             $data_dir_mode               = $consul::params::data_dir_mode,
diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb
index c249ac76..f55c2c8a 100644
--- a/spec/classes/init_spec.rb
+++ b/spec/classes/init_spec.rb
@@ -159,14 +159,14 @@
             'ui' => true
           },
         }}
-        it { should contain_file('consul config.json').with_content(/"ui":true/) }
+        it { should contain_file('consul config').with_content(/"ui":true/) }
       end
 
       context "When not installing UI" do
         let(:params) {{
           :config_hash => { },
         }}
-        it { should_not contain_file('consul config.json').with_content(/"ui":true/) }
+        it { should_not contain_file('consul config').with_content(/"ui":true/) }
       end
 
       context "By default, a user and group should be installed" do
@@ -194,8 +194,8 @@
           :config_hash =>
             { 'bootstrap_expect' => '5' }
         }}
-        it { should contain_file('consul config.json').with_content(/"bootstrap_expect":5/) }
-        it { should_not contain_file('consul config.json').with_content(/"bootstrap_expect":"5"/) }
+        it { should contain_file('consul config').with_content(/"bootstrap_expect":5/) }
+        it { should_not contain_file('consul config').with_content(/"bootstrap_expect":"5"/) }
       end
 
       context 'Config_defaults is used to provide additional config' do
@@ -207,8 +207,8 @@
               'bootstrap_expect' => '5',
           }
         }}
-        it { should contain_file('consul config.json').with_content(/"bootstrap_expect":5/) }
-        it { should contain_file('consul config.json').with_content(/"data_dir":"\/dir1"/) }
+        it { should contain_file('consul config').with_content(/"bootstrap_expect":5/) }
+        it { should contain_file('consul config').with_content(/"data_dir":"\/dir1"/) }
       end
 
       context 'Config_defaults is used to provide additional config and is overridden' do
@@ -230,11 +230,11 @@
               },
           }
         }}
-        it { should contain_file('consul config.json').with_content(/"bootstrap_expect":5/) }
-        it { should contain_file('consul config.json').with_content(/"data_dir":"\/dir1"/) }
-        it { should contain_file('consul config.json').with_content(/"server":true/) }
-        it { should contain_file('consul config.json').with_content(/"http":-1/) }
-        it { should contain_file('consul config.json').with_content(/"https":8500/) }
+        it { should contain_file('consul config').with_content(/"bootstrap_expect":5/) }
+        it { should contain_file('consul config').with_content(/"data_dir":"\/dir1"/) }
+        it { should contain_file('consul config').with_content(/"server":true/) }
+        it { should contain_file('consul config').with_content(/"http":-1/) }
+        it { should contain_file('consul config').with_content(/"https":8500/) }
       end
 
       context 'When pretty config is true' do
@@ -249,11 +249,11 @@
               },
           }
         }}
-        it { should contain_file('consul config.json').with_content(/"bootstrap_expect": 5,/) }
-        it { should contain_file('consul config.json').with_content(/"server": true/) }
-        it { should contain_file('consul config.json').with_content(/"http": -1,/) }
-        it { should contain_file('consul config.json').with_content(/"https": 8500/) }
-        it { should contain_file('consul config.json').with_content(/"ports": \{/) }
+        it { should contain_file('consul config').with_content(/"bootstrap_expect": 5,/) }
+        it { should contain_file('consul config').with_content(/"server": true/) }
+        it { should contain_file('consul config').with_content(/"http": -1,/) }
+        it { should contain_file('consul config').with_content(/"https": 8500/) }
+        it { should contain_file('consul config').with_content(/"ports": \{/) }
       end
 
       context "When asked not to manage the user" do
@@ -311,7 +311,7 @@
           :group => 'custom_consul_group',
           :config_mode  => '0600',
         }}
-        it { should contain_file('consul config.json').with(
+        it { should contain_file('consul config').with(
           :owner => 'custom_consul_user',
           :group => 'custom_consul_group',
           :mode  => '0600'