Merge remote-tracking branch 'origin/main' into dependabot/bundler/uri-1.0.3

Author: jochenehret

.github/workflows/bump_bbs_protos.yml

@@ -9,7 +9,7 @@ jobs:
   update-protos:
     runs-on: ubuntu-latest
     permissions:
-      contents: read
+      contents: write
       pull-requests: write
     steps:
       - uses: hmarr/debug-action@v3
@@ -26,28 +26,22 @@ jobs:
 
       - name: Install protoc
         run: |
-          wget -q -O /tmp/protoc.zip https://github.com/protocolbuffers/protobuf/releases/download/v3.6.1/protoc-3.6.1-linux-x86_64.zip
-          sudo unzip -q /tmp/protoc.zip -d /usr/local
+          wget -q -O /tmp/protoc.zip https://github.com/protocolbuffers/protobuf/releases/download/v30.2/protoc-30.2-linux-x86_64.zip
+          unzip -q /tmp/protoc.zip -d /tmp/protoc
           rm /tmp/protoc.zip
-          wget -q -O /tmp/protobuf.zip https://github.com/protocolbuffers/protobuf/archive/v3.6.1.zip
-          unzip -q /tmp/protobuf.zip -d /tmp
-          sudo cp -r /tmp/protobuf-3.6.1/src/google /usr/local/include/
+
+          sudo mv /tmp/protoc/bin/protoc /usr/local/bin/protoc
+          sudo cp -r /tmp/protoc/include/google /usr/local/include/
           sudo chmod -R 755 /usr/local/include/google
-          rm -rf /tmp/protobuf.zip /tmp/protobuf-3.6.1
+          rm -rf /tmp/protoc
           export PATH=$PATH:/usr/local/bin
 
-      - name: Clone gogo/protobuf
-        run: |
-          PROTO_SRC=$(mktemp -d)
-          git clone https://github.com/gogo/protobuf.git "$PROTO_SRC/github.com/gogo/protobuf"
-          echo "PROTO_SRC=$PROTO_SRC" >> $GITHUB_ENV
-
       - name: Generate Ruby files from protos
         run: |
           RUBY_OUT=$(mktemp -d)
           pushd bbs > /dev/null
-            sed -i'' -e 's/package models/package diego.bbs.models/' models/*.proto
-            protoc --proto_path="$PROTO_SRC":models --ruby_out="$RUBY_OUT" models/*.proto
+            sed -i'' -E '/import.*gogoproto/d; /option.*gogoproto/d; s/\(gogoproto.*, //g; s/, \(gogoproto[^]]+//g;  s/\[\(gogoproto[^]]*\]//g; s/package models/package diego.bbs.models/' models/*.proto
+            protoc --proto_path=models --ruby_out="$RUBY_OUT" models/*.proto
           popd > /dev/null
           cp -r "$RUBY_OUT/." cloud_controller_ng/lib/diego/bbs/models
 

.github/workflows/docs_test.yml

@@ -21,7 +21,7 @@ permissions:
 jobs:
   Test-Docs:
     runs-on: ubuntu-latest
-    timeout-minutes: 30
+    timeout-minutes: 60
     steps:
       - uses: hmarr/debug-action@v3
       - uses: actions/checkout@v4
@@ -34,6 +34,8 @@ jobs:
         working-directory: docs/v2
         run: ./render.sh
       - name: Run docs tests
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           bundle config set --local without 'development'
           bundle install

.github/workflows/unit_tests.yml

@@ -39,11 +39,11 @@ jobs:
 
   Test-Postgres:
     runs-on: ubuntu-latest
-    timeout-minutes: 30
+    timeout-minutes: 60
     strategy:
       fail-fast: false
       matrix:
-        image: ["postgres:13", "postgres:15", "postgres:16"]
+        image: ["postgres:13", "postgres:15", "postgres:17"]
     services:
       postgres:
         image: ${{ matrix.image }}
@@ -72,7 +72,7 @@ jobs:
 
   Test-Mysql:
     runs-on: ubuntu-latest
-    timeout-minutes: 30
+    timeout-minutes: 60
     strategy:
       fail-fast: false
       matrix:

.github/workflows/unit_tests_backwards_compatibility.yml

@@ -28,12 +28,12 @@ permissions:
 jobs:
   Test-Postgres-Backwards-Compatibillity:
     runs-on: ubuntu-latest
-    timeout-minutes: 30
+    timeout-minutes: 60
     strategy:
       fail-fast: false
       max-parallel: 3
       matrix:
-        image: ["postgres:13", "postgres:15", "postgres:16"]
+        image: ["postgres:13", "postgres:15", "postgres:17"]
     services:
       postgres:
         image: ${{ matrix.image }}
@@ -80,7 +80,7 @@ jobs:
 
   Test-Mysql-Backwards-Compatibillity:
     runs-on: ubuntu-latest
-    timeout-minutes: 30
+    timeout-minutes: 60
     strategy:
       fail-fast: false
       max-parallel: 3

.rubocop_cc.yml

@@ -21,7 +21,8 @@ AllCops:
     - errors/**/*
     - lib/diego/bbs/models/**/*
     - lib/locket/**/*
-    - lib/logcache/v2/**/*
+    - lib/loggregator-api/**/*
+    - lib/logcache/*_pb.rb
     - vendor/bundle/**/*
 Layout/DotPosition:
   EnforcedStyle: trailing

Gemfile

@@ -8,7 +8,7 @@ gem 'concurrent-ruby'
 gem 'digest-xxhash'
 gem 'eventmachine', '~> 1.2.7'
 gem 'fluent-logger'
-gem 'googleapis-common-protos', '>= 1.3.12'
+gem 'googleapis-common-protos', '>= 1.8.0'
 gem 'hashdiff'
 gem 'honeycomb-beeline'
 gem 'httpclient'
@@ -32,7 +32,7 @@ gem 'puma'
 gem 'rake'
 gem 'redis'
 gem 'rubyzip', '>= 1.3.0'
-gem 'sequel', '~> 5.92'
+gem 'sequel', '~> 5.94'
 gem 'sequel_pg', require: 'sequel'
 gem 'sinatra', '~> 3.2'
 gem 'sinatra-contrib'
@@ -55,8 +55,8 @@ gem 'azure-storage-blob', git: 'https://github.com/sethboyles/azure-storage-ruby
 gem 'fog-aliyun'
 gem 'fog-aws'
 gem 'fog-azure-rm', git: 'https://github.com/fog/fog-azure-rm.git', branch: 'fog-arm-cf'
-gem 'fog-core', '~> 2.4.0'
-gem 'fog-google', '~> 1.24.1'
+gem 'fog-core', '~> 2.6.0'
+gem 'fog-google', '~> 1.25.0'
 gem 'fog-local'
 gem 'fog-openstack'
 
@@ -77,17 +77,17 @@ group :test do
   gem 'mock_redis'
   gem 'parallel_tests'
   gem 'rack-test'
-  gem 'rspec', '~> 3.13.0'
+  gem 'rspec', '~> 3.13.1'
   gem 'rspec_api_documentation', '>= 6.1.0'
   gem 'rspec-collection_matchers'
   gem 'rspec-instafail'
   gem 'rspec-its'
-  gem 'rspec-rails', '~> 8.0.0'
+  gem 'rspec-rails', '~> 8.0.1'
   gem 'rspec-wait'
-  gem 'rubocop', '~> 1.75.5'
+  gem 'rubocop', '~> 1.78.0'
   gem 'rubocop-capybara'
   gem 'rubocop-factory_bot'
-  gem 'rubocop-rails', '~> 2.31'
+  gem 'rubocop-rails', '~> 2.32'
   gem 'rubocop-rspec', '~> 3.6'
   gem 'rubocop-rspec_rails'
   gem 'rubocop-sequel', '~> 0.4.1'
@@ -97,7 +97,7 @@ end
 
 group :development do
   gem 'byebug'
-  gem 'debug', '~> 1.10'
+  gem 'debug', '~> 1.11'
   gem 'listen'
   gem 'roodi'
   gem 'solargraph'