@@ -483,25 +483,20 @@ apply_yaml_files() {
483
483
done
484
484
485
485
DH_TARGET_URL=$( echo -n " test-backstage-customization-provider-${project} .${K8S_CLUSTER_ROUTER_BASE} " | base64 -w 0)
486
- echo " [DEBUG] key: DH_TARGET_URL value: $( echo -n " test-backstage-customization-provider-${project} .${K8S_CLUSTER_ROUTER_BASE} " ) "
487
- echo " [DEBUG] key: DH_TARGET_URL encoded: ${DH_TARGET_URL} "
488
-
489
- echo " [DEBUG] key: rhdh_base_url value: @@@${rhdh_base_url} @@@"
490
- local escaped_rhdh_base_url=$( echo -n " $rhdh_base_url " | sed ' s/\//\\\//g' )
491
- echo " [DEBUG] key: escaped_rhdh_base_url value: @@@${escaped_rhdh_base_url} @@@"
492
- local RHDH_BASE_URL=$( echo -n " $escaped_rhdh_base_url " | base64)
493
-
494
- local escaped_rhdh_base_url_http=$( echo -n " ${rhdh_base_url/ https/ http} " | sed ' s/\//\\\//g' )
495
- echo " [DEBUG] key: RHDH_BASE_URL_HTTP value: @@@${escaped_rhdh_base_url_http} @@@"
496
-
497
- local RHDH_BASE_URL_HTTP=$( echo -n " ${escaped_rhdh_base_url_http} " | base64)
498
- # echo "[DEBUG] key: RHDH_BASE_URL_HTTP encoded : @@@${RHDH_BASE_URL_HTTP}@@@"
486
+ local RHDH_BASE_URL=$( echo -n " $rhdh_base_url " | base64 | tr -d ' \n' )
487
+ local RHDH_BASE_URL_HTTP=$( echo -n " ${rhdh_base_url/ https/ http} " | base64 | tr -d ' \n' )
499
488
500
- for key in GITHUB_APP_APP_ID GITHUB_APP_CLIENT_ID GITHUB_APP_PRIVATE_KEY GITHUB_APP_CLIENT_SECRET GITHUB_APP_JANUS_TEST_APP_ID GITHUB_APP_JANUS_TEST_CLIENT_ID GITHUB_APP_JANUS_TEST_CLIENT_SECRET GITHUB_APP_JANUS_TEST_PRIVATE_KEY GITHUB_APP_WEBHOOK_URL GITHUB_APP_WEBHOOK_SECRET KEYCLOAK_CLIENT_SECRET ACR_SECRET GOOGLE_CLIENT_ID GOOGLE_CLIENT_SECRET K8S_CLUSTER_TOKEN_ENCODED OCM_CLUSTER_URL GITLAB_TOKEN KEYCLOAK_AUTH_BASE_URL KEYCLOAK_AUTH_CLIENTID KEYCLOAK_AUTH_CLIENT_SECRET KEYCLOAK_AUTH_LOGIN_REALM KEYCLOAK_AUTH_REALM RHDH_BASE_URL_HTTP DH_TARGET_URL RHDH_BASE_URL; do
501
- echo " [DEBUG] key: ${key} "
489
+ for key in GITHUB_APP_APP_ID GITHUB_APP_CLIENT_ID GITHUB_APP_PRIVATE_KEY GITHUB_APP_CLIENT_SECRET GITHUB_APP_JANUS_TEST_APP_ID GITHUB_APP_JANUS_TEST_CLIENT_ID GITHUB_APP_JANUS_TEST_CLIENT_SECRET GITHUB_APP_JANUS_TEST_PRIVATE_KEY GITHUB_APP_WEBHOOK_URL GITHUB_APP_WEBHOOK_SECRET KEYCLOAK_CLIENT_SECRET ACR_SECRET GOOGLE_CLIENT_ID GOOGLE_CLIENT_SECRET K8S_CLUSTER_TOKEN_ENCODED OCM_CLUSTER_URL GITLAB_TOKEN KEYCLOAK_AUTH_BASE_URL KEYCLOAK_AUTH_CLIENTID KEYCLOAK_AUTH_CLIENT_SECRET KEYCLOAK_AUTH_LOGIN_REALM KEYCLOAK_AUTH_REALM DH_TARGET_URL; do
502
490
sed -i " s|${key} :.*|${key} : ${! key} |g" " $dir /auth/secrets-rhdh-secrets.yaml"
503
491
done
504
-
492
+
493
+ for key in RHDH_BASE_URL RHDH_BASE_URL_HTTP; do
494
+ echo " [DEBUG] RHDH_BASE_URL: ${! key} _"
495
+ # Escape any special characters in the base64 value
496
+ local escaped_value=$( printf ' %s' " ${! key} " | sed ' s/[\/&]/\\&/g' )
497
+ sed -i " s|${key} :.*|${key} : ${escaped_value} |g" " $dir /auth/secrets-rhdh-secrets.yaml"
498
+ done
499
+
505
500
oc apply -f " $dir /resources/service_account/service-account-rhdh.yaml" --namespace=" ${project} "
506
501
oc apply -f " $dir /auth/service-account-rhdh-secret.yaml" --namespace=" ${project} "
507
502
oc apply -f " $dir /auth/secrets-rhdh-secrets.yaml" --namespace=" ${project} "
0 commit comments