Make linter happy

Author: albertvaka

manifests/integration.pp

@@ -21,8 +21,10 @@
     $dst = "${datadog_agent::params::legacy_conf_dir}/${integration}.yaml"
   }
 
+  $file_ensure = $ensure ? { default => file, 'absent' => absent }
+
   file { $dst:
-    ensure  => $ensure ? { default => file, 'absent' => absent },
+    ensure  => $file_ensure,
     owner   => $datadog_agent::dd_user,
     group   => $datadog_agent::dd_group,
     mode    => $datadog_agent::params::permissions_file,

spec/defines/datadog_agent__integration_spec.rb

@@ -9,14 +9,15 @@
 
       if agent_major_version == 5
         let(:conf_file) { '/etc/dd-agent/conf.d/test.yaml' }
+
       else
         let(:conf_dir) { "#{CONF_DIR}/test.d" }
         let(:conf_file) { "#{conf_dir}/conf.yaml" }
       end
 
       gem_spec = Gem.loaded_specs['puppet']
 
-      if agent_major_version == 5
+      if agent_major_version > 5
         it { is_expected.to contain_file(conf_dir.to_s).that_comes_before("File[#{conf_file}]") }
       end
       it { is_expected.to contain_file(conf_file.to_s).that_notifies("Service[#{SERVICE_NAME}]") }
@@ -31,12 +32,14 @@
             ],
           }
         end
+
         it { is_expected.to compile }
         if gem_spec.version >= Gem::Version.new('4.0.0')
           it { is_expected.to contain_file(conf_file.to_s).with_content(%r{---\ninit_config:\ninstances:\n- one: two\n}) }
         else
           it { is_expected.to contain_file(conf_file.to_s).with_content(%r{--- \n  init_config:\n  instances: \n    - one: two}) }
         end
+        it { is_expected.to contain_file(conf_file).with_ensure('file') }
       end
 
       context 'with logs' do
@@ -50,12 +53,14 @@
             logs: ['one', 'two'],
           }
         end
+
         it { is_expected.to compile }
         if gem_spec.version >= Gem::Version.new('4.0.0')
           it { is_expected.to contain_file(conf_file).with_content(%r{logs:\n- one\n- two}) }
         else
           it { is_expected.to contain_file(conf_file).with_content(%r{logs:\n  - one\n  - two}) }
         end
+        it { is_expected.to contain_file(conf_file).with_ensure('file') }
       end
 
       context 'with ensure absent' do
@@ -64,10 +69,10 @@
             ensure: 'absent',
           }
         end
+
         it { is_expected.to compile }
         it { is_expected.to contain_file(conf_file).with_ensure('absent') }
       end
-
     end
   end
 end