Skip to content

Commit c28a0bc

Browse files
chouetzcocker-cc
chouetz
authored and
cocker-cc
committed
Fill facts with values checks by apt puppet module
1 parent 558d976 commit c28a0bc

7 files changed

Lines changed: 216 additions & 20 deletions

‎spec/classes/datadog_agent_redhat_spec.rb‎

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515
'architecture' => 'x86_64',
1616
'family' => 'redhat',
1717
'name' => 'Fedora',
18+
'release' => {
19+
'major' => '36',
20+
'full' => '36',
21+
},
1822
},
1923
}
2024
end
@@ -70,6 +74,10 @@
7074
'architecture' => 'x86_64',
7175
'family' => 'redhat',
7276
'name' => 'Fedora',
77+
'release' => {
78+
'major' => '36',
79+
'full' => '36',
80+
},
7381
},
7482
}
7583
end
@@ -125,6 +133,10 @@
125133
'architecture' => 'x86_64',
126134
'family' => 'redhat',
127135
'name' => 'Fedora',
136+
'release' => {
137+
'major' => '36',
138+
'full' => '36',
139+
},
128140
},
129141
}
130142
end
@@ -183,7 +195,10 @@
183195
'architecture' => 'x86_64',
184196
'family' => 'redhat',
185197
'name' => 'RedHat',
186-
'release' => { 'full' => '8.1' },
198+
'release' => {
199+
'major' => '8',
200+
'full' => '8.1',
201+
},
187202
},
188203
}
189204
end
@@ -222,7 +237,10 @@
222237
'architecture' => 'x86_64',
223238
'family' => 'redhat',
224239
'name' => 'RedHat',
225-
'release' => { 'full' => '8.2' },
240+
'release' => {
241+
'major' => '8',
242+
'full' => '8.2',
243+
},
226244
},
227245
}
228246
end
@@ -261,7 +279,10 @@
261279
'architecture' => 'x86_64',
262280
'family' => 'redhat',
263281
'name' => 'AlmaLinux',
264-
'release' => { 'full' => '8.5' },
282+
'release' => {
283+
'major' => '8',
284+
'full' => '8.5',
285+
},
265286
},
266287
}
267288
end
@@ -299,7 +320,10 @@
299320
'architecture' => 'x86_64',
300321
'family' => 'redhat',
301322
'name' => 'Rocky',
302-
'release' => { 'full' => '8.5' },
323+
'release' => {
324+
'major' => '8',
325+
'full' => '8.5',
326+
},
303327
},
304328
}
305329
end

‎spec/classes/datadog_agent_reports_spec.rb‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,13 @@
2424
osfamily: getosfamily(operatingsystem),
2525
operatingsystemrelease: getosrelease(operatingsystem),
2626
os: {
27+
'architecture' => 'x86_64',
2728
'family' => getosfamily(operatingsystem),
2829
'name' => operatingsystem,
29-
'release' => { 'full' => getosrelease(operatingsystem) },
30+
'release' => {
31+
'major' => getosmajor(operatingsystem),
32+
'full' => getosrelease(operatingsystem),
33+
},
3034
},
3135
}
3236
end
@@ -89,8 +93,13 @@
8993
operatingsystem: 'Debian',
9094
osfamily: 'debian',
9195
os: {
96+
'architecture' => 'x86_64',
9297
'family' => 'debian',
9398
'name' => 'Debian',
99+
'release' => {
100+
'major' => '8',
101+
'full' => '8.1',
102+
},
94103
},
95104
}
96105
end
@@ -135,8 +144,13 @@
135144
operatingsystem: 'Debian',
136145
osfamily: 'debian',
137146
os: {
147+
'architecture' => 'x86_64',
138148
'family' => 'debian',
139149
'name' => 'Debian',
150+
'release' => {
151+
'major' => '8',
152+
'full' => '8.1',
153+
},
140154
},
141155
}
142156
end
@@ -176,8 +190,13 @@
176190
operatingsystem: 'Debian',
177191
osfamily: 'debian',
178192
os: {
193+
'architecture' => 'x86_64',
179194
'family' => 'debian',
180195
'name' => 'Debian',
196+
'release' => {
197+
'major' => '8',
198+
'full' => '8.1',
199+
},
181200
},
182201
}
183202
end
@@ -219,8 +238,13 @@
219238
operatingsystem: 'Debian',
220239
osfamily: 'debian',
221240
os: {
241+
'architecture' => 'x86_64',
222242
'family' => 'debian',
223243
'name' => 'Debian',
244+
'release' => {
245+
'major' => '8',
246+
'full' => '8.1',
247+
},
224248
},
225249
}
226250
end

‎spec/classes/datadog_agent_spec.rb‎

Lines changed: 87 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,13 @@
99
osfamily: 'Solaris',
1010
operatingsystem: 'Nexenta',
1111
os: {
12+
'architecture' => 'x86_64',
1213
'family' => 'Solaris',
1314
'name' => 'Nexenta',
15+
'release' => {
16+
'major' => '3',
17+
'full' => '3.0',
18+
},
1419
},
1520
}
1621
end
@@ -34,8 +39,13 @@
3439
osfamily: 'debian',
3540
operatingsystem: 'Ubuntu',
3641
os: {
42+
'architecture' => 'x86_64',
3743
'family' => 'debian',
3844
'name' => 'Ubuntu',
45+
'release' => {
46+
'major' => '14',
47+
'full' => '14.04',
48+
},
3949
},
4050
}
4151
end
@@ -57,8 +67,13 @@
5767
osfamily: 'debian',
5868
operatingsystem: 'Ubuntu',
5969
os: {
70+
'architecture' => 'x86_64',
6071
'family' => 'debian',
6172
'name' => 'Ubuntu',
73+
'release' => {
74+
'major' => '14',
75+
'full' => '14.04',
76+
},
6277
},
6378
}
6479
end
@@ -80,8 +95,13 @@
8095
osfamily: 'debian',
8196
operatingsystem: 'Ubuntu',
8297
os: {
98+
'architecture' => 'x86_64',
8399
'family' => 'debian',
84100
'name' => 'Ubuntu',
101+
'release' => {
102+
'major' => '14',
103+
'full' => '14.04',
104+
},
85105
},
86106
}
87107
end
@@ -103,8 +123,13 @@
103123
osfamily: 'debian',
104124
operatingsystem: 'Ubuntu',
105125
os: {
126+
'architecture' => 'x86_64',
106127
'family' => 'debian',
107128
'name' => 'Ubuntu',
129+
'release' => {
130+
'major' => '14',
131+
'full' => '14.04',
132+
},
108133
},
109134
}
110135
end
@@ -126,8 +151,13 @@
126151
osfamily: 'debian',
127152
operatingsystem: 'Ubuntu',
128153
os: {
154+
'architecture' => 'x86_64',
129155
'family' => 'debian',
130156
'name' => 'Ubuntu',
157+
'release' => {
158+
'major' => '14',
159+
'full' => '14.04',
160+
},
131161
},
132162
}
133163
end
@@ -149,8 +179,13 @@
149179
osfamily: 'debian',
150180
operatingsystem: 'Ubuntu',
151181
os: {
182+
'architecture' => 'x86_64',
152183
'family' => 'debian',
153184
'name' => 'Ubuntu',
185+
'release' => {
186+
'major' => '14',
187+
'full' => '14.04',
188+
},
154189
},
155190
}
156191
end
@@ -172,8 +207,13 @@
172207
osfamily: 'debian',
173208
operatingsystem: 'Ubuntu',
174209
os: {
210+
'architecture' => 'x86_64',
175211
'family' => 'debian',
176212
'name' => 'Ubuntu',
213+
'release' => {
214+
'major' => '14',
215+
'full' => '14.04',
216+
},
177217
},
178218
}
179219
end
@@ -197,8 +237,13 @@
197237
osfamily: 'debian',
198238
operatingsystem: 'Ubuntu',
199239
os: {
240+
'architecture' => 'x86_64',
200241
'family' => 'debian',
201242
'name' => 'Ubuntu',
243+
'release' => {
244+
'major' => '14',
245+
'full' => '14.04',
246+
},
202247
},
203248
}
204249
end
@@ -218,8 +263,13 @@
218263
osfamily: 'windows',
219264
operatingsystem: 'Windows',
220265
os: {
266+
'architecture' => 'x86_64',
221267
'family' => 'windows',
222268
'name' => 'Windows',
269+
'release' => {
270+
'major' => '2019',
271+
'full' => '2019 SP1',
272+
},
223273
},
224274
}
225275
end
@@ -269,8 +319,13 @@
269319
operatingsystem: operatingsystem,
270320
osfamily: getosfamily(operatingsystem),
271321
os: {
322+
'architecture' => 'x86_64',
272323
'family' => getosfamily(operatingsystem),
273324
'name' => operatingsystem,
325+
'release' => {
326+
'major' => getosmajor(operatingsystem),
327+
'full' => getosrelease(operatingsystem),
328+
},
274329
},
275330
}
276331
end
@@ -315,8 +370,13 @@
315370
operatingsystem: operatingsystem,
316371
osfamily: getosfamily(operatingsystem),
317372
os: {
373+
'architecture' => 'x86_64',
318374
'family' => getosfamily(operatingsystem),
319375
'name' => operatingsystem,
376+
'release' => {
377+
'major' => getosmajor(operatingsystem),
378+
'full' => getosrelease(operatingsystem),
379+
},
320380
},
321381
}
322382
end
@@ -1671,8 +1731,13 @@
16711731
operatingsystem: operatingsystem,
16721732
osfamily: getosfamily(operatingsystem),
16731733
os: {
1734+
'architecture' => 'x86_64',
16741735
'family' => getosfamily(operatingsystem),
16751736
'name' => operatingsystem,
1737+
'release' => {
1738+
'major' => getosmajor(operatingsystem),
1739+
'full' => getosrelease(operatingsystem),
1740+
},
16761741
},
16771742
}
16781743
end
@@ -1701,8 +1766,13 @@
17011766
operatingsystem: operatingsystem,
17021767
osfamily: getosfamily(operatingsystem),
17031768
os: {
1769+
'architecture' => 'x86_64',
17041770
'family' => getosfamily(operatingsystem),
17051771
'name' => operatingsystem,
1772+
'release' => {
1773+
'major' => getosmajor(operatingsystem),
1774+
'full' => getosrelease(operatingsystem),
1775+
},
17061776
},
17071777
}
17081778
end
@@ -2313,9 +2383,14 @@
23132383
{
23142384
'operatingsystem' => 'CentOS',
23152385
'osfamily' => 'redhat',
2316-
os => {
2386+
'os' => {
2387+
'architecture' => 'x86_64',
23172388
'family' => 'redhat',
23182389
'name' => 'CentOS',
2390+
'release' => {
2391+
'major' => '6',
2392+
'full' => '6.3',
2393+
},
23192394
},
23202395
}
23212396
end
@@ -2360,9 +2435,14 @@
23602435
},
23612436
},
23622437
'looks.like.a.path' => 'but_its_not',
2363-
os => {
2438+
'os' => {
2439+
'architecture' => 'x86_64',
23642440
'family' => 'redhat',
23652441
'name' => 'CentOS',
2442+
'release' => {
2443+
'major' => '6',
2444+
'full' => '6.3',
2445+
},
23662446
},
23672447
}
23682448
end
@@ -2387,8 +2467,13 @@
23872467
osfamily: 'redhat',
23882468
facts_array: ['one', 'two'],
23892469
os: {
2470+
'architecture' => 'x86_64',
23902471
'family' => 'redhat',
23912472
'name' => 'CentOS',
2473+
'release' => {
2474+
'major' => '6',
2475+
'full' => '6.3',
2476+
},
23922477
},
23932478
}
23942479
end

0 commit comments

Comments
 (0)
⚡