Upgrade to Ruby 4.0

.final_builds/packages/ruby-4.0/index.yml

@@ -0,0 +1,10 @@
+builds:
+  1c57129111fddc1177f567ea243bb538a8087297eb916e61444e2fb27408b25d:
+    version: 1c57129111fddc1177f567ea243bb538a8087297eb916e61444e2fb27408b25d
+    blobstore_id: 35e7e099-6aa1-4def-5131-b4d40906479b
+    sha1: sha256:5962350916c57b180cc2453aa098d868ee17cef9610dabe8257fe1989779c29a
+  e33c6fb21a7a9e5cbf9df3cc9a23ee245e38227d64739abf95c7b9622866b0a8:
+    version: e33c6fb21a7a9e5cbf9df3cc9a23ee245e38227d64739abf95c7b9622866b0a8
+    blobstore_id: 514f174a-60a2-4e24-52cf-562f7217296d
+    sha1: sha256:7b55b7b74effac308b3fec4e2b915142686182d667445ab667ee02f426100700
+format-version: "2"

.final_builds/packages/rust-1-linux/index.yml

@@ -1,6 +1,6 @@
 builds:
   9d04c35339688bfab109d4685fa9adad9d4a87050c73850e180d95172cbf13a0:
     version: 9d04c35339688bfab109d4685fa9adad9d4a87050c73850e180d95172cbf13a0
-    blobstore_id: 0b11647b-eb41-42c2-74cc-17a1471a6009
+    blobstore_id: 7a389dcc-7459-481e-6bb3-a9c0ff18930c
     sha1: sha256:495c7122dfe102d7f994e8c00dd0e149235870eda2e6f00468dac750f2802609
 format-version: "2"

.ruby-version

@@ -1 +1 @@
-3.3.12
+4.0.6

jobs/blobstore_benchmark/spec

@@ -16,7 +16,7 @@ templates:
 packages:
   - capi_utils
   - cloud_controller_ng
-  - ruby-3.3
+  - ruby-4.0
   - jemalloc
   - storage-cli
   - mariadb_connector_c

jobs/cc_deployment_updater/spec

@@ -42,7 +42,7 @@ packages:
   - libpq
   - jemalloc
   - mariadb_connector_c
-  - ruby-3.3
+  - ruby-4.0
 
 consumes:
 - name: database

jobs/cloud_controller_clock/spec

@@ -43,7 +43,7 @@ packages:
   - libpq
   - jemalloc
   - mariadb_connector_c
-  - ruby-3.3
+  - ruby-4.0
 
 consumes:
 - name: database

jobs/cloud_controller_ng/spec

@@ -77,7 +77,7 @@ packages:
   - libpq
   - jemalloc
   - mariadb_connector_c
-  - ruby-3.3
+  - ruby-4.0
 
 provides:
 - name: cloud_controller

jobs/cloud_controller_ng/templates/shutdown_drain.rb.erb

@@ -1,4 +1,4 @@
-#!/var/vcap/packages/ruby-3.3/bin/ruby --disable-all
+#!/var/vcap/packages/ruby-4.0/bin/ruby --disable-all
 
 $LOAD_PATH.unshift('/var/vcap/packages/cloud_controller_ng/cloud_controller_ng/app')
 $LOAD_PATH.unshift('/var/vcap/packages/cloud_controller_ng/cloud_controller_ng/lib')

jobs/cloud_controller_worker/spec

@@ -51,7 +51,7 @@ packages:
   - libpq
   - jemalloc
   - mariadb_connector_c
-  - ruby-3.3
+  - ruby-4.0
 
 consumes:
 - name: database

jobs/cloud_controller_worker/templates/shutdown_drain.rb.erb

@@ -1,4 +1,4 @@
-#!/var/vcap/packages/ruby-3.3/bin/ruby --disable-all
+#!/var/vcap/packages/ruby-4.0/bin/ruby --disable-all
 
 $LOAD_PATH.unshift('/var/vcap/packages/cloud_controller_ng/cloud_controller_ng/app')
 $LOAD_PATH.unshift('/var/vcap/packages/cloud_controller_ng/cloud_controller_ng/lib')

jobs/rotate_cc_database_key/spec

@@ -16,7 +16,7 @@ packages:
   - libpq
   - jemalloc
   - mariadb_connector_c
-  - ruby-3.3
+  - ruby-4.0
 
 consumes:
 - name: cloud_controller_db

packages/cloud_controller_ng/packaging

@@ -1,7 +1,7 @@
 set -e -x
 
 # shellcheck disable=1090
-source "${BOSH_PACKAGES_DIR:-/var/vcap/packages}/ruby-3.3/bosh/compile.env"
+source "${BOSH_PACKAGES_DIR:-/var/vcap/packages}/ruby-4.0/bosh/compile.env"
 cp -a * ${BOSH_INSTALL_TARGET}
 cd ${BOSH_INSTALL_TARGET}/cloud_controller_ng
 
@@ -15,7 +15,8 @@ gem install --local vendor/cache/bundler-${BUNDLER_VERSION}.gem
 
 bundle config build.pg --with-pg-lib=$libpq_dir/lib --with-pg-include=$libpq_dir/include
 bundle config build.mysql2 --with-mysql-config=$mariadb_dir/bin/mariadb_config-wrapper.sh
-bosh_bundle_local --deployment
+bundle config set deployment true
+bosh_bundle_local
 
 # remove world-writable permissions on files if a gem has them
 chmod -R o-w ../gem_home

packages/cloud_controller_ng/spec

@@ -3,7 +3,7 @@ name: cloud_controller_ng
 dependencies:
 - libpq
 - mariadb_connector_c
-- ruby-3.3
+- ruby-4.0
 
 files:
 - cloud_controller_ng/{.ruby-version,Rakefile,Gemfile,Gemfile.lock}

packages/nginx_newrelic_plugin/packaging

@@ -1,13 +1,14 @@
 set -ex
 # shellcheck disable=1090
 
-source "${BOSH_PACKAGES_DIR:-/var/vcap/packages}/ruby-3.3/bosh/compile.env"
+source "${BOSH_PACKAGES_DIR:-/var/vcap/packages}/ruby-4.0/bosh/compile.env"
 
 echo "Installing nginx newrelic plugin"
 
 cp -a nginx/newrelic_nginx_agent/* ${BOSH_INSTALL_TARGET}
 
 # Forcing an update to get BOSH to recompile this package
 pushd ${BOSH_INSTALL_TARGET}
-  bosh_bundle_local --deployment
+  bundle config set deployment true
+  bosh_bundle_local
 popd

packages/nginx_newrelic_plugin/spec

@@ -1,6 +1,6 @@
 ---
 name: nginx_newrelic_plugin
 dependencies:
-- ruby-3.3
+- ruby-4.0
 files:
 - nginx/newrelic_nginx_agent-1.2.1.tar.gz

packages/ruby-4.0/spec.lock

@@ -0,0 +1,4 @@
+name: ruby-4.0
+fingerprint: e33c6fb21a7a9e5cbf9df3cc9a23ee245e38227d64739abf95c7b9622866b0a8
+dependencies:
+- rust-1-linux

shared_job_templates/ruby_version.sh.erb

@@ -1,5 +1,5 @@
 # shellcheck disable=1090
-source "${BOSH_PACKAGES_DIR:-/var/vcap/packages}/ruby-3.3/bosh/runtime.env"
+source "${BOSH_PACKAGES_DIR:-/var/vcap/packages}/ruby-4.0/bosh/runtime.env"
 
 CC_PACKAGE_DIR="${BOSH_PACKAGES_DIR:-/var/vcap/packages}/cloud_controller_ng"
 BUNDLER_VERSION=$(grep "BUNDLED WITH" ${CC_PACKAGE_DIR}/cloud_controller_ng/Gemfile.lock -A 1 | grep -v "BUNDLED" | awk '{print $1}')

spec/Gemfile

@@ -3,6 +3,7 @@
 source 'https://rubygems.org'
 
 group :develop do
+  gem 'ostruct'
   gem 'rubocop'
   gem 'rubocop-capybara'
   gem 'rubocop-factory_bot'

spec/Gemfile.lock

@@ -8,6 +8,7 @@ GEM
     json (2.21.2)
     language_server-protocol (3.17.0.6)
     lint_roller (1.1.0)
+    ostruct (0.6.3)
     parallel (2.1.0)
     parser (3.3.12.0)
       ast (~> 2.4.1)
@@ -68,6 +69,7 @@ PLATFORMS
 
 DEPENDENCIES
   bosh-template
+  ostruct
   rspec
   rubocop
   rubocop-capybara