Skip to content

Commit 4e751f5

Browse files
committed
(PE-38079) Gem updates to prepare for upcomming pe release
This commit updates runtimes that package up bolt with latest gem dependencies. This includes bolt packages, bolt/ace server, and installer packages.
1 parent 71e0463 commit 4e751f5

35 files changed

+86
-73
lines changed

configs/components/rubygem-CFPropertyList.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
component 'rubygem-CFPropertyList' do |pkg, settings, platform|
22
if settings[:ruby_version].to_f >= 3.2
3-
pkg.version '3.0.6'
4-
pkg.md5sum 'a10c1a40d093160f7264c0985b89881d'
3+
pkg.version '3.0.7'
4+
pkg.md5sum 'ed89ce5e7074a6f8e8b8e744eaf014d0'
55
else
66
pkg.version '2.3.6'
77
pkg.md5sum 'ae4086185992f293ffab1641b83286a5'
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
component "rubygem-addressable" do |pkg, settings, platform|
2-
pkg.version "2.8.5"
3-
pkg.sha256sum "63f0fbcde42edf116d6da98a9437f19dd1692152f1efa3fcc4741e443c772117"
2+
pkg.version "2.8.6"
3+
pkg.sha256sum "798f6af3556641a7619bad1dce04cdb6eb44b0216a991b0396ea7339276f2b47"
44

55
instance_eval File.read('configs/components/_base-rubygem.rb')
66
end
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
component "rubygem-aws-eventstream" do |pkg, settings, platform|
2-
pkg.version "1.2.0"
3-
pkg.md5sum "47689acbf31e71cd5fb3877cce3d9d58"
2+
pkg.version "1.3.0"
3+
pkg.md5sum "e50f43c1f2d7805bbeaa155c6b52e033"
44

55
instance_eval File.read('configs/components/_base-rubygem.rb')
66
end
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
component "rubygem-aws-partitions" do |pkg, settings, platform|
2-
pkg.version "1.831.0"
3-
pkg.md5sum "9a25c0714eb323e8b2f8b77ac1b86b0c"
2+
pkg.version "1.913.0"
3+
pkg.md5sum "6231fd992c84e56941488776aa0be8b5"
44

55
instance_eval File.read('configs/components/_base-rubygem.rb')
66
end
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
component "rubygem-aws-sdk-core" do |pkg, settings, platform|
2-
pkg.version "3.185.0"
3-
pkg.md5sum "834895779a8bc78112f26492688c8295"
2+
pkg.version "3.191.6"
3+
pkg.md5sum "cdce9ffd297496550ec650fe7c0f0c0e"
44

55
instance_eval File.read('configs/components/_base-rubygem.rb')
66
end
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
component "rubygem-aws-sdk-ec2" do |pkg, settings, platform|
2-
pkg.version "1.411.0"
3-
pkg.md5sum "1f915f9bb6344d054a29c17478789460"
2+
pkg.version "1.448.0"
3+
pkg.md5sum "79f7f0f2fd051cedda210399d45590c6"
44

55
instance_eval File.read('configs/components/_base-rubygem.rb')
66
end
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
component "rubygem-aws-sigv4" do |pkg, settings, platform|
2-
pkg.version "1.6.0"
3-
pkg.md5sum "a5a45f14886bbdcff038262a80dc4c75"
2+
pkg.version "1.8.0"
3+
pkg.md5sum "586f3e0e914c67bae0b8793e64347c03"
44

55
instance_eval File.read('configs/components/_base-rubygem.rb')
66
end

configs/components/rubygem-base64.rb

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
component 'rubygem-bas64' do |pkg, settings, platform|
2+
pkg.version '0.2.0'
3+
pkg.md5sum 'fe02f4347a5846f79f4d4615edababd3'
4+
5+
instance_eval File.read('configs/components/_base-rubygem.rb')
6+
end

configs/components/rubygem-bindata.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
component 'rubygem-bindata' do |pkg, settings, platform|
2-
pkg.version '2.4.15'
3-
pkg.md5sum '55ccdea22d70273b136e573dba9b97cf'
2+
pkg.version '2.5.0'
3+
pkg.md5sum 'c893016c3b689893b033e12536faeeab'
44

55
instance_eval File.read('configs/components/_base-rubygem.rb')
66
end

configs/components/rubygem-concurrent-ruby.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
component 'rubygem-concurrent-ruby' do |pkg, settings, platform|
22
# Projects may define a :rubygem_concurrent_ruby_version setting
3-
version = settings[:rubygem_concurrent_ruby_version] || '1.2.2'
3+
version = settings[:rubygem_concurrent_ruby_version] || '1.2.3'
44
pkg.version version
55

66
case version
7-
when '1.2.2'
8-
pkg.sha256sum '3879119b8b75e3b62616acc256c64a134d0b0a7a9a3fcba5a233025bcde22c4f'
7+
when '1.2.3'
8+
pkg.sha256sum '82fdd3f8a0816e28d513e637bb2b90a45d7b982bdf4f3a0511722d2e495801e2'
99
else
1010
raise "rubygem-concurrent-ruby #{version} has not been configured; Cannot continue."
1111
end
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
component "rubygem-diff-lcs" do |pkg, settings, platform|
2-
pkg.version "1.5.0"
3-
pkg.sha256sum "49b934001c8c6aedb37ba19daec5c634da27b318a7a3c654ae979d6ba1929b67"
2+
pkg.version "1.5.1"
3+
pkg.sha256sum "273223dfb40685548436d32b4733aa67351769c7dea621da7d9dd4813e63ddfe"
44

55
instance_eval File.read('configs/components/_base-rubygem.rb')
66
end

configs/components/rubygem-facter.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
component 'rubygem-facter' do |pkg, settings, platform|
2-
pkg.version '4.5.0'
3-
pkg.md5sum 'b10500668a69db77ddb65907be2bd908'
2+
pkg.version '4.7.0'
3+
pkg.md5sum 'b77bcd4ed8ebf713717a89014b835830'
44

55
instance_eval File.read('configs/components/_base-rubygem.rb')
66
end

configs/components/rubygem-ffi.rb

+5-5
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
pkg.version '1.13.1'
1212
pkg.sha256sum '4e15f52ee45af7c5674d656041855448adbb5022618be252cd602d81b8e2978a'
1313
else
14-
pkg.version '1.15.5'
15-
pkg.sha256sum '6f2ed2fa68047962d6072b964420cba91d82ce6fa8ee251950c17fca6af3c2a0'
14+
pkg.version '1.16.3'
15+
pkg.sha256sum '6d3242ff10c87271b0675c58d68d3f10148fabc2ad6da52a18123f06078871fb'
1616
end
1717

1818
instance_eval File.read('configs/components/_base-rubygem.rb')
@@ -59,7 +59,7 @@
5959
case pkg.get_version
6060
when '1.9.25'
6161
pkg.sha256sum '5473ac958b78f271f53e9a88197c35cd3e990fbe625d21e525c56d62ae3750da'
62-
when '1.15.5'
62+
when '1.16.3'
6363
pkg.sha256sum '9acc4e474bef25dbcf827b1e6fce4067e9a1eff74a0296d25f0af392fafcd096'
6464
end
6565

@@ -70,8 +70,8 @@
7070
case pkg.get_version
7171
when '1.9.25'
7272
pkg.sha256sum '43d357732a6a0e3e41dc7e28a9c9c5112ac66f4a6ed9e1de40afba9ffcb836c1'
73-
when '1.15.5'
74-
pkg.sha256sum '6e52c39fdbbccc085ae05d489d1b835ce05dcdf2a4c88ba739e3b42afd2b5404'
73+
when '1.16.3'
74+
pkg.sha256sum 'ee49ccfa125f84a2f2053a0e6dd8433a34233479e026513ecbf06798ba542fe6'
7575
end
7676

7777
pkg.url "https://rubygems.org/downloads/ffi-#{pkg.get_version}-x86-mingw32.gem"

configs/components/rubygem-gettext.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
component "rubygem-gettext" do |pkg, settings, platform|
2-
version = settings[:rubygem_gettext_version] || '3.4.3'
2+
version = settings[:rubygem_gettext_version] || '3.4.9'
33
pkg.version version
44

55
case version
6-
when '3.4.3'
7-
pkg.sha256sum '1b98e1272d0f55a56f519ee86d24e0fcd114b94c9d10b26e72512d65f9174251'
6+
when '3.4.9'
7+
pkg.sha256sum '292864fe6a15c224cee4125a4a72fab426fdbb280e4cff3cfe44935f549b009a'
88
when '3.2.2'
99
pkg.sha256sum '9d250bb79273efb4a268977f219d2daca05cdc7473eff40288b8ab8ddd0f51b4'
1010
else
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
component "rubygem-json-schema" do |pkg, settings, platform|
2-
pkg.version "4.1.1"
3-
pkg.sha256sum "89a8399745a710c2c7be3ff9564f67a0ae982c82f7590a95ab9cebe374fa2d49"
2+
pkg.version "4.3.1"
3+
pkg.sha256sum "ac35bfabf99eea2b8b45fbccbb714b399fbe7824c621fc985048a9c2e45d58d2"
44

55
instance_eval File.read('configs/components/_base-rubygem.rb')
66
end

configs/components/rubygem-jwt.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
component "rubygem-jwt" do |pkg, settings, platform|
2-
pkg.version "2.2.3"
3-
pkg.md5sum "a25cbd9b40f8da7a40faad7a26b8153c"
2+
pkg.version "2.7.1"
3+
pkg.md5sum "d3a7ba14444b03f91c7d36b61519fe17"
44

55
instance_eval File.read('configs/components/_base-rubygem.rb')
66
end

configs/components/rubygem-locale.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
component "rubygem-locale" do |pkg, settings, platform|
2-
pkg.version "2.1.3"
3-
pkg.md5sum "f5bef9eed8e8c40417a3ab68fa34f477"
2+
pkg.version "2.1.4"
3+
pkg.md5sum "c324a7f34b94044f8d38eabff159de62"
44

55
instance_eval File.read('configs/components/_base-rubygem.rb')
66

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
component 'rubygem-multipart-post' do |pkg, settings, platform|
2-
pkg.version '2.3.0'
3-
pkg.md5sum '067cd7270a1f476ce71454d499213671'
2+
pkg.version '2.4.0'
3+
pkg.md5sum '626fd8b3f8cd080c1eccfa0e25d7bfed'
44

55
instance_eval File.read('configs/components/_base-rubygem.rb')
66
end

configs/components/rubygem-net-ssh.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
pkg.version version
55

66
case version
7-
when "7.0.1"
8-
pkg.md5sum "2ac500ae0a9c578b64d8c3a4bff741c0"
7+
when "7.2.3"
8+
pkg.md5sum "be25f70538cb8dcde68d924f001d75df"
99
when "6.1.0"
1010
pkg.md5sum "383afadb1bd66a458a5d8d2d60736b3d"
1111
when "5.2.0"

configs/components/rubygem-nkf.rb

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
component 'rubygem-nkf' do |pkg, settings, platform|
2+
pkg.version '0.2.0'
3+
pkg.md5sum '7a0af896fa45703c594cf0535096a8ed'
4+
5+
instance_eval File.read('configs/components/_base-rubygem.rb')
6+
end

configs/components/rubygem-optimist.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
component 'rubygem-optimist' do |pkg, settings, _platform|
2-
pkg.version '3.0.1'
3-
pkg.md5sum 'ce7ee8dac7e34793756680c2af9a8ee9'
2+
pkg.version '3.1.0'
3+
pkg.md5sum 'bd9b5fc3bfba641766817760cc8b58e9'
44

55
instance_eval File.read('configs/components/_base-rubygem.rb')
66

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
component 'rubygem-public_suffix' do |pkg, _settings, _platform|
2-
pkg.version '5.0.1'
3-
pkg.md5sum '504e45c1f5f7b629e46e4deef7d0f46f'
2+
pkg.version '5.0.5'
3+
pkg.md5sum '1e6879068c1bc976a0ba890a4b11b24d'
44

55
instance_eval File.read('configs/components/_base-rubygem.rb')
66
end

configs/components/rubygem-puppet-strings.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
# 2021.7.x LTS has a jruby that does not work with puppet-strings
33
# version 4.y. The 4 series requires ruby >= 2.7
44
# Default to 4.x sereies but allow it to be configuratble by project.
5-
version = settings[:rubygem_puppet_strings_version] || '4.1.0'
5+
version = settings[:rubygem_puppet_strings_version] || '4.1.2'
66
pkg.version(version)
77

88
case version
99
when '3.0.1'
1010
pkg.md5sum '7c9a8936509a0434c39975a75197472c'
11-
when '4.1.0'
12-
pkg.md5sum 'd8259d8a9144757f4e78f118b59e2681'
11+
when '4.1.2'
12+
pkg.md5sum 'e19f3fdc60692df346d1a348ab9facee'
1313
else
1414
raise "Invalid version #{version} for rubygem-puppet-strings; Cannot continue."
1515
end

configs/components/rubygem-puppet.rb

+4-8
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,10 @@
1313
#
1414
# Always use the generic version below
1515
case version
16-
when '8.3.1'
17-
pkg.md5sum '9cff495eff59639fce989dceeff34560'
18-
when '8.0.1'
19-
pkg.md5sum '7e87d988e485c0f0c3d6ef76bd39409d'
20-
when '7.27.0'
21-
pkg.md5sum '6a49f375dffe5f786ed474b3eaaaf931'
22-
when '7.26.0'
23-
pkg.md5sum '347ec39281f59232be5cbb47daf9b539'
16+
when '8.6.0'
17+
pkg.md5sum '5ac831a42a5fbaef9c6e320c64bbcbd5'
18+
when '7.30.0'
19+
pkg.md5sum '1b36ae786efdf3c91edf60f60af54af7'
2420
when '6.28.0'
2521
pkg.md5sum '31520d986869f9362c88c7d6a4a5c103'
2622
else
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
component "rubygem-puppetfile-resolver" do |pkg, settings, platform|
2-
pkg.version "0.6.2"
3-
pkg.md5sum "e0b40ef4258d32d6d47857b1eb4a5acf"
2+
pkg.version "0.6.3"
3+
pkg.md5sum "8377387749cf0fcfcfd9f8c0c6baaf0c"
44

55
instance_eval File.read('configs/components/_base-rubygem.rb')
66
end

configs/components/rubygem-semantic_puppet.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
component "rubygem-semantic_puppet" do |pkg, settings, platform|
22
# Projects may define a :rubygem_semantic_puppet_version setting, or we use 1.0.4 by default
3-
version = settings[:rubygem_semantic_puppet_version] || '1.0.4'
3+
version = settings[:rubygem_semantic_puppet_version] || '1.1.0'
44
pkg.version version
55

66
case version
77
when '0.1.2'
88
pkg.md5sum '192ae7729997cb5d5364f64b99b13121'
9-
when '1.0.4'
10-
pkg.sha256sum "5d8380bf733c1552ef77e06a7c44a6d5b48def7d390ecf3bd71cad477f5ce13d"
9+
when '1.1.0'
10+
pkg.sha256sum "52d108d08e1a5d95c00343cb3a4936fb1deecff2be612ec39c9cb66be5a8b859"
1111
else
1212
raise "rubygem-semantic_puppet version #{version} has not been configured; Cannot continue."
1313
end

configs/components/rubygem-yard.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
component 'rubygem-yard' do |pkg, settings, platform|
2-
pkg.version '0.9.34'
3-
pkg.md5sum '9c8530eaaf9acf6fd32ee4b51119e46a'
2+
pkg.version '0.9.36'
3+
pkg.md5sum 'ffaaaaafc1257e3bb98aea44fa47c05d'
44

55
instance_eval File.read('configs/components/_base-rubygem.rb')
66
end

configs/projects/_shared-pe-bolt-server.rb

+3-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
# Set desired versions for gem components that offer multiple versions:
3737
# TODO: Can runtime projects use these updated versions?
3838
proj.setting(:rubygem_deep_merge_version, '1.2.2')
39-
proj.setting(:rubygem_net_ssh_version, '7.0.1')
39+
proj.setting(:rubygem_net_ssh_version, '7.2.3')
4040

4141
# (pe-bolt-server does not run on Windows, so only the *nix path is here)
4242
proj.setting(:prefix, '/opt/puppetlabs/server/apps/bolt-server')
@@ -110,6 +110,7 @@
110110
proj.component('rubygem-aws-sdk-core')
111111
proj.component('rubygem-aws-sdk-ec2')
112112
proj.component('rubygem-aws-sigv4')
113+
proj.component('rubygem-base64')
113114
proj.component('rubygem-bcrypt_pbkdf')
114115
proj.component('rubygem-bindata')
115116
proj.component('rubygem-builder')
@@ -140,6 +141,7 @@
140141
proj.component('rubygem-net-scp')
141142
proj.component('rubygem-net-ssh')
142143
proj.component('rubygem-net-ssh-krb')
144+
proj.component('rubygem-nkf')
143145
proj.component('rubygem-rubyntlm')
144146
proj.component('rubygem-nori')
145147
proj.component('rubygem-orchestrator_client')

configs/projects/_shared-pe-bolt-server_with_ruby.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
# Set desired versions for gem components that offer multiple versions:
4444
# TODO: Can runtime projects use these updated versions?
4545
proj.setting(:rubygem_deep_merge_version, '1.2.2')
46-
proj.setting(:rubygem_net_ssh_version, '7.0.1')
46+
proj.setting(:rubygem_net_ssh_version, '7.2.3')
4747

4848
# (pe-bolt-server does not run on Windows, so only the *nix path is here)
4949
proj.setting(:prefix, '/opt/puppetlabs/server/apps/bolt-server')

configs/projects/_shared-pe-installer-runtime.rb

+2
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@
9393
proj.component('rubygem-aws-sdk-core')
9494
proj.component('rubygem-aws-sdk-ec2')
9595
proj.component('rubygem-aws-sigv4')
96+
proj.component('rubygem-base64')
9697
proj.component('rubygem-bcrypt_pbkdf')
9798
proj.component('rubygem-bindata')
9899
proj.component('rubygem-builder')
@@ -121,6 +122,7 @@
121122
proj.component('rubygem-net-http-persistent')
122123
proj.component('rubygem-net-scp')
123124
proj.component('rubygem-net-ssh-krb')
125+
proj.component('rubygem-nkf')
124126
proj.component('rubygem-nori')
125127
proj.component('rubygem-rubyntlm')
126128
proj.component('rubygem-orchestrator_client')

configs/projects/bolt-runtime.rb

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
proj.setting(:augeas_version, '1.11.0')
88
# TODO: Can runtime projects use these updated versions?
99
proj.setting(:rubygem_deep_merge_version, '1.2.2')
10-
proj.setting(:rubygem_puppet_version, '7.27.0')
10+
proj.setting(:rubygem_puppet_version, '7.30.0')
1111

1212
platform = proj.get_platform
1313

@@ -166,6 +166,7 @@
166166
proj.component 'rubygem-aws-sdk-core'
167167
proj.component 'rubygem-aws-sdk-ec2'
168168
proj.component 'rubygem-aws-sigv4'
169+
proj.component 'rubygem-base64'
169170
proj.component 'rubygem-bindata'
170171
proj.component 'rubygem-builder'
171172
proj.component 'rubygem-CFPropertyList'
@@ -193,6 +194,7 @@
193194
proj.component 'rubygem-net-scp'
194195
proj.component 'rubygem-net-ssh'
195196
proj.component 'rubygem-net-ssh-krb'
197+
proj.component 'rubygem-nkf'
196198
proj.component 'rubygem-nori'
197199
proj.component 'rubygem-orchestrator_client'
198200
proj.component 'rubygem-paint'

configs/projects/pe-bolt-server-runtime-2021.7.x.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
project 'pe-bolt-server-runtime-2021.7.x' do |proj|
22
proj.setting(:pe_version, '2021.7')
3-
proj.setting(:rubygem_puppet_version, '7.27.0')
3+
proj.setting(:rubygem_puppet_version, '7.30.0')
44
proj.setting(:rubygem_puppet_strings_version, '3.0.1')
55
proj.setting(:rubygem_net_ssh_version, '6.1.0')
66
# We build bolt server with the ruby installed in the puppet-agent dep. For ruby 2.7 we need to use a --no-document flag

configs/projects/pe-bolt-server-runtime-main.rb

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
project 'pe-bolt-server-runtime-main' do |proj|
22
proj.setting(:pe_version, 'main')
3-
proj.setting(:rubygem_puppet_version, '8.3.1')
4-
proj.setting(:rubygem_net_ssh_version, '7.0.1')
3+
proj.setting(:rubygem_puppet_version, '8.6.0')
54
# We build bolt server with the ruby installed in the puppet-agent dep. For ruby 2.7 we need to use a --no-document flag
65
# for gem installs instead of --no-ri --no-rdoc. This setting allows us to use this while we support both ruby 2.5 and 2.7
76
# Once we are no longer using ruby 2.5 we can update.

0 commit comments

Comments
 (0)