ohai 16.5.6 → 16.10.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (158) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +7 -8
  3. data/bin/ohai +1 -0
  4. data/lib/ohai.rb +1 -0
  5. data/lib/ohai/application.rb +40 -0
  6. data/lib/ohai/common/dmi.rb +8 -3
  7. data/lib/ohai/config.rb +1 -0
  8. data/lib/ohai/dsl.rb +1 -0
  9. data/lib/ohai/dsl/plugin.rb +9 -1
  10. data/lib/ohai/dsl/plugin/versionvii.rb +28 -17
  11. data/lib/ohai/exception.rb +1 -0
  12. data/lib/ohai/hints.rb +1 -0
  13. data/lib/ohai/log.rb +1 -0
  14. data/lib/ohai/mash.rb +1 -0
  15. data/lib/ohai/mixin/azure_metadata.rb +4 -3
  16. data/lib/ohai/mixin/chef_utils_wiring.rb +14 -1
  17. data/lib/ohai/mixin/command.rb +1 -0
  18. data/lib/ohai/mixin/constant_helper.rb +1 -0
  19. data/lib/ohai/mixin/dmi_decode.rb +1 -0
  20. data/lib/ohai/mixin/do_metadata.rb +3 -2
  21. data/lib/ohai/mixin/ec2_metadata.rb +37 -11
  22. data/lib/ohai/mixin/gce_metadata.rb +4 -3
  23. data/lib/ohai/mixin/http_helper.rb +1 -0
  24. data/lib/ohai/mixin/network_helper.rb +1 -0
  25. data/lib/ohai/mixin/os.rb +67 -1
  26. data/lib/ohai/mixin/scaleway_metadata.rb +3 -2
  27. data/lib/ohai/mixin/seconds_to_human.rb +1 -0
  28. data/lib/ohai/mixin/shell_out.rb +1 -0
  29. data/lib/ohai/mixin/softlayer_metadata.rb +2 -1
  30. data/lib/ohai/mixin/string.rb +1 -0
  31. data/lib/ohai/mixin/train_helpers.rb +36 -0
  32. data/lib/ohai/mixin/which.rb +1 -0
  33. data/lib/ohai/plugin_config.rb +1 -0
  34. data/lib/ohai/plugins/aix/kernel.rb +7 -4
  35. data/lib/ohai/plugins/aix/memory.rb +4 -3
  36. data/lib/ohai/plugins/aix/network.rb +51 -58
  37. data/lib/ohai/plugins/aix/platform.rb +3 -2
  38. data/lib/ohai/plugins/aix/uptime.rb +3 -2
  39. data/lib/ohai/plugins/aix/virtualization.rb +6 -6
  40. data/lib/ohai/plugins/azure.rb +25 -4
  41. data/lib/ohai/plugins/bsd/virtualization.rb +3 -2
  42. data/lib/ohai/plugins/c.rb +4 -3
  43. data/lib/ohai/plugins/chef.rb +2 -1
  44. data/lib/ohai/plugins/cloud.rb +2 -1
  45. data/lib/ohai/plugins/command.rb +1 -0
  46. data/lib/ohai/plugins/cpu.rb +31 -32
  47. data/lib/ohai/plugins/darwin/hardware.rb +1 -0
  48. data/lib/ohai/plugins/darwin/memory.rb +2 -3
  49. data/lib/ohai/plugins/darwin/network.rb +8 -9
  50. data/lib/ohai/plugins/darwin/platform.rb +1 -0
  51. data/lib/ohai/plugins/darwin/virtualization.rb +2 -1
  52. data/lib/ohai/plugins/digital_ocean.rb +3 -1
  53. data/lib/ohai/plugins/dmi.rb +6 -5
  54. data/lib/ohai/plugins/docker.rb +2 -1
  55. data/lib/ohai/plugins/dragonflybsd/memory.rb +9 -8
  56. data/lib/ohai/plugins/dragonflybsd/network.rb +1 -0
  57. data/lib/ohai/plugins/dragonflybsd/platform.rb +3 -2
  58. data/lib/ohai/plugins/ec2.rb +17 -7
  59. data/lib/ohai/plugins/elixir.rb +1 -1
  60. data/lib/ohai/plugins/erlang.rb +1 -0
  61. data/lib/ohai/plugins/eucalyptus.rb +4 -1
  62. data/lib/ohai/plugins/filesystem.rb +4 -4
  63. data/lib/ohai/plugins/fips.rb +1 -0
  64. data/lib/ohai/plugins/freebsd/memory.rb +9 -8
  65. data/lib/ohai/plugins/freebsd/network.rb +1 -0
  66. data/lib/ohai/plugins/freebsd/platform.rb +3 -2
  67. data/lib/ohai/plugins/gce.rb +3 -2
  68. data/lib/ohai/plugins/go.rb +1 -1
  69. data/lib/ohai/plugins/groovy.rb +1 -1
  70. data/lib/ohai/plugins/grub2.rb +40 -0
  71. data/lib/ohai/plugins/haskell.rb +1 -0
  72. data/lib/ohai/plugins/hostname.rb +2 -2
  73. data/lib/ohai/plugins/init_package.rb +2 -1
  74. data/lib/ohai/plugins/java.rb +1 -0
  75. data/lib/ohai/plugins/kernel.rb +14 -11
  76. data/lib/ohai/plugins/keys.rb +1 -0
  77. data/lib/ohai/plugins/languages.rb +1 -0
  78. data/lib/ohai/plugins/libvirt.rb +4 -3
  79. data/lib/ohai/plugins/linode.rb +22 -14
  80. data/lib/ohai/plugins/linux/block_device.rb +9 -8
  81. data/lib/ohai/plugins/linux/hostnamectl.rb +3 -2
  82. data/lib/ohai/plugins/linux/interrupts.rb +4 -3
  83. data/lib/ohai/plugins/linux/ipc.rb +1 -0
  84. data/lib/ohai/plugins/linux/lsb.rb +7 -20
  85. data/lib/ohai/plugins/linux/lspci.rb +1 -1
  86. data/lib/ohai/plugins/linux/machineid.rb +5 -4
  87. data/lib/ohai/plugins/linux/mdadm.rb +3 -2
  88. data/lib/ohai/plugins/linux/memory.rb +38 -37
  89. data/lib/ohai/plugins/linux/network.rb +33 -7
  90. data/lib/ohai/plugins/linux/platform.rb +32 -31
  91. data/lib/ohai/plugins/linux/selinux.rb +1 -0
  92. data/lib/ohai/plugins/linux/sessions.rb +1 -0
  93. data/lib/ohai/plugins/linux/sysctl.rb +1 -0
  94. data/lib/ohai/plugins/linux/systemd_paths.rb +1 -0
  95. data/lib/ohai/plugins/linux/virtualization.rb +24 -23
  96. data/lib/ohai/plugins/lua.rb +1 -1
  97. data/lib/ohai/plugins/mono.rb +1 -1
  98. data/lib/ohai/plugins/netbsd/memory.rb +1 -0
  99. data/lib/ohai/plugins/netbsd/network.rb +1 -0
  100. data/lib/ohai/plugins/netbsd/platform.rb +3 -2
  101. data/lib/ohai/plugins/network.rb +2 -1
  102. data/lib/ohai/plugins/nodejs.rb +1 -1
  103. data/lib/ohai/plugins/ohai.rb +1 -0
  104. data/lib/ohai/plugins/ohai_time.rb +2 -1
  105. data/lib/ohai/plugins/openbsd/memory.rb +1 -0
  106. data/lib/ohai/plugins/openbsd/network.rb +1 -0
  107. data/lib/ohai/plugins/openbsd/platform.rb +3 -2
  108. data/lib/ohai/plugins/openstack.rb +1 -0
  109. data/lib/ohai/plugins/os.rb +6 -1
  110. data/lib/ohai/plugins/packages.rb +2 -1
  111. data/lib/ohai/plugins/passwd.rb +58 -1
  112. data/lib/ohai/plugins/perl.rb +1 -1
  113. data/lib/ohai/plugins/php.rb +1 -1
  114. data/lib/ohai/plugins/platform.rb +1 -0
  115. data/lib/ohai/plugins/powershell.rb +1 -1
  116. data/lib/ohai/plugins/ps.rb +1 -0
  117. data/lib/ohai/plugins/python.rb +1 -1
  118. data/lib/ohai/plugins/rackspace.rb +6 -5
  119. data/lib/ohai/plugins/root_group.rb +1 -0
  120. data/lib/ohai/plugins/ruby.rb +3 -2
  121. data/lib/ohai/plugins/rust.rb +1 -1
  122. data/lib/ohai/plugins/scala.rb +1 -0
  123. data/lib/ohai/plugins/scaleway.rb +3 -2
  124. data/lib/ohai/plugins/scsi.rb +1 -1
  125. data/lib/ohai/plugins/shard.rb +1 -1
  126. data/lib/ohai/plugins/shells.rb +3 -2
  127. data/lib/ohai/plugins/softlayer.rb +1 -0
  128. data/lib/ohai/plugins/solaris2/dmi.rb +2 -1
  129. data/lib/ohai/plugins/solaris2/memory.rb +1 -0
  130. data/lib/ohai/plugins/solaris2/network.rb +2 -1
  131. data/lib/ohai/plugins/solaris2/platform.rb +8 -14
  132. data/lib/ohai/plugins/solaris2/virtualization.rb +4 -4
  133. data/lib/ohai/plugins/ssh_host_key.rb +13 -12
  134. data/lib/ohai/plugins/sysconf.rb +1 -0
  135. data/lib/ohai/plugins/timezone.rb +1 -0
  136. data/lib/ohai/plugins/train.rb +35 -0
  137. data/lib/ohai/plugins/uptime.rb +2 -1
  138. data/lib/ohai/plugins/virtualbox.rb +2 -1
  139. data/lib/ohai/plugins/vmware.rb +3 -3
  140. data/lib/ohai/plugins/windows/dmi.rb +1 -0
  141. data/lib/ohai/plugins/windows/drivers.rb +1 -0
  142. data/lib/ohai/plugins/windows/memory.rb +1 -0
  143. data/lib/ohai/plugins/windows/network.rb +2 -1
  144. data/lib/ohai/plugins/windows/platform.rb +1 -0
  145. data/lib/ohai/plugins/windows/system_enclosure.rb +1 -0
  146. data/lib/ohai/plugins/windows/virtualization.rb +1 -0
  147. data/lib/ohai/plugins/zpools.rb +5 -3
  148. data/lib/ohai/provides_map.rb +1 -0
  149. data/lib/ohai/runner.rb +7 -4
  150. data/lib/ohai/system.rb +33 -4
  151. data/lib/ohai/train_transport.rb +29 -0
  152. data/lib/ohai/util/file_helper.rb +1 -0
  153. data/lib/ohai/util/ip_helper.rb +2 -1
  154. data/lib/ohai/util/win32.rb +1 -0
  155. data/lib/ohai/version.rb +2 -1
  156. data/ohai.gemspec +3 -1
  157. metadata +22 -5
  158. data/lib/ohai/plugins/joyent.rb +0 -77
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: bdf73dcd0e2c5c510ea32c222ba7d1af4518248bd7da383e830950fc6abae14f
4
- data.tar.gz: 670279df5019b42e10a62ccfef09a1c14ad23037ec419da228c5dc15ec9f3a9e
3
+ metadata.gz: 6d9954302145b0fd7ddc2729f4d875374092545c12684935b5e7f013818f8264
4
+ data.tar.gz: fcb81fa7a3e06dc990b8b00c090cd73bccc62514adeecf449557df096006ef98
5
5
  SHA512:
6
- metadata.gz: 573ca2d973a564ca588904e7230f5db4c3aa5a97bdbbcafc8a833830a5530348b9c824a172b0e72bfe672393213e19dd276cabbbe054968a41dabe905a84f523
7
- data.tar.gz: ee0d263f7213fae70cb7d6a9230103cc5112d54b48669b1b17276dd873117e420222c418646ec5283c93be268083ad09103df0d62f3ffac9215173eb33979ca3
6
+ metadata.gz: 48f3b8c8f3edd9a97c6e50df24c75f65fa6681d18f900825ace766fbc820e49e2adf2f3651feb65a7aec80ba2b38e279d4651021512ffe79224745549fb780ea
7
+ data.tar.gz: 4b2fd69df9d172c0874cde31fb8cca8fe834c3db4b24c09c4af6de916d8be1e9a731760581de79e4ea44881272bc62aa66f79ab76ab419853178a796458a07d6
data/Gemfile CHANGED
@@ -1,7 +1,12 @@
1
+ # frozen_string_literal: true
1
2
  source "https://rubygems.org"
2
3
 
3
4
  gemspec
4
5
 
6
+ # pull these gems from master of chef/chef so that we're testing against what we will release
7
+ gem "chef-config", git: "https://github.com/chef/chef", branch: "chef-16", glob: "chef-config/chef-config.gemspec"
8
+ gem "chef-utils", git: "https://github.com/chef/chef", branch: "chef-16", glob: "chef-utils/chef-utils.gemspec"
9
+
5
10
  # NOTE: do not submit PRs to add pry as a dep, add to your Gemfile.local
6
11
  group :development do
7
12
  gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "master"
@@ -11,19 +16,13 @@ group :development do
11
16
  gem "rspec-core", "~> 3.0"
12
17
  gem "rspec-expectations", "~> 3.0"
13
18
  gem "rspec-mocks", "~> 3.0"
14
- gem "rubocop-performance", "1.8.1"
19
+ gem "rubocop-performance", "1.9.0"
15
20
  gem "rubocop-rspec"
16
21
  end
17
22
 
18
- group :docs do
19
- gem "github-markup"
20
- gem "redcarpet"
21
- gem "yard"
22
- end
23
-
24
23
  group :debug do
25
24
  gem "pry"
26
25
  gem "pry-byebug"
27
- gem "pry-stack_explorer", "~> 0.4.0" # pin until we drop ruby < 2.6
26
+ gem "pry-stack_explorer"
28
27
  gem "rb-readline"
29
28
  end
data/bin/ohai CHANGED
@@ -1,4 +1,5 @@
1
1
  #!/usr/bin/env ruby
2
+ # frozen_string_literal: true
2
3
  #
3
4
  # Author:: Adam Jacob (<adam@chef.io>)
4
5
  # Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
data/lib/ohai.rb CHANGED
@@ -1,3 +1,4 @@
1
+ # frozen_string_literal: true
1
2
  #
2
3
  # Author:: Adam Jacob (<adam@chef.io>)
3
4
  # Copyright:: Copyright (c) Chef Software Inc.
@@ -1,3 +1,4 @@
1
+ # frozen_string_literal: true
1
2
  #
2
3
  # Author:: Mathieu Sauve-Frankel <msf@kisoku.net>
3
4
  # Copyright:: Copyright (c) 2009 Mathieu Sauve-Frankel.
@@ -56,6 +57,15 @@ class Ohai::Application
56
57
  description: "Set the log file location, defaults to STDOUT - recommended for daemonizing",
57
58
  proc: nil
58
59
 
60
+ option :target,
61
+ short: "-t TARGET",
62
+ long: "--target TARGET",
63
+ description: "Target Ohai against a remote system or device",
64
+ proc: lambda { |target|
65
+ Ohai::Log.warn "-- EXPERIMENTAL -- Target mode activated -- EXPERIMENTAL --"
66
+ target
67
+ }
68
+
59
69
  option :help,
60
70
  short: "-h",
61
71
  long: "--help",
@@ -93,9 +103,39 @@ class Ohai::Application
93
103
 
94
104
  load_workstation_config
95
105
 
106
+ merge_configs
107
+
108
+ if config[:target]
109
+ Ohai::Config.target_mode.host = config[:target]
110
+ if URI.parse(Ohai::Config.target_mode.host).scheme
111
+ train_config = Train.unpack_target_from_uri(Ohai::Config.target_mode.host)
112
+ Ohai::Config.target_mode = train_config
113
+ end
114
+ Ohai::Config.target_mode.enabled = true
115
+ Ohai::Config.node_name = Ohai::Config.target_mode.host unless Ohai::Config.node_name
116
+ end
117
+
96
118
  Ohai::Log.init(Ohai.config[:log_location])
97
119
  end
98
120
 
121
+ # @api private
122
+ def config_file_defaults
123
+ Ohai::Config.save(true)
124
+ end
125
+
126
+ # @api private
127
+ def config_file_settings
128
+ Ohai::Config.save(false)
129
+ end
130
+
131
+ # See lib/chef/knife.rb in the chef/chef github repo
132
+ #
133
+ # @api private
134
+ def merge_configs
135
+ config.replace(config_file_defaults.merge(default_config).merge(config_file_settings).merge(config))
136
+ Ohai::Config.merge!(config) # make them both the same
137
+ end
138
+
99
139
  # Passes config and attributes arguments to Ohai::System then prints the results.
100
140
  # Called by the run method after config / logging have been initialized
101
141
  #
@@ -1,3 +1,4 @@
1
+ # frozen_string_literal: true
1
2
  #
2
3
  # Author:: Kurt Yoder (ktyopscode@yoderhome.com)
3
4
  # Copyright:: Copyright (c) 2010 Kurt Yoder
@@ -76,11 +77,11 @@ module Ohai
76
77
  # away some of the less useful IDs
77
78
  ID_TO_CAPTURE = [ 0, 1, 2, 3, 4, 6, 11 ].freeze
78
79
 
79
- # the whitelisted DMI IDs. This is combination of the defaults + any additional
80
+ # the allowlisted DMI IDs. This is combination of the defaults + any additional
80
81
  # IDs defined in the :additional_dmi_ids config
81
82
  #
82
83
  # @return [Array] the list of DMI IDs to capture
83
- def whitelisted_ids
84
+ def allowlisted_ids
84
85
  if Ohai.config[:additional_dmi_ids]
85
86
  if [ Integer, Array ].include?(Ohai.config[:additional_dmi_ids].class)
86
87
  return ID_TO_CAPTURE + Array(Ohai.config[:additional_dmi_ids])
@@ -91,6 +92,10 @@ module Ohai
91
92
  ID_TO_CAPTURE
92
93
  end
93
94
 
95
+ ##
96
+ # @deprecated Use the `allowlisted_ids` method instead.
97
+ alias whitelisted_ids allowlisted_ids
98
+
94
99
  # the human readable description from a DMI ID
95
100
  #
96
101
  # @param id [String, Integer] the ID to lookup
@@ -152,7 +157,7 @@ module Ohai
152
157
  end
153
158
  end
154
159
 
155
- module_function :id_lookup, :convenience_keys, :whitelisted_ids
160
+ module_function :id_lookup, :convenience_keys, :allowlisted_ids, :whitelisted_ids
156
161
  end
157
162
  end
158
163
  end
data/lib/ohai/config.rb CHANGED
@@ -1,3 +1,4 @@
1
+ # frozen_string_literal: true
1
2
  #
2
3
  # Author:: Adam Jacob (<adam@chef.io>)
3
4
  # Author:: Claire McQuin (<claire@chef.io>)
data/lib/ohai/dsl.rb CHANGED
@@ -1,3 +1,4 @@
1
+ # frozen_string_literal: true
1
2
  #
2
3
  # Author:: Serdar Sutay (<serdar@chef.io>)
3
4
  # Copyright:: Copyright (c) Chef Software Inc.
@@ -1,3 +1,4 @@
1
+ # frozen_string_literal: true
1
2
  #
2
3
  # Author:: Adam Jacob (<adam@chef.io>)
3
4
  # Author:: Claire McQuin (<claire@chef.io>)
@@ -22,6 +23,7 @@ require_relative "../mixin/os"
22
23
  require_relative "../mixin/shell_out"
23
24
  require_relative "../mixin/seconds_to_human"
24
25
  require_relative "../mixin/which"
26
+ require_relative "../mixin/train_helpers"
25
27
  require_relative "../hints"
26
28
 
27
29
  module Ohai
@@ -86,10 +88,12 @@ module Ohai
86
88
  include Ohai::Mixin::ShellOut
87
89
  include Ohai::Mixin::SecondsToHuman
88
90
  include Ohai::Mixin::Which
91
+ include Ohai::Mixin::TrainHelpers
89
92
 
90
93
  attr_reader :data
91
94
  attr_reader :failed
92
95
  attr_reader :logger
96
+ attr_accessor :transport_connection
93
97
 
94
98
  def initialize(data, logger)
95
99
  @data = data
@@ -98,6 +102,10 @@ module Ohai
98
102
  @failed = false
99
103
  end
100
104
 
105
+ def target_mode?
106
+ !!@transport_connection
107
+ end
108
+
101
109
  def run
102
110
  @has_run = true
103
111
 
@@ -210,7 +218,7 @@ module Ohai
210
218
  def safe_get_attribute(*keys)
211
219
  keys.inject(@data) do |attrs, key|
212
220
  unless attrs.nil? || attrs.is_a?(Array) || attrs.is_a?(Hash)
213
- raise TypeError.new("Expected Hash but got #{attrs.class}.")
221
+ raise TypeError, "Expected Hash but got #{attrs.class}."
214
222
  end
215
223
 
216
224
  attrs[key]
@@ -1,3 +1,4 @@
1
+ # frozen_string_literal: true
1
2
  #
2
3
  # Author:: Serdar Sutay (<serdar@chef.io>)
3
4
  # Copyright:: Copyright (c) Chef Software Inc.
@@ -46,7 +47,8 @@ module Ohai
46
47
  :version7
47
48
  end
48
49
 
49
- # the source of the plugin on disk. This is an array since a plugin may exist for multiple platforms and this would include each of those platform specific file paths
50
+ # The source of the plugin on disk. This is an array since a plugin may exist for multiple
51
+ # oses and this would include each of those os specific file paths
50
52
  #
51
53
  # @return [Array]
52
54
  def self.sources
@@ -61,7 +63,7 @@ module Ohai
61
63
  @depends_attrs ||= []
62
64
  end
63
65
 
64
- # A block per platform for actually performing data collection constructed
66
+ # A block per os for actually performing data collection constructed
65
67
  # by the collect_data method
66
68
  #
67
69
  # @return [Mash]
@@ -101,15 +103,16 @@ module Ohai
101
103
  !!@optional
102
104
  end
103
105
 
104
- # define data collection methodology per platform
106
+ # define data collection methodology per os
105
107
  #
106
- # @param platform [Symbol] the platform to collect data for
107
- # @param other_platforms [Array] additional platforms to collect data for
108
- # @param block [block] the actual code to collect data for the specified platforms
109
- def self.collect_data(platform = :default, *other_platforms, &block)
110
- [platform, other_platforms].flatten.each do |plat|
111
- Ohai::Log.warn("collect_data already defined on platform '#{plat}' for #{self}, last plugin seen will be used") if data_collector.key?(plat)
112
- data_collector[plat] = block
108
+ # @param os [Array<Symbol>] the list of oses to collect data for
109
+ # @param block [block] the actual code to collect data for the specified os
110
+ #
111
+ def self.collect_data(*os_list, &block)
112
+ os_list = [ :default ] if os_list.empty?
113
+ os_list.flatten.each do |os|
114
+ Ohai::Log.warn("collect_data already defined on os '#{os}' for #{self}, last plugin seen will be used") if data_collector.key?(os)
115
+ data_collector[os] = block
113
116
  end
114
117
  end
115
118
 
@@ -120,12 +123,22 @@ module Ohai
120
123
 
121
124
  def run_plugin
122
125
  collector = self.class.data_collector
123
- platform = collect_os
124
-
125
- if collector.key?(platform)
126
- instance_eval(&collector[platform])
127
- elsif collector.key?(:default)
126
+ os = collect_os
127
+
128
+ # :default - means any remote or local unix or windows host
129
+ # :target - means any remote API which is not unix/windows or otherwise rubyable (cisco switches, IPMI console, HTTP API, etc)
130
+ #
131
+ # Do not be confused by the fact that collectors tagged :target do not run against e.g. target-mode ubuntu boxes, that is not
132
+ # what :target is intended for. Also, do not be confused by the fact that collectors tagged :default do not run by default against
133
+ # pure-target mode targets like switches. That is all intended behavior, the names are problematic. The :default nomenclature was
134
+ # invented 10 years before target mode and we are stuck with it.
135
+ #
136
+ if collector.key?(os)
137
+ instance_eval(&collector[os])
138
+ elsif collector.key?(:default) && !nonruby_target?
128
139
  instance_eval(&collector[:default])
140
+ elsif collector.key?(:target) && nonruby_target?
141
+ instance_eval(&collector[:target])
129
142
  else
130
143
  logger.trace("Plugin #{name}: No data to collect. Skipping...")
131
144
  end
@@ -182,8 +195,6 @@ module Ohai
182
195
  # key? to avoid falsely instantiating a configuration hash.
183
196
  if Ohai.config[:plugin].key?(snake_case_name)
184
197
  Ohai.config[:plugin][snake_case_name]
185
- else
186
- nil
187
198
  end
188
199
  end
189
200
  end
@@ -1,3 +1,4 @@
1
+ # frozen_string_literal: true
1
2
  #
2
3
  # Author:: Adam Jacob (<adam@chef.io>)
3
4
  # Copyright:: Copyright (c) Chef Software Inc.
data/lib/ohai/hints.rb CHANGED
@@ -1,3 +1,4 @@
1
+ # frozen_string_literal: true
1
2
  #
2
3
  # Author:: Serdar Sutay (<serdar@chef.io>)
3
4
  # Copyright:: Copyright (c) Chef Software Inc.
data/lib/ohai/log.rb CHANGED
@@ -1,3 +1,4 @@
1
+ # frozen_string_literal: true
1
2
  #
2
3
  # Author:: Adam Jacob (<adam@chef.io>)
3
4
  # Copyright:: Copyright (c) Chef Software Inc.
data/lib/ohai/mash.rb CHANGED
@@ -1,3 +1,4 @@
1
+ # frozen_string_literal: true
1
2
  #
2
3
  # Copyright:: Copyright (c) Chef Software Inc.
3
4
  # License:: Apache License, Version 2.0
@@ -1,3 +1,4 @@
1
+ # frozen_string_literal: true
1
2
  #
2
3
  # Author:: Tim Smith (<tsmith@chef.io>)
3
4
  # Copyright:: Copyright (c) Chef Software Inc.
@@ -31,12 +32,12 @@ module Ohai
31
32
  #
32
33
  module AzureMetadata
33
34
 
34
- AZURE_METADATA_ADDR ||= "169.254.169.254".freeze
35
+ AZURE_METADATA_ADDR ||= "169.254.169.254"
35
36
 
36
37
  # it's important that the newer versions are at the end of this array so we can skip sorting it
37
38
  AZURE_SUPPORTED_VERSIONS ||= %w{ 2017-04-02 2017-08-01 2017-12-01 2018-02-01 2018-04-02
38
- 2018-10-01 2019-02-01 2019-03-11 2019-04-30 2019-06-01
39
- 2019-06-04 2019-08-01 2019-08-15 2019-11-01 }.freeze
39
+ 2018-10-01 2019-02-01 2019-03-11 2019-04-30 2019-06-01
40
+ 2019-06-04 2019-08-01 2019-08-15 2019-11-01 }.freeze
40
41
 
41
42
  def best_api_version
42
43
  @api_version ||= begin
@@ -1,3 +1,4 @@
1
+ # frozen_string_literal: true
1
2
  #
2
3
  # Copyright:: Copyright (c) Chef Software Inc.
3
4
  # License:: Apache License, Version 2.0
@@ -16,6 +17,7 @@
16
17
  #
17
18
 
18
19
  require_relative "../config"
20
+ require "singleton" unless defined?(Singleton)
19
21
 
20
22
  module Ohai
21
23
  module Mixin
@@ -32,7 +34,18 @@ module Ohai
32
34
  end
33
35
 
34
36
  def __transport_connection
35
- # Chef.run_context&.transport_connection
37
+ transport_connection
38
+ end
39
+
40
+ # because of target mode we cache the PATH to avoid massive amounts of `echo $PATH` remote queries
41
+ #
42
+ def __env_path
43
+ PathCache.instance.path_cache ||= super
44
+ end
45
+
46
+ class PathCache
47
+ include Singleton
48
+ attr_accessor :path_cache
36
49
  end
37
50
  end
38
51
  end
@@ -1,3 +1,4 @@
1
+ # frozen_string_literal: true
1
2
  $stderr.puts "WARN: Ohai::Mixin::Command is deprecated, please use Ohai::Mixin::ShellOut or remove if the reference is unnecessary"
2
3
  require_relative "shell_out"
3
4
  Ohai::Mixin::Command = Ohai::Mixin::ShellOut unless defined?(Ohai::Mixin::Command)
@@ -1,3 +1,4 @@
1
+ # frozen_string_literal: true
1
2
  #
2
3
  # Author:: Serdar Sutay (<serdar@chef.io>)
3
4
  # Copyright:: Copyright (c) Chef Software Inc.
@@ -1,3 +1,4 @@
1
+ # frozen_string_literal: true
1
2
  #
2
3
  # Author:: Tim Smith <tsmith@chef.io>
3
4
  # Copyright:: Copyright (c) Chef Software Inc.
@@ -1,3 +1,4 @@
1
+ # frozen_string_literal: true
1
2
 
2
3
  # Author:: Dylan Page (<dpage@digitalocean.com>)
3
4
  # License:: Apache License, Version 2.0
@@ -20,8 +21,8 @@ module Ohai
20
21
  module Mixin
21
22
  module DOMetadata
22
23
 
23
- DO_METADATA_ADDR ||= "169.254.169.254".freeze
24
- DO_METADATA_URL ||= "/metadata/v1.json".freeze
24
+ DO_METADATA_ADDR ||= "169.254.169.254"
25
+ DO_METADATA_URL ||= "/metadata/v1.json"
25
26
 
26
27
  def http_client
27
28
  Net::HTTP.start(DO_METADATA_ADDR).tap { |h| h.read_timeout = 6 }
@@ -1,3 +1,4 @@
1
+ # frozen_string_literal: true
1
2
  #
2
3
  # Author:: Tim Dysinger (<tim@dysinger.net>)
3
4
  # Author:: Benjamin Black (<bb@chef.io>)
@@ -39,25 +40,33 @@ module Ohai
39
40
  #
40
41
  module Ec2Metadata
41
42
 
42
- EC2_METADATA_ADDR ||= "169.254.169.254".freeze
43
+ EC2_METADATA_ADDR ||= "169.254.169.254"
43
44
  EC2_SUPPORTED_VERSIONS ||= %w{ 1.0 2007-01-19 2007-03-01 2007-08-29 2007-10-10 2007-12-15
44
- 2008-02-01 2008-09-01 2009-04-04 2011-01-01 2011-05-01 2012-01-12
45
- 2014-02-25 2014-11-05 2015-10-20 2016-04-19 2016-06-30 2016-09-02 }.freeze
45
+ 2008-02-01 2008-09-01 2009-04-04 2011-01-01 2011-05-01 2012-01-12
46
+ 2014-02-25 2014-11-05 2015-10-20 2016-04-19 2016-06-30 2016-09-02
47
+ 2016-11-30 2018-08-17 2018-11-29 2019-10-01 2020-08-24 2020-11-01 }.freeze
46
48
  EC2_ARRAY_VALUES ||= %w{security-groups local_ipv4s}.freeze
47
49
  EC2_ARRAY_DIR ||= %w{network/interfaces/macs}.freeze
48
50
  EC2_JSON_DIR ||= %w{iam}.freeze
49
51
 
52
+ #
53
+ # The latest metadata version in EC2_SUPPORTED_VERSIONS that this instance supports
54
+ # in AWS supported metadata versions are determined at instance start so we need to be
55
+ # cautious here in case an instance has been running for a long time
56
+ #
57
+ # @return [String] the version
58
+ #
50
59
  def best_api_version
51
60
  @api_version ||= begin
52
61
  logger.trace("Mixin EC2: Fetching http://#{EC2_METADATA_ADDR}/ to determine the latest supported metadata release")
53
- response = http_client.get("/")
62
+ response = http_client.get("/", { 'X-aws-ec2-metadata-token': v2_token })
54
63
  if response.code == "404"
55
64
  logger.trace("Mixin EC2: Received HTTP 404 from metadata server while determining API version, assuming 'latest'")
56
65
  return "latest"
57
66
  elsif response.code != "200"
58
67
  raise "Mixin EC2: Unable to determine EC2 metadata version (returned #{response.code} response)"
59
68
  end
60
- # Note: Sorting the list of versions may have unintended consequences in
69
+ # NOTE: Sorting the list of versions may have unintended consequences in
61
70
  # non-EC2 environments. It appears to be safe in EC2 as of 2013-04-12.
62
71
  versions = response.body.split("\n").sort
63
72
  until versions.empty? || EC2_SUPPORTED_VERSIONS.include?(versions.last)
@@ -83,6 +92,23 @@ module Ohai
83
92
  end
84
93
  end
85
94
 
95
+ #
96
+ # Fetch an API token for use querying AWS IMDSv2 or return nil if no token if found
97
+ # AWS like systems (think OpenStack) will not respond with a token here
98
+ #
99
+ # @return [NilClass, String] API token or nil
100
+ #
101
+ def v2_token
102
+ @v2_token ||= begin
103
+ request = http_client.put("/latest/api/token", nil, { 'X-aws-ec2-metadata-token-ttl-seconds': "60" })
104
+ if request.code == "404" # not on AWS
105
+ nil
106
+ else
107
+ request.body
108
+ end
109
+ end
110
+ end
111
+
86
112
  # Get metadata for a given path and API version
87
113
  #
88
114
  # Typically, a 200 response is expected for valid metadata.
@@ -92,7 +118,7 @@ module Ohai
92
118
  def metadata_get(id, api_version)
93
119
  path = "/#{api_version}/meta-data/#{id}"
94
120
  logger.trace("Mixin EC2: Fetching http://#{EC2_METADATA_ADDR}#{path}")
95
- response = http_client.get(path)
121
+ response = http_client.get(path, { 'X-aws-ec2-metadata-token': v2_token })
96
122
  case response.code
97
123
  when "200"
98
124
  response.body
@@ -118,7 +144,7 @@ module Ohai
118
144
  else
119
145
  metadata_get(key, best_api_version)
120
146
  end
121
- elsif (not key.eql?(id)) && (not key.eql?("/"))
147
+ elsif (!key.eql?(id)) && (!key.eql?("/"))
122
148
  name = key[0..-2]
123
149
  sym = metadata_key(name)
124
150
  if EC2_ARRAY_DIR.include?(name)
@@ -143,7 +169,7 @@ module Ohai
143
169
  if key[-1..-1] != "/"
144
170
  retr_meta = metadata_get("#{id}#{key}", api_version)
145
171
  metadata[metadata_key(key)] = retr_meta || ""
146
- elsif not key.eql?("/")
172
+ elsif !key.eql?("/")
147
173
  metadata[key[0..-2]] = fetch_dir_metadata("#{id}#{key}", api_version)
148
174
  end
149
175
  end
@@ -163,7 +189,7 @@ module Ohai
163
189
  json = String(data)
164
190
  parser = FFI_Yajl::Parser.new
165
191
  metadata[metadata_key(key)] = parser.parse(json)
166
- elsif not key.eql?("/")
192
+ elsif !key.eql?("/")
167
193
  metadata[key[0..-2]] = fetch_json_dir_metadata("#{id}#{key}", api_version)
168
194
  end
169
195
  end
@@ -173,13 +199,13 @@ module Ohai
173
199
 
174
200
  def fetch_userdata
175
201
  logger.trace("Mixin EC2: Fetching http://#{EC2_METADATA_ADDR}/#{best_api_version}/user-data/")
176
- response = http_client.get("/#{best_api_version}/user-data/")
202
+ response = http_client.get("/#{best_api_version}/user-data/", { 'X-aws-ec2-metadata-token': v2_token })
177
203
  response.code == "200" ? response.body : nil
178
204
  end
179
205
 
180
206
  def fetch_dynamic_data
181
207
  @fetch_dynamic_data ||= begin
182
- response = http_client.get("/#{best_api_version}/dynamic/instance-identity/document/")
208
+ response = http_client.get("/#{best_api_version}/dynamic/instance-identity/document/", { 'X-aws-ec2-metadata-token': v2_token })
183
209
 
184
210
  if json?(response.body) && response.code == "200"
185
211
  FFI_Yajl::Parser.parse(response.body)