Skip to content

Commit 850aac9

Browse files
johhajohha
committed
Remove cloudfront-signer gem and dead CDN config
1 parent 8d562d8 commit 850aac9

9 files changed

Lines changed: 16 additions & 77 deletions

File tree

‎Gemfile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ source 'https://rubygems.org'
33
gem 'addressable'
44
gem 'bootsnap', require: false
55
gem 'clockwork', require: false
6-
gem 'cloudfront-signer'
76
gem 'concurrent-ruby'
87
gem 'digest-xxhash'
98
gem 'fluent-logger'

‎Gemfile.lock‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ GEM
5454
clockwork (4.0.1)
5555
activesupport
5656
tzinfo
57-
cloudfront-signer (3.0.2)
5857
codeclimate-test-reporter (1.0.9)
5958
simplecov (<= 0.13)
6059
coderay (1.1.3)
@@ -80,8 +79,6 @@ GEM
8079
drb (2.2.3)
8180
erb (6.0.6)
8281
erubi (1.13.1)
83-
excon (1.6.0)
84-
logger
8582
factory_bot (6.6.0)
8683
activesupport (>= 6.1.0)
8784
ffi (1.17.4)
@@ -90,8 +87,6 @@ GEM
9087
fluent-logger (0.10.0)
9188
logger (~> 1.6)
9289
msgpack (>= 1.0.0, < 2)
93-
formatador (1.2.3)
94-
reline
9590
google-protobuf (4.35.1)
9691
bigdecimal
9792
rake (~> 13.3)
@@ -458,7 +453,6 @@ DEPENDENCIES
458453
byebug
459454
cf-uaa-lib (~> 4.0.10)
460455
clockwork
461-
cloudfront-signer
462456
codeclimate-test-reporter (>= 1.0.8)
463457
concurrent-ruby
464458
debug (~> 1.11)

‎config/bosh-lite.yml‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,6 @@ resource_pool:
132132
minimum_size: 65536
133133
maximum_size: 536870912
134134
resource_directory_key: bosh-lite.com-cc-resources
135-
cdn:
136-
uri:
137-
key_pair_id:
138-
private_key: ""
139135

140136
packages:
141137
blobstore_type: webdav
@@ -148,10 +144,6 @@ packages:
148144
app_package_directory_key: bosh-lite.com-cc-packages
149145
max_valid_packages_stored: 5
150146
max_package_size: 1073741824
151-
cdn:
152-
uri:
153-
key_pair_id:
154-
private_key: ""
155147

156148
droplets:
157149
blobstore_type: webdav
@@ -162,10 +154,6 @@ droplets:
162154
username: blobstore-username
163155
password: blobstore-password
164156
droplet_directory_key: bosh-lite.com-cc-droplets
165-
cdn:
166-
uri:
167-
key_pair_id:
168-
private_key: ""
169157
max_staged_droplets_stored: 5
170158

171159
buildpacks:
@@ -177,10 +165,6 @@ buildpacks:
177165
username: blobstore-username
178166
password: blobstore-password
179167
buildpack_directory_key: bosh-lite.com-cc-buildpacks
180-
cdn:
181-
uri:
182-
key_pair_id:
183-
private_key: ""
184168

185169
db_encryption_key: db-encryption-key
186170

‎config/initializers/cloudfront_signer.rb‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎lib/cloud_controller/config_schemas/api_schema.rb‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -222,17 +222,15 @@ class ApiSchema < VCAP::Config
222222
optional(:blobstore_type) => String,
223223
optional(:local_blobstore_path) => String,
224224
optional(:connection_config) => Hash,
225-
optional(:webdav_config) => Hash,
226-
optional(:cdn) => Hash
225+
optional(:webdav_config) => Hash
227226
},
228227

229228
buildpacks: {
230229
buildpack_directory_key: String,
231230
optional(:blobstore_type) => String,
232231
optional(:local_blobstore_path) => String,
233232
optional(:connection_config) => Hash,
234-
optional(:webdav_config) => Hash,
235-
optional(:cdn) => Hash
233+
optional(:webdav_config) => Hash
236234
},
237235

238236
packages: {
@@ -242,8 +240,7 @@ class ApiSchema < VCAP::Config
242240
optional(:blobstore_type) => String,
243241
optional(:local_blobstore_path) => String,
244242
optional(:connection_config) => Hash,
245-
optional(:webdav_config) => Hash,
246-
optional(:cdn) => Hash
243+
optional(:webdav_config) => Hash
247244
},
248245

249246
droplets: {
@@ -252,8 +249,7 @@ class ApiSchema < VCAP::Config
252249
optional(:blobstore_type) => String,
253250
optional(:local_blobstore_path) => String,
254251
optional(:connection_config) => Hash,
255-
optional(:webdav_config) => Hash,
256-
optional(:cdn) => Hash
252+
optional(:webdav_config) => Hash
257253
},
258254

259255
db_encryption_key: enum(String, NilClass),

‎lib/cloud_controller/config_schemas/blobstore_benchmarks_schema.rb‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ class BlobstoreBenchmarksSchema < VCAP::Config
1212
optional(:local_blobstore_path) => String,
1313
optional(:connection_config) => Hash,
1414
optional(:webdav_config) => Hash,
15-
optional(:cdn) => Hash,
1615

1716
optional(:resource_directory_key) => String,
1817
optional(:buildpack_directory_key) => String,

‎lib/cloud_controller/config_schemas/clock_schema.rb‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -129,17 +129,15 @@ class ClockSchema < VCAP::Config
129129
optional(:blobstore_type) => String,
130130
optional(:local_blobstore_path) => String,
131131
optional(:connection_config) => Hash,
132-
optional(:webdav_config) => Hash,
133-
optional(:cdn) => Hash
132+
optional(:webdav_config) => Hash
134133
},
135134

136135
buildpacks: {
137136
buildpack_directory_key: String,
138137
optional(:blobstore_type) => String,
139138
optional(:local_blobstore_path) => String,
140139
optional(:connection_config) => Hash,
141-
optional(:webdav_config) => Hash,
142-
optional(:cdn) => Hash
140+
optional(:webdav_config) => Hash
143141
},
144142

145143
packages: {
@@ -148,17 +146,15 @@ class ClockSchema < VCAP::Config
148146
optional(:blobstore_type) => String,
149147
optional(:local_blobstore_path) => String,
150148
optional(:connection_config) => Hash,
151-
optional(:webdav_config) => Hash,
152-
optional(:cdn) => Hash
149+
optional(:webdav_config) => Hash
153150
},
154151

155152
droplets: {
156153
droplet_directory_key: String,
157154
optional(:blobstore_type) => String,
158155
optional(:local_blobstore_path) => String,
159156
optional(:connection_config) => Hash,
160-
optional(:webdav_config) => Hash,
161-
optional(:cdn) => Hash
157+
optional(:webdav_config) => Hash
162158
},
163159

164160
db_encryption_key: enum(String, NilClass),

‎lib/cloud_controller/config_schemas/deployment_updater_schema.rb‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -124,17 +124,15 @@ class DeploymentUpdaterSchema < VCAP::Config
124124
optional(:blobstore_type) => String,
125125
optional(:local_blobstore_path) => String,
126126
optional(:connection_config) => Hash,
127-
optional(:webdav_config) => Hash,
128-
optional(:cdn) => Hash
127+
optional(:webdav_config) => Hash
129128
},
130129

131130
buildpacks: {
132131
buildpack_directory_key: String,
133132
optional(:blobstore_type) => String,
134133
optional(:local_blobstore_path) => String,
135134
optional(:connection_config) => Hash,
136-
optional(:webdav_config) => Hash,
137-
optional(:cdn) => Hash
135+
optional(:webdav_config) => Hash
138136
},
139137

140138
packages: {
@@ -143,17 +141,15 @@ class DeploymentUpdaterSchema < VCAP::Config
143141
optional(:blobstore_type) => String,
144142
optional(:local_blobstore_path) => String,
145143
optional(:connection_config) => Hash,
146-
optional(:webdav_config) => Hash,
147-
optional(:cdn) => Hash
144+
optional(:webdav_config) => Hash
148145
},
149146

150147
droplets: {
151148
droplet_directory_key: String,
152149
optional(:blobstore_type) => String,
153150
optional(:local_blobstore_path) => String,
154151
optional(:connection_config) => Hash,
155-
optional(:webdav_config) => Hash,
156-
optional(:cdn) => Hash
152+
optional(:webdav_config) => Hash
157153
},
158154

159155
stacks_file: String,

‎lib/cloud_controller/config_schemas/worker_schema.rb‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -123,17 +123,15 @@ class WorkerSchema < VCAP::Config
123123
optional(:blobstore_type) => String,
124124
optional(:local_blobstore_path) => String,
125125
optional(:connection_config) => Hash,
126-
optional(:webdav_config) => Hash,
127-
optional(:cdn) => Hash
126+
optional(:webdav_config) => Hash
128127
},
129128

130129
buildpacks: {
131130
buildpack_directory_key: String,
132131
optional(:blobstore_type) => String,
133132
optional(:local_blobstore_path) => String,
134133
optional(:connection_config) => Hash,
135-
optional(:webdav_config) => Hash,
136-
optional(:cdn) => Hash
134+
optional(:webdav_config) => Hash
137135
},
138136

139137
packages: {
@@ -143,17 +141,15 @@ class WorkerSchema < VCAP::Config
143141
optional(:blobstore_type) => String,
144142
optional(:local_blobstore_path) => String,
145143
optional(:connection_config) => Hash,
146-
optional(:webdav_config) => Hash,
147-
optional(:cdn) => Hash
144+
optional(:webdav_config) => Hash
148145
},
149146

150147
droplets: {
151148
droplet_directory_key: String,
152149
optional(:blobstore_type) => String,
153150
optional(:local_blobstore_path) => String,
154151
optional(:connection_config) => Hash,
155-
optional(:webdav_config) => Hash,
156-
optional(:cdn) => Hash
152+
optional(:webdav_config) => Hash
157153
},
158154

159155
db_encryption_key: enum(String, NilClass),

0 commit comments

Comments
 (0)