Add spec test for new site option

Author: remicalixte

manifests/init.pp

@@ -6,7 +6,7 @@
 #   $dd_url:
 #       The host of the Datadog intake server to send agent data to.
 #       Defaults to https://app.datadoghq.com.
-#   $site:
+#   $datadog_site:
 #       The site of the Datadog intake to send Agent data to. Defaults to 'datadoghq.com',
 #       set to 'datadoghq.eu' to send data to the EU site.
 #       This option is only available with agent version >= 6.6.0.
@@ -205,7 +205,7 @@
 #
 class datadog_agent(
   $dd_url = '',
-  $site = $datadog_agent::params::default_site,
+  $datadog_site = $datadog_agent::params::datadog_site,
   $host = '',
   $api_key = 'your_API_key',
   $collect_ec2_tags = false,
@@ -306,7 +306,7 @@
   # lint:endignore
 
   validate_legacy(String, 'validate_string', $dd_url)
-  validate_legacy(String, 'validate_string', $site)
+  validate_legacy(String, 'validate_string', $datadog_site)
   validate_legacy(String, 'validate_string', $host)
   validate_legacy(String, 'validate_string', $api_key)
   validate_legacy(Array, 'validate_array', $tags)
@@ -493,7 +493,7 @@
     }
 
     if ($dd_url == '') {
-      $_dd_url = 'app.datadoghq.com'
+      $_dd_url = 'https://app.datadoghq.com'
     } else {
       $_dd_url = $dd_url
     }
@@ -618,7 +618,7 @@
     $_agent_config = {
       'api_key' => $api_key,
       'dd_url' => $dd_url,
-      'site' => $site,
+      'site' => $datadog_site,
       'cmd_port' => 5001,
       'collect_ec2_tags' => $collect_ec2_tags,
       'conf_path' => $datadog_agent::params::conf6_dir,

manifests/params.pp

@@ -15,7 +15,7 @@
 # Sample Usage:
 #
 class datadog_agent::params {
-  $default_site                   = 'datadoghq.com'
+  $datadog_site                   = 'datadoghq.com'
   $agent5_enable                  = false
   $conf_dir                       = '/etc/dd-agent/conf.d'
   $conf6_dir                      = '/etc/datadog-agent/conf.d'

spec/classes/datadog_agent_spec.rb

@@ -881,7 +881,10 @@
               'content' => /^collect_ec2_tags: false\n/,
               )}
               it { should contain_file('/etc/datadog-agent/datadog.yaml').with(
-              'content' => /^dd_url: \"{0,1}https:\/\/app.datadoghq.com\"{0,1}\n/,
+              'content' => /^dd_url: ''\n/,
+              )}
+              it { should contain_file('/etc/datadog-agent/datadog.yaml').with(
+                'content' => /^site: datadoghq.com\n/,
               )}
               it { should contain_file('/etc/datadog-agent/datadog.yaml').with(
               'content' => /^enable_metadata_collection: true\n/,
@@ -947,6 +950,14 @@
               'content' => /^collect_ec2_tags: true\n/,
               )}
             end
+            context 'datadog EU' do
+              let(:params) {{
+                  :datadog_site => 'datadoghq.eu',
+              }}
+              it { should contain_file('/etc/datadog-agent/datadog.yaml').with(
+              'content' => /^site: datadoghq.eu\n/,
+              )}
+            end
             context 'forward statsd settings set' do
               let(:params) {{
                   :statsd_forward_host => 'foo',