diff --git a/Gemfile b/Gemfile index 2abaf6ff08b..34fe33d06b4 100644 --- a/Gemfile +++ b/Gemfile @@ -42,7 +42,6 @@ gem 'railties', '~> 8.1.1' gem 'fog-aws' gem 'fog-core', '~> 2.6.0' -gem 'fog-google', '~> 1.29.4' gem 'cf-uaa-lib', '~> 4.0.9' diff --git a/Gemfile.lock b/Gemfile.lock index 7e37ccdd4e3..435794ccaa6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -69,7 +69,6 @@ GEM debug (1.11.1) irb (~> 1.10) reline (>= 0.3.8) - declarative (0.0.20) delayed_job (4.2.0) activesupport (>= 3.0, < 9.0) benchmark @@ -85,8 +84,6 @@ GEM logger factory_bot (6.6.0) activesupport (>= 6.1.0) - faraday (0.17.6) - multipart-post (>= 1.2, < 3) ffi (1.17.4) ffi (1.17.4-x86_64-darwin) ffi (1.17.4-x86_64-linux-gnu) @@ -103,19 +100,6 @@ GEM excon (~> 1.0) formatador (>= 0.2, < 2.0) mime-types - fog-google (1.29.4) - addressable (>= 2.7.0) - fog-core (~> 2.5) - fog-json (~> 1.2) - fog-xml (~> 0.1.0) - google-apis-compute_v1 (~> 0.53) - google-apis-dns_v1 (~> 0.28) - google-apis-iamcredentials_v1 (~> 0.15) - google-apis-monitoring_v3 (~> 0.37) - google-apis-pubsub_v1 (~> 0.30) - google-apis-sqladmin_v1beta4 (~> 0.38) - google-apis-storage_v1 (>= 0.19, < 1) - google-cloud-env (>= 1.2, < 3.0) fog-json (1.3.0) fog-core multi_json (~> 1.10) @@ -124,30 +108,6 @@ GEM nokogiri (>= 1.5.11, < 2.0.0) formatador (1.2.3) reline - google-apis-compute_v1 (0.86.0) - google-apis-core (>= 0.11.0, < 2.a) - google-apis-core (0.11.3) - addressable (~> 2.5, >= 2.5.1) - googleauth (>= 0.16.2, < 2.a) - httpclient (>= 2.8.1, < 3.a) - mini_mime (~> 1.0) - representable (~> 3.0) - retriable (>= 2.0, < 4.a) - rexml - google-apis-dns_v1 (0.36.0) - google-apis-core (>= 0.11.0, < 2.a) - google-apis-iamcredentials_v1 (0.17.0) - google-apis-core (>= 0.11.0, < 2.a) - google-apis-monitoring_v3 (0.54.0) - google-apis-core (>= 0.11.0, < 2.a) - google-apis-pubsub_v1 (0.45.0) - google-apis-core (>= 0.11.0, < 2.a) - google-apis-sqladmin_v1beta4 (0.61.0) - google-apis-core (>= 0.11.0, < 2.a) - google-apis-storage_v1 (0.32.0) - google-apis-core (>= 0.11.0, < 2.a) - google-cloud-env (1.6.0) - faraday (>= 0.17.3, < 3.0) google-protobuf (4.35.1) bigdecimal rake (~> 13.3) @@ -163,12 +123,6 @@ GEM grpc (~> 1.41) googleapis-common-protos-types (1.23.0) google-protobuf (~> 4.26) - googleauth (1.8.1) - faraday (>= 0.17.3, < 3.a) - jwt (>= 1.4, < 3.0) - multi_json (~> 1.11) - os (>= 0.9, < 2.0) - signet (>= 0.16, < 2.a) grpc (1.81.1) google-protobuf (>= 3.25, < 5.0) googleapis-common-protos-types (~> 1.0) @@ -198,8 +152,6 @@ GEM json-schema (6.2.0) addressable (~> 2.8) bigdecimal (>= 3.1, < 5) - jwt (2.10.3) - base64 kramdown (2.5.2) rexml (>= 3.4.4) kramdown-parser-gfm (1.1.0) @@ -219,7 +171,6 @@ GEM logger mime-types-data (~> 3.2025, >= 3.2025.0507) mime-types-data (3.2026.0414) - mini_mime (1.1.5) mini_portile2 (2.8.9) minitest (6.0.6) drb (~> 2.0) @@ -229,7 +180,6 @@ GEM msgpack (1.8.3) multi_json (1.21.1) multipart-parser (0.1.1) - multipart-post (2.4.1) mustache (1.1.2) mustermann (3.1.1) mutex_m (0.3.0) @@ -252,7 +202,6 @@ GEM ostruct (>= 0.2) open3 (0.2.1) openssl (4.0.2) - os (1.1.4) ostruct (0.6.3) parallel (2.1.0) parallel_tests (5.7.0) @@ -336,11 +285,6 @@ GEM regexp_parser (2.12.0) reline (0.6.3) io-console (~> 0.5) - representable (3.2.0) - declarative (< 0.1.0) - trailblazer-option (>= 0.1.1, < 0.2.0) - uber (< 0.2.0) - retriable (3.8.0) reverse_markdown (3.0.2) nokogiri rexml (3.4.4) @@ -435,10 +379,6 @@ GEM pg (>= 0.18.0, != 1.2.0) sequel (>= 4.38.0) sexp_processor (4.17.5) - signet (0.22.0) - addressable (~> 2.8) - faraday (>= 0.17.5, < 3.a) - jwt (>= 1.5, < 4.0) simplecov (0.13.0) docile (~> 1.1.0) json (>= 1.8, < 3) @@ -501,11 +441,9 @@ GEM thor (1.5.0) tilt (2.7.0) timecop (0.9.11) - trailblazer-option (0.1.2) tsort (0.2.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - uber (0.1.0) unicode-display_width (3.2.0) unicode-emoji (~> 4.1) unicode-emoji (4.2.0) @@ -547,7 +485,6 @@ DEPENDENCIES fluent-logger fog-aws fog-core (~> 2.6.0) - fog-google (~> 1.29.4) googleapis-common-protos (>= 1.8.0) hashdiff httpclient diff --git a/config/cloud_controller.yml b/config/cloud_controller.yml index d706ac9389d..c2e7d248ab8 100644 --- a/config/cloud_controller.yml +++ b/config/cloud_controller.yml @@ -184,7 +184,6 @@ resource_pool: blobstore_type: local-temp-storage fog_connection: {} fog_aws_storage_options: {} - fog_gcp_storage_options: {} packages: app_package_directory_key: "cc-packages" @@ -193,7 +192,6 @@ packages: blobstore_type: local-temp-storage fog_connection: {} fog_aws_storage_options: {} - fog_gcp_storage_options: {} droplets: droplet_directory_key: cc-droplets @@ -201,14 +199,12 @@ droplets: blobstore_type: local-temp-storage fog_connection: {} fog_aws_storage_options: {} - fog_gcp_storage_options: {} buildpacks: buildpack_directory_key: cc-buildpacks blobstore_type: local-temp-storage fog_connection: {} fog_aws_storage_options: {} - fog_gcp_storage_options: {} db_encryption_key: "asdfasdfasdf" database_encryption: diff --git a/lib/cloud_controller/blobstore/client_provider.rb b/lib/cloud_controller/blobstore/client_provider.rb index 677a8a9325f..0c7572f86f4 100644 --- a/lib/cloud_controller/blobstore/client_provider.rb +++ b/lib/cloud_controller/blobstore/client_provider.rb @@ -6,7 +6,6 @@ require 'cloud_controller/blobstore/local/local_client' require 'cloud_controller/blobstore/safe_delete_client' require 'cloud_controller/blobstore/storage_cli/storage_cli_client' -require 'google/apis/errors' module CloudController module Blobstore @@ -40,8 +39,7 @@ def provide_fog(options, directory_key, root_dir) root_dir: root_dir, min_size: options[:minimum_size], max_size: options[:maximum_size], - aws_storage_options: options[:fog_aws_storage_options], - gcp_storage_options: options[:fog_gcp_storage_options] + aws_storage_options: options[:fog_aws_storage_options] ) logger = Steno.logger('cc.blobstore') @@ -52,8 +50,7 @@ def provide_fog(options, directory_key, root_dir) # and https://github.com/fog/fog-aws/issues/265 # and intermittent GCS blobstore download errors errors = [Excon::Errors::BadRequest, Excon::Errors::SocketError, SystemCallError, - Excon::Errors::InternalServerError, Excon::Errors::ServiceUnavailable, - Google::Apis::ServerError, Google::Apis::TransmissionError, OpenSSL::OpenSSLError] + Excon::Errors::InternalServerError, Excon::Errors::ServiceUnavailable, OpenSSL::OpenSSLError] retryable_client = RetryableClient.new(client:, errors:, logger:) Client.new(ErrorHandlingClient.new(SafeDeleteClient.new(retryable_client, root_dir))) diff --git a/lib/cloud_controller/blobstore/fog/fog_client.rb b/lib/cloud_controller/blobstore/fog/fog_client.rb index 7067191e26c..4350d01c9e2 100644 --- a/lib/cloud_controller/blobstore/fog/fog_client.rb +++ b/lib/cloud_controller/blobstore/fog/fog_client.rb @@ -23,8 +23,7 @@ def initialize(connection_config:, root_dir: nil, min_size: nil, max_size: nil, - aws_storage_options: nil, - gcp_storage_options: nil) + aws_storage_options: nil) @root_dir = root_dir @connection_config = connection_config @directory_key = directory_key @@ -32,7 +31,6 @@ def initialize(connection_config:, @min_size = min_size || 0 @max_size = max_size @aws_storage_options = aws_storage_options - @gcp_storage_options = gcp_storage_options logger.warn('blobstore.fog-deprecated', message: DEPRECATION_MESSAGE) end @@ -142,11 +140,6 @@ def formatted_storage_options opts['x-amz-server-side-encryption'] = encrypt_opt opts - elsif [Fog::Google::StorageJSON, Fog::Google::StorageXML].include?(connection.service) - return {} unless @gcp_storage_options - - @gcp_storage_options - else {} diff --git a/lib/cloud_controller/blobstore/fog/providers.rb b/lib/cloud_controller/blobstore/fog/providers.rb index 9d5d56f10e1..7dc84f65359 100644 --- a/lib/cloud_controller/blobstore/fog/providers.rb +++ b/lib/cloud_controller/blobstore/fog/providers.rb @@ -1,12 +1,8 @@ require 'fog/core' -# This can be removed once fog-google fixes -# https://github.com/fog/fog-google/issues/421, which will allow us to upgrade -# fog-core to 2.2.4. original = Fog::Logger[:deprecation] Fog::Logger[:deprecation] = nil require 'fog/aws' -require 'fog/google' Fog::Logger[:deprecation] = original diff --git a/lib/cloud_controller/blobstore/storage_cli/storage_cli_client.rb b/lib/cloud_controller/blobstore/storage_cli/storage_cli_client.rb index dcf9f031679..57cb78cca43 100644 --- a/lib/cloud_controller/blobstore/storage_cli/storage_cli_client.rb +++ b/lib/cloud_controller/blobstore/storage_cli/storage_cli_client.rb @@ -23,7 +23,6 @@ class StorageCliClient < BaseClient # DEPRECATED: Legacy fog provider names (remove after migration window) LEGACY_PROVIDER_TO_STORAGE_CLI_TYPE = { 'AWS' => 's3', - 'Google' => 'gcs', 'webdav' => 'dav' }.freeze diff --git a/lib/cloud_controller/config_schemas/api_schema.rb b/lib/cloud_controller/config_schemas/api_schema.rb index ac952146dc3..ad57647eea9 100644 --- a/lib/cloud_controller/config_schemas/api_schema.rb +++ b/lib/cloud_controller/config_schemas/api_schema.rb @@ -216,7 +216,6 @@ class ApiSchema < VCAP::Config fog_connection: Hash, optional(:connection_config) => Hash, fog_aws_storage_options: Hash, - fog_gcp_storage_options: Hash, optional(:webdav_config) => Hash, optional(:cdn) => Hash }, @@ -228,7 +227,6 @@ class ApiSchema < VCAP::Config fog_connection: Hash, optional(:connection_config) => Hash, fog_aws_storage_options: Hash, - fog_gcp_storage_options: Hash, optional(:webdav_config) => Hash, optional(:cdn) => Hash }, @@ -242,7 +240,6 @@ class ApiSchema < VCAP::Config fog_connection: Hash, optional(:connection_config) => Hash, fog_aws_storage_options: Hash, - fog_gcp_storage_options: Hash, optional(:webdav_config) => Hash, optional(:cdn) => Hash }, @@ -255,7 +252,6 @@ class ApiSchema < VCAP::Config fog_connection: Hash, optional(:connection_config) => Hash, fog_aws_storage_options: Hash, - fog_gcp_storage_options: Hash, optional(:webdav_config) => Hash, optional(:cdn) => Hash }, diff --git a/lib/cloud_controller/config_schemas/blobstore_benchmarks_schema.rb b/lib/cloud_controller/config_schemas/blobstore_benchmarks_schema.rb index e37d8eb6f8d..dd7a772f766 100644 --- a/lib/cloud_controller/config_schemas/blobstore_benchmarks_schema.rb +++ b/lib/cloud_controller/config_schemas/blobstore_benchmarks_schema.rb @@ -16,7 +16,6 @@ class BlobstoreBenchmarksSchema < VCAP::Config optional(:cdn) => Hash, fog_aws_storage_options: Hash, - fog_gcp_storage_options: Hash, optional(:resource_directory_key) => String, optional(:buildpack_directory_key) => String, diff --git a/lib/cloud_controller/config_schemas/clock_schema.rb b/lib/cloud_controller/config_schemas/clock_schema.rb index 5f2a049f11a..68a0433be46 100644 --- a/lib/cloud_controller/config_schemas/clock_schema.rb +++ b/lib/cloud_controller/config_schemas/clock_schema.rb @@ -131,7 +131,6 @@ class ClockSchema < VCAP::Config fog_connection: Hash, optional(:connection_config) => Hash, fog_aws_storage_options: Hash, - fog_gcp_storage_options: Hash, optional(:webdav_config) => Hash, optional(:cdn) => Hash }, @@ -143,7 +142,6 @@ class ClockSchema < VCAP::Config fog_connection: Hash, optional(:connection_config) => Hash, fog_aws_storage_options: Hash, - fog_gcp_storage_options: Hash, optional(:webdav_config) => Hash, optional(:cdn) => Hash }, @@ -156,7 +154,6 @@ class ClockSchema < VCAP::Config fog_connection: Hash, optional(:connection_config) => Hash, fog_aws_storage_options: Hash, - fog_gcp_storage_options: Hash, optional(:webdav_config) => Hash, optional(:cdn) => Hash }, @@ -168,7 +165,6 @@ class ClockSchema < VCAP::Config fog_connection: Hash, optional(:connection_config) => Hash, fog_aws_storage_options: Hash, - fog_gcp_storage_options: Hash, optional(:webdav_config) => Hash, optional(:cdn) => Hash }, diff --git a/lib/cloud_controller/config_schemas/deployment_updater_schema.rb b/lib/cloud_controller/config_schemas/deployment_updater_schema.rb index e6430b97322..057bfe90d3e 100644 --- a/lib/cloud_controller/config_schemas/deployment_updater_schema.rb +++ b/lib/cloud_controller/config_schemas/deployment_updater_schema.rb @@ -126,7 +126,6 @@ class DeploymentUpdaterSchema < VCAP::Config fog_connection: Hash, optional(:connection_config) => Hash, fog_aws_storage_options: Hash, - fog_gcp_storage_options: Hash, optional(:webdav_config) => Hash, optional(:cdn) => Hash }, @@ -138,7 +137,6 @@ class DeploymentUpdaterSchema < VCAP::Config fog_connection: Hash, optional(:connection_config) => Hash, fog_aws_storage_options: Hash, - fog_gcp_storage_options: Hash, optional(:webdav_config) => Hash, optional(:cdn) => Hash }, @@ -151,7 +149,6 @@ class DeploymentUpdaterSchema < VCAP::Config fog_connection: Hash, optional(:connection_config) => Hash, fog_aws_storage_options: Hash, - fog_gcp_storage_options: Hash, optional(:webdav_config) => Hash, optional(:cdn) => Hash }, @@ -163,7 +160,6 @@ class DeploymentUpdaterSchema < VCAP::Config fog_connection: Hash, optional(:connection_config) => Hash, fog_aws_storage_options: Hash, - fog_gcp_storage_options: Hash, optional(:webdav_config) => Hash, optional(:cdn) => Hash }, diff --git a/lib/cloud_controller/config_schemas/worker_schema.rb b/lib/cloud_controller/config_schemas/worker_schema.rb index a8f37dc7fb1..f4f7e753964 100644 --- a/lib/cloud_controller/config_schemas/worker_schema.rb +++ b/lib/cloud_controller/config_schemas/worker_schema.rb @@ -117,7 +117,6 @@ class WorkerSchema < VCAP::Config fog_connection: Hash, optional(:connection_config) => Hash, fog_aws_storage_options: Hash, - fog_gcp_storage_options: Hash, optional(:webdav_config) => Hash, optional(:cdn) => Hash }, @@ -129,7 +128,6 @@ class WorkerSchema < VCAP::Config fog_connection: Hash, optional(:connection_config) => Hash, fog_aws_storage_options: Hash, - fog_gcp_storage_options: Hash, optional(:webdav_config) => Hash, optional(:cdn) => Hash }, @@ -143,7 +141,6 @@ class WorkerSchema < VCAP::Config fog_connection: Hash, optional(:connection_config) => Hash, fog_aws_storage_options: Hash, - fog_gcp_storage_options: Hash, optional(:webdav_config) => Hash, optional(:cdn) => Hash }, @@ -155,7 +152,6 @@ class WorkerSchema < VCAP::Config fog_connection: Hash, optional(:connection_config) => Hash, fog_aws_storage_options: Hash, - fog_gcp_storage_options: Hash, optional(:webdav_config) => Hash, optional(:cdn) => Hash }, diff --git a/spec/fixtures/config/port_8181_config.yml b/spec/fixtures/config/port_8181_config.yml index 9eae493ae3d..215ef29245b 100644 --- a/spec/fixtures/config/port_8181_config.yml +++ b/spec/fixtures/config/port_8181_config.yml @@ -142,22 +142,18 @@ resource_pool: maximum_size: 42 minimum_size: 1 fog_aws_storage_options: {} - fog_gcp_storage_options: {} buildpacks: fog_aws_storage_options: {} - fog_gcp_storage_options: {} packages: max_package_size: 42 max_valid_packages_stored: 42 fog_aws_storage_options: {} - fog_gcp_storage_options: {} droplets: max_staged_droplets_stored: 42 fog_aws_storage_options: {} - fog_gcp_storage_options: {} request_timeout_in_seconds: 600 skip_cert_verify: true @@ -181,13 +177,11 @@ resource_pool: minimum_size: 1 fog_connection: {} fog_aws_storage_options: {} - fog_gcp_storage_options: {} buildpacks: buildpack_directory_key: '' fog_connection: {} fog_aws_storage_options: {} - fog_gcp_storage_options: {} packages: app_package_directory_key: '' @@ -195,14 +189,12 @@ packages: max_valid_packages_stored: 42 fog_connection: {} fog_aws_storage_options: {} - fog_gcp_storage_options: {} droplets: droplet_directory_key: '' max_staged_droplets_stored: 42 fog_connection: {} fog_aws_storage_options: {} - fog_gcp_storage_options: {} diff --git a/spec/unit/lib/cloud_controller/blobstore/client_provider_spec.rb b/spec/unit/lib/cloud_controller/blobstore/client_provider_spec.rb index e11c7db187b..1bf33355a52 100644 --- a/spec/unit/lib/cloud_controller/blobstore/client_provider_spec.rb +++ b/spec/unit/lib/cloud_controller/blobstore/client_provider_spec.rb @@ -46,8 +46,7 @@ module Blobstore root_dir: anything, min_size: anything, max_size: anything, - aws_storage_options: { encryption: 'my organic algo' }, - gcp_storage_options: anything) + aws_storage_options: { encryption: 'my organic algo' }) end context 'fog methods' do @@ -63,25 +62,6 @@ module Blobstore end end - context 'when a gcp uniform option is requested' do - before do - options.merge!(fog_gcp_storage_options: { uniform: false }) - end - - it 'passes the specified uniform option to the fog client' do - allow(FogClient).to receive(:new).and_call_original - ClientProvider.provide(options: options, directory_key: 'key') - expect(FogClient).to have_received(:new).with(connection_config: anything, - directory_key: anything, - cdn: anything, - root_dir: anything, - min_size: anything, - max_size: anything, - aws_storage_options: anything, - gcp_storage_options: { uniform: false }) - end - end - context 'when a cdn is requested in the options' do before do options.merge!(cdn: { uri: 'http://cdn.com' }) @@ -96,8 +76,7 @@ module Blobstore root_dir: anything, min_size: anything, max_size: anything, - aws_storage_options: anything, - gcp_storage_options: anything) + aws_storage_options: anything) end end diff --git a/spec/unit/lib/cloud_controller/blobstore/fog/fog_client_spec.rb b/spec/unit/lib/cloud_controller/blobstore/fog/fog_client_spec.rb index 726b4cf78ec..d13bf2e0125 100644 --- a/spec/unit/lib/cloud_controller/blobstore/fog/fog_client_spec.rb +++ b/spec/unit/lib/cloud_controller/blobstore/fog/fog_client_spec.rb @@ -383,58 +383,6 @@ def upload_tmpfile(client, key='abcdef') end end end - - context 'gcp' do - let(:gcp_connection_config) do - { - provider: 'Google', - google_project: 'gcs_project', - google_client_email: 'gcs_service_account_email', - google_json_key_string: 'gcs_service_account_json_key' - } - end - - context 'when uniform flag is specified' do - let(:client_with_encryption) do - FogClient.new(connection_config: gcp_connection_config, - directory_key: directory_key, - gcp_storage_options: { uniform: false, other: 'thing' }) - end - - it 'passes the storage options to gcp' do - path = File.join(local_dir, 'empty_file.png') - FileUtils.touch(path) - - client_with_encryption.cp_to_blobstore(path, 'abcdef123456') - - expect(files).to have_received(:create).with(key: anything, - body: anything, - content_type: anything, - public: anything, - uniform: false, - other: 'thing') - end - end - - context 'when gcp uniform flag is not specified' do - let(:client_with_encryption) do - FogClient.new(connection_config: gcp_connection_config, - directory_key: directory_key) - end - - it 'has empty storage options' do - path = File.join(local_dir, 'empty_file.png') - FileUtils.touch(path) - - client_with_encryption.cp_to_blobstore(path, 'abcdef123456') - - expect(files).to have_received(:create).with(key: anything, - body: anything, - content_type: anything, - public: anything) - end - end - end end end diff --git a/spec/unit/lib/cloud_controller/blobstore/storage_cli/storage_cli_client_spec.rb b/spec/unit/lib/cloud_controller/blobstore/storage_cli/storage_cli_client_spec.rb index f04d582b106..03958760213 100644 --- a/spec/unit/lib/cloud_controller/blobstore/storage_cli/storage_cli_client_spec.rb +++ b/spec/unit/lib/cloud_controller/blobstore/storage_cli/storage_cli_client_spec.rb @@ -43,26 +43,6 @@ def stub_config_for_droplets(path) end end - it 'maps Google legacy provider to gcs storage-cli type' do - droplets_cfg = write_config_file( - provider: 'Google', - bucket_name: 'test-bucket', - json_key: '{}' - ) - begin - stub_config_for_droplets(droplets_cfg.path) - - client = StorageCliClient.new( - directory_key: 'dummy-key', - root_dir: 'dummy-root', - resource_type: 'droplets' - ) - expect(client.instance_variable_get(:@storage_type)).to eq('gcs') - ensure - droplets_cfg.close! - end - end - it 'maps webdav legacy provider to dav storage-cli type' do droplets_cfg = write_config_file( provider: 'webdav', diff --git a/spec/unit/lib/cloud_controller/config_spec.rb b/spec/unit/lib/cloud_controller/config_spec.rb index 4b22a4021e6..294fb3ab1b4 100644 --- a/spec/unit/lib/cloud_controller/config_spec.rb +++ b/spec/unit/lib/cloud_controller/config_spec.rb @@ -9,7 +9,6 @@ module VCAP::CloudController fog_aws_storage_options: { encryption: 'AES256' }, - fog_gcp_storage_options: {}, app_package_directory_key: 'app_key' }, droplets: { @@ -389,7 +388,6 @@ module VCAP::CloudController fog_aws_storage_options: { encryption: 'AES256' }, - fog_gcp_storage_options: {}, app_package_directory_key: 'app_key' }, droplets: { @@ -552,7 +550,6 @@ module VCAP::CloudController fog_aws_storage_options: { encryption: 'AES256' }, - fog_gcp_storage_options: {}, app_package_directory_key: 'app_key' }) expect(config_instance.get(:packages, :fog_aws_storage_options)).to eq(encryption: 'AES256')