Skip to content

Commit 393b900

Browse files
cocker-cccocker-cc
committed
Remove legacy Facts from Rspec-Tests
1 parent 7ff14d8 commit 393b900

8 files changed

Lines changed: 8 additions & 103 deletions

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ To enable the Datadog Agent Network Performance Monitoring (NPM) features follow
204204
205205
```conf
206206
class { 'datadog_agent::system_probe':
207-
network_enabled => true,
207+
network_enabled => true,
208208
}
209209
```
210210
@@ -214,7 +214,7 @@ To enable the Datadog Agent Universal Service Monitoring (USM) use the `datadog_
214214
215215
```conf
216216
class { 'datadog_agent::system_probe':
217-
service_monitoring_enabled => true,
217+
service_monitoring_enabled => true,
218218
}
219219
```
220220
@@ -276,7 +276,7 @@ To generate tags from custom facts classify your nodes with Puppet facts as an a
276276
```conf
277277
class { "datadog_agent":
278278
api_key => "<YOUR_DD_API_KEY>",
279-
facts_to_tags => ["osfamily","networking.domain","my_custom_fact"],
279+
facts_to_tags => ["os.family","networking.domain","my_custom_fact"],
280280
}
281281
```
282282

‎spec/classes/datadog_agent_integrations_haproxy_spec.rb‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
let(:pre_condition) { "class {'::datadog_agent': agent_major_version => #{agent_major_version}}" }
77
let(:facts) do
88
{
9-
ipaddress: '1.2.3.4',
109
networking: { 'ip' => '1.2.3.4' },
1110
}
1211
end

‎spec/classes/datadog_agent_redhat_spec.rb‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88

99
let(:facts) do
1010
{
11-
osfamily: 'redhat',
12-
operatingsystem: 'Fedora',
13-
architecture: 'x86_64',
1411
os: {
1512
'architecture' => 'x86_64',
1613
'family' => 'redhat',
@@ -67,9 +64,6 @@
6764
context 'agent 6' do
6865
let(:facts) do
6966
{
70-
osfamily: 'redhat',
71-
operatingsystem: 'Fedora',
72-
architecture: 'x86_64',
7367
os: {
7468
'architecture' => 'x86_64',
7569
'family' => 'redhat',
@@ -126,9 +120,6 @@
126120
context 'agent 7' do
127121
let(:facts) do
128122
{
129-
osfamily: 'redhat',
130-
operatingsystem: 'Fedora',
131-
architecture: 'x86_64',
132123
os: {
133124
'architecture' => 'x86_64',
134125
'family' => 'redhat',
@@ -187,10 +178,6 @@
187178
# we expect repo_gpgcheck to be false on 8.1
188179
let(:facts) do
189180
{
190-
osfamily: 'redhat',
191-
operatingsystem: 'RedHat',
192-
operatingsystemrelease: '8.1',
193-
architecture: 'x86_64',
194181
os: {
195182
'architecture' => 'x86_64',
196183
'family' => 'redhat',
@@ -229,10 +216,6 @@
229216
# we expect repo_gpgcheck to be true on 8.2 (and later)
230217
let(:facts) do
231218
{
232-
osfamily: 'redhat',
233-
operatingsystem: 'RedHat',
234-
operatingsystemrelease: '8.2',
235-
architecture: 'x86_64',
236219
os: {
237220
'architecture' => 'x86_64',
238221
'family' => 'redhat',
@@ -271,10 +254,6 @@
271254
context 'almalinux 8', if: min_puppet_version('7.12.0') do
272255
let(:facts) do
273256
{
274-
osfamily: 'redhat',
275-
operatingsystem: 'AlmaLinux',
276-
operatingsystemrelease: '8.5',
277-
architecture: 'x86_64',
278257
os: {
279258
'architecture' => 'x86_64',
280259
'family' => 'redhat',
@@ -312,10 +291,6 @@
312291
context 'rocky 8', if: min_puppet_version('7.12.0') do
313292
let(:facts) do
314293
{
315-
osfamily: 'redhat',
316-
operatingsystem: 'Rocky',
317-
operatingsystemrelease: '8.5',
318-
architecture: 'x86_64',
319294
os: {
320295
'architecture' => 'x86_64',
321296
'family' => 'redhat',

‎spec/classes/datadog_agent_reports_spec.rb‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@
2020
describe "datadog_agent class common actions on #{operatingsystem}" do
2121
let(:facts) do
2222
{
23-
operatingsystem: operatingsystem,
24-
osfamily: getosfamily(operatingsystem),
25-
operatingsystemrelease: getosrelease(operatingsystem),
2623
os: {
2724
'architecture' => 'x86_64',
2825
'family' => getosfamily(operatingsystem),
@@ -90,8 +87,6 @@
9087
describe 'datadog_agent class dogapi version override' do
9188
let(:facts) do
9289
{
93-
operatingsystem: 'Debian',
94-
osfamily: 'debian',
9590
os: {
9691
'architecture' => 'x86_64',
9792
'family' => 'debian',
@@ -141,8 +136,6 @@
141136
describe 'datadog_agent class puppet gem provider override' do
142137
let(:facts) do
143138
{
144-
operatingsystem: 'Debian',
145-
osfamily: 'debian',
146139
os: {
147140
'architecture' => 'x86_64',
148141
'family' => 'debian',
@@ -187,8 +180,6 @@
187180
describe 'datadog_agent class dogapi version override' do
188181
let(:facts) do
189182
{
190-
operatingsystem: 'Debian',
191-
osfamily: 'debian',
192183
os: {
193184
'architecture' => 'x86_64',
194185
'family' => 'debian',
@@ -235,8 +226,6 @@
235226
describe 'datadog_agent class dogapi version override' do
236227
let(:facts) do
237228
{
238-
operatingsystem: 'Debian',
239-
osfamily: 'debian',
240229
os: {
241230
'architecture' => 'x86_64',
242231
'family' => 'debian',

‎spec/classes/datadog_agent_spec.rb‎

Lines changed: 5 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
describe 'datadog_agent class without any parameters on Solaris/Nexenta' do
77
let(:facts) do
88
{
9-
osfamily: 'Solaris',
10-
operatingsystem: 'Nexenta',
119
os: {
1210
'architecture' => 'x86_64',
1311
'family' => 'Solaris',
@@ -36,8 +34,6 @@
3634
end
3735
let(:facts) do
3836
{
39-
osfamily: 'debian',
40-
operatingsystem: 'Ubuntu',
4137
os: {
4238
'architecture' => 'x86_64',
4339
'family' => 'debian',
@@ -64,8 +60,6 @@
6460
end
6561
let(:facts) do
6662
{
67-
osfamily: 'debian',
68-
operatingsystem: 'Ubuntu',
6963
os: {
7064
'architecture' => 'x86_64',
7165
'family' => 'debian',
@@ -92,8 +86,6 @@
9286
end
9387
let(:facts) do
9488
{
95-
osfamily: 'debian',
96-
operatingsystem: 'Ubuntu',
9789
os: {
9890
'architecture' => 'x86_64',
9991
'family' => 'debian',
@@ -120,8 +112,6 @@
120112
end
121113
let(:facts) do
122114
{
123-
osfamily: 'debian',
124-
operatingsystem: 'Ubuntu',
125115
os: {
126116
'architecture' => 'x86_64',
127117
'family' => 'debian',
@@ -148,8 +138,6 @@
148138
end
149139
let(:facts) do
150140
{
151-
osfamily: 'debian',
152-
operatingsystem: 'Ubuntu',
153141
os: {
154142
'architecture' => 'x86_64',
155143
'family' => 'debian',
@@ -176,8 +164,6 @@
176164
end
177165
let(:facts) do
178166
{
179-
osfamily: 'debian',
180-
operatingsystem: 'Ubuntu',
181167
os: {
182168
'architecture' => 'x86_64',
183169
'family' => 'debian',
@@ -204,8 +190,6 @@
204190
end
205191
let(:facts) do
206192
{
207-
osfamily: 'debian',
208-
operatingsystem: 'Ubuntu',
209193
os: {
210194
'architecture' => 'x86_64',
211195
'family' => 'debian',
@@ -234,8 +218,6 @@
234218
end
235219
let(:facts) do
236220
{
237-
osfamily: 'debian',
238-
operatingsystem: 'Ubuntu',
239221
os: {
240222
'architecture' => 'x86_64',
241223
'family' => 'debian',
@@ -260,8 +242,6 @@
260242
context 'windows NPM' do
261243
let(:facts) do
262244
{
263-
osfamily: 'windows',
264-
operatingsystem: 'Windows',
265245
os: {
266246
'architecture' => 'x86_64',
267247
'family' => 'windows',
@@ -316,8 +296,6 @@
316296
ALL_OS.each do |operatingsystem|
317297
let(:facts) do
318298
{
319-
operatingsystem: operatingsystem,
320-
osfamily: getosfamily(operatingsystem),
321299
os: {
322300
'architecture' => 'x86_64',
323301
'family' => getosfamily(operatingsystem),
@@ -367,8 +345,6 @@
367345
end
368346
let(:facts) do
369347
{
370-
operatingsystem: operatingsystem,
371-
osfamily: getosfamily(operatingsystem),
372348
os: {
373349
'architecture' => 'x86_64',
374350
'family' => getosfamily(operatingsystem),
@@ -1728,8 +1704,6 @@
17281704
end
17291705
let(:facts) do
17301706
{
1731-
operatingsystem: operatingsystem,
1732-
osfamily: getosfamily(operatingsystem),
17331707
os: {
17341708
'architecture' => 'x86_64',
17351709
'family' => getosfamily(operatingsystem),
@@ -1763,8 +1737,6 @@
17631737
end
17641738
let(:facts) do
17651739
{
1766-
operatingsystem: operatingsystem,
1767-
osfamily: getosfamily(operatingsystem),
17681740
os: {
17691741
'architecture' => 'x86_64',
17701742
'family' => getosfamily(operatingsystem),
@@ -2375,14 +2347,12 @@
23752347
{
23762348
agent_major_version: 6,
23772349
puppet_run_reports: true,
2378-
facts_to_tags: ['osfamily'],
2350+
facts_to_tags: ['os.family'],
23792351
trusted_facts_to_tags: ['extensions.trusted_fact', 'extensions.facts_array', 'extensions.facts_hash.actor.first_name'],
23802352
}
23812353
end
23822354
let(:facts) do
23832355
{
2384-
'operatingsystem' => 'CentOS',
2385-
'osfamily' => 'redhat',
23862356
'os' => {
23872357
'architecture' => 'x86_64',
23882358
'family' => 'redhat',
@@ -2409,7 +2379,7 @@
24092379

24102380
it do
24112381
is_expected.to contain_file('/etc/datadog-agent/datadog.yaml')
2412-
.with_content(%r{tags:\n- osfamily:redhat\n- extensions.trusted_fact:test\n- extensions.facts_array:one\n- extensions.facts_array:two\n- extensions.facts_hash.actor.first_name:Macaulay})
2382+
.with_content(%r{tags:\n- os.family:redhat\n- extensions.trusted_fact:test\n- extensions.facts_array:one\n- extensions.facts_array:two\n- extensions.facts_hash.actor.first_name:Macaulay})
24132383
end
24142384
end
24152385
end
@@ -2420,13 +2390,11 @@
24202390
{
24212391
agent_major_version: 6,
24222392
puppet_run_reports: true,
2423-
facts_to_tags: ['osfamily', 'facts_array', 'facts_hash.actor.first_name', 'looks.like.a.path'],
2393+
facts_to_tags: ['os.family', 'facts_array', 'facts_hash.actor.first_name', 'looks.like.a.path'],
24242394
}
24252395
end
24262396
let(:facts) do
24272397
{
2428-
'operatingsystem' => 'CentOS',
2429-
'osfamily' => 'redhat',
24302398
'facts_array' => ['one', 'two'],
24312399
'facts_hash' => {
24322400
'actor' => {
@@ -2449,7 +2417,7 @@
24492417

24502418
it do
24512419
is_expected.to contain_file('/etc/datadog-agent/datadog.yaml')
2452-
.with_content(%r{tags:\n- osfamily:redhat\n- facts_array:one\n- facts_array:two\n- facts_hash.actor.first_name:Macaulay\n- looks.like.a.path:but_its_not})
2420+
.with_content(%r{tags:\n- os.family:redhat\n- facts_array:one\n- facts_array:two\n- facts_hash.actor.first_name:Macaulay\n- looks.like.a.path:but_its_not})
24532421
end
24542422
end
24552423

@@ -2463,9 +2431,8 @@
24632431
end
24642432
let(:facts) do
24652433
{
2466-
operatingsystem: 'CentOS',
2467-
osfamily: 'redhat',
24682434
facts_array: ['one', 'two'],
2435+
osfamily: 'redhat',
24692436
os: {
24702437
'architecture' => 'x86_64',
24712438
'family' => 'redhat',

‎spec/classes/datadog_agent_suse_spec.rb‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77

88
let(:facts) do
99
{
10-
operatingsystem: 'OpenSuSE',
11-
architecture: 'x86_64',
1210
os: {
1311
'architecture' => 'x86_64',
1412
'family' => 'redhat',
@@ -24,7 +22,6 @@
2422
context 'suse >= 15' do
2523
let(:facts) do
2624
{
27-
operatingsystemmajrelease: '15',
2825
os: {
2926
'architecture' => 'x86_64',
3027
'family' => 'redhat',
@@ -81,7 +78,6 @@
8178
context 'suse < 15' do
8279
let(:facts) do
8380
{
84-
operatingsystemmajrelease: '14',
8581
os: {
8682
'architecture' => 'x86_64',
8783
'family' => 'redhat',

0 commit comments

Comments
 (0)
⚡