Merge pull request #326 from sap-contributions/remove-deprecated-uaa-…

…client

Remove deprecated UAA client

jobs/cloud_controller_clock/spec

@@ -429,12 +429,6 @@ properties:
     default: "off"
     description: "NewRelic's SQL statement recording mode: [off | obfuscated | raw]"
 
-  uaa.clients.cc_service_broker_client.secret:
-    description: "(DEPRECATED) - Used for generating SSO clients for service brokers."
-  uaa.clients.cc_service_broker_client.scope:
-    description: "(DEPRECATED) - Used to grant scope for SSO clients for service brokers"
-    default: "openid,cloud_controller_service_permissions.read"
-
   uaa.clients.cc-service-dashboards.secret:
     description: "Used for generating SSO clients for service brokers."
   uaa.clients.cc-service-dashboards.scope:

jobs/cloud_controller_clock/templates/cloud_controller_ng.yml.erb

@@ -288,11 +288,7 @@ database_encryption:
 <% end %>
 
 
-<% if_p("uaa.clients.cc_service_broker_client.secret") do %>
-uaa_client_name: "cc_service_broker_client"
-uaa_client_secret: <%= p("uaa.clients.cc_service_broker_client.secret") %>
-uaa_client_scope: <%= p("uaa.clients.cc_service_broker_client.scope") %>
-<% end.else_if_p("uaa.clients.cc-service-dashboards.secret") do %>
+<% if_p("uaa.clients.cc-service-dashboards.secret") do %>
 uaa_client_name: "cc-service-dashboards"
 uaa_client_secret: <%= p("uaa.clients.cc-service-dashboards.secret") %>
 uaa_client_scope: <%= p("uaa.clients.cc-service-dashboards.scope") %>

jobs/cloud_controller_ng/spec

@@ -919,12 +919,6 @@ properties:
   cc.renderer.max_total_results:
     description: "Maximum number of total results (page * per_page)"
 
-  uaa.clients.cc_service_broker_client.secret:
-    description: "(DEPRECATED) - Used for generating SSO clients for service brokers"
-  uaa.clients.cc_service_broker_client.scope:
-    description: "(DEPRECATED) - Used to grant scope for SSO clients for service brokers"
-    default: "openid,cloud_controller_service_permissions.read"
-
   uaa.clients.cc-service-dashboards.secret:
     description: "Used for generating SSO clients for service brokers."
   uaa.clients.cc-service-dashboards.scope:

jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb

@@ -397,11 +397,7 @@ renderer:
   max_total_results: <%= max_total_results %>
   <% end %>
 
-<% if_p("uaa.clients.cc_service_broker_client.secret") do %>
-uaa_client_name: "cc_service_broker_client"
-uaa_client_secret: <%= p("uaa.clients.cc_service_broker_client.secret") %>
-uaa_client_scope: <%= p("uaa.clients.cc_service_broker_client.scope") %>
-<% end.else_if_p("uaa.clients.cc-service-dashboards.secret") do %>
+<% if_p("uaa.clients.cc-service-dashboards.secret") do %>
 uaa_client_name: "cc-service-dashboards"
 uaa_client_secret: <%= p("uaa.clients.cc-service-dashboards.secret") %>
 uaa_client_scope: <%= p("uaa.clients.cc-service-dashboards.scope") %>

jobs/cloud_controller_worker/spec

@@ -414,12 +414,6 @@ properties:
     default: 1
     description: "Number of generic cloud_controller_worker workers"
 
-  uaa.clients.cc_service_broker_client.secret:
-    description: "(DEPRECATED) - Used for generating SSO clients for service brokers."
-  uaa.clients.cc_service_broker_client.scope:
-    description: "(DEPRECATED) - Used to grant scope for SSO clients for service brokers"
-    default: "openid,cloud_controller_service_permissions.read"
-
   uaa.clients.cc-service-dashboards.secret:
     description: "Used for generating SSO clients for service brokers."
   uaa.clients.cc-service-dashboards.scope:

jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb

@@ -265,11 +265,7 @@ broker_client_response_parser:
   log_validators: <%= p("cc.broker_client_response_parser.log_validators") %>
   log_response_fields: <%= p("cc.broker_client_response_parser.log_response_fields").to_json %>
 
-<% if_p("uaa.clients.cc_service_broker_client.secret") do %>
-uaa_client_name: "cc_service_broker_client"
-uaa_client_secret: <%= p("uaa.clients.cc_service_broker_client.secret") %>
-uaa_client_scope: <%= p("uaa.clients.cc_service_broker_client.scope") %>
-<% end.else_if_p("uaa.clients.cc-service-dashboards.secret") do %>
+<% if_p("uaa.clients.cc-service-dashboards.secret") do %>
 uaa_client_name: "cc-service-dashboards"
 uaa_client_secret: <%= p("uaa.clients.cc-service-dashboards.secret") %>
 uaa_client_scope: <%= p("uaa.clients.cc-service-dashboards.scope") %>