Revert "Merge pull request cloudfoundry#2651 from cloudfoundry/ruby-3…

…-keywords" This reverts commit ba86c2a, reversing changes made to 58eaf84. This commit was breaking CATs
sap-contributions · Feb 2, 2022 · 536ab5b · 536ab5b
1 parent 85275b8
commit 536ab5b
Show file tree

Hide file tree

Showing 58 changed files with 232 additions and 224 deletions.
diff --git a/app/controllers/v3/service_plan_visibility_controller.rb b/app/controllers/v3/service_plan_visibility_controller.rb
@@ -67,7 +67,7 @@ def update_visibility(opts={})
     message = ServicePlanVisibilityUpdateMessage.new(hashed_params[:body])
     bad_request!(message.errors.full_messages) unless message.valid?
 
-    updated_service_plan = V3::ServicePlanVisibilityUpdate.new.update(service_plan, message, **opts)
+    updated_service_plan = V3::ServicePlanVisibilityUpdate.new.update(service_plan, message, opts)
     event_repository.record_service_plan_update_visibility_event(service_plan, message.audit_hash)
     updated_service_plan
   rescue V3::ServicePlanVisibilityUpdate::UnprocessableRequest => e

diff --git a/lib/cloud_controller/blobstore/fog/error_handling_client.rb b/lib/cloud_controller/blobstore/fog/error_handling_client.rb
@@ -43,7 +43,7 @@ def cp_r_to_blobstore(*args)
         error_handling { wrapped_client.cp_r_to_blobstore(*args)    }
       end
 
-      def download_from_blobstore(*args, **kwargs)
+      def download_from_blobstore(*args)
         error_handling { wrapped_client.download_from_blobstore(*args) }
       end
 

diff --git a/lib/cloud_controller/clock/scheduler.rb b/lib/cloud_controller/clock/scheduler.rb
@@ -57,7 +57,7 @@ def start_inline_jobs
         interval: @config.get(:diego_sync, :frequency_in_seconds),
         timeout: @timeout_calculator.calculate(:diego_sync),
       }
-      @clock.schedule_frequent_inline_job(**clock_opts) do
+      @clock.schedule_frequent_inline_job(clock_opts) do
         Jobs::Diego::Sync.new
       end
     end
@@ -68,7 +68,7 @@ def start_frequent_jobs
           name: job_config[:name],
           interval: @config.get(job_config[:name].to_sym, :frequency_in_seconds),
         }
-        @clock.schedule_frequent_worker_job(**clock_opts) do
+        @clock.schedule_frequent_worker_job(clock_opts) do
           klass = job_config[:class]
           klass.new(@config.get(job_config[:name].to_sym, :expiration_in_seconds))
         end
@@ -83,7 +83,7 @@ def start_daily_jobs
           priority: cleanup_config[:priority] || Clock::HIGH_PRIORITY
         }
 
-        @clock.schedule_daily_job(**clock_opts) do
+        @clock.schedule_daily_job(clock_opts) do
           klass = cleanup_config[:class]
 
           if cleanup_config[:arg_from_config]

diff --git a/lib/cloud_controller/seeds.rb b/lib/cloud_controller/seeds.rb
@@ -93,7 +93,7 @@ def create_seed_domains(config, system_org)
               router_group_guid: find_routing_guid(domain),
               internal: domain['internal']
             }
-            SharedDomain.find_or_create(**attrs.compact)
+            SharedDomain.find_or_create(attrs.compact)
           end
 
           if CloudController::DomainDecorator.new(system_domain).has_sub_domain?(test_domains: domains.map { |domain_hash| domain_hash['name'] })

diff --git a/lib/services/service_brokers/v2/response_parser.rb b/lib/services/service_brokers/v2/response_parser.rb
@@ -35,7 +35,7 @@ def parse_provision(path, response)
             end
 
           validator = CommonErrorValidator.new(validator)
-          validator.validate(**unvalidated_response.to_hash)
+          validator.validate(unvalidated_response.to_hash)
         end
 
         def parse_bind(path, response, opts={})
@@ -65,7 +65,7 @@ def parse_bind(path, response, opts={})
             end
 
           validator = CommonErrorValidator.new(validator)
-          validator.validate(**unvalidated_response.to_hash)
+          validator.validate(unvalidated_response.to_hash)
         end
 
         def parse_unbind(path, response)
@@ -93,7 +93,7 @@ def parse_unbind(path, response)
             end
 
           validator = CommonErrorValidator.new(validator)
-          validator.validate(**unvalidated_response.to_hash)
+          validator.validate(unvalidated_response.to_hash)
         end
 
         def parse_deprovision(path, response)
@@ -122,7 +122,7 @@ def parse_deprovision(path, response)
             end
 
           validator = CommonErrorValidator.new(validator)
-          validator.validate(**unvalidated_response.to_hash)
+          validator.validate(unvalidated_response.to_hash)
         end
 
         def parse_catalog(path, response)
@@ -140,7 +140,7 @@ def parse_catalog(path, response)
             end
 
           validator = CommonErrorValidator.new(validator)
-          validator.validate(**unvalidated_response.to_hash)
+          validator.validate(unvalidated_response.to_hash)
         end
 
         def parse_update(path, response)
@@ -167,7 +167,7 @@ def parse_update(path, response)
             end
 
           validator = CommonErrorValidator.new(validator)
-          validator.validate(**unvalidated_response.to_hash)
+          validator.validate(unvalidated_response.to_hash)
         end
 
         def parse_fetch_state(path, response)
@@ -195,7 +195,7 @@ def parse_fetch_state(path, response)
               CommonErrorValidator.new(FailingValidator.new(Errors::ServiceBrokerBadResponse))
             end
 
-          validator.validate(**unvalidated_response.to_hash)
+          validator.validate(unvalidated_response.to_hash)
         end
 
         def parse_fetch_parameters(path, response, schema)
@@ -211,7 +211,7 @@ def parse_fetch_parameters(path, response, schema)
 
           validator = CommonErrorValidator.new(validator)
 
-          validator.validate(**unvalidated_response.to_hash)
+          validator.validate(unvalidated_response.to_hash)
         end
 
         def parse_fetch_instance_parameters(path, response)

diff --git a/middleware/block_v3_only_roles.rb b/middleware/block_v3_only_roles.rb
@@ -3,9 +3,9 @@
 module CloudFoundry
   module Middleware
     class BlockV3OnlyRoles
-      def initialize(app, opts)
+      def initialize(app, logger:)
         @app                   = app
-        @logger                = opts[:logger]
+        @logger                = logger
       end
 
       def call(env)

diff --git a/middleware/rate_limiter.rb b/middleware/rate_limiter.rb
@@ -49,14 +49,14 @@ def create_new_request_count(user_guid, reset_interval_in_minutes)
     class RateLimiter
       include CloudFoundry::Middleware::ClientIp
 
-      def initialize(app, opts)
+      def initialize(app, logger:, per_process_general_limit:, global_general_limit:, per_process_unauthenticated_limit:, global_unauthenticated_limit:, interval:)
         @app                               = app
-        @logger                            = opts[:logger]
-        @per_process_general_limit         = opts[:per_process_general_limit]
-        @global_general_limit              = opts[:global_general_limit]
-        @per_process_unauthenticated_limit = opts[:per_process_unauthenticated_limit]
-        @global_unauthenticated_limit      = opts[:global_unauthenticated_limit]
-        @interval                          = opts[:interval]
+        @logger                            = logger
+        @per_process_general_limit         = per_process_general_limit
+        @global_general_limit              = global_general_limit
+        @per_process_unauthenticated_limit = per_process_unauthenticated_limit
+        @global_unauthenticated_limit      = global_unauthenticated_limit
+        @interval                          = interval
         @request_counter                   = RequestCounter.instance
       end
 

diff --git a/middleware/service_broker_rate_limiter.rb b/middleware/service_broker_rate_limiter.rb
@@ -23,9 +23,9 @@ def release(user_guid)
     end
 
     class ServiceBrokerRateLimiter
-      def initialize(app, opts)
+      def initialize(app, logger:)
         @app                               = app
-        @logger                            = opts[:logger]
+        @logger                            = logger
         @request_counter = ServiceBrokerRequestCounter.instance
       end
 

diff --git a/spec/api/documentation/buildpack_cache_api_spec.rb b/spec/api/documentation/buildpack_cache_api_spec.rb
@@ -30,7 +30,7 @@
   end
 
   before do
-    TestConfig.override(**blobstore_config)
+    TestConfig.override(blobstore_config)
   end
 
   after do

diff --git a/spec/performance/packages_controller_index_spec.rb b/spec/performance/packages_controller_index_spec.rb
@@ -17,12 +17,12 @@
     let(:n) { 10 }
 
     before do
-      TestConfig.override(
+      TestConfig.override({
         db: {
           log_level: 'debug',
       }
         # logging.level: 'debug2'
-      )
+      })
       allow_user_read_access_for(user, spaces: user_spaces)
       n.times do |i|
         app = VCAP::CloudController::AppModel.make(space: user_spaces.sample, guid: "app-guid-#{i}")

diff --git a/spec/request/domains_spec.rb b/spec/request/domains_spec.rb
@@ -1073,7 +1073,7 @@
 
         context 'when the domain is in the list of reserved private domains' do
           before do
-            TestConfig.override(reserved_private_domains: File.join(Paths::FIXTURES, 'config/reserved_private_domains.dat'))
+            TestConfig.override({ reserved_private_domains: File.join(Paths::FIXTURES, 'config/reserved_private_domains.dat') })
           end
 
           it 'returns a 422 with a error message about reserved domains' do

diff --git a/spec/request/knowledge_bombs/verify_old_lrps_can_download_assets_spec.rb b/spec/request/knowledge_bombs/verify_old_lrps_can_download_assets_spec.rb
@@ -20,7 +20,7 @@
       end
 
       before do
-        TestConfig.override(**staging_config)
+        TestConfig.override(staging_config)
         allow(VCAP::CloudController::BlobDispatcher).to receive(:new).and_return(blob_dispatcher)
       end
 

diff --git a/spec/request/packages_spec.rb b/spec/request/packages_spec.rb
@@ -822,7 +822,7 @@
     before do
       space.organization.add_user(user)
       space.add_developer(user)
-      TestConfig.override(**test_config_overrides)
+      TestConfig.override(test_config_overrides)
     end
 
     shared_examples :upload_bits_successfully do

diff --git a/spec/request/service_brokers_spec.rb b/spec/request/service_brokers_spec.rb
@@ -704,7 +704,7 @@ def expect_empty_list(user_headers)
       context 'when job succeeds with warnings' do
         context 'when warning is a UAA problem' do
           let(:broker) do
-            TestConfig.override(uaa_client_name: nil, uaa_client_secret: nil)
+            TestConfig.override({ uaa_client_name: nil, uaa_client_secret: nil })
             create_broker_successfully(global_broker_request_body, with: admin_headers, execute_all_jobs: true)
           end
 
@@ -729,7 +729,7 @@ def expect_empty_list(user_headers)
 
         context 'when warning is a catalog problem (deactivated plan, but there is a service instance)' do
           let!(:broker) do
-            TestConfig.override
+            TestConfig.override({})
             create_broker_successfully(global_broker_request_body, with: admin_headers, execute_all_jobs: true)
           end
 
@@ -1138,7 +1138,7 @@ def expect_empty_list(user_headers)
     context 'when job succeeds with warnings' do
       context 'when warning is a UAA problem' do
         before do
-          TestConfig.override(uaa_client_name: nil, uaa_client_secret: nil)
+          TestConfig.override({ uaa_client_name: nil, uaa_client_secret: nil })
           create_broker_successfully(global_broker_request_body, with: admin_headers)
           execute_all_jobs(expected_successes: 1, expected_failures: 0)
         end

diff --git a/spec/request_spec_shared_examples.rb b/spec/request_spec_shared_examples.rb
@@ -103,15 +103,15 @@ def expect_filtered_resources(endpoint, filter, list)
       it 'returns the correct response status and resources' do
         email = Sham.email
         user_name = Sham.name
-        headers = set_user_with_header_as_role(
+        headers = set_user_with_header_as_role({
           role: role,
           org: org,
           space: space,
           user: user,
           scopes: expected_codes_and_responses[role][:scopes],
           user_name: user_name,
           email: email,
-        )
+        })
 
         api_call.call(headers)
 

diff --git a/spec/support/bootstrap/test_config.rb b/spec/support/bootstrap/test_config.rb
@@ -19,7 +19,7 @@ def override(**overrides)
     end
 
     def reset
-      override
+      override({})
     end
 
     def config

diff --git a/spec/support/shared_examples/controllers/resource_pool.rb b/spec/support/shared_examples/controllers/resource_pool.rb
@@ -59,7 +59,7 @@
 
   before do
     @resource_pool = VCAP::CloudController::ResourcePool.new(
-      VCAP::CloudController::Config.new({ resource_pool: resource_pool_config })
+      VCAP::CloudController::Config.new(resource_pool: resource_pool_config)
     )
     allow(VCAP::CloudController::ResourcePool).to receive(:instance).and_return(@resource_pool)
   end

diff --git a/spec/support/shared_examples/jobs/create_binding_job.rb b/spec/support/shared_examples/jobs/create_binding_job.rb
@@ -58,9 +58,9 @@
       context 'asynchronous response' do
         context 'computes the maximum duration' do
           before do
-            TestConfig.override(
+            TestConfig.override({
               broker_client_max_async_poll_duration_minutes: 90009
-            )
+            })
             subject.perform
           end
 
@@ -141,7 +141,7 @@
       context 'the maximum duration' do
         it 'recomputes the value' do
           subject.maximum_duration_seconds = 90009
-          TestConfig.override(broker_client_max_async_poll_duration_minutes: 8088)
+          TestConfig.override({ broker_client_max_async_poll_duration_minutes: 8088 })
           subject.perform
           expect(subject.maximum_duration_seconds).to eq(8088.minutes)
         end

diff --git a/spec/support/shared_examples/jobs/delete_binding_job.rb b/spec/support/shared_examples/jobs/delete_binding_job.rb
@@ -58,9 +58,9 @@
 
         context 'computes the maximum duration' do
           before do
-            TestConfig.override(
+            TestConfig.override({
               broker_client_max_async_poll_duration_minutes: 90009
-            )
+            })
             subject.perform
           end
 
@@ -130,7 +130,7 @@
       context 'the maximum duration' do
         it 'recomputes the value' do
           subject.maximum_duration_seconds = 90009
-          TestConfig.override(broker_client_max_async_poll_duration_minutes: 8088)
+          TestConfig.override({ broker_client_max_async_poll_duration_minutes: 8088 })
           subject.perform
           expect(subject.maximum_duration_seconds).to eq(8088.minutes)
         end

diff --git a/spec/unit/actions/task_create_spec.rb b/spec/unit/actions/task_create_spec.rb
@@ -5,11 +5,11 @@ module VCAP::CloudController
   RSpec.describe TaskCreate do
     subject(:task_create_action) { TaskCreate.new(config) }
     let(:config) do
-      Config.new({
+      Config.new(
         maximum_app_disk_in_mb: 4096,
         default_app_memory: 1024,
         default_app_disk_in_mb: 1024
-      })
+      )
     end
 
     describe '#create' do

diff --git a/spec/unit/controllers/internal/download_droplets_controller_spec.rb b/spec/unit/controllers/internal/download_droplets_controller_spec.rb
@@ -35,7 +35,7 @@ module VCAP::CloudController
 
       before do
         Fog.unmock!
-        TestConfig.override(**staging_config)
+        TestConfig.override(staging_config)
       end
       after { FileUtils.rm_rf(workspace) }
 
@@ -152,7 +152,7 @@ def upload_droplet
 
       before do
         Fog.unmock!
-        TestConfig.override(**staging_config)
+        TestConfig.override(staging_config)
       end
       after { FileUtils.rm_rf(workspace) }
 

diff --git a/spec/unit/controllers/internal/staging_completion_controller_spec.rb b/spec/unit/controllers/internal/staging_completion_controller_spec.rb
@@ -41,7 +41,7 @@ module VCAP::CloudController
     let(:one_hour_in_nanoseconds) { (1.hour.to_i * 1e9).to_i }
 
     before do
-      TestConfig.override(kubernetes: nil)
+      TestConfig.override({ kubernetes: nil })
 
       allow(VCAP::CloudController::Metrics::StatsdUpdater).to receive(:new).and_return(statsd_updater)
     end
@@ -190,7 +190,7 @@ module VCAP::CloudController
       describe 'authentication' do
         context 'when running in Kubernetes' do
           before do
-            TestConfig.override(kubernetes: { host_url: 'example.com' })
+            TestConfig.override({ kubernetes: { host_url: 'example.com' } })
           end
 
           context 'when missing authentication' do

diff --git a/spec/unit/controllers/runtime/app_bits_upload_controller_spec.rb b/spec/unit/controllers/runtime/app_bits_upload_controller_spec.rb
@@ -10,7 +10,7 @@ module VCAP::CloudController
     describe 'PUT /v2/app/:id/bits' do
       before do
         TestConfig.override(
-          **config_override.merge(
+          config_override.merge(
             directories: { tmpdir: File.dirname(valid_zip.path) },
             kubernetes: {}
           )