facter 4.2.0 → 4.2.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/facter/framework/cli/cli.rb +13 -15
- data/lib/facter/resolvers/ec2.rb +8 -1
- data/lib/facter/resolvers/windows/ffi/kernel_ffi.rb +1 -1
- data/lib/facter/version.rb +1 -1
- metadata +16 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 7d82b5638d66725eb654bb71a40be9e8faf9f98ab17200bc3340ec2a88416076
|
4
|
+
data.tar.gz: 2f6d868d28453ddf1fce7ce5cd24efce4365f5f7383980b6857f4771f7e8e22a
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 8a81868164b70e5f172354f3666c2d3c7cb8f8bf52ccbb4b8bd150ce097d771ad6c2df99f43401311d089eac5cb7404c90ec8cc7c2d074c062b7f2a66249be0f
|
7
|
+
data.tar.gz: 7de563f91031e60fd404bd00843f38a73c9782d1b816a997975db71bc0bca4a7302190fbded94559e0b1bc8613c32d950749fd2578b75d1518826d4b09958465
|
@@ -97,6 +97,11 @@ module Facter
|
|
97
97
|
type: :boolean,
|
98
98
|
desc: 'Resolve facts sequentially'
|
99
99
|
|
100
|
+
class_option :puppet,
|
101
|
+
type: :boolean,
|
102
|
+
aliases: '-p',
|
103
|
+
desc: 'Load the Puppet libraries, thus allowing Facter to load Puppet-specific facts.'
|
104
|
+
|
100
105
|
desc '--man', 'Display manual.', hide: true
|
101
106
|
map ['--man'] => :man
|
102
107
|
def man(*args)
|
@@ -111,6 +116,7 @@ module Facter
|
|
111
116
|
|
112
117
|
desc 'query', 'Default method', hide: true
|
113
118
|
def query(*args)
|
119
|
+
Facter.puppet_facts if options[:puppet]
|
114
120
|
output, status = Facter.to_user_output(@options, *args)
|
115
121
|
puts output
|
116
122
|
|
@@ -126,7 +132,7 @@ module Facter
|
|
126
132
|
Facter.values(@options, args)
|
127
133
|
end
|
128
134
|
|
129
|
-
desc '--version, -v', 'Print the version'
|
135
|
+
desc '--version, -v', 'Print the version'
|
130
136
|
map ['--version', '-v'] => :version
|
131
137
|
def version(*_args)
|
132
138
|
puts Facter::VERSION
|
@@ -156,19 +162,7 @@ module Facter
|
|
156
162
|
puts cache_groups
|
157
163
|
end
|
158
164
|
|
159
|
-
desc '--
|
160
|
-
map ['--puppet', '-p'] => :puppet
|
161
|
-
def puppet(*args)
|
162
|
-
Facter.puppet_facts
|
163
|
-
|
164
|
-
output, status = Facter.to_user_output(@options, *args)
|
165
|
-
puts output
|
166
|
-
|
167
|
-
status = 1 if Facter::Log.errors?
|
168
|
-
exit status
|
169
|
-
end
|
170
|
-
|
171
|
-
desc 'help', 'Help for all arguments'
|
165
|
+
desc '--help, -h', 'Help for all arguments'
|
172
166
|
def help(*args)
|
173
167
|
help_string = +''
|
174
168
|
help_string << help_header(args)
|
@@ -205,7 +199,11 @@ module Facter
|
|
205
199
|
Cli.commands
|
206
200
|
.select { |_k, command_class| command_class.instance_of?(Thor::Command) }
|
207
201
|
.each do |_k, command|
|
208
|
-
help_command_options << build_option(
|
202
|
+
help_command_options << build_option(
|
203
|
+
command['name'],
|
204
|
+
[command['usage'].split(',')[1]],
|
205
|
+
command['description']
|
206
|
+
)
|
209
207
|
end
|
210
208
|
|
211
209
|
help_command_options
|
data/lib/facter/resolvers/ec2.rb
CHANGED
@@ -51,7 +51,7 @@ module Facter
|
|
51
51
|
|
52
52
|
def get_data_from(url)
|
53
53
|
headers = {}
|
54
|
-
headers['X-aws-ec2-metadata-token'] =
|
54
|
+
headers['X-aws-ec2-metadata-token'] = v2_token if v2_token
|
55
55
|
Facter::Util::Resolvers::Http.get_request(url, headers, { session: determine_session_timeout })
|
56
56
|
end
|
57
57
|
|
@@ -59,6 +59,13 @@ module Facter
|
|
59
59
|
session_env = ENV['EC2_SESSION_TIMEOUT']
|
60
60
|
session_env ? session_env.to_i : EC2_SESSION_TIMEOUT
|
61
61
|
end
|
62
|
+
|
63
|
+
def v2_token
|
64
|
+
@v2_token ||= begin
|
65
|
+
token = Facter::Util::Resolvers::AwsToken.get
|
66
|
+
token == '' ? nil : token
|
67
|
+
end
|
68
|
+
end
|
62
69
|
end
|
63
70
|
end
|
64
71
|
end
|
data/lib/facter/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: facter
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 4.2.
|
4
|
+
version: 4.2.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Puppet
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2021-
|
11
|
+
date: 2021-06-09 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rake
|
@@ -108,6 +108,20 @@ dependencies:
|
|
108
108
|
- - "~>"
|
109
109
|
- !ruby/object:Gem::Version
|
110
110
|
version: '1.3'
|
111
|
+
- !ruby/object:Gem::Dependency
|
112
|
+
name: timecop
|
113
|
+
requirement: !ruby/object:Gem::Requirement
|
114
|
+
requirements:
|
115
|
+
- - "~>"
|
116
|
+
- !ruby/object:Gem::Version
|
117
|
+
version: '0.9'
|
118
|
+
type: :development
|
119
|
+
prerelease: false
|
120
|
+
version_requirements: !ruby/object:Gem::Requirement
|
121
|
+
requirements:
|
122
|
+
- - "~>"
|
123
|
+
- !ruby/object:Gem::Version
|
124
|
+
version: '0.9'
|
111
125
|
- !ruby/object:Gem::Dependency
|
112
126
|
name: webmock
|
113
127
|
requirement: !ruby/object:Gem::Requirement
|