Skip to content

Commit 57ffbd1

Browse files
chouetzchouetz
authored
[AP-2104] Add new APT and RPM signing keys (#782)
* Update signing keys * AP-2104 append keys instead of replacing
1 parent 60bd9ab commit 57ffbd1

6 files changed

Lines changed: 23 additions & 9 deletions

File tree

‎manifests/redhat.pp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
'https://keys.datadoghq.com/DATADOG_RPM_KEY_CURRENT.public',
1919
'https://keys.datadoghq.com/DATADOG_RPM_KEY_E09422B3.public',
2020
'https://keys.datadoghq.com/DATADOG_RPM_KEY_FD4BF915.public',
21+
'https://keys.datadoghq.com/DATADOG_RPM_KEY_B01082D3.public',
2122
]
2223

2324
if ($rpm_repo_gpgcheck != undef) {

‎manifests/suse.pp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
$current_key,
1818
'https://keys.datadoghq.com/DATADOG_RPM_KEY_E09422B3.public',
1919
'https://keys.datadoghq.com/DATADOG_RPM_KEY_FD4BF915.public',
20+
'https://keys.datadoghq.com/DATADOG_RPM_KEY_B01082D3.public',
2021
]
2122

2223
if ($rpm_repo_gpgcheck != undef) {

‎manifests/ubuntu.pp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
Optional[String] $apt_usr_share_keyring = '/usr/share/keyrings/datadog-archive-keyring.gpg',
1515
Optional[Hash[String, String]] $apt_default_keys = {
1616
'DATADOG_APT_KEY_CURRENT.public' => 'https://keys.datadoghq.com/DATADOG_APT_KEY_CURRENT.public',
17+
'5F1E256061D813B125E156E8E6266D4AC0962C7D' => 'https://keys.datadoghq.com/DATADOG_APT_KEY_C0962C7D.public',
1718
'D75CEA17048B9ACBF186794B32637D44F14F620E' => 'https://keys.datadoghq.com/DATADOG_APT_KEY_F14F620E.public',
1819
'A2923DFF56EDA6E76E55E492D3A80E30382E94DE' => 'https://keys.datadoghq.com/DATADOG_APT_KEY_382E94DE.public',
1920
},

‎spec/classes/datadog_agent_redhat_spec.rb‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@
2929
.with_gpgcheck(1)\
3030
.with_gpgkey('https://keys.datadoghq.com/DATADOG_RPM_KEY_CURRENT.public
3131
https://keys.datadoghq.com/DATADOG_RPM_KEY_E09422B3.public
32-
https://keys.datadoghq.com/DATADOG_RPM_KEY_FD4BF915.public')\
32+
https://keys.datadoghq.com/DATADOG_RPM_KEY_FD4BF915.public
33+
https://keys.datadoghq.com/DATADOG_RPM_KEY_B01082D3.public')\
3334
.with_baseurl('https://yum.datadoghq.com/rpm/x86_64/')\
3435
.with_repo_gpgcheck(false)
3536
end
@@ -77,7 +78,8 @@
7778
.with_gpgcheck(1)\
7879
.with_gpgkey('https://keys.datadoghq.com/DATADOG_RPM_KEY_CURRENT.public
7980
https://keys.datadoghq.com/DATADOG_RPM_KEY_E09422B3.public
80-
https://keys.datadoghq.com/DATADOG_RPM_KEY_FD4BF915.public')\
81+
https://keys.datadoghq.com/DATADOG_RPM_KEY_FD4BF915.public
82+
https://keys.datadoghq.com/DATADOG_RPM_KEY_B01082D3.public')\
8183
.with_baseurl('https://yum.datadoghq.com/stable/6/x86_64/')\
8284
.with_repo_gpgcheck(true)
8385
end
@@ -126,7 +128,8 @@
126128
.with_gpgcheck(1)\
127129
.with_gpgkey('https://keys.datadoghq.com/DATADOG_RPM_KEY_CURRENT.public
128130
https://keys.datadoghq.com/DATADOG_RPM_KEY_E09422B3.public
129-
https://keys.datadoghq.com/DATADOG_RPM_KEY_FD4BF915.public')\
131+
https://keys.datadoghq.com/DATADOG_RPM_KEY_FD4BF915.public
132+
https://keys.datadoghq.com/DATADOG_RPM_KEY_B01082D3.public')\
130133
.with_baseurl('https://yum.datadoghq.com/stable/7/x86_64/')\
131134
.with_repo_gpgcheck(true)
132135
end
@@ -178,7 +181,8 @@
178181
.with_gpgcheck(1)\
179182
.with_gpgkey('https://keys.datadoghq.com/DATADOG_RPM_KEY_CURRENT.public
180183
https://keys.datadoghq.com/DATADOG_RPM_KEY_E09422B3.public
181-
https://keys.datadoghq.com/DATADOG_RPM_KEY_FD4BF915.public')\
184+
https://keys.datadoghq.com/DATADOG_RPM_KEY_FD4BF915.public
185+
https://keys.datadoghq.com/DATADOG_RPM_KEY_B01082D3.public')\
182186
.with_baseurl('https://yum.datadoghq.com/stable/7/x86_64/')\
183187
.with_repo_gpgcheck(false)
184188
end
@@ -211,7 +215,8 @@
211215
.with_gpgcheck(1)\
212216
.with_gpgkey('https://keys.datadoghq.com/DATADOG_RPM_KEY_CURRENT.public
213217
https://keys.datadoghq.com/DATADOG_RPM_KEY_E09422B3.public
214-
https://keys.datadoghq.com/DATADOG_RPM_KEY_FD4BF915.public')\
218+
https://keys.datadoghq.com/DATADOG_RPM_KEY_FD4BF915.public
219+
https://keys.datadoghq.com/DATADOG_RPM_KEY_B01082D3.public')\
215220
.with_baseurl('https://yum.datadoghq.com/stable/7/x86_64/')\
216221
.with_repo_gpgcheck(true)
217222
end
@@ -242,7 +247,8 @@
242247
.with_gpgcheck(1)\
243248
.with_gpgkey('https://keys.datadoghq.com/DATADOG_RPM_KEY_CURRENT.public
244249
https://keys.datadoghq.com/DATADOG_RPM_KEY_E09422B3.public
245-
https://keys.datadoghq.com/DATADOG_RPM_KEY_FD4BF915.public')\
250+
https://keys.datadoghq.com/DATADOG_RPM_KEY_FD4BF915.public
251+
https://keys.datadoghq.com/DATADOG_RPM_KEY_B01082D3.public')\
246252
.with_baseurl('https://yum.datadoghq.com/stable/7/x86_64/')\
247253
.with_repo_gpgcheck(true)
248254
end
@@ -273,7 +279,8 @@
273279
.with_gpgcheck(1)\
274280
.with_gpgkey('https://keys.datadoghq.com/DATADOG_RPM_KEY_CURRENT.public
275281
https://keys.datadoghq.com/DATADOG_RPM_KEY_E09422B3.public
276-
https://keys.datadoghq.com/DATADOG_RPM_KEY_FD4BF915.public')\
282+
https://keys.datadoghq.com/DATADOG_RPM_KEY_FD4BF915.public
283+
https://keys.datadoghq.com/DATADOG_RPM_KEY_B01082D3.public')\
277284
.with_baseurl('https://yum.datadoghq.com/stable/7/x86_64/')\
278285
.with_repo_gpgcheck(true)
279286
end

‎spec/classes/datadog_agent_suse_spec.rb‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@
3232
.with_gpgcheck(1)\
3333
.with_gpgkey('https://keys.datadoghq.com/DATADOG_RPM_KEY_CURRENT.public
3434
https://keys.datadoghq.com/DATADOG_RPM_KEY_E09422B3.public
35-
https://keys.datadoghq.com/DATADOG_RPM_KEY_FD4BF915.public')\
35+
https://keys.datadoghq.com/DATADOG_RPM_KEY_FD4BF915.public
36+
https://keys.datadoghq.com/DATADOG_RPM_KEY_B01082D3.public')\
3637
.with_baseurl('https://yum.datadoghq.com/suse/stable/6/x86_64')
3738
# .with_repo_gpgcheck(true)
3839
end
@@ -51,7 +52,8 @@
5152
.with_gpgcheck(1)\
5253
.with_gpgkey('https://keys.datadoghq.com/DATADOG_RPM_KEY_CURRENT.public
5354
https://keys.datadoghq.com/DATADOG_RPM_KEY_E09422B3.public
54-
https://keys.datadoghq.com/DATADOG_RPM_KEY_FD4BF915.public')\
55+
https://keys.datadoghq.com/DATADOG_RPM_KEY_FD4BF915.public
56+
https://keys.datadoghq.com/DATADOG_RPM_KEY_B01082D3.public')\
5557
.with_baseurl('https://yum.datadoghq.com/suse/stable/7/x86_64')
5658
# .with_repo_gpgcheck(true)
5759
end

‎spec/classes/datadog_agent_ubuntu_spec.rb‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
is_expected.to contain_file('/usr/share/keyrings/datadog-archive-keyring.gpg')
66
is_expected.to contain_file('/etc/apt/trusted.gpg.d/datadog-archive-keyring.gpg')
77
is_expected.to contain_exec('ensure key DATADOG_APT_KEY_CURRENT.public is imported in APT keyring')
8+
is_expected.to contain_exec('ensure key 5F1E256061D813B125E156E8E6266D4AC0962C7D is imported in APT keyring')
89
is_expected.to contain_exec('ensure key D75CEA17048B9ACBF186794B32637D44F14F620E is imported in APT keyring')
910
is_expected.to contain_exec('ensure key A2923DFF56EDA6E76E55E492D3A80E30382E94DE is imported in APT keyring')
1011
end
@@ -15,6 +16,7 @@
1516
is_expected.to contain_file('/usr/share/keyrings/datadog-archive-keyring.gpg')
1617
is_expected.not_to contain_file('/etc/apt/trusted.gpg.d/datadog-archive-keyring.gpg')
1718
is_expected.to contain_exec('ensure key DATADOG_APT_KEY_CURRENT.public is imported in APT keyring')
19+
is_expected.to contain_exec('ensure key 5F1E256061D813B125E156E8E6266D4AC0962C7D is imported in APT keyring')
1820
is_expected.to contain_exec('ensure key D75CEA17048B9ACBF186794B32637D44F14F620E is imported in APT keyring')
1921
is_expected.to contain_exec('ensure key A2923DFF56EDA6E76E55E492D3A80E30382E94DE is imported in APT keyring')
2022
end

0 commit comments

Comments
 (0)
⚡