From 850aac9026942ca34db27525756390d0f60f65af Mon Sep 17 00:00:00 2001 From: johha Date: Thu, 30 Jul 2026 10:34:16 +0200 Subject: [PATCH] Remove cloudfront-signer gem and dead CDN config --- Gemfile | 1 - Gemfile.lock | 6 ------ config/bosh-lite.yml | 16 -------------- config/initializers/cloudfront_signer.rb | 21 ------------------- .../config_schemas/api_schema.rb | 12 ++++------- .../blobstore_benchmarks_schema.rb | 1 - .../config_schemas/clock_schema.rb | 12 ++++------- .../deployment_updater_schema.rb | 12 ++++------- .../config_schemas/worker_schema.rb | 12 ++++------- 9 files changed, 16 insertions(+), 77 deletions(-) delete mode 100644 config/initializers/cloudfront_signer.rb diff --git a/Gemfile b/Gemfile index dbebfa8de80..c7936b827ea 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,6 @@ source 'https://rubygems.org' gem 'addressable' gem 'bootsnap', require: false gem 'clockwork', require: false -gem 'cloudfront-signer' gem 'concurrent-ruby' gem 'digest-xxhash' gem 'fluent-logger' diff --git a/Gemfile.lock b/Gemfile.lock index f428399ff53..b7fdc8e8f5f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -54,7 +54,6 @@ GEM clockwork (4.0.1) activesupport tzinfo - cloudfront-signer (3.0.2) codeclimate-test-reporter (1.0.9) simplecov (<= 0.13) coderay (1.1.3) @@ -80,8 +79,6 @@ GEM drb (2.2.3) erb (6.0.6) erubi (1.13.1) - excon (1.6.0) - logger factory_bot (6.6.0) activesupport (>= 6.1.0) ffi (1.17.4) @@ -90,8 +87,6 @@ GEM fluent-logger (0.10.0) logger (~> 1.6) msgpack (>= 1.0.0, < 2) - formatador (1.2.3) - reline google-protobuf (4.35.1) bigdecimal rake (~> 13.3) @@ -458,7 +453,6 @@ DEPENDENCIES byebug cf-uaa-lib (~> 4.0.10) clockwork - cloudfront-signer codeclimate-test-reporter (>= 1.0.8) concurrent-ruby debug (~> 1.11) diff --git a/config/bosh-lite.yml b/config/bosh-lite.yml index 0d88a230a38..17746e4817a 100644 --- a/config/bosh-lite.yml +++ b/config/bosh-lite.yml @@ -132,10 +132,6 @@ resource_pool: minimum_size: 65536 maximum_size: 536870912 resource_directory_key: bosh-lite.com-cc-resources - cdn: - uri: - key_pair_id: - private_key: "" packages: blobstore_type: webdav @@ -148,10 +144,6 @@ packages: app_package_directory_key: bosh-lite.com-cc-packages max_valid_packages_stored: 5 max_package_size: 1073741824 - cdn: - uri: - key_pair_id: - private_key: "" droplets: blobstore_type: webdav @@ -162,10 +154,6 @@ droplets: username: blobstore-username password: blobstore-password droplet_directory_key: bosh-lite.com-cc-droplets - cdn: - uri: - key_pair_id: - private_key: "" max_staged_droplets_stored: 5 buildpacks: @@ -177,10 +165,6 @@ buildpacks: username: blobstore-username password: blobstore-password buildpack_directory_key: bosh-lite.com-cc-buildpacks - cdn: - uri: - key_pair_id: - private_key: "" db_encryption_key: db-encryption-key diff --git a/config/initializers/cloudfront_signer.rb b/config/initializers/cloudfront_signer.rb deleted file mode 100644 index 87a06d4def3..00000000000 --- a/config/initializers/cloudfront_signer.rb +++ /dev/null @@ -1,21 +0,0 @@ -require 'cloudfront-signer' - -module CCInitializers - def self.cloudfront_signer(cc_config) - return if cc_config[:droplets].blank? - - cdn_config = cc_config[:droplets][:cdn] - return unless cdn_config && cdn_config[:private_key].present? - - key_file = Tempfile.open('pk-cdn.pem') do |file| - file.write(cc_config[:droplets][:cdn][:private_key]) - file - end - - Aws::CF::Signer.configure do |config| - config.key_path = key_file.path - config.key_pair_id = cc_config[:droplets][:cdn][:key_pair_id] - config.default_expires = 600 - end - end -end diff --git a/lib/cloud_controller/config_schemas/api_schema.rb b/lib/cloud_controller/config_schemas/api_schema.rb index 08b9a71674b..a4b041e3684 100644 --- a/lib/cloud_controller/config_schemas/api_schema.rb +++ b/lib/cloud_controller/config_schemas/api_schema.rb @@ -222,8 +222,7 @@ class ApiSchema < VCAP::Config optional(:blobstore_type) => String, optional(:local_blobstore_path) => String, optional(:connection_config) => Hash, - optional(:webdav_config) => Hash, - optional(:cdn) => Hash + optional(:webdav_config) => Hash }, buildpacks: { @@ -231,8 +230,7 @@ class ApiSchema < VCAP::Config optional(:blobstore_type) => String, optional(:local_blobstore_path) => String, optional(:connection_config) => Hash, - optional(:webdav_config) => Hash, - optional(:cdn) => Hash + optional(:webdav_config) => Hash }, packages: { @@ -242,8 +240,7 @@ class ApiSchema < VCAP::Config optional(:blobstore_type) => String, optional(:local_blobstore_path) => String, optional(:connection_config) => Hash, - optional(:webdav_config) => Hash, - optional(:cdn) => Hash + optional(:webdav_config) => Hash }, droplets: { @@ -252,8 +249,7 @@ class ApiSchema < VCAP::Config optional(:blobstore_type) => String, optional(:local_blobstore_path) => String, optional(:connection_config) => Hash, - optional(:webdav_config) => Hash, - optional(:cdn) => Hash + optional(:webdav_config) => Hash }, db_encryption_key: enum(String, NilClass), diff --git a/lib/cloud_controller/config_schemas/blobstore_benchmarks_schema.rb b/lib/cloud_controller/config_schemas/blobstore_benchmarks_schema.rb index 85daf240165..51d031b86aa 100644 --- a/lib/cloud_controller/config_schemas/blobstore_benchmarks_schema.rb +++ b/lib/cloud_controller/config_schemas/blobstore_benchmarks_schema.rb @@ -12,7 +12,6 @@ class BlobstoreBenchmarksSchema < VCAP::Config optional(:local_blobstore_path) => String, optional(:connection_config) => Hash, optional(:webdav_config) => Hash, - optional(:cdn) => 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 9cac053cb40..79b4461b66c 100644 --- a/lib/cloud_controller/config_schemas/clock_schema.rb +++ b/lib/cloud_controller/config_schemas/clock_schema.rb @@ -129,8 +129,7 @@ class ClockSchema < VCAP::Config optional(:blobstore_type) => String, optional(:local_blobstore_path) => String, optional(:connection_config) => Hash, - optional(:webdav_config) => Hash, - optional(:cdn) => Hash + optional(:webdav_config) => Hash }, buildpacks: { @@ -138,8 +137,7 @@ class ClockSchema < VCAP::Config optional(:blobstore_type) => String, optional(:local_blobstore_path) => String, optional(:connection_config) => Hash, - optional(:webdav_config) => Hash, - optional(:cdn) => Hash + optional(:webdav_config) => Hash }, packages: { @@ -148,8 +146,7 @@ class ClockSchema < VCAP::Config optional(:blobstore_type) => String, optional(:local_blobstore_path) => String, optional(:connection_config) => Hash, - optional(:webdav_config) => Hash, - optional(:cdn) => Hash + optional(:webdav_config) => Hash }, droplets: { @@ -157,8 +154,7 @@ class ClockSchema < VCAP::Config optional(:blobstore_type) => String, optional(:local_blobstore_path) => String, optional(:connection_config) => Hash, - optional(:webdav_config) => Hash, - optional(:cdn) => Hash + optional(:webdav_config) => Hash }, db_encryption_key: enum(String, NilClass), diff --git a/lib/cloud_controller/config_schemas/deployment_updater_schema.rb b/lib/cloud_controller/config_schemas/deployment_updater_schema.rb index a96c9eaf461..207a0b12f64 100644 --- a/lib/cloud_controller/config_schemas/deployment_updater_schema.rb +++ b/lib/cloud_controller/config_schemas/deployment_updater_schema.rb @@ -124,8 +124,7 @@ class DeploymentUpdaterSchema < VCAP::Config optional(:blobstore_type) => String, optional(:local_blobstore_path) => String, optional(:connection_config) => Hash, - optional(:webdav_config) => Hash, - optional(:cdn) => Hash + optional(:webdav_config) => Hash }, buildpacks: { @@ -133,8 +132,7 @@ class DeploymentUpdaterSchema < VCAP::Config optional(:blobstore_type) => String, optional(:local_blobstore_path) => String, optional(:connection_config) => Hash, - optional(:webdav_config) => Hash, - optional(:cdn) => Hash + optional(:webdav_config) => Hash }, packages: { @@ -143,8 +141,7 @@ class DeploymentUpdaterSchema < VCAP::Config optional(:blobstore_type) => String, optional(:local_blobstore_path) => String, optional(:connection_config) => Hash, - optional(:webdav_config) => Hash, - optional(:cdn) => Hash + optional(:webdav_config) => Hash }, droplets: { @@ -152,8 +149,7 @@ class DeploymentUpdaterSchema < VCAP::Config optional(:blobstore_type) => String, optional(:local_blobstore_path) => String, optional(:connection_config) => Hash, - optional(:webdav_config) => Hash, - optional(:cdn) => Hash + optional(:webdav_config) => Hash }, stacks_file: String, diff --git a/lib/cloud_controller/config_schemas/worker_schema.rb b/lib/cloud_controller/config_schemas/worker_schema.rb index 84b52365ebf..c6b99c27a67 100644 --- a/lib/cloud_controller/config_schemas/worker_schema.rb +++ b/lib/cloud_controller/config_schemas/worker_schema.rb @@ -123,8 +123,7 @@ class WorkerSchema < VCAP::Config optional(:blobstore_type) => String, optional(:local_blobstore_path) => String, optional(:connection_config) => Hash, - optional(:webdav_config) => Hash, - optional(:cdn) => Hash + optional(:webdav_config) => Hash }, buildpacks: { @@ -132,8 +131,7 @@ class WorkerSchema < VCAP::Config optional(:blobstore_type) => String, optional(:local_blobstore_path) => String, optional(:connection_config) => Hash, - optional(:webdav_config) => Hash, - optional(:cdn) => Hash + optional(:webdav_config) => Hash }, packages: { @@ -143,8 +141,7 @@ class WorkerSchema < VCAP::Config optional(:blobstore_type) => String, optional(:local_blobstore_path) => String, optional(:connection_config) => Hash, - optional(:webdav_config) => Hash, - optional(:cdn) => Hash + optional(:webdav_config) => Hash }, droplets: { @@ -152,8 +149,7 @@ class WorkerSchema < VCAP::Config optional(:blobstore_type) => String, optional(:local_blobstore_path) => String, optional(:connection_config) => Hash, - optional(:webdav_config) => Hash, - optional(:cdn) => Hash + optional(:webdav_config) => Hash }, db_encryption_key: enum(String, NilClass),