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 CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: f7c38d18ba317c18ecba9a443a7e56bd45b6ae8eb546694588954699ef74f5e8
4
- data.tar.gz: 6708362273b4e202c3b6dc59e65490618b72ad6b79eaab1065e85a0c5b3cc4e9
3
+ metadata.gz: b9675f206602060c3853fda1b7c6789fa409de0b7991738f1346c80512e42675
4
+ data.tar.gz: cc56609a6641a36be3007f194b814d1d82fd1ea3bac5db9f803b28bd8361c396
5
5
  SHA512:
6
- metadata.gz: ad8dc68e5fae6d069e227f5678a3e0e2d78cb098a17de6cdff595feeb24515e3c3fe86d1c63ea1a583a334350d3b6fd123fda0dfb63c1f4c37ac5117375aabb1
7
- data.tar.gz: 463c53e37b1a8bdc6a0f9606c7316109ee8fbf72049f39c7dbac7fae93f584b7ede41174e4e619ac2a8a1ebc70e78515b156f8ba77f5795365e5fd57707cfe32
6
+ metadata.gz: 00b6ad532cd5a3dcf5ee2773ee5721a8c4503c6e4f374bc087ea4f8b70d463a42f2da337e01a1b22f3bfd4cdae30a5f445332301bc3b5de795f8012fd21d83eb
7
+ data.tar.gz: f85fbabf6f445e4a4c439475e4d2cabfa72083a232e1fc5a576b3bc66725e27eb737fef35975bef1b039ef10ef33ffcf2a5814e311f323551919601ae0262a1b
@@ -30,7 +30,7 @@ Ohai.plugin(:ShardSeed) do
30
30
 
31
31
  def default_sources
32
32
  case collect_os
33
- when :linux, :darwin, :windows
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
@@ -18,5 +18,5 @@
18
18
 
19
19
  module Ohai
20
20
  OHAI_ROOT = File.expand_path(File.dirname(__FILE__))
21
- VERSION = "15.1.3".freeze
21
+ VERSION = "15.1.5".freeze
22
22
  end
@@ -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) { :linux }
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) { :darwin }
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) { :windows }
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) { :aix }
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.3
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-13 00:00:00.000000000 Z
11
+ date: 2019-06-22 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: systemu