cc-uploader: remove http config (#621)

- http_port (also as link property)
- temporary_disable_non_tls_endpoints
- requires cloudfoundry/cc-uploader#351

Author: stephanme

jobs/cc_uploader/spec

@@ -25,24 +25,16 @@ provides:
     type: cc_uploader
     properties:
     - internal_hostname
-    - http_port
     - https_port
 
 properties:
   internal_hostname:
     description: "Hostname by which clients will communicate with the cc uploader"
     default: cc-uploader.service.cf.internal
-  http_port:
-    description: "Port by which clients will communicate with the cc uploader using http"
-    default: 9090
   https_port:
     description: "Port by which clients will communicate with the cc uploader using https (mutual TLS)"
     default: 9091
 
-  temporary_disable_non_tls_endpoints:
-    description: "nginx_cc and cc_uploader components disable non-TLS endpoints"
-    default: true
-
   capi.cc_uploader.bind_addr:
     description: "Address of interface on which to serve files"
     default: "0.0.0.0"

jobs/cc_uploader/templates/cc_uploader_config.json.erb

@@ -12,7 +12,6 @@
   end
   config[:lager_config] = { log_level: p("capi.cc_uploader.log_level"), time_format: p("capi.cc_uploader.logging.format.timestamp") }
 
-  config[:listen_addr] = "#{p("capi.cc_uploader.bind_addr")}:#{p("http_port")}"
   if_p("capi.cc_uploader.debug_port") do |debug_port|
     config[:debug_server_config] = { debug_address: "#{p("capi.cc_uploader.debug_bind_addr")}:#{debug_port}" }
   end
@@ -31,7 +30,5 @@
   if_p("capi.cc_uploader.cc.job_polling_interval_in_seconds") do |interval|
     config[:job_polling_interval_in_seconds] = "#{interval}s"
   end
-
-  config[:disable_non_tls] = !!p('temporary_disable_non_tls_endpoints')
 %>
 <%= config.to_json %>

spec/cc_uploader/cc_uploader_config_spec.rb

@@ -18,13 +18,6 @@ module Test
           let(:template) { job.template('config/cc_uploader_config.json') }
 
           describe 'default settings' do
-            it 'defaults disable_non_tls to true' do
-              rendered_template = template.render({}, consumes: links)
-              parsed_template = JSON.parse(rendered_template)
-
-              expect(parsed_template['disable_non_tls']).to be(true)
-            end
-
             it 'does not include debug_server_config by default' do
               rendered_template = template.render({}, consumes: links)
               parsed_template = JSON.parse(rendered_template)