diff --git a/config/blobs.yml b/config/blobs.yml index 1ca9d4745cf..64a7f9f7412 100644 --- a/config/blobs.yml +++ b/config/blobs.yml @@ -1,15 +1,15 @@ -azure-storage-cli/azure-storage-cli-0.0.80-linux-amd64: +azure-storage-cli/azure-storage-cli-0.0.82-linux-amd64: size: 8824052 - object_id: df2f33c5-ed5d-4282-4829-a60ea4cbc53a - sha: sha256:959015ad18354817aecb3d4c227c3b01fd68726ff030ab54935a28b8e691d219 -bosh-gcscli/bosh-gcscli-0.0.213-linux-amd64: - size: 21236945 - object_id: 83e9014d-6d71-4b82-4ebc-fb2a663639e2 - sha: sha256:8938d61fbdd008d3b58eab910c3745dcf645670695c894d0eefb22d3dbf399fc -davcli/davcli-0.0.330-linux-amd64: + object_id: 9106bff1-5729-46d2-79bd-d0c5ca20c809 + sha: sha256:f5ef5b02e00ffb63b2b56f07a114ca956d8c502144f040cfce3d071d2ab5d096 +bosh-gcscli/bosh-gcscli-0.0.215-linux-amd64: + size: 21223798 + object_id: d12c4703-4554-4262-5710-4285f0e4fa2c + sha: sha256:5a722e973216fb9fa519b417f960ddce738eae4501dcaea0634258931b389a80 +davcli/davcli-0.0.332-linux-amd64: size: 8737766 - object_id: bfc9720f-6ad1-4d40-6dd9-4c76bbb84fc6 - sha: sha256:f1de74dd934bac77c68fa6a7783b530f5fdbfaaa0ef6bb052d13adfd42f82798 + object_id: 8f354bb6-db20-4e3c-62ff-b21bd331ab94 + sha: sha256:0a9639ef8a85214faff60c818050d75ffc31c41fe43d6e48f2403b1f9b62aaec mysql/mariadb-connector-c-3.3.8-src.tar.gz: size: 1393368 object_id: 1f7670c3-efd4-4bd9-7b91-c0a26ca854bb @@ -30,11 +30,11 @@ postgres/postgresql-15.6.tar.gz: size: 30299236 object_id: 8cc25480-8de8-4f0b-56a2-b359ff6838dc sha: sha256:3a08314af1714671213a8a4f6bd646d0b1cdc94b029e8988944ab04d4b8cf2d2 -s3cli/s3cli-0.0.278-linux-amd64: - size: 18537400 - object_id: 0fd7c662-c598-46fd-4497-b729329be85e - sha: sha256:01a40e4be9bedeb6eac5af71171dd0e578fbf59d0186aabed1e091fe7fe67a4b -verify-multidigest/verify-multidigest-0.0.452-linux-amd64: +s3cli/s3cli-0.0.279-linux-amd64: + size: 18496144 + object_id: a4445869-9b78-431b-5448-11810142b89c + sha: sha256:125f4a5f6e6fbdab8408e72b8466896613993b139e413ac4204bcd8348fceac9 +verify-multidigest/verify-multidigest-0.0.454-linux-amd64: size: 3314041 - object_id: ed21c93b-7325-479b-5ffe-2d6df70282f1 - sha: sha256:199dc8c9327df798f0cd4f150edf9f881edcebfc18cd53aa27ab123a15fa29b8 + object_id: ee7ade8e-e052-46ab-66d7-310b5b99bfc8 + sha: sha256:72bd943df316963a87ae23a1789ee7956547d7b461dfa9a1a9bc720bd2ce418c diff --git a/src/Gemfile.lock b/src/Gemfile.lock index 9333bb3d8e4..db7ec5b94c9 100644 --- a/src/Gemfile.lock +++ b/src/Gemfile.lock @@ -120,12 +120,12 @@ GEM addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) ast (2.4.2) - async (2.9.0) + async (2.10.1) console (~> 1.10) fiber-annotation io-event (~> 1.5, >= 1.5.1) timers (~> 4.1) - async-http (0.63.0) + async-http (0.64.0) async (>= 1.25) async-io (>= 1.28) async-pool (>= 0.2) @@ -133,7 +133,7 @@ GEM protocol-http1 (~> 0.18.0) protocol-http2 (~> 0.16.0) traces (>= 0.10.0) - async-io (1.41.0) + async-io (1.42.0) async async-pool (0.4.0) async (>= 1.25) @@ -161,7 +161,7 @@ GEM coderay (1.1.3) concurrent-ruby (1.2.3) connection_pool (2.4.1) - console (1.23.5) + console (1.23.6) fiber-annotation fiber-local json @@ -176,7 +176,7 @@ GEM multi_json domain_name (0.6.20240107) drb (2.2.1) - et-orbi (1.2.9) + et-orbi (1.2.11) tzinfo factory_bot (6.4.6) activesupport (>= 5.0.0) @@ -220,11 +220,11 @@ GEM concurrent-ruby (~> 1.0) net-protocol (0.2.2) timeout - net-smtp (0.4.0.1) + net-smtp (0.5.0) net-protocol net-ssh (7.2.1) netrc (0.11.0) - nio4r (2.7.0) + nio4r (2.7.1) openssl (3.2.0) parallel (1.24.0) parallel_tests (2.32.0) @@ -255,7 +255,7 @@ GEM nio4r (~> 2.0) raabro (1.4.0) racc (1.7.3) - rack (2.2.8.1) + rack (2.2.9) rack-protection (2.2.4) rack rack-test (2.1.0) diff --git a/src/bosh-director/lib/bosh/director/deployment_plan/ip_provider/ip_repo.rb b/src/bosh-director/lib/bosh/director/deployment_plan/ip_provider/ip_repo.rb index f4a50b87631..b23e56c1379 100644 --- a/src/bosh-director/lib/bosh/director/deployment_plan/ip_provider/ip_repo.rb +++ b/src/bosh-director/lib/bosh/director/deployment_plan/ip_provider/ip_repo.rb @@ -85,9 +85,9 @@ def try_to_allocate_dynamic_ip(reservation, subnet) addresses_we_cant_allocate.merge(subnet.static_ips.to_a) unless subnet.static_ips.empty? addr = find_first_available_address(addresses_we_cant_allocate, first_range_address) if subnet.range.version == 6 - ip_address = NetAddr::CIDRv6.new(addr) + ip_address = NetAddr::CIDR.create(addr, Version: 6) else - ip_address = NetAddr::CIDRv4.new(addr) + ip_address = NetAddr::CIDR.create(addr, Version: 4) end unless subnet.range == ip_address || subnet.range.contains?(ip_address) @@ -115,7 +115,7 @@ def try_to_allocate_vip_ip(reservation, subnet) raise NoMoreIPsAvailableAndStopRetrying if available_ips.empty? - ip_address = NetAddr::CIDRv4.new(available_ips.first) + ip_address = NetAddr::CIDR.create(available_ips.first, Version: 4) save_ip(ip_address, reservation, false) diff --git a/src/bosh-director/lib/cloud/dummy.rb b/src/bosh-director/lib/cloud/dummy.rb index a9f15abe8d6..b2b32462e98 100644 --- a/src/bosh-director/lib/cloud/dummy.rb +++ b/src/bosh-director/lib/cloud/dummy.rb @@ -96,7 +96,7 @@ def create_vm(agent_id, stemcell_id, cloud_properties, networks, disk_cids, env) elsif cloud_properties['az_name'] ip_address = cmd.ip_address_for_az(cloud_properties['az_name']) else - ip_address = NetAddr::CIDRv4.new(rand(0..4294967295)).ip #collisions? + ip_address = NetAddr::CIDR.create(rand(0..4294967295), Version: 4).ip #collisions? end if ip_address diff --git a/src/vendor/cache/async-2.10.1.gem b/src/vendor/cache/async-2.10.1.gem new file mode 100644 index 00000000000..4f8d368598b --- /dev/null +++ b/src/vendor/cache/async-2.10.1.gem @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ec103b51792ceaa74efcf3cc943d43231335b17d3a0fc27ea5a424703e0330ec +size 28672 diff --git a/src/vendor/cache/async-2.9.0.gem b/src/vendor/cache/async-2.9.0.gem deleted file mode 100644 index e60f78e81aa..00000000000 --- a/src/vendor/cache/async-2.9.0.gem +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:460378ebc2e054a7b2eb5aa36b3a94ec81ef91ccc9e5c62400ed695b48838773 -size 28160 diff --git a/src/vendor/cache/async-http-0.63.0.gem b/src/vendor/cache/async-http-0.63.0.gem deleted file mode 100644 index ab673225157..00000000000 --- a/src/vendor/cache/async-http-0.63.0.gem +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f6584d786e79af85fe86aec3e9ea85d3ff5c3d5d932de720c79f5c03896b4c2e -size 33792 diff --git a/src/vendor/cache/async-http-0.64.0.gem b/src/vendor/cache/async-http-0.64.0.gem new file mode 100644 index 00000000000..236b0cbad93 --- /dev/null +++ b/src/vendor/cache/async-http-0.64.0.gem @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2f04a7def507f33eb52c3a569f740d526783119a56e7d1ed4d687b74ce194eb4 +size 33792 diff --git a/src/vendor/cache/async-io-1.41.0.gem b/src/vendor/cache/async-io-1.41.0.gem deleted file mode 100644 index 0fb0f029759..00000000000 --- a/src/vendor/cache/async-io-1.41.0.gem +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:98cd2a0b351b7840419f43621d9a999dedfad7358f23da680dc53a20310495f1 -size 27648 diff --git a/src/vendor/cache/async-io-1.42.0.gem b/src/vendor/cache/async-io-1.42.0.gem new file mode 100644 index 00000000000..b74d62aaffe --- /dev/null +++ b/src/vendor/cache/async-io-1.42.0.gem @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:302fd7623613535ac5b28db6301f3bb44af17fa1de7f374bec00ea03f46d268d +size 27648 diff --git a/src/vendor/cache/console-1.23.5.gem b/src/vendor/cache/console-1.23.5.gem deleted file mode 100644 index a9029ac87d2..00000000000 --- a/src/vendor/cache/console-1.23.5.gem +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:58a14b0448778ddc9be7c9a1d8f746a177f25e54fff79e41c7ca65c2535a959e -size 21504 diff --git a/src/vendor/cache/console-1.23.6.gem b/src/vendor/cache/console-1.23.6.gem new file mode 100644 index 00000000000..20f74975952 --- /dev/null +++ b/src/vendor/cache/console-1.23.6.gem @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:91e562701f6f4748f0e58c13e124dd3528f9fa7695519727233c580c1504cdc1 +size 21504 diff --git a/src/vendor/cache/et-orbi-1.2.11.gem b/src/vendor/cache/et-orbi-1.2.11.gem new file mode 100644 index 00000000000..59dc5e0a9cf --- /dev/null +++ b/src/vendor/cache/et-orbi-1.2.11.gem @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d26e868cc21db88280a9ec1a50aa3da5d267eb9b2037ba7b831d6c2731f5df64 +size 18432 diff --git a/src/vendor/cache/et-orbi-1.2.9.gem b/src/vendor/cache/et-orbi-1.2.9.gem deleted file mode 100644 index 7873418cdbe..00000000000 --- a/src/vendor/cache/et-orbi-1.2.9.gem +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8367604f9d7abb8092286a76c7a06024842f9c76e215a4523fa7067d93b57ea0 -size 18432 diff --git a/src/vendor/cache/net-smtp-0.4.0.1.gem b/src/vendor/cache/net-smtp-0.4.0.1.gem deleted file mode 100644 index 8c804df85fa..00000000000 --- a/src/vendor/cache/net-smtp-0.4.0.1.gem +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:098d28fab9d9bc280a2cfada77692cdca89c83c6789bdbb8d8429f97f1bf5a33 -size 16896 diff --git a/src/vendor/cache/net-smtp-0.5.0.gem b/src/vendor/cache/net-smtp-0.5.0.gem new file mode 100644 index 00000000000..96191e23f13 --- /dev/null +++ b/src/vendor/cache/net-smtp-0.5.0.gem @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5fc0415e6ea1cc0b3dfea7270438ec22b278ca8d524986a3ae4e5ae8d087b42a +size 17920 diff --git a/src/vendor/cache/nio4r-2.7.0.gem b/src/vendor/cache/nio4r-2.7.0.gem deleted file mode 100644 index a4888344757..00000000000 --- a/src/vendor/cache/nio4r-2.7.0.gem +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9586a685eca8246d6406e712a525e705d15bb88f709d78fc3f141e864df97276 -size 124416 diff --git a/src/vendor/cache/nio4r-2.7.1.gem b/src/vendor/cache/nio4r-2.7.1.gem new file mode 100644 index 00000000000..d11bcb7090a --- /dev/null +++ b/src/vendor/cache/nio4r-2.7.1.gem @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:559c9bb19b1aee94e7f3da2e0dbcaecd3a681b653303ba1a94a68b22635c3c96 +size 124416 diff --git a/src/vendor/cache/rack-2.2.8.1.gem b/src/vendor/cache/rack-2.2.8.1.gem deleted file mode 100644 index ccb8e6511e0..00000000000 --- a/src/vendor/cache/rack-2.2.8.1.gem +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a7121de625e86133e0cdd03ff281642a712b628dee86eb8818db42432198b782 -size 152064 diff --git a/src/vendor/cache/rack-2.2.9.gem b/src/vendor/cache/rack-2.2.9.gem new file mode 100644 index 00000000000..036aed5f8ee --- /dev/null +++ b/src/vendor/cache/rack-2.2.9.gem @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fd6301a97a1c1e955e68f85c861fcb1cde6145a32c532e1ea321a72ff8cc4042 +size 152576