diff --git a/jobs/cloud_controller_ng/spec b/jobs/cloud_controller_ng/spec index fc5988cb2a..4d0d1d7325 100644 --- a/jobs/cloud_controller_ng/spec +++ b/jobs/cloud_controller_ng/spec @@ -211,6 +211,7 @@ provides: - cc.statsd_port - cc.enable_statsd_metrics - cc.system_hostnames + - cc.temporary_enable_v2 - cc.tls_port - cc.uaa.client_timeout - cc.internal_route_vip_range diff --git a/jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb b/jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb index 62053c7d21..867dfc169a 100644 --- a/jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb +++ b/jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb @@ -128,6 +128,8 @@ db: &db <% system_domain = p("system_domain") %> +temporary_enable_v2: <%= link("cloud_controller_internal").p("cc.temporary_enable_v2") %> + uaa: internal_url: <%= "https://#{p("cc.uaa.internal_url")}:#{p("uaa.ssl.port")}" %> ca_file: /var/vcap/jobs/cloud_controller_worker/config/certs/uaa_ca.crt diff --git a/spec/cloud_controller_worker/cloud_controller_worker_spec.rb b/spec/cloud_controller_worker/cloud_controller_worker_spec.rb index 8570269cb9..722a82080f 100644 --- a/spec/cloud_controller_worker/cloud_controller_worker_spec.rb +++ b/spec/cloud_controller_worker/cloud_controller_worker_spec.rb @@ -80,10 +80,12 @@ module Test 'jobs' => { 'enable_dynamic_job_priorities' => false }, - 'app_log_revision' => true + 'app_log_revision' => true, + 'temporary_enable_v2' => true } } end + let(:cloud_controller_internal_link) do Link.new(name: 'cloud_controller_internal', properties:, instances: [LinkInstance.new(address: 'default_app_ssh_access')]) end @@ -258,6 +260,13 @@ module Test end end end + + describe 'enable v2 API' do + it 'is by default true' do + template_hash = YAML.safe_load(template.render(manifest_properties, consumes: links)) + expect(template_hash['temporary_enable_v2']).to be(true) + end + end end end end