[ubuntu] removing unnecessary key management (DataDog#507)

Author: truthbk

manifests/ubuntu/agent5.pp

@@ -26,10 +26,12 @@
 ) inherits datadog_agent::params{
 
   if !$skip_apt_key_trusting {
-    ::datadog_agent::ubuntu::install_key { [$apt_key]:
-      server => $apt_keyserver,
-      before => Apt::Source['datadog'],
+    $key = {
+      'id' => $apt_key,
+      'server' => $apt_keyserver,
     }
+  } else {
+    $key = {}
   }
 
   # This is a hack - I'm not happy about it, but we should rarely
@@ -66,6 +68,7 @@
     release  => $release,
     repos    => $repos,
     require  => Class['apt'],
+    key      => $key,
     notify   => Exec['datadog_apt-get_remove_agent6'],
   }
 
@@ -77,7 +80,7 @@
   package { $datadog_agent::params::package_name:
     ensure  => $agent_version,
     require => [Apt::Source['datadog'],
-                Exec['apt_update']],
+                Class['apt::update']],
   }
 
   if $service_provider {

manifests/ubuntu/agent6.pp

@@ -17,10 +17,12 @@
 ) inherits datadog_agent::params {
 
   if !$skip_apt_key_trusting {
-    ::datadog_agent::ubuntu::install_key { [$apt_key]:
-      server => $apt_keyserver,
-      before => Apt::Source['datadog6'],
+    $key = {
+      'id' => $apt_key,
+      'server' => $apt_keyserver,
     }
+  } else {
+    $key = {}
   }
 
   apt::source { 'datadog':
@@ -33,6 +35,7 @@
     release  => $release,
     repos    => $repos,
     require  => Class['apt'],
+    key      => $key,
   }
 
   package { 'datadog-agent-base':
@@ -43,7 +46,7 @@
   package { $datadog_agent::params::package_name:
     ensure  => $agent_version,
     require => [Apt::Source['datadog6'],
-                Exec['apt_update']],
+                Class['apt::update']],
   }
 
   if $service_provider {

manifests/ubuntu/install_key.pp

@@ -16,20 +16,20 @@
   end
 
   # it should install the mirror
-  it { should_not contain_datadog_agent__ubuntu__install_key('935F5A436A5A6E8788F0765B226AE980C7A7DA52') }
+  it { should_not contain_apt__key('Add key: 935F5A436A5A6E8788F0765B226AE980C7A7DA52 from Apt::Source datadog') }
   it do
-    should contain_datadog_agent__ubuntu__install_key('A2923DFF56EDA6E76E55E492D3A80E30382E94DE')\
+    should contain_apt__key('Add key: A2923DFF56EDA6E76E55E492D3A80E30382E94DE from Apt::Source datadog')
   end
   context 'overriding keyserver' do
     let(:params) {{
       apt_keyserver: 'hkp://pool.sks-keyservers.net:80',
     }}
     it do
-      should contain_datadog_agent__ubuntu__install_key('A2923DFF56EDA6E76E55E492D3A80E30382E94DE')\
+      should contain_apt__key('Add key: A2923DFF56EDA6E76E55E492D3A80E30382E94DE from Apt::Source datadog')\
         .with_server('hkp://pool.sks-keyservers.net:80')
     end
   end
-  
+
   it do
     should contain_file('/etc/apt/sources.list.d/datadog.list')\
       .that_notifies('exec[apt_update]')
@@ -87,8 +87,8 @@
   end
 
   # it should install the mirror
-  it { should_not contain_datadog_agent__ubuntu__install_key('935F5A436A5A6E8788F0765B226AE980C7A7DA52') }
-  it { should contain_datadog_agent__ubuntu__install_key('A2923DFF56EDA6E76E55E492D3A80E30382E94DE') }
+  it { should_not contain_apt__key('Add key: 935F5A436A5A6E8788F0765B226AE980C7A7DA52 from Apt::Source datadog6') }
+  it { should contain_apt__key('Add key: A2923DFF56EDA6E76E55E492D3A80E30382E94DE from Apt::Source datadog6') }
 
   it do
     should contain_file('/etc/apt/sources.list.d/datadog6.list')\