Skip to content

Remove cloudfront-signer gem and dead CDN config #5319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
johha merged 1 commit into from
Jul 30, 2026
Merged

Remove cloudfront-signer gem and dead CDN config #5319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
6 changes: 0 additions & 6 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
16 changes: 0 additions & 16 deletions config/bosh-lite.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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:
Expand All @@ -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

Expand Down
21 changes: 0 additions & 21 deletions config/initializers/cloudfront_signer.rb
View file
Open in desktop

This file was deleted.

12 changes: 4 additions & 8 deletions lib/cloud_controller/config_schemas/api_schema.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,17 +222,15 @@ 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: {
buildpack_directory_key: String,
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: {
Expand All @@ -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: {
Expand All @@ -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),
Expand Down
1 change: 0 additions & 1 deletion lib/cloud_controller/config_schemas/blobstore_benchmarks_schema.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
12 changes: 4 additions & 8 deletions lib/cloud_controller/config_schemas/clock_schema.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,17 +129,15 @@ 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: {
buildpack_directory_key: String,
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: {
Expand All @@ -148,17 +146,15 @@ 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: {
droplet_directory_key: String,
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),
Expand Down
12 changes: 4 additions & 8 deletions lib/cloud_controller/config_schemas/deployment_updater_schema.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,17 +124,15 @@ 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: {
buildpack_directory_key: String,
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: {
Expand All @@ -143,17 +141,15 @@ 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: {
droplet_directory_key: String,
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,
Expand Down
12 changes: 4 additions & 8 deletions lib/cloud_controller/config_schemas/worker_schema.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,17 +123,15 @@ 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: {
buildpack_directory_key: String,
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: {
Expand All @@ -143,17 +141,15 @@ 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: {
droplet_directory_key: String,
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),
Expand Down
Loading