Skip to content

Commit 63cd172

Browse files
Fix uaa tests
Use tls 1.2 with curl to check when uaa is up Uncomment configuration line
1 parent 041b10a commit 63cd172

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

selenium/bin/components/uaa

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ start_uaa() {
3838
--name uaa \
3939
--net ${DOCKER_NETWORK} \
4040
--publish 8443:8443 \
41-
--mount "type=bind,source=$MOUNT_UAA_CONF_DIR,target=/uaa" \
41+
-v ${MOUNT_UAA_CONF_DIR}:/uaa \
4242
-v ${UAA_CONFIG_DIR}/server.xml:/layers/paketo-buildpacks_apache-tomcat/catalina-base/conf/server.xml \
4343
--env UAA_CONFIG_PATH="/uaa" \
4444
--env JAVA_OPTS="-Djava.security.policy=unlimited -Djava.security.egd=file:/dev/./urandom" \

selenium/bin/suite_template

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,13 +170,13 @@ wait_for_oidc_endpoint() {
170170
wait_for_oidc_endpoint_local() {
171171
NAME=$1
172172
BASE_URL=$2
173-
CURL_ARGS="-k -L --fail "
173+
CURL_ARGS="-k --tlsv1.2 -L --fail "
174174
DELAY_BETWEEN_ATTEMPTS=5
175175
if [[ $# -eq 3 ]]; then
176176
CURL_ARGS="$CURL_ARGS --cacert $3"
177177
DELAY_BETWEEN_ATTEMPTS=10
178178
fi
179-
max_retry=10
179+
max_retry=15
180180
counter=0
181181
print "Waiting for OIDC discovery endpoint $NAME ... (BASE_URL: $BASE_URL)"
182182
until (curl $CURL_ARGS ${BASE_URL}/.well-known/openid-configuration >/dev/null 2>&1)
@@ -191,15 +191,15 @@ wait_for_oidc_endpoint_local() {
191191
wait_for_oidc_endpoint_docker() {
192192
NAME=$1
193193
BASE_URL=$2
194-
CURL_ARGS="-L --fail "
194+
CURL_ARGS="-k --tlsv1.2 -L --fail "
195195
DOCKER_ARGS="--rm --net ${DOCKER_NETWORK} "
196196
DELAY_BETWEEN_ATTEMPTS=5
197197
if [[ $# -gt 2 ]]; then
198198
DOCKER_ARGS="$DOCKER_ARGS -v $3:/tmp/ca_certificate.pem"
199199
CURL_ARGS="$CURL_ARGS --cacert /tmp/ca_certificate.pem"
200200
DELAY_BETWEEN_ATTEMPTS=10
201201
fi
202-
max_retry=10
202+
max_retry=15
203203
counter=0
204204
print "Waiting for OIDC discovery endpoint $NAME ... (BASE_URL: $BASE_URL)"
205205
until (docker run $DOCKER_ARGS curlimages/curl:7.85.0 $CURL_ARGS ${BASE_URL}/.well-known/openid-configuration >/dev/null 2>&1)

selenium/test/oauth/rabbitmq.uaa-oauth-provider.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ management.oauth_client_secret = ${OAUTH_CLIENT_SECRET}
33

44
# configure static signing keys and the oauth provider used by the plugin
55
auth_oauth2.default_key = ${OAUTH_SIGNING_KEY_ID}
6-
#auth_oauth2.signing_keys.${OAUTH_SIGNING_KEY_ID} = ${OAUTH_SERVER_CONFIG_DIR}/signing-key.pem
6+
auth_oauth2.signing_keys.${OAUTH_SIGNING_KEY_ID} = ${OAUTH_SERVER_CONFIG_DIR}/signing-key.pem

0 commit comments

Comments
 (0)