puppet 8.2.0-x64-mingw32 → 8.3.1-x64-mingw32
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile +1 -1
- data/Gemfile.lock +25 -31
- data/ext/project_data.yaml +2 -2
- data/lib/puppet/application/doc.rb +1 -1
- data/lib/puppet/application/ssl.rb +42 -7
- data/lib/puppet/application.rb +5 -1
- data/lib/puppet/defaults.rb +5 -5
- data/lib/puppet/face/config.rb +1 -1
- data/lib/puppet/face/epp.rb +2 -2
- data/lib/puppet/face/module/list.rb +2 -2
- data/lib/puppet/face/parser.rb +1 -1
- data/lib/puppet/functions/split.rb +28 -1
- data/lib/puppet/indirector/facts/facter.rb +1 -1
- data/lib/puppet/indirector/file_bucket_file/file.rb +1 -1
- data/lib/puppet/indirector/indirection.rb +1 -1
- data/lib/puppet/info_service/task_information_service.rb +1 -1
- data/lib/puppet/module_tool.rb +1 -1
- data/lib/puppet/network/formats.rb +3 -3
- data/lib/puppet/network/http/memory_response.rb +1 -1
- data/lib/puppet/parameter/value_collection.rb +1 -1
- data/lib/puppet/parser/files.rb +4 -3
- data/lib/puppet/parser/functions.rb +1 -1
- data/lib/puppet/pops/loader/loader_paths.rb +4 -4
- data/lib/puppet/pops/lookup/explainer.rb +1 -1
- data/lib/puppet/pops/lookup/hiera_config.rb +1 -1
- data/lib/puppet/pops/model/factory.rb +1 -1
- data/lib/puppet/pops/model/tree_dumper.rb +1 -1
- data/lib/puppet/pops/parser/epp_support.rb +1 -1
- data/lib/puppet/pops/parser/evaluating_parser.rb +1 -1
- data/lib/puppet/pops/parser/pn_parser.rb +1 -1
- data/lib/puppet/pops/pn.rb +1 -1
- data/lib/puppet/pops/serialization/json_path.rb +1 -1
- data/lib/puppet/pops/time/timespan.rb +4 -4
- data/lib/puppet/pops/types/ruby_generator.rb +2 -2
- data/lib/puppet/pops/types/string_converter.rb +6 -6
- data/lib/puppet/pops/types/type_formatter.rb +2 -2
- data/lib/puppet/pops/types/types.rb +1 -1
- data/lib/puppet/provider/nameservice/directoryservice.rb +2 -2
- data/lib/puppet/provider/package/apt.rb +1 -1
- data/lib/puppet/provider/package/dnf.rb +1 -1
- data/lib/puppet/provider/package/yum.rb +1 -1
- data/lib/puppet/provider/user/directoryservice.rb +1 -1
- data/lib/puppet/reference/configuration.rb +1 -1
- data/lib/puppet/reference/indirection.rb +1 -1
- data/lib/puppet/reports.rb +1 -1
- data/lib/puppet/transaction/report.rb +1 -1
- data/lib/puppet/type/filebucket.rb +1 -1
- data/lib/puppet/util/diff.rb +1 -1
- data/lib/puppet/util/execution.rb +9 -4
- data/lib/puppet/util/inifile.rb +2 -2
- data/lib/puppet/util/monkey_patches.rb +18 -0
- data/lib/puppet/util/package/version/rpm.rb +1 -1
- data/lib/puppet/util/provider_features.rb +1 -1
- data/lib/puppet/util/selinux.rb +1 -1
- data/lib/puppet/util/windows/access_control_entry.rb +1 -1
- data/lib/puppet/util/windows/access_control_list.rb +1 -1
- data/lib/puppet/util/windows/adsi.rb +9 -2
- data/lib/puppet/util/windows/error.rb +1 -1
- data/lib/puppet/util/windows/file.rb +2 -2
- data/lib/puppet/util/windows/process.rb +1 -1
- data/lib/puppet/util/windows/sid.rb +4 -2
- data/lib/puppet/util.rb +2 -3
- data/lib/puppet/version.rb +1 -1
- data/lib/puppet/x509/cert_provider.rb +6 -2
- data/locales/puppet.pot +40 -32
- data/man/man5/puppet.conf.5 +3 -3
- data/man/man8/puppet-agent.8 +1 -1
- data/man/man8/puppet-apply.8 +1 -1
- data/man/man8/puppet-catalog.8 +1 -1
- data/man/man8/puppet-config.8 +1 -1
- data/man/man8/puppet-describe.8 +1 -1
- data/man/man8/puppet-device.8 +1 -1
- data/man/man8/puppet-doc.8 +1 -1
- data/man/man8/puppet-epp.8 +1 -1
- data/man/man8/puppet-facts.8 +1 -1
- data/man/man8/puppet-filebucket.8 +1 -1
- data/man/man8/puppet-generate.8 +1 -1
- data/man/man8/puppet-help.8 +1 -1
- data/man/man8/puppet-lookup.8 +1 -1
- data/man/man8/puppet-module.8 +1 -1
- data/man/man8/puppet-node.8 +1 -1
- data/man/man8/puppet-parser.8 +1 -1
- data/man/man8/puppet-plugin.8 +1 -1
- data/man/man8/puppet-report.8 +1 -1
- data/man/man8/puppet-resource.8 +1 -1
- data/man/man8/puppet-script.8 +1 -1
- data/man/man8/puppet-ssl.8 +5 -1
- data/man/man8/puppet.8 +2 -2
- data/spec/integration/type/exec_spec.rb +13 -0
- data/spec/lib/puppet_spec/verbose.rb +10 -1
- data/spec/unit/agent_spec.rb +2 -9
- data/spec/unit/application/ssl_spec.rb +49 -0
- data/spec/unit/functions/split_spec.rb +6 -0
- data/spec/unit/info_service_spec.rb +1 -1
- data/spec/unit/ssl/certificate_signer_spec.rb +17 -0
- data/spec/unit/ssl/ssl_provider_spec.rb +1 -1
- data/spec/unit/util/execution_spec.rb +1 -0
- data/spec/unit/util/monkey_patches_spec.rb +42 -0
- data/spec/unit/util/windows/adsi_spec.rb +25 -0
- metadata +9 -13
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: d61a1c9e1bdda54c70fa51861b4b2713e38e9fee6804a13658a660d771c166e6
|
4
|
+
data.tar.gz: 4fef0c63a2a0c6d3be51e7b5f969ca85b8be50a58623badb4dc8efd10b488954
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 695246ef143289c7d12c2d57162e02ac17ad5ea9b5fafb2100e29ebe86af53851ac6faacde7a67410bf395c9e5d598b6b7a7b24615cd76b62078f6b8cb882bb9
|
7
|
+
data.tar.gz: cae4b82154cca6f2c2aa3a8c19f94306061020b3fa94bc206170491b98777aa8602bd065d0a577135ad1a461da4e3ba29893e52e87f5cc3a824d6f7a96e3ace7
|
data/Gemfile
CHANGED
@@ -36,7 +36,7 @@ group(:features) do
|
|
36
36
|
end
|
37
37
|
|
38
38
|
group(:test) do
|
39
|
-
gem "ffi", require: false
|
39
|
+
gem "ffi", '1.15.5', require: false
|
40
40
|
gem "json-schema", "~> 2.0", require: false
|
41
41
|
gem "rake", *location_for(ENV['RAKE_LOCATION'] || '~> 13.0')
|
42
42
|
gem "rspec", "~> 3.1", require: false
|
data/Gemfile.lock
CHANGED
@@ -1,21 +1,7 @@
|
|
1
|
-
GIT
|
2
|
-
remote: https://github.com/puppetlabs/packaging
|
3
|
-
revision: affecba5dfacc5862fc7199895ccf11b69153570
|
4
|
-
branch: 1.0.x
|
5
|
-
specs:
|
6
|
-
packaging (0)
|
7
|
-
apt_stage_artifacts
|
8
|
-
artifactory (~> 3)
|
9
|
-
csv (>= 3.1.5)
|
10
|
-
google-cloud-storage
|
11
|
-
googleauth
|
12
|
-
rake (>= 12.3)
|
13
|
-
release-metrics
|
14
|
-
|
15
1
|
PATH
|
16
2
|
remote: .
|
17
3
|
specs:
|
18
|
-
puppet (8.
|
4
|
+
puppet (8.3.1)
|
19
5
|
CFPropertyList (~> 2.2)
|
20
6
|
concurrent-ruby (~> 1.0)
|
21
7
|
deep_merge (~> 1.0)
|
@@ -37,6 +23,7 @@ GEM
|
|
37
23
|
docopt
|
38
24
|
artifactory (3.0.15)
|
39
25
|
ast (2.4.2)
|
26
|
+
base64 (0.1.1)
|
40
27
|
coderay (1.1.3)
|
41
28
|
concurrent-ruby (1.2.2)
|
42
29
|
crack (0.4.5)
|
@@ -49,17 +36,18 @@ GEM
|
|
49
36
|
rake (>= 12.0.0, < 14.0.0)
|
50
37
|
docopt (0.6.1)
|
51
38
|
erubi (1.12.0)
|
52
|
-
facter (4.
|
39
|
+
facter (4.5.0)
|
53
40
|
hocon (~> 1.3)
|
54
41
|
thor (>= 1.0.1, < 2.0)
|
55
|
-
faraday (2.7.
|
42
|
+
faraday (2.7.11)
|
43
|
+
base64
|
56
44
|
faraday-net_http (>= 2.0, < 3.1)
|
57
45
|
ruby2_keywords (>= 0.0.4)
|
58
46
|
faraday-net_http (3.0.2)
|
59
47
|
fast_gettext (2.3.0)
|
60
48
|
ffi (1.15.5)
|
61
49
|
forwardable (1.3.3)
|
62
|
-
gettext (3.4.
|
50
|
+
gettext (3.4.9)
|
63
51
|
erubi
|
64
52
|
locale (>= 2.0.5)
|
65
53
|
prime
|
@@ -96,10 +84,9 @@ GEM
|
|
96
84
|
google-cloud-core (~> 1.6)
|
97
85
|
googleauth (>= 0.16.2, < 2.a)
|
98
86
|
mini_mime (~> 1.0)
|
99
|
-
googleauth (1.
|
87
|
+
googleauth (1.8.1)
|
100
88
|
faraday (>= 0.17.3, < 3.a)
|
101
89
|
jwt (>= 1.4, < 3.0)
|
102
|
-
memoist (~> 0.16)
|
103
90
|
multi_json (~> 1.11)
|
104
91
|
os (>= 0.9, < 2.0)
|
105
92
|
signet (>= 0.16, < 2.a)
|
@@ -115,7 +102,6 @@ GEM
|
|
115
102
|
addressable (>= 2.4)
|
116
103
|
jwt (2.7.1)
|
117
104
|
locale (2.1.3)
|
118
|
-
memoist (0.16.2)
|
119
105
|
memory_profiler (1.0.1)
|
120
106
|
method_source (1.0.0)
|
121
107
|
mini_mime (1.1.5)
|
@@ -125,8 +111,16 @@ GEM
|
|
125
111
|
mustache (1.1.1)
|
126
112
|
optimist (3.1.0)
|
127
113
|
os (1.1.4)
|
114
|
+
packaging (0.111.0)
|
115
|
+
apt_stage_artifacts
|
116
|
+
artifactory (~> 3)
|
117
|
+
csv (>= 3.1.5)
|
118
|
+
google-cloud-storage
|
119
|
+
googleauth
|
120
|
+
rake (>= 12.3)
|
121
|
+
release-metrics
|
128
122
|
parallel (1.23.0)
|
129
|
-
parser (3.2.2.
|
123
|
+
parser (3.2.2.4)
|
130
124
|
ast (~> 2.4.1)
|
131
125
|
racc
|
132
126
|
prime (0.1.2)
|
@@ -145,7 +139,7 @@ GEM
|
|
145
139
|
rake (13.0.6)
|
146
140
|
rdiscount (2.2.7.1)
|
147
141
|
rdoc (6.3.3)
|
148
|
-
regexp_parser (2.8.
|
142
|
+
regexp_parser (2.8.2)
|
149
143
|
release-metrics (1.1.0)
|
150
144
|
csv
|
151
145
|
docopt
|
@@ -184,7 +178,7 @@ GEM
|
|
184
178
|
rubocop-ast (>= 1.17.0, < 2.0)
|
185
179
|
ruby-progressbar (~> 1.7)
|
186
180
|
unicode-display_width (>= 1.4.0, < 3.0)
|
187
|
-
rubocop-ast (1.
|
181
|
+
rubocop-ast (1.30.0)
|
188
182
|
parser (>= 3.2.1.0)
|
189
183
|
rubocop-i18n (3.0.0)
|
190
184
|
rubocop (~> 1.0)
|
@@ -193,19 +187,19 @@ GEM
|
|
193
187
|
ruby2_keywords (0.0.5)
|
194
188
|
scanf (1.0.0)
|
195
189
|
semantic_puppet (1.1.0)
|
196
|
-
signet (0.
|
190
|
+
signet (0.18.0)
|
197
191
|
addressable (~> 2.8)
|
198
192
|
faraday (>= 0.17.5, < 3.a)
|
199
193
|
jwt (>= 1.5, < 3.0)
|
200
194
|
multi_json (~> 1.10)
|
201
195
|
singleton (0.1.1)
|
202
196
|
text (1.3.1)
|
203
|
-
thor (1.
|
197
|
+
thor (1.3.0)
|
204
198
|
trailblazer-option (0.1.2)
|
205
199
|
uber (0.1.0)
|
206
|
-
unicode-display_width (2.
|
200
|
+
unicode-display_width (2.5.0)
|
207
201
|
vcr (6.2.0)
|
208
|
-
webmock (3.
|
202
|
+
webmock (3.19.1)
|
209
203
|
addressable (>= 2.8.0)
|
210
204
|
crack (>= 0.3.2)
|
211
205
|
hashdiff (>= 0.4.0, < 2.0.0)
|
@@ -218,7 +212,7 @@ PLATFORMS
|
|
218
212
|
DEPENDENCIES
|
219
213
|
diff-lcs (~> 1.3)
|
220
214
|
facter (~> 4.3)
|
221
|
-
ffi
|
215
|
+
ffi (= 1.15.5)
|
222
216
|
gettext-setup (~> 1.0)
|
223
217
|
hiera-eyaml
|
224
218
|
hocon (~> 1.0)
|
@@ -226,7 +220,7 @@ DEPENDENCIES
|
|
226
220
|
memory_profiler
|
227
221
|
minitar (~> 0.9)
|
228
222
|
msgpack (~> 1.2)
|
229
|
-
packaging
|
223
|
+
packaging (= 0.111.0)
|
230
224
|
pry
|
231
225
|
puppet!
|
232
226
|
puppet-resource_api (~> 1.5)
|
@@ -248,4 +242,4 @@ DEPENDENCIES
|
|
248
242
|
yard
|
249
243
|
|
250
244
|
BUNDLED WITH
|
251
|
-
2.4.
|
245
|
+
2.4.20
|
data/ext/project_data.yaml
CHANGED
@@ -39,11 +39,11 @@ gem_platform_dependencies:
|
|
39
39
|
CFPropertyList: '~> 2.2'
|
40
40
|
x86-mingw32:
|
41
41
|
gem_runtime_dependencies:
|
42
|
-
ffi:
|
42
|
+
ffi: '1.15.5'
|
43
43
|
minitar: '~> 0.9'
|
44
44
|
x64-mingw32:
|
45
45
|
gem_runtime_dependencies:
|
46
|
-
ffi:
|
46
|
+
ffi: '1.15.5'
|
47
47
|
minitar: '~> 0.9'
|
48
48
|
bundle_platforms:
|
49
49
|
universal-darwin: all
|
@@ -60,6 +60,11 @@ ACTIONS
|
|
60
60
|
the CSR. Otherwise a new key pair will be generated. If a CSR has already
|
61
61
|
been submitted with the given `certname`, then the operation will fail.
|
62
62
|
|
63
|
+
* generate_request:
|
64
|
+
Generate a certificate signing request (CSR). If
|
65
|
+
a private and public key pair already exist, they will be used to generate
|
66
|
+
the CSR. Otherwise a new key pair will be generated.
|
67
|
+
|
63
68
|
* download_cert:
|
64
69
|
Download a certificate for this host. If the current private key matches
|
65
70
|
the downloaded certificate, then the certificate will be saved and used
|
@@ -137,9 +142,21 @@ HELP
|
|
137
142
|
unless cert
|
138
143
|
raise Puppet::Error, _("The certificate for '%{name}' has not yet been signed") % { name: certname }
|
139
144
|
end
|
145
|
+
when 'generate_request'
|
146
|
+
generate_request(certname)
|
140
147
|
when 'verify'
|
141
148
|
verify(certname)
|
142
149
|
when 'clean'
|
150
|
+
possible_extra_args = command_line.args.drop(1)
|
151
|
+
unless possible_extra_args.empty?
|
152
|
+
raise Puppet::Error, _(<<END) % { args: possible_extra_args.join(' ')}
|
153
|
+
Extra arguments detected: %{args}
|
154
|
+
Did you mean to run:
|
155
|
+
puppetserver ca clean --certname <name>
|
156
|
+
Or:
|
157
|
+
puppet ssl clean --target <name>
|
158
|
+
END
|
159
|
+
end
|
143
160
|
clean(certname)
|
144
161
|
when 'bootstrap'
|
145
162
|
if !Puppet::Util::Log.sendlevel?(:info)
|
@@ -163,13 +180,7 @@ HELP
|
|
163
180
|
def submit_request(ssl_context)
|
164
181
|
key = @cert_provider.load_private_key(Puppet[:certname])
|
165
182
|
unless key
|
166
|
-
|
167
|
-
Puppet.info _("Creating a new EC SSL key for %{name} using curve %{curve}") % { name: Puppet[:certname], curve: Puppet[:named_curve] }
|
168
|
-
key = OpenSSL::PKey::EC.generate(Puppet[:named_curve])
|
169
|
-
else
|
170
|
-
Puppet.info _("Creating a new SSL key for %{name}") % { name: Puppet[:certname] }
|
171
|
-
key = OpenSSL::PKey::RSA.new(Puppet[:keylength].to_i)
|
172
|
-
end
|
183
|
+
key = create_key(Puppet[:certname])
|
173
184
|
@cert_provider.save_private_key(Puppet[:certname], key)
|
174
185
|
end
|
175
186
|
|
@@ -188,6 +199,20 @@ HELP
|
|
188
199
|
raise Puppet::Error.new(_("Failed to submit certificate request: %{message}") % { message: e.message }, e)
|
189
200
|
end
|
190
201
|
|
202
|
+
def generate_request(certname)
|
203
|
+
key = @cert_provider.load_private_key(certname)
|
204
|
+
unless key
|
205
|
+
key = create_key(certname)
|
206
|
+
@cert_provider.save_private_key(certname, key)
|
207
|
+
end
|
208
|
+
|
209
|
+
csr = @cert_provider.create_request(certname, key)
|
210
|
+
@cert_provider.save_request(certname, csr)
|
211
|
+
Puppet.notice _("Generated certificate request in '%{path}'") % { path: @cert_provider.to_path(Puppet[:requestdir], certname) }
|
212
|
+
rescue => e
|
213
|
+
raise Puppet::Error.new(_("Failed to generate certificate request: %{message}") % { message: e.message }, e)
|
214
|
+
end
|
215
|
+
|
191
216
|
def download_cert(ssl_context)
|
192
217
|
key = @cert_provider.load_private_key(Puppet[:certname])
|
193
218
|
|
@@ -286,4 +311,14 @@ END
|
|
286
311
|
def create_route(ssl_context)
|
287
312
|
@session.route_to(:ca, ssl_context: ssl_context)
|
288
313
|
end
|
314
|
+
|
315
|
+
def create_key(certname)
|
316
|
+
if Puppet[:key_type] == 'ec'
|
317
|
+
Puppet.info _("Creating a new EC SSL key for %{name} using curve %{curve}") % { name: certname, curve: Puppet[:named_curve] }
|
318
|
+
OpenSSL::PKey::EC.generate(Puppet[:named_curve])
|
319
|
+
else
|
320
|
+
Puppet.info _("Creating a new SSL key for %{name}") % { name: certname }
|
321
|
+
OpenSSL::PKey::RSA.new(Puppet[:keylength].to_i)
|
322
|
+
end
|
323
|
+
end
|
289
324
|
end
|
data/lib/puppet/application.rb
CHANGED
@@ -504,8 +504,12 @@ class Application
|
|
504
504
|
runtime_info = {
|
505
505
|
'puppet_version' => Puppet.version,
|
506
506
|
'ruby_version' => RUBY_VERSION,
|
507
|
-
'run_mode' => self.class.run_mode.name
|
507
|
+
'run_mode' => self.class.run_mode.name
|
508
508
|
}
|
509
|
+
unless Puppet::Util::Platform.jruby_fips?
|
510
|
+
runtime_info['openssl_version'] = "'#{OpenSSL::OPENSSL_VERSION}'"
|
511
|
+
runtime_info['openssl_fips'] = OpenSSL::OPENSSL_FIPS
|
512
|
+
end
|
509
513
|
runtime_info['default_encoding'] = Encoding.default_external
|
510
514
|
runtime_info.merge!(extra_info) unless extra_info.nil?
|
511
515
|
|
data/lib/puppet/defaults.rb
CHANGED
@@ -1247,11 +1247,11 @@ EOT
|
|
1247
1247
|
:hostcert_renewal_interval => {
|
1248
1248
|
:default => "30d",
|
1249
1249
|
:type => :duration,
|
1250
|
-
:desc => "
|
1251
|
-
By default the client certificate
|
1252
|
-
a different duration is specified, then the agent will refresh its
|
1253
|
-
client certificate whenever it next runs and the
|
1254
|
-
|
1250
|
+
:desc => "When the Puppet agent refreshes its client certificate.
|
1251
|
+
By default the client certificate will refresh 30 days before the certificate
|
1252
|
+
expires. If a different duration is specified, then the agent will refresh its
|
1253
|
+
client certificate whenever it next runs and if the client certificate expires
|
1254
|
+
within the duration specified.
|
1255
1255
|
|
1256
1256
|
In general, the duration should be greater than the `runinterval`.
|
1257
1257
|
Setting it to 0 will disable automatic renewal.
|
data/lib/puppet/face/config.rb
CHANGED
@@ -82,7 +82,7 @@ Puppet::Face.define(:config, '0.0.1') do
|
|
82
82
|
end
|
83
83
|
|
84
84
|
when_rendering :console do |to_be_rendered|
|
85
|
-
output =
|
85
|
+
output = ''.dup
|
86
86
|
if to_be_rendered.keys.length > 1
|
87
87
|
to_be_rendered.keys.sort.each do |setting|
|
88
88
|
output << "#{setting} = #{to_be_rendered[setting]}\n"
|
data/lib/puppet/face/epp.rb
CHANGED
@@ -367,7 +367,7 @@ Puppet::Face.define(:epp, '0.0.1') do
|
|
367
367
|
end
|
368
368
|
|
369
369
|
def dump_parse(source, filename, options, show_filename = true)
|
370
|
-
output =
|
370
|
+
output = ''.dup
|
371
371
|
evaluating_parser = Puppet::Pops::Parser::EvaluatingParser::EvaluatingEppParser.new
|
372
372
|
begin
|
373
373
|
if options[:validate]
|
@@ -451,7 +451,7 @@ Puppet::Face.define(:epp, '0.0.1') do
|
|
451
451
|
|
452
452
|
def render_file(epp_template_name, compiler, options, show_filename, file_nbr)
|
453
453
|
template_args = get_values(compiler, options)
|
454
|
-
output =
|
454
|
+
output = ''.dup
|
455
455
|
begin
|
456
456
|
if show_filename && options[:header]
|
457
457
|
output << "\n" unless file_nbr == 1
|
@@ -74,7 +74,7 @@ Puppet::Face.define(:module, '1.0.0') do
|
|
74
74
|
environment = result[:environment]
|
75
75
|
modules_by_path = result[:modules_by_path]
|
76
76
|
|
77
|
-
output =
|
77
|
+
output = ''.dup
|
78
78
|
|
79
79
|
warn_unmet_dependencies(environment)
|
80
80
|
|
@@ -248,7 +248,7 @@ Puppet::Face.define(:module, '1.0.0') do
|
|
248
248
|
# Returns a Hash
|
249
249
|
#
|
250
250
|
def list_build_node(mod, parent, params)
|
251
|
-
str =
|
251
|
+
str = ''.dup
|
252
252
|
str << (mod.forge_name ? mod.forge_name.tr('/', '-') : mod.name)
|
253
253
|
str << ' (' + colorize(:cyan, mod.version ? "v#{mod.version}" : '???') + ')'
|
254
254
|
|
data/lib/puppet/face/parser.rb
CHANGED
@@ -174,7 +174,7 @@ Puppet::Face.define(:parser, '0.0.1') do
|
|
174
174
|
end
|
175
175
|
|
176
176
|
def dump_parse(source, filename, options, show_filename = true)
|
177
|
-
output =
|
177
|
+
output = ''.dup
|
178
178
|
evaluating_parser = Puppet::Pops::Parser::EvaluatingParser.new
|
179
179
|
begin
|
180
180
|
if options[:validate]
|
@@ -36,6 +36,21 @@ Puppet::Functions.create_function(:split) do
|
|
36
36
|
param 'Type[Regexp]', :pattern
|
37
37
|
end
|
38
38
|
|
39
|
+
dispatch :split_String_sensitive do
|
40
|
+
param 'Sensitive[String]', :sensitive
|
41
|
+
param 'String', :pattern
|
42
|
+
end
|
43
|
+
|
44
|
+
dispatch :split_Regexp_sensitive do
|
45
|
+
param 'Sensitive[String]', :sensitive
|
46
|
+
param 'Regexp', :pattern
|
47
|
+
end
|
48
|
+
|
49
|
+
dispatch :split_RegexpType_sensitive do
|
50
|
+
param 'Sensitive[String]', :sensitive
|
51
|
+
param 'Type[Regexp]', :pattern
|
52
|
+
end
|
53
|
+
|
39
54
|
def split_String(str, pattern)
|
40
55
|
str.split(Regexp.compile(pattern))
|
41
56
|
end
|
@@ -47,4 +62,16 @@ Puppet::Functions.create_function(:split) do
|
|
47
62
|
def split_RegexpType(str, pattern)
|
48
63
|
str.split(pattern.regexp)
|
49
64
|
end
|
50
|
-
|
65
|
+
|
66
|
+
def split_String_sensitive(sensitive, pattern)
|
67
|
+
Puppet::Pops::Types::PSensitiveType::Sensitive.new(split_String(sensitive.unwrap, pattern))
|
68
|
+
end
|
69
|
+
|
70
|
+
def split_Regexp_sensitive(sensitive, pattern)
|
71
|
+
Puppet::Pops::Types::PSensitiveType::Sensitive.new(split_Regexp(sensitive.unwrap, pattern))
|
72
|
+
end
|
73
|
+
|
74
|
+
def split_RegexpType_sensitive(sensitive, pattern)
|
75
|
+
Puppet::Pops::Types::PSensitiveType::Sensitive.new(split_RegexpType(sensitive.unwrap, pattern))
|
76
|
+
end
|
77
|
+
end
|
@@ -105,7 +105,7 @@ class Puppet::Node::Facts::Facter < Puppet::Indirector::Code
|
|
105
105
|
|
106
106
|
def find_with_options(request)
|
107
107
|
options = request.options
|
108
|
-
options_for_facter =
|
108
|
+
options_for_facter = ''.dup
|
109
109
|
options_for_facter += options[:user_query].join(' ')
|
110
110
|
options_for_facter += " --config #{options[:config_file]}" if options[:config_file]
|
111
111
|
options_for_facter += " --show-legacy" if options[:show_legacy]
|
@@ -58,7 +58,7 @@ module Puppet::FileBucketFile
|
|
58
58
|
end
|
59
59
|
# Setting hash's default value to [], needed by the following loop
|
60
60
|
bucket = Hash.new {[]}
|
61
|
-
msg =
|
61
|
+
msg = ''.dup
|
62
62
|
# Get all files with mtime between 'from' and 'to'
|
63
63
|
Pathname.new(request.options[:bucket_path]).find { |item|
|
64
64
|
if item.file? and item.basename.to_s == "paths"
|
@@ -13,7 +13,7 @@ class Puppet::InfoService::TaskInformationService
|
|
13
13
|
task.validate
|
14
14
|
{:module => {:name => task.module.name}, :name => task.name, :metadata => task.metadata}
|
15
15
|
rescue Puppet::Module::Task::Error => err
|
16
|
-
Puppet.log_exception(err
|
16
|
+
Puppet.log_exception(err)
|
17
17
|
nil
|
18
18
|
end
|
19
19
|
end
|
data/lib/puppet/module_tool.rb
CHANGED
@@ -70,7 +70,7 @@ module Puppet
|
|
70
70
|
# Builds a formatted tree from a list of node hashes containing +:text+
|
71
71
|
# and +:dependencies+ keys.
|
72
72
|
def self.format_tree(nodes, level = 0)
|
73
|
-
str =
|
73
|
+
str = ''.dup
|
74
74
|
nodes.each_with_index do |node, i|
|
75
75
|
last_node = nodes.length - 1 == i
|
76
76
|
deps = node[:dependencies] || []
|
@@ -156,7 +156,7 @@ Puppet::Network::FormatHandler.create(:console,
|
|
156
156
|
|
157
157
|
# Simple hash to table
|
158
158
|
if datum.is_a?(Hash) && datum.keys.all? { |x| x.is_a?(String) || x.is_a?(Numeric) }
|
159
|
-
output =
|
159
|
+
output = ''.dup
|
160
160
|
column_a = datum.empty? ? 2 : datum.map{ |k,v| k.to_s.length }.max + 2
|
161
161
|
datum.sort_by { |k,v| k.to_s } .each do |key, value|
|
162
162
|
output << key.to_s.ljust(column_a)
|
@@ -169,7 +169,7 @@ Puppet::Network::FormatHandler.create(:console,
|
|
169
169
|
|
170
170
|
# Print one item per line for arrays
|
171
171
|
if datum.is_a? Array
|
172
|
-
output =
|
172
|
+
output = ''.dup
|
173
173
|
datum.each do |item|
|
174
174
|
output << item.to_s
|
175
175
|
output << "\n"
|
@@ -227,7 +227,7 @@ Puppet::Network::FormatHandler.create(:flat,
|
|
227
227
|
end
|
228
228
|
|
229
229
|
def construct_output(data)
|
230
|
-
output =
|
230
|
+
output = ''.dup
|
231
231
|
data.each do |key, value|
|
232
232
|
output << "#{key}=#{value}"
|
233
233
|
output << "\n"
|
data/lib/puppet/parser/files.rb
CHANGED
@@ -29,9 +29,10 @@ module Puppet::Parser::Files
|
|
29
29
|
# * modulename/filename selector: a file is found in the file directory
|
30
30
|
# of the named module.
|
31
31
|
#
|
32
|
-
#
|
33
|
-
#
|
34
|
-
#
|
32
|
+
# The check for file existence is performed on the node compiling the
|
33
|
+
# manifest. A node running "puppet apply" compiles its own manifest, but
|
34
|
+
# a node running "puppet agent" depends on the configured puppetserver
|
35
|
+
# for compiling. In either case, a nil is returned if no file is found.
|
35
36
|
#
|
36
37
|
# @param template [String] the file selector
|
37
38
|
# @param environment [Puppet::Node::Environment] the environment in which to search
|
@@ -258,7 +258,7 @@ module Puppet::Parser::Functions
|
|
258
258
|
def self.functiondocs(environment = Puppet.lookup(:current_environment))
|
259
259
|
autoloader.delegatee.loadall(environment)
|
260
260
|
|
261
|
-
ret =
|
261
|
+
ret = ''.dup
|
262
262
|
|
263
263
|
merged_functions(environment).sort { |a,b| a[0].to_s <=> b[0].to_s }.each do |name, hash|
|
264
264
|
ret << "#{name}\n#{"-" * name.to_s.length}\n"
|
@@ -88,7 +88,7 @@ module LoaderPaths
|
|
88
88
|
|
89
89
|
def typed_name(type, name_authority, relative_path, module_name)
|
90
90
|
# Module name is assumed to be included in the path and therefore not added here
|
91
|
-
n =
|
91
|
+
n = ''.dup
|
92
92
|
unless extension.empty?
|
93
93
|
# Remove extension
|
94
94
|
relative_path = relative_path[0..-(extension.length+1)]
|
@@ -153,7 +153,7 @@ module LoaderPaths
|
|
153
153
|
end
|
154
154
|
|
155
155
|
def typed_name(type, name_authority, relative_path, module_name)
|
156
|
-
n =
|
156
|
+
n = ''.dup
|
157
157
|
n << module_name unless module_name.nil?
|
158
158
|
unless extension.empty?
|
159
159
|
# Remove extension
|
@@ -249,7 +249,7 @@ module LoaderPaths
|
|
249
249
|
end
|
250
250
|
|
251
251
|
def typed_name(type, name_authority, relative_path, module_name)
|
252
|
-
n =
|
252
|
+
n = ''.dup
|
253
253
|
n << module_name unless module_name.nil?
|
254
254
|
|
255
255
|
# Remove the file extension, defined as everything after the *last* dot.
|
@@ -351,7 +351,7 @@ module LoaderPaths
|
|
351
351
|
if @init_filenames.include?(relative_path) && !(module_name.nil? || module_name.empty?)
|
352
352
|
TypedName.new(type, module_name, name_authority)
|
353
353
|
else
|
354
|
-
n =
|
354
|
+
n = ''.dup
|
355
355
|
n << module_name unless module_name.nil?
|
356
356
|
ext = @extensions.find { |extension| relative_path.end_with?(extension) }
|
357
357
|
relative_path = relative_path[0..-(ext.length+1)]
|