From e879db6e9cad3ef88e774369633a807a1b12e4a7 Mon Sep 17 00:00:00 2001 From: Katharina Przybill <30441792+kathap@users.noreply.github.com> Date: Fri, 31 Jul 2026 09:16:50 +0200 Subject: [PATCH] Remove tiny fog leftovers --- .devcontainer/scripts/cc-generate-config | 2 -- LICENSE | 29 ------------------- .../internal_url_generator_spec.rb | 1 + 3 files changed, 1 insertion(+), 31 deletions(-) diff --git a/.devcontainer/scripts/cc-generate-config b/.devcontainer/scripts/cc-generate-config index e6672fdc82d..d1f38a55bb7 100755 --- a/.devcontainer/scripts/cc-generate-config +++ b/.devcontainer/scripts/cc-generate-config @@ -66,7 +66,6 @@ def generate_config(mode, hosts) %w[resource_pool packages droplets buildpacks].each do |store| config[store]['blobstore_type'] = 'local' config[store]['local_blobstore_path'] = blobstore_path - config[store]['fog_connection'] = {} end when 'storage-cli' config_dir = "#{Dir.pwd}/tmp/.dev-generated/storage_cli_configs" @@ -78,7 +77,6 @@ def generate_config(mode, hosts) 'secret_access_key' => 'any', 'region' => 'us-east-1' }, mode: :compat, indent: 2 )) config[store]['blobstore_type'] = 'storage-cli' - config[store]['fog_connection'] = {} config[store].delete('local_blobstore_path') config["storage_cli_config_file_#{store}"] = "#{config_dir}/#{store}.json" end diff --git a/LICENSE b/LICENSE index fed5f5d96a4..68059201fa5 100644 --- a/LICENSE +++ b/LICENSE @@ -227,7 +227,6 @@ SECTION 1: BSD-STYLE, MIT-STYLE, OR SIMILAR STYLE LICENSES >>> em-http-request-1.1.0 >>> em-socksify-0.3.0 >>> excon-0.23.0 - >>> fog-1.12.1 >>> formatador-0.2.4 >>> grape-0.5.0 >>> guard-1.8.1 @@ -731,34 +730,6 @@ The above copyright notice and this permission notice shall be included in all c THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ->>> fog-1.12.1 - -Copyright - -(The MIT License) - -Copyright (c) 2013 [geemus (Wesley Beary)](http://github.com/geemus) - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - >>> formatador-0.2.4 Copyright diff --git a/spec/unit/lib/cloud_controller/blobstore/url_generator/internal_url_generator_spec.rb b/spec/unit/lib/cloud_controller/blobstore/url_generator/internal_url_generator_spec.rb index 24896cc8d2a..6e02cd473f3 100644 --- a/spec/unit/lib/cloud_controller/blobstore/url_generator/internal_url_generator_spec.rb +++ b/spec/unit/lib/cloud_controller/blobstore/url_generator/internal_url_generator_spec.rb @@ -1,4 +1,5 @@ require 'spec_helper' +require 'cloud_controller/blobstore/null_blob' require 'cloud_controller/blobstore/url_generator/internal_url_generator' module CloudController