Skip to content

Commit 47f873e

Browse files
committed
Add temporary_enable_v2 flag to cc-worker config
* required for cloudfoundry/cloud_controller_ng#4058
1 parent b817791 commit 47f873e

File tree

3 files changed

+24
-0
lines changed

3 files changed

+24
-0
lines changed

jobs/cloud_controller_worker/spec

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -388,6 +388,10 @@ properties:
388388
default: false
389389
description: "Enable development features for monitoring and insight"
390390

391+
cc.temporary_enable_v2:
392+
description: "Enable V2 endpoints"
393+
default: true
394+
391395
cc.newrelic.license_key:
392396
default: ~
393397
description: "The api key for NewRelic"

jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,8 @@ db: &db
128128

129129
<% system_domain = p("system_domain") %>
130130

131+
temporary_enable_v2: <%= p("cc.temporary_enable_v2") %>
132+
131133
uaa:
132134
internal_url: <%= "https://#{p("cc.uaa.internal_url")}:#{p("uaa.ssl.port")}" %>
133135
ca_file: /var/vcap/jobs/cloud_controller_worker/config/certs/uaa_ca.crt

spec/cloud_controller_worker/cloud_controller_worker_spec.rb

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,24 @@ module Test
258258
end
259259
end
260260
end
261+
262+
describe 'enable v2 API' do
263+
it 'is by default true' do
264+
template_hash = YAML.safe_load(template.render(manifest_properties, consumes: links))
265+
expect(template_hash['temporary_enable_v2']).to be(true)
266+
end
267+
268+
context 'when explicitly disabled' do
269+
before do
270+
manifest_properties['cc']['temporary_enable_v2'] = false
271+
end
272+
273+
it 'is false' do
274+
template_hash = YAML.safe_load(template.render(manifest_properties, consumes: links))
275+
expect(template_hash['temporary_enable_v2']).to be(false)
276+
end
277+
end
278+
end
261279
end
262280
end
263281
end

0 commit comments

Comments
 (0)