Update uaa configuration with tls

And include uaa test suite into the short test-suite
run on each PR

Author: MarcialRosales

selenium/bin/components/uaa

@@ -37,7 +37,6 @@ start_uaa() {
     --detach \
     --name uaa \
     --net ${DOCKER_NETWORK} \
-    --publish 8080:8080 \
     --publish 8443:8443 \
     --mount "type=bind,source=$MOUNT_UAA_CONF_DIR,target=/uaa" \
     -v ${UAA_CONFIG_DIR}/server.xml:/layers/paketo-buildpacks_apache-tomcat/catalina-base/conf/server.xml \

selenium/bin/suite_template

@@ -170,7 +170,7 @@ wait_for_oidc_endpoint() {
 wait_for_oidc_endpoint_local() {
   NAME=$1
   BASE_URL=$2
-  CURL_ARGS="-L --fail "
+  CURL_ARGS="-k -L --fail "
   DELAY_BETWEEN_ATTEMPTS=5
   if [[ $# -eq 3 ]]; then
     CURL_ARGS="$CURL_ARGS --cacert $3"
@@ -438,7 +438,7 @@ generate-truststore-if-required() {
 generate-server-keystore-if-required() {
   NAME=$1
   FOLDER=$2
-  if [[ ! -f "${FOLDER}/${NAME}.jks " ]]; then
+  if [[ ! -f "${FOLDER}/server_${NAME}.jks " ]]; then
 	keytool -importkeystore \
 			-destkeystore ${FOLDER}/server_${NAME}.jks \
 			-srckeystore ${FOLDER}/server_${NAME}.p12 \
@@ -456,7 +456,7 @@ generate-server-keystore-if-required() {
 generate-client-keystore-if-required() {
   NAME=$1
   FOLDER=$2
-  if [[ ! -f "${FOLDER}/${NAME}.jks " ]]; then
+  if [[ ! -f "${FOLDER}/client_${NAME}.jks " ]]; then
 	keytool -importkeystore \
 			-destkeystore ${FOLDER}/client_${NAME}.jks \
 			-srckeystore ${FOLDER}/client_${NAME}.p12 \

selenium/short-suite-management-ui

@@ -1,5 +1,6 @@
 authnz-mgt/basic-auth.sh
 authnz-mgt/oauth-with-keycloak.sh
+authnz-mgt/oauth-with-uaa.sh
 mgt/vhosts.sh
 mgt/exchanges.sh
 mgt/limits.sh

selenium/test/oauth/env.docker.uaa

@@ -1 +1 @@
-export UAA_URL=http://uaa:8080
+export UAA_URL=https://uaa:8443

selenium/test/oauth/env.local.uaa

@@ -1 +1 @@
-export UAA_URL=http://localhost:8080
+export UAA_URL=https://localhost:8443

selenium/test/oauth/uaa/server.xml

@@ -17,7 +17,7 @@
                 sslProtocol="TLS"
                 keystoreFile="/uaa/server_uaa.jks"
                 keystoreType="PKCS12"
-                keyAlias="uaa-tls"
+                keyAlias="server-uaa-tls"
                 keystorePass="foobar"
                 bindOnInit="false"/>
     <Connector protocol="org.apache.coyote.http11.Http11NioProtocol"