Remove fog-aws and fog-core, complete fog removal

.rubocop_todo.yml

@@ -62,7 +62,6 @@ Lint/SuppressedException:
     - 'lib/cloud_controller/database_uri_generator.rb'
     - 'lib/vcap/pid_file.rb'
     - 'spec/unit/actions/v2/route_create_spec.rb'
-    - 'spec/unit/lib/cloud_controller/blobstore/fog/fog_client_spec.rb'
     - 'spec/unit/lib/services/service_brokers/service_broker_registration_spec.rb'
     - 'spec/unit/models/services/service_broker_spec.rb'
 
@@ -581,7 +580,6 @@ Style/HashSlice:
     - 'app/controllers/services/service_instances_controller.rb'
     - 'app/controllers/services/service_plans_controller.rb'
     - 'app/presenters/system_environment/service_binding_presenter.rb'
-    - 'lib/cloud_controller/blobstore/fog/fog_blob.rb'
     - 'lib/cloud_controller/blobstore/storage_cli/storage_cli_blob.rb'
     - 'lib/cloud_controller/blobstore/webdav/dav_blob.rb'
     - 'lib/cloud_controller/telemetry_logger.rb'

Gemfile

@@ -40,9 +40,6 @@ gem 'actionview', '~> 8.1.3'
 gem 'activemodel', '~> 8.1.2'
 gem 'railties', '~> 8.1.1'
 
-gem 'fog-aws'
-gem 'fog-core', '~> 2.6.0'
-
 gem 'cf-uaa-lib', '~> 4.0.10'
 
 group :db do

Gemfile.lock

@@ -90,22 +90,6 @@ GEM
     fluent-logger (0.10.0)
       logger (~> 1.6)
       msgpack (>= 1.0.0, < 2)
-    fog-aws (3.33.2)
-      base64 (>= 0.2, < 0.4)
-      fog-core (~> 2.6)
-      fog-json (~> 1.1)
-      fog-xml (~> 0.1)
-    fog-core (2.6.0)
-      builder
-      excon (~> 1.0)
-      formatador (>= 0.2, < 2.0)
-      mime-types
-    fog-json (1.3.0)
-      fog-core
-      multi_json (~> 1.10)
-    fog-xml (0.1.5)
-      fog-core
-      nokogiri (>= 1.5.11, < 2.0.0)
     formatador (1.2.3)
       reline
     google-protobuf (4.35.1)
@@ -481,8 +465,6 @@ DEPENDENCIES
   digest-xxhash
   factory_bot (~> 6.5)
   fluent-logger
-  fog-aws
-  fog-core (~> 2.6.0)
   googleapis-common-protos (>= 1.8.0)
   hashdiff
   httpclient

README.md

@@ -40,7 +40,6 @@ When deployed via capi-release only:
 | Provider | `blobstore_type` | Backends                                      | Notes |
 |----------|------------------|-----------------------------------------------|-------|
 | Storage CLI | `storage-cli` | S3, S3-compatible, GCS, Azure, Alibaba Cloud  | |
-| Fog | `fog` | AWS, GCS, Alibaba Cloud, OpenStack, Local/NFS | **Default.** Local/NFS not recommended for production |
 | WebDAV | `webdav` | WebDAV servers                                | |
 | Local | `local`, `local-temp-storage` | Filesystem, NFS                               | Development and testing only |
 

config/bosh-lite.yml

@@ -136,7 +136,6 @@ resource_pool:
     uri: 
     key_pair_id: 
     private_key: ""
-  fog_connection: {}
 
 packages:
   blobstore_type: webdav
@@ -153,7 +152,6 @@ packages:
     uri: 
     key_pair_id: 
     private_key: ""
-  fog_connection: {}
 
 droplets:
   blobstore_type: webdav
@@ -168,7 +166,6 @@ droplets:
     uri: 
     key_pair_id: 
     private_key: ""
-  fog_connection: {}
   max_staged_droplets_stored: 5
 
 buildpacks:
@@ -184,7 +181,6 @@ buildpacks:
     uri: 
     key_pair_id: 
     private_key: ""
-  fog_connection: {}
 
 db_encryption_key: db-encryption-key
 

config/cloud_controller.yml

@@ -182,29 +182,21 @@ resource_pool:
   minimum_size: 1
   resource_directory_key: "spec-cc-resources"
   blobstore_type: local-temp-storage
-  fog_connection: {}
-  fog_aws_storage_options: {}
 
 packages:
   app_package_directory_key: "cc-packages"
   max_package_size: 42
   max_valid_packages_stored: 42
   blobstore_type: local-temp-storage
-  fog_connection: {}
-  fog_aws_storage_options: {}
 
 droplets:
   droplet_directory_key: cc-droplets
   max_staged_droplets_stored: 42
   blobstore_type: local-temp-storage
-  fog_connection: {}
-  fog_aws_storage_options: {}
 
 buildpacks:
   buildpack_directory_key: cc-buildpacks
   blobstore_type: local-temp-storage
-  fog_connection: {}
-  fog_aws_storage_options: {}
 
 db_encryption_key: "asdfasdfasdf"
 database_encryption:

decisions/0014-storage-clis-for-blobstore-operations.md

@@ -12,16 +12,14 @@
 | Alibaba Cloud| ✅ Implemented            | Uses [`storage-cli`](https://github.com/cloudfoundry/storage-cli/tree/main/alioss) with native type `alioss`                                                  |
 
 **Configuration Migration Status:**
-- The `blobstore_provider` field accepts both native storage-cli type names AND legacy fog names
-- **Recommended:** Use native storage-cli type names (azurebs, s3, gcs, alioss)
-- **Legacy fog names** (AzureRM, AWS, Google, aliyun) still supported for backwards compatibility
+- The `blobstore_provider` field accepts native storage-cli type names (azurebs, s3, gcs, alioss)
+- **Legacy fog names** (AzureRM, AWS, Google, aliyun) are no longer supported — fog gems have been fully removed
 - **WebDAV/dav intentionally excluded** until fully supported
-- **Timeline:** Legacy fog name support to be removed May 2026
 
 
 ## Context
 
-Cloud Controller uses the fog gem family to interface with blobstores like Azure, AWS, GCP, and Alibaba Cloud.
+Cloud Controller previously used the fog gem family to interface with blobstores like Azure, AWS, GCP, and Alibaba Cloud.
 These Ruby gems are largely unmaintained, introducing risks such as:
 * Dependency on deprecated SDKs (e.g., Azure SDK for Ruby)
 * Blocking Ruby version upgrades
@@ -79,11 +77,13 @@ The `bosh-azure-storage-cli` needs to be extended with the following commands:
 
 Other providers (AWS, GCP, Alibaba Cloud) will follow. Each will require equivalent blobstore clients and support for the above commands.
 This will eventually allow us to remove all fog related gems from Cloud Controller.
+> ✅ **All fog gems have been fully removed** (fog-aws, fog-core, fog-azure-rm, fog-google, fog-aliyun).
+> ✅ **fog-aws and fog-core have been fully removed** as of this change.
 
 
 ## Consequences
 
-* Enables the removal of `fog-azure-rm` and all other fog related gems
+* ✅ Enabled the removal of all fog related gems — fog-aws, fog-core, fog-azure-rm, fog-google, and fog-aliyun have all been removed
 * Reduces long-term maintenance burden and potential security issues
 * Allows providers to be migrated independently
 * Increases initial complexity during migration phase

lib/cloud_controller/blobstore/blob.rb

@@ -2,6 +2,18 @@ module CloudController
   module Blobstore
     class Blob
       CACHE_ATTRIBUTES = %i[etag last_modified created_at content_length].freeze
+
+      def internal_download_url
+        raise NotImplementedError
+      end
+
+      def public_download_url
+        raise NotImplementedError
+      end
+
+      def local_path
+        raise NotImplementedError
+      end
     end
   end
 end

lib/cloud_controller/blobstore/client_provider.rb

@@ -1,6 +1,5 @@
 require 'cloud_controller/blobstore/client'
 require 'cloud_controller/blobstore/retryable_client'
-require 'cloud_controller/blobstore/fog/fog_client'
 require 'cloud_controller/blobstore/error_handling_client'
 require 'cloud_controller/blobstore/webdav/dav_client'
 require 'cloud_controller/blobstore/local/local_client'
@@ -18,8 +17,6 @@ def self.provide(options:, directory_key:, root_dir: nil, resource_type: nil)
           provide_local(options, directory_key, root_dir, use_temp_storage: true)
         when 'storage-cli'
           provide_storage_cli(options, directory_key, root_dir, resource_type)
-        when 'fog', nil, ''
-          provide_fog(options, directory_key, root_dir)
         else
           provide_webdav(options, directory_key, root_dir)
         end
@@ -28,34 +25,6 @@ def self.provide(options:, directory_key:, root_dir: nil, resource_type: nil)
       class << self
         private
 
-        def provide_fog(options, directory_key, root_dir)
-          cdn_uri        = HashUtils.dig(options[:cdn], :uri)
-          cdn            = CloudController::Blobstore::Cdn.make(cdn_uri)
-
-          client = FogClient.new(
-            connection_config: options.fetch(:fog_connection),
-            directory_key: directory_key,
-            cdn: cdn,
-            root_dir: root_dir,
-            min_size: options[:minimum_size],
-            max_size: options[:maximum_size],
-            aws_storage_options: options[:fog_aws_storage_options]
-          )
-
-          logger = Steno.logger('cc.blobstore')
-
-          # work around https://github.com/fog/fog/issues/3137
-          # and Fog raising an EOFError SocketError intermittently
-          # and https://github.com/fog/fog-aws/issues/264
-          # 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, OpenSSL::OpenSSLError]
-          retryable_client = RetryableClient.new(client:, errors:, logger:)
-
-          Client.new(ErrorHandlingClient.new(SafeDeleteClient.new(retryable_client, root_dir)))
-        end
-
         def provide_local(options, directory_key, root_dir, use_temp_storage:)
           client = LocalClient.new(
             directory_key: directory_key,