Merge some changes from tanzu

MarcialRosales · MarcialRosales · commit 3b8a097e323e · 2025-04-04T15:37:53.000+02:00
diff --git a/selenium/test/oauth/env.docker.keycloak b/selenium/test/oauth/env.docker.keycloak
@@ -1,3 +1,2 @@
 export KEYCLOAK_URL=https://keycloak:8443/realms/test
-export OAUTH_PROVIDER_URL=https://keycloak:8443/realms/test
-export OAUTH_PROVIDER_CA_CERT=/config/oauth/keycloak/ca_keycloak_certificate.pem
+export KEYCLOAK_CA_CERT=/config/oauth/keycloak/ca_keycloak_certificate.pem
diff --git a/selenium/test/oauth/env.keycloak-oauth-provider b/selenium/test/oauth/env.keycloak-oauth-provider
@@ -1 +1,2 @@
-# export OAUTH_PROVIDER_URL=${KEYCLOAK_URL}
+export OAUTH_PROVIDER_URL=${KEYCLOAK_URL}
+export OAUTH_PROVIDER_CA_CERT=${KEYCLOAK_CA_CERT}
diff --git a/selenium/test/oauth/env.local.keycloak b/selenium/test/oauth/env.local.keycloak
@@ -1,3 +1,3 @@
 export KEYCLOAK_URL=https://localhost:8443/realms/test
-export OAUTH_PROVIDER_URL=https://localhost:8443/realms/test
-export OAUTH_PROVIDER_CA_CERT=selenium/test/oauth/keycloak/ca_keycloak_certificate.pem
+export OAUTH_PROVIDER_URL=${KEYCLOAK_URL}
+export KEYCLOAK_CA_CERT=selenium/test/oauth/keycloak/ca_keycloak_certificate.pem
diff --git a/selenium/test/oauth/imports/users.json b/selenium/test/oauth/imports/users.json
@@ -56,6 +56,9 @@
   "vhosts": [
     {
       "name": "/"
+    },
+    {
+      "name": "other"
     }
   ],
   "permissions": [
diff --git a/selenium/test/oauth/rabbitmq.keycloak-mgt-oauth-provider.conf b/selenium/test/oauth/rabbitmq.keycloak-mgt-oauth-provider.conf
@@ -1,3 +1,3 @@
 # uaa requires a secret in order to renew tokens
-management.oauth_provider_url = ${KEYCLOAK_URL}
+#management.oauth_provider_url = ${KEYCLOAK_URL}
 management.oauth_authorization_endpoint_params.resource = rabbitmq
diff --git a/selenium/test/oauth/rabbitmq.keycloak-oauth-provider.conf b/selenium/test/oauth/rabbitmq.keycloak-oauth-provider.conf
@@ -1,2 +1,2 @@
-auth_oauth2.issuer = ${OAUTH_PROVIDER_URL}
-auth_oauth2.https.cacertfile = ${OAUTH_PROVIDER_CA_CERT}
+auth_oauth2.issuer = ${KEYCLOAK_URL}
+auth_oauth2.https.cacertfile = ${KEYCLOAK_CA_CERT}
diff --git a/selenium/test/oauth/rabbitmq.keycloak-verify-none-oauth-provider.conf b/selenium/test/oauth/rabbitmq.keycloak-verify-none-oauth-provider.conf
@@ -1,2 +1,2 @@
-auth_oauth2.issuer = ${OAUTH_PROVIDER_URL}
+auth_oauth2.issuer = ${KEYCLOAK_URL}
 auth_oauth2.https.peer_verification = verify_none
diff --git a/selenium/test/oauth/rabbitmq.uaa-mgt-oauth-provider.conf b/selenium/test/oauth/rabbitmq.uaa-mgt-oauth-provider.conf
@@ -1,2 +1,5 @@
+# uaa requires a secret in order to renew tokens
+management.oauth_client_secret = ${OAUTH_CLIENT_SECRET}
+
 # uaa requires a secret in order to renew tokens
 management.oauth_provider_url = ${UAA_URL}
diff --git a/selenium/test/oauth/rabbitmq.uaa-oauth-provider.conf b/selenium/test/oauth/rabbitmq.uaa-oauth-provider.conf
@@ -1,5 +1,3 @@
-# uaa requires a secret in order to renew tokens
-management.oauth_client_secret = ${OAUTH_CLIENT_SECRET}
 
 # configure static signing keys and the oauth provider used by the plugin
 auth_oauth2.default_key = ${OAUTH_SIGNING_KEY_ID}

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-# export OAUTH_PROVIDER_URL=${KEYCLOAK_URL}`
	`1`	`+export OAUTH_PROVIDER_URL=${KEYCLOAK_URL}`
	`2`	`+export OAUTH_PROVIDER_CA_CERT=${KEYCLOAK_CA_CERT}`
Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,9 @@`
`56`	`56`	`"vhosts": [`
`57`	`57`	`{`
`58`	`58`	`"name": "/"`
	`59`	`+ },`
	`60`	`+ {`
	`61`	`+ "name": "other"`
`59`	`62`	`}`
`60`	`63`	`],`
`61`	`64`	`"permissions": [`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-auth_oauth2.issuer = ${OAUTH_PROVIDER_URL}`
	`1`	`+auth_oauth2.issuer = ${KEYCLOAK_URL}`
`2`	`2`	`auth_oauth2.https.peer_verification = verify_none`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-# uaa requires a secret in order to renew tokens`
`2`		`-management.oauth_client_secret = ${OAUTH_CLIENT_SECRET}`
`3`	`1`
`4`	`2`	`# configure static signing keys and the oauth provider used by the plugin`
`5`	`3`	`auth_oauth2.default_key = ${OAUTH_SIGNING_KEY_ID}`