Test optimization

.github/workflows/composite/setup/action.yml

@@ -43,3 +43,6 @@ runs:
       with:
         bundler-cache: true
         working-directory: ${{ inputs.WORKING_DIRECTORY }}
+    - name: Enable YJIT
+      run: echo "RUBY_YJIT_ENABLE=1" >> "$GITHUB_ENV"
+      shell: bash

lib/cloud_controller/diego/reporters/instances_reporter.rb

@@ -1,6 +1,7 @@
 require 'utils/workpool'
 require 'cloud_controller/diego/constants'
 require 'cloud_controller/diego/reporters/reporter_mixins'
+require 'diego/lrp_constants'
 
 module VCAP::CloudController
   module Diego

lib/cloud_controller/telemetry_logger.rb

@@ -1,3 +1,4 @@
+require 'oj'
 require 'openssl'
 
 module VCAP::CloudController

spec/db_spec_helper.rb

@@ -4,6 +4,10 @@
   require 'rspec/collection_matchers'
 
   require 'rails'
+  require 'oj'
+  require 'sequel'
+  Sequel.default_timezone = :utc
+
   require 'support/bootstrap/spec_bootstrap'
   require 'support/database_isolation'
   require 'sequel_plugins/sequel_plugins'

spec/lightweight_spec_helper.rb

@@ -1,27 +1,43 @@
 $LOAD_PATH.push(File.expand_path(File.join(__dir__, '..', 'app')))
 $LOAD_PATH.push(File.expand_path(File.join(__dir__, '..', 'lib')))
+$LOAD_PATH.push(File.expand_path(File.join(__dir__, '..', 'middleware')))
 
 require 'active_support/all'
+require 'active_model'
+require 'rspec/its'
 require 'pry'
 # So that specs using this helper don't fail with undefined constant error
 module VCAP
   module CloudController
+    # Minimal Config stub for message validation specs
+    # Only define if not already defined (avoid conflict with spec_helper)
+    unless defined?(Config)
+      class Config
+        def self.config
+          @config ||= new
+        end
+
+        def get(*_keys)
+          nil
+        end
+      end
+    end
   end
 end
 
 class StubConfig
   def self.prepare(example, **data)
     config = new(data)
-    example.allow(TestConfig).to example.receive(:config).and_return(config)
+    example.allow(TestConfig).to example.receive(:config).and_return(config) if defined?(TestConfig)
     example.allow(VCAP::CloudController::Config).to example.receive(:config).and_return(config)
   end
 
   def initialize(data)
     @data = data
   end
 
-  def get(key)
-    data[key]
+  def get(*keys)
+    keys.inject(data) { |memo, key| memo.is_a?(Hash) ? memo[key] : nil }
   end
 
   alias_method :[], :get
@@ -33,4 +49,8 @@ def get(key)
 
 RSpec.configure do |rspec_config|
   rspec_config.expose_dsl_globally = false
+
+  rspec_config.before do
+    allow(VCAP::CloudController::Config).to receive(:config).and_return(StubConfig.new({})) if defined?(VCAP::CloudController::Config) && VCAP::CloudController::Config.config.nil?
+  end
 end

spec/unit/decorators/embed_process_instances_decorator_spec.rb

@@ -1,4 +1,5 @@
-require 'spec_helper'
+require 'db_spec_helper'
+require 'decorators/embed_process_instances_decorator'
 
 module VCAP::CloudController
   RSpec.describe EmbedProcessInstancesDecorator do

spec/unit/decorators/field_service_offering_service_broker_decorator_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'db_spec_helper'
 require 'decorators/field_service_offering_service_broker_decorator'
 require 'field_decorator_spec_shared_examples'
 

spec/unit/decorators/field_service_plan_service_broker_decorator_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'db_spec_helper'
 require 'decorators/field_service_plan_service_broker_decorator'
 require 'field_decorator_spec_shared_examples'
 

spec/unit/fetchers/app_fetcher_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'db_spec_helper'
 require 'fetchers/app_fetcher'
 
 module VCAP::CloudController

spec/unit/fetchers/assign_current_droplet_fetcher_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'db_spec_helper'
 require 'fetchers/assign_current_droplet_fetcher'
 
 module VCAP::CloudController

spec/unit/fetchers/base_list_fetcher_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'db_spec_helper'
 require 'messages/events_list_message'
 require 'fetchers/event_list_fetcher'
 

spec/unit/fetchers/build_list_fetcher_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'db_spec_helper'
 require 'messages/builds_list_message'
 require 'fetchers/build_list_fetcher'
 

spec/unit/fetchers/droplet_fetcher_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'db_spec_helper'
 require 'fetchers/droplet_fetcher'
 
 module VCAP::CloudController

spec/unit/fetchers/event_list_fetcher_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'db_spec_helper'
 require 'messages/events_list_message'
 require 'fetchers/event_list_fetcher'
 

spec/unit/fetchers/organization_quota_list_fetcher_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'db_spec_helper'
 require 'fetchers/organization_quota_list_fetcher'
 require 'messages/organization_quotas_list_message'
 

spec/unit/fetchers/organization_user_roles_fetcher_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'db_spec_helper'
 require 'fetchers/organization_user_roles_fetcher'
 
 module VCAP::CloudController

spec/unit/fetchers/package_fetcher_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'db_spec_helper'
 require 'fetchers/package_fetcher'
 
 module VCAP::CloudController

spec/unit/fetchers/process_fetcher_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'db_spec_helper'
 require 'fetchers/process_fetcher'
 
 module VCAP::CloudController

spec/unit/fetchers/route_destinations_list_fetcher_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'db_spec_helper'
 require 'fetchers/route_destinations_list_fetcher'
 require 'messages/route_destinations_list_message'
 

spec/unit/fetchers/service_binding_list_fetcher_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'db_spec_helper'
 require 'fetchers/service_binding_list_fetcher'
 
 module VCAP::CloudController

spec/unit/fetchers/space_quota_list_fetcher_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'db_spec_helper'
 require 'fetchers/space_quota_list_fetcher'
 require 'messages/space_quotas_list_message'
 

spec/unit/lib/cloud_controller/adjective_noun_generator_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'cloud_controller/adjective_noun_generator'
 
 module VCAP::CloudController

spec/unit/lib/cloud_controller/app_manifest/byte_converter_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'cloud_controller/app_manifest/byte_converter'
 
 module VCAP::CloudController

spec/unit/lib/cloud_controller/app_manifest/manifest_route_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'cloud_controller/app_manifest/manifest_route'
 
 module VCAP::CloudController

spec/unit/lib/cloud_controller/blob_sender/default_blob_sender_spec.rb

@@ -1,4 +1,5 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'steno/steno'
 require 'cloud_controller/blob_sender/default_blob_sender'
 
 module CloudController

spec/unit/lib/cloud_controller/blobstore/blob_key_generator_spec.rb

@@ -1,4 +1,5 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'cloud_controller/blobstore/blob_key_generator'
 
 module CloudController
   module Blobstore

spec/unit/lib/cloud_controller/blobstore/fingerprints_collection_spec.rb

@@ -1,4 +1,6 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'cloud_controller/errors/api_error'
+require 'cloud_controller/file_path_checker'
 require 'cloud_controller/blobstore/fingerprints_collection'
 
 module CloudController

spec/unit/lib/cloud_controller/blobstore/fog/fog_blob_spec.rb

@@ -1,4 +1,7 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'timecop'
+require 'cloud_controller/blobstore/blob'
+require 'cloud_controller/blobstore/fog/fog_blob'
 require_relative '../blob_shared'
 
 module CloudController

spec/unit/lib/cloud_controller/blobstore/local/local_blob_spec.rb

@@ -1,4 +1,8 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'tempfile'
+require 'openssl'
+require 'fileutils'
+require 'cloud_controller/blobstore/local/local_blob'
 
 module CloudController
   module Blobstore

spec/unit/lib/cloud_controller/blobstore/null_blob_spec.rb

@@ -1,4 +1,5 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'cloud_controller/blobstore/blob'
 require 'cloud_controller/blobstore/null_blob'
 require_relative 'blob_shared'
 

spec/unit/lib/cloud_controller/blobstore/retryable_blob_spec.rb

@@ -1,4 +1,6 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'steno/steno'
+require 'cloud_controller/blobstore/blob'
 require 'cloud_controller/blobstore/retryable_blob'
 require 'cloud_controller/blobstore/null_blob'
 require_relative 'blob_shared'

spec/unit/lib/cloud_controller/blobstore/storage_cli/storage_cli_blob_spec.rb

@@ -1,4 +1,7 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'cloud_controller/blobstore/blob'
+require 'cloud_controller/blobstore/storage_cli/storage_cli_blob'
+require 'cloud_controller/blobstore/errors'
 require_relative '../blob_shared'
 
 module CloudController

spec/unit/lib/cloud_controller/blobstore/url_generator/upload_url_generator_spec.rb

@@ -1,4 +1,5 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'securerandom'
 require 'cloud_controller/blobstore/url_generator/upload_url_generator'
 
 module CloudController
@@ -32,7 +33,7 @@ module Blobstore
           end
 
           it 'gives out the mTLS url for droplet upload' do
-            droplet_guid = Sham.guid
+            droplet_guid = SecureRandom.uuid
             uri          = URI.parse(url_generator.droplet_upload_url(droplet_guid))
             expect(uri.scheme).to eql 'https'
             expect(uri.host).to eql blobstore_host
@@ -41,8 +42,8 @@ module Blobstore
           end
 
           it 'gives out the mTLS url for buildpack_cache upload' do
-            app_guid = Sham.guid
-            stack    = Sham.name
+            app_guid = SecureRandom.uuid
+            stack    = "stack-#{SecureRandom.hex(4)}"
             uri      = URI.parse(url_generator.buildpack_cache_upload_url(app_guid, stack))
             expect(uri.scheme).to eql 'https'
             expect(uri.host).to eql blobstore_host

spec/unit/lib/cloud_controller/blobstore/webdav/nginx_secure_link_signer_spec.rb

@@ -1,4 +1,7 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'base64'
+require 'httpclient'
+require 'cloud_controller/blobstore/errors'
 require 'cloud_controller/blobstore/webdav/nginx_secure_link_signer'
 
 module CloudController

spec/unit/lib/cloud_controller/byte_quantity_spec.rb

@@ -1,10 +1,10 @@
 # Derived from the palm_civet library
 # Copyright (c) 2013 Anand Gaitonde
+require 'cloud_controller/byte_quantity'
 # Licensed under the MIT License
 # https://github.com/goodmustache/palm_civet
 
-require 'spec_helper'
-require 'cloud_controller/byte_quantity'
+require 'lightweight_spec_helper'
 
 module VCAP::CloudController
   RSpec.describe ByteQuantity do

spec/unit/lib/cloud_controller/clock/distributed_scheduler_spec.rb

@@ -1,4 +1,5 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'clockwork'
 require 'cloud_controller/clock/distributed_scheduler'
 
 module VCAP::CloudController

spec/unit/lib/cloud_controller/database_parts_parser_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'cloud_controller/database_parts_parser'
 
 RSpec.describe VCAP::CloudController::DatabasePartsParser do

spec/unit/lib/cloud_controller/database_uri_generator_spec.rb

@@ -1,4 +1,5 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'cloud_controller/database_uri_generator'
 
 RSpec.describe VCAP::CloudController::DatabaseUriGenerator do
   let(:service_uris) { ['postgres://username:password@host/db'] }

spec/unit/lib/cloud_controller/db_connection/finalizer_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'cloud_controller/db_connection/finalizer'
 
 RSpec.describe VCAP::CloudController::DbConnection::Finalizer do

spec/unit/lib/cloud_controller/db_connection/mysql_options_factory_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'cloud_controller/db_connection/mysql_options_factory'
 
 RSpec.describe VCAP::CloudController::DbConnection::MysqlOptionsFactory do

spec/unit/lib/cloud_controller/db_connection/options_factory_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'cloud_controller/db_connection/options_factory'
 require 'cloud_controller/db_connection/mysql_options_factory'
 

spec/unit/lib/cloud_controller/db_connection/postgres_options_factory_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
 require 'cloud_controller/db_connection/postgres_options_factory'
 
 RSpec.describe VCAP::CloudController::DbConnection::PostgresOptionsFactory do

spec/unit/lib/cloud_controller/diego/bbs_task_client_spec.rb

@@ -1,14 +1,21 @@
-require 'spec_helper'
-require 'cloud_controller/diego/task_recipe_builder'
+require 'lightweight_spec_helper'
+require 'steno/steno'
+require 'cloud_controller/errors/api_error'
 require 'cloud_controller/diego/bbs_task_client'
 
+module VCAP::CloudController
+  module Diego
+    TaskRecipeBuilder = Class.new unless defined?(TaskRecipeBuilder)
+  end
+end
+
 module VCAP::CloudController::Diego
   RSpec.describe BbsTaskClient do
-    let(:task) { instance_double(VCAP::CloudController::TaskModel, guid: 'task-guid') }
-    let(:config) { instance_double(VCAP::CloudController::Config) }
+    let(:task) { double(:task_model, guid: 'task-guid') }
+    let(:config) { double(:config) }
     let(:domain) { 'foobar-domain' }
-    let(:bbs_client) { instance_double(::Diego::Client) }
-    let(:recipe_builder) { instance_double(TaskRecipeBuilder) }
+    let(:bbs_client) { double(:bbs_client) }
+    let(:recipe_builder) { double(:task_recipe_builder) }
 
     subject(:client) { BbsTaskClient.new(config, bbs_client) }
 

spec/unit/lib/cloud_controller/diego/buildpack/lifecycle_data_spec.rb

@@ -1,4 +1,5 @@
-require 'spec_helper'
+require 'lightweight_spec_helper'
+require 'membrane'
 require 'cloud_controller/diego/buildpack/lifecycle_data'
 
 module VCAP::CloudController