Repeat the manifest changes in the test

cloudfoundry-attic · Dec 30, 2014 · 01c0e9b · 01c0e9b
1 parent cac6340
commit 01c0e9b
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 75 deletions.
diff --git a/spec/fixtures/aws/cf-manifest.yml b/spec/fixtures/aws/cf-manifest.yml
@@ -874,21 +874,8 @@ properties:
       client_secret: cc_client_secret
     clients:
       app-direct:
-        access-token-validity: 1209600
-        authorities: app_direct_invoice.write
-        authorized-grant-types: authorization_code,client_credentials,password,refresh_token,implicit
-        override: true
-        redirect-uri: https://console.example.com
-        refresh-token-validity: 1209600
         secret: app-direct_secret
       developer_console:
-        access-token-validity: 1209600
-        authorities: scim.write,scim.read,cloud_controller.read,cloud_controller.write,password.write,uaa.admin,uaa.resource,cloud_controller.admin,billing.admin
-        authorized-grant-types: authorization_code,client_credentials
-        override: true
-        redirect-uri: https://console.example.com/oauth/callback
-        refresh-token-validity: 1209600
-        scope: openid,cloud_controller.read,cloud_controller.write,password.write,console.admin,console.support
         secret: developer_console_secret
       login:
         override: true
@@ -911,13 +898,6 @@ properties:
         redirect-uri: http://servicesmgmt.example.com/auth/cloudfoundry/callback
         scope: openid,cloud_controller.read,cloud_controller.write
         secret: service_mgmt_secret
-      space-mail:
-        access-token-validity: 1209600
-        authorities: scim.read,scim.write,cloud_controller.admin
-        authorized-grant-types: client_credentials
-        override: true
-        refresh-token-validity: 1209600
-        secret: space-mail_secret
       support-services:
         access-token-validity: 1209600
         authorities: portal.users.read

diff --git a/spec/fixtures/aws/cf-stub.yml b/spec/fixtures/aws/cf-stub.yml
@@ -79,8 +79,6 @@ properties:
         secret: notification_secret
       servicesmgmt:
         secret: service_mgmt_secret
-      space-mail:
-        secret: space-mail_secret
       support-services:
         secret: support-services_secret
       doppler:

diff --git a/spec/fixtures/openstack/cf-manifest.yml b/spec/fixtures/openstack/cf-manifest.yml
@@ -864,21 +864,8 @@ properties:
       client_secret: cc_client_secret
     clients:
       app-direct:
-        access-token-validity: 1209600
-        authorities: app_direct_invoice.write
-        authorized-grant-types: authorization_code,client_credentials,password,refresh_token,implicit
-        override: true
-        redirect-uri: https://console.example.com
-        refresh-token-validity: 1209600
         secret: app-direct_secret
       developer_console:
-        access-token-validity: 1209600
-        authorities: scim.write,scim.read,cloud_controller.read,cloud_controller.write,password.write,uaa.admin,uaa.resource,cloud_controller.admin,billing.admin
-        authorized-grant-types: authorization_code,client_credentials
-        override: true
-        redirect-uri: https://console.example.com/oauth/callback
-        refresh-token-validity: 1209600
-        scope: openid,cloud_controller.read,cloud_controller.write,password.write,console.admin,console.support
         secret: developer_console_secret
       login:
         override: true
@@ -901,13 +888,6 @@ properties:
         redirect-uri: http://servicesmgmt.example.com/auth/cloudfoundry/callback
         scope: openid,cloud_controller.read,cloud_controller.write
         secret: service_mgmt_secret
-      space-mail:
-        access-token-validity: 1209600
-        authorities: scim.read,scim.write,cloud_controller.admin
-        authorized-grant-types: client_credentials
-        override: true
-        refresh-token-validity: 1209600
-        secret: space-mail_secret
       support-services:
         access-token-validity: 1209600
         authorities: portal.users.read

diff --git a/spec/fixtures/openstack/cf-stub.yml b/spec/fixtures/openstack/cf-stub.yml
@@ -72,8 +72,6 @@ properties:
         secret: login_client_secret
       servicesmgmt:
         secret: service_mgmt_secret
-      space-mail:
-        secret: space-mail_secret
       support-services:
         secret: support-services_secret
       doppler:

diff --git a/spec/fixtures/vsphere/cf-manifest.yml b/spec/fixtures/vsphere/cf-manifest.yml
@@ -875,21 +875,8 @@ properties:
       client_secret: cc_client_secret
     clients:
       app-direct:
-        access-token-validity: 1209600
-        authorities: app_direct_invoice.write
-        authorized-grant-types: authorization_code,client_credentials,password,refresh_token,implicit
-        override: true
-        redirect-uri: https://console.0.0.0.3.xip.io
-        refresh-token-validity: 1209600
         secret: app-direct_secret
       developer_console:
-        access-token-validity: 1209600
-        authorities: scim.write,scim.read,cloud_controller.read,cloud_controller.write,password.write,uaa.admin,uaa.resource,cloud_controller.admin,billing.admin
-        authorized-grant-types: authorization_code,client_credentials
-        override: true
-        redirect-uri: https://console.0.0.0.3.xip.io/oauth/callback
-        refresh-token-validity: 1209600
-        scope: openid,cloud_controller.read,cloud_controller.write,password.write,console.admin,console.support
         secret: developer_console_secret
       login:
         authorities: oauth.login,scim.write,clients.read,notifications.write,critical_notifications.write,emails.write,scim.userids,password.write
@@ -910,13 +897,6 @@ properties:
         redirect-uri: http://servicesmgmt.0.0.0.3.xip.io/auth/cloudfoundry/callback
         scope: openid,cloud_controller.read,cloud_controller.write
         secret: service_mgmt_secret
-      space-mail:
-        access-token-validity: 1209600
-        authorities: scim.read,scim.write,cloud_controller.admin
-        authorized-grant-types: client_credentials
-        override: true
-        refresh-token-validity: 1209600
-        secret: space-mail_secret
       support-services:
         access-token-validity: 1209600
         authorities: portal.users.read

diff --git a/spec/fixtures/vsphere/cf-stub.yml b/spec/fixtures/vsphere/cf-stub.yml
@@ -63,8 +63,6 @@ properties:
         secret: notification_secret
       servicesmgmt:
         secret: service_mgmt_secret
-      space-mail:
-        secret: space-mail_secret
       support-services:
         secret: support-services_secret
       doppler:

diff --git a/spec/fixtures/warden/cf-manifest.yml b/spec/fixtures/warden/cf-manifest.yml
@@ -2662,13 +2662,6 @@ properties:
         redirect-uri: http://servicesmgmt.10.244.0.34.xip.io/auth/cloudfoundry/callback
         scope: openid,cloud_controller.read,cloud_controller.write
         secret: servicesmgmt-secret
-      space-mail:
-        access-token-validity: 1209600
-        authorities: scim.read,scim.write,cloud_controller.admin
-        authorized-grant-types: client_credentials
-        override: true
-        refresh-token-validity: 1209600
-        secret: space-mail-secret
       support-services:
         access-token-validity: 1209600
         authorities: portal.users.read

diff --git a/spec/fixtures/warden/cf-stub.yml b/spec/fixtures/warden/cf-stub.yml
@@ -45,6 +45,25 @@ properties:
         - protocol: all
           destination: 10.244.3.0/24
     default_running_security_groups: ["public_networks", "dns", "services"]
+  uaa:
+    clients:
+      app-direct:
+        access-token-validity: 1209600
+        authorities: app_direct_invoice.write
+        authorized-grant-types: authorization_code,client_credentials,password,refresh_token,implicit
+        override: true
+        redirect-uri: https://console.10.244.0.34.xip.io
+        refresh-token-validity: 1209600
+        secret: app-direct-secret
+      developer_console:
+        access-token-validity: 1209600
+        authorities: scim.write,scim.read,cloud_controller.read,cloud_controller.write,password.write,uaa.admin,uaa.resource,cloud_controller.admin,billing.admin
+        authorized-grant-types: authorization_code,client_credentials
+        override: true
+        redirect-uri: https://console.10.244.0.34.xip.io/oauth/callback
+        refresh-token-validity: 1209600
+        scope: openid,cloud_controller.read,cloud_controller.write,password.write,console.admin,console.support
+        secret: console-secret
 
 # code_snippet cf-stub-warden end
 # The previous line helps maintain current documentation at http://docs.cloudfoundry.org.
diff --git a/templates/cf-infrastructure-warden.yml b/templates/cf-infrastructure-warden.yml
@@ -114,13 +114,17 @@ properties:
         redirect-uri: (( "https://console." domain "/oauth/callback" ))
         secret: console-secret
       app-direct:
+        override: true
+        authorities: app_direct_invoice.write
+        authorized-grant-types: authorization_code,client_credentials,password,refresh_token,implicit
+        access-token-validity: 1209600
+        refresh-token-validity: 1209600
+        redirect-uri: (( properties.login/links.home ))
         secret: app-direct-secret
       support-services:
         secret: support-services-secret
       servicesmgmt:
         secret: servicesmgmt-secret
-      space-mail:
-        secret: space-mail-secret
       notifications:
         secret: notification-secret
       doppler:
@@ -133,6 +137,8 @@ properties:
   login:
     catalina_opts: -Xmx96m -XX:MaxPermSize=64m
     protocol: http
+    links:
+      home: (( "https://console." domain ))
     uaa_certificate: |
           -----BEGIN CERTIFICATE-----
           MIIDETCCAfmgAwIBAgIJANZuykf1uh3LMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV