ohai 15.1.3 → 15.1.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/ohai/plugins/shard.rb +2 -2
- data/lib/ohai/version.rb +1 -1
- data/spec/unit/plugins/shard_spec.rb +5 -4
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: b9675f206602060c3853fda1b7c6789fa409de0b7991738f1346c80512e42675
|
4
|
+
data.tar.gz: cc56609a6641a36be3007f194b814d1d82fd1ea3bac5db9f803b28bd8361c396
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 00b6ad532cd5a3dcf5ee2773ee5721a8c4503c6e4f374bc087ea4f8b70d463a42f2da337e01a1b22f3bfd4cdae30a5f445332301bc3b5de795f8012fd21d83eb
|
7
|
+
data.tar.gz: f85fbabf6f445e4a4c439475e4d2cabfa72083a232e1fc5a576b3bc66725e27eb737fef35975bef1b039ef10ef33ffcf2a5814e311f323551919601ae0262a1b
|
data/lib/ohai/plugins/shard.rb
CHANGED
@@ -30,7 +30,7 @@ Ohai.plugin(:ShardSeed) do
|
|
30
30
|
|
31
31
|
def default_sources
|
32
32
|
case collect_os
|
33
|
-
when
|
33
|
+
when "linux", "darwin", "windows"
|
34
34
|
[:machinename, :serial, :uuid]
|
35
35
|
else
|
36
36
|
[:machinename]
|
@@ -38,7 +38,7 @@ Ohai.plugin(:ShardSeed) do
|
|
38
38
|
end
|
39
39
|
|
40
40
|
def default_digest_algorithm
|
41
|
-
if fips["kernel"]["enabled"]
|
41
|
+
if fips && fips["kernel"]["enabled"]
|
42
42
|
# Even though it is being used safely, FIPS-mode will still blow up on
|
43
43
|
# any use of MD5 so default to SHA2 instead.
|
44
44
|
"sha256"
|
data/lib/ohai/version.rb
CHANGED
@@ -27,7 +27,7 @@ describe Ohai::System, "shard plugin" do
|
|
27
27
|
let(:machine_id) { "0a1f869f457a4c8080ab19faf80af9cc" }
|
28
28
|
let(:machinename) { "somehost004" }
|
29
29
|
let(:fips) { false }
|
30
|
-
let(:os) {
|
30
|
+
let(:os) { "linux" }
|
31
31
|
|
32
32
|
subject do
|
33
33
|
plugin.run
|
@@ -66,8 +66,9 @@ describe Ohai::System, "shard plugin" do
|
|
66
66
|
end
|
67
67
|
|
68
68
|
context "with Darwin OS" do
|
69
|
-
let(:os) {
|
69
|
+
let(:os) { "darwin" }
|
70
70
|
before do
|
71
|
+
plugin.data.delete("fips") # FIPS is undefined on Macs, make sure this still work
|
71
72
|
plugin["hardware"] = { "serial_number" => serial, "platform_UUID" => uuid }
|
72
73
|
end
|
73
74
|
|
@@ -77,7 +78,7 @@ describe Ohai::System, "shard plugin" do
|
|
77
78
|
end
|
78
79
|
|
79
80
|
context "with Windows OS" do
|
80
|
-
let(:os) {
|
81
|
+
let(:os) { "windows" }
|
81
82
|
before do
|
82
83
|
wmi = double("WmiLite::Wmi")
|
83
84
|
allow(WmiLite::Wmi).to receive(:new).and_return(wmi)
|
@@ -99,7 +100,7 @@ describe Ohai::System, "shard plugin" do
|
|
99
100
|
end
|
100
101
|
|
101
102
|
context "with a weird OS" do
|
102
|
-
let(:os) {
|
103
|
+
let(:os) { "aix" }
|
103
104
|
|
104
105
|
it "should provide a shard with a default-safe set of sources" do
|
105
106
|
# Note: this is different than the other defaults.
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: ohai
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 15.1.
|
4
|
+
version: 15.1.5
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Adam Jacob
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2019-06-
|
11
|
+
date: 2019-06-22 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: systemu
|