Skip to content

Commit e908c81

Browse files
refactor keycload vars
1 parent 1ab3414 commit e908c81

10 files changed

Lines changed: 69 additions & 82 deletions

File tree

.github/scripts/end2end/common.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
get_token() {
22
curl -k -H "Host: keycloak.zenko.local" \
3-
-d "client_id=${OIDC_CLIENT_ID}" \
4-
-d "username=${OIDC_USERNAME}" \
3+
-d "client_id=${KEYCLOAK_TEST_CLIENT_ID}" \
4+
-d "username=${KEYCLOAK_TEST_USER}" \
55
-d "password=${KEYCLOAK_TEST_PASSWORD}" \
66
-d "grant_type=password" \
77
-d "scope=openid" \
8-
https://localhost/auth/realms/${OIDC_REALM}/protocol/openid-connect/token | \
8+
https://localhost/auth/realms/${KEYCLOAK_TEST_REALM_NAME}/protocol/openid-connect/token | \
99
jq -cr '.id_token'
1010
}
1111

.github/scripts/end2end/configs/zenko.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,10 @@ spec:
8787
management:
8888
provider: InCluster
8989
oidc:
90-
provider: '${OIDC_ENDPOINT}/auth/realms/${OIDC_REALM}'
90+
provider: '${KEYCLOAK_TEST_ENDPOINT}/auth/realms/${KEYCLOAK_TEST_REALM_NAME}'
9191
federatedProviders:
92-
- '${OIDC_ENDPOINT}/auth/realms/${OIDC_REALM}'
93-
vaultClientId: ${OIDC_CLIENT_ID}
92+
- '${KEYCLOAK_TEST_ENDPOINT}/auth/realms/${KEYCLOAK_TEST_REALM_NAME}'
93+
vaultClientId: ${KEYCLOAK_TEST_CLIENT_ID}
9494
api:
9595
ingress:
9696
hostname: ${ZENKO_MANAGEMENT_INGRESS}

.github/scripts/end2end/enable-https.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ kubectl patch zenko/${ZENKO_NAME} --type=merge -p '{
6060
kubectl wait --for condition=Available --timeout 5m zenko/${ZENKO_NAME}
6161

6262
# Update environment variables to use HTTPS URLs
63-
echo "OIDC_ENDPOINT=https://keycloak.zenko.local" >> $GITHUB_ENV
64-
echo "OIDC_HOST=keycloak.zenko.local" >> $GITHUB_ENV
63+
echo "KEYCLOAK_TEST_ENDPOINT=https://keycloak.zenko.local" >> $GITHUB_ENV
64+
echo "KEYCLOAK_TEST_HOST=keycloak.zenko.local" >> $GITHUB_ENV
6565
echo "ENABLE_KEYCLOAK_HTTPS=true" >> $GITHUB_ENV
6666

6767
# Set the HTTPS ingress options for Keycloak

.github/scripts/end2end/keycloak-helper.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,17 @@ case $COMMAND in
3434
export OIDC_EMAIL=${OIDC_EMAIL:-"e2e@zenko.local"}
3535

3636
envsubst < $DIR/configs/keycloak_user.json | \
37-
${KEYCLOAK_EXEC} /opt/jboss/keycloak/bin/kcadm.sh create users -r ${OIDC_REALM} -f -
37+
${KEYCLOAK_EXEC} /opt/jboss/keycloak/bin/kcadm.sh create users -r ${KEYCLOAK_TEST_REALM_NAME} -f -
3838

3939
${KEYCLOAK_EXEC} /opt/jboss/keycloak/bin/kcadm.sh set-password \
40-
-r ${OIDC_REALM} \
41-
--username ${OIDC_USERNAME} \
40+
-r ${KEYCLOAK_TEST_REALM_NAME} \
41+
--username ${KEYCLOAK_TEST_USER} \
4242
--new-password ${KEYCLOAK_TEST_PASSWORD}
4343

4444
# attach StorageManager role to user
4545
${KEYCLOAK_EXEC} /opt/jboss/keycloak/bin/kcadm.sh add-roles \
46-
-r ${OIDC_REALM} \
47-
--uusername ${OIDC_USERNAME} \
46+
-r ${KEYCLOAK_TEST_REALM_NAME} \
47+
--uusername ${KEYCLOAK_TEST_USER} \
4848
--rolename "StorageManager"
4949
;;
5050

@@ -54,9 +54,9 @@ case $COMMAND in
5454
export INSTANCE_ID=`kubectl -n ${NAMESPACE} get zenko -o jsonpath='{.items[0].status.instanceID}'`
5555

5656
# get user id
57-
USER_ID=$(${KEYCLOAK_EXEC} /opt/jboss/keycloak/bin/kcadm.sh get users -r ${OIDC_REALM} -q "username=${OIDC_USERNAME}" | jq -r '.[0].id')
57+
USER_ID=$(${KEYCLOAK_EXEC} /opt/jboss/keycloak/bin/kcadm.sh get users -r ${KEYCLOAK_TEST_REALM_NAME} -q "username=${KEYCLOAK_TEST_USER}" | jq -r '.[0].id')
5858
# set instanceIds array attribute for user
59-
${KEYCLOAK_EXEC} /opt/jboss/keycloak/bin/kcadm.sh update users/${USER_ID} -r ${OIDC_REALM} -s 'attributes={"instanceIds":["'"${INSTANCE_ID}"'"],"role":"user"}'
59+
${KEYCLOAK_EXEC} /opt/jboss/keycloak/bin/kcadm.sh update users/${USER_ID} -r ${KEYCLOAK_TEST_REALM_NAME} -s 'attributes={"instanceIds":["'"${INSTANCE_ID}"'"],"role":"user"}'
6060

6161

6262
;;

.github/scripts/end2end/load-config.sh

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,11 @@ load_common() {
3737
ENV_VARS=()
3838

3939
# From end2end.yaml
40-
ENV_VARS+=("KEYCLOAK_TEST_REALM_NAME=$(get_env_var OIDC_REALM)")
41-
ENV_VARS+=("KEYCLOAK_TEST_CLIENT_ID=$(get_env_var OIDC_CLIENT_ID)")
42-
ENV_VARS+=("KEYCLOAK_TEST_USER=$(get_env_var OIDC_USERNAME)")
40+
ENV_VARS+=("KEYCLOAK_TEST_REALM_NAME=$(get_env_var KEYCLOAK_TEST_REALM_NAME)")
41+
ENV_VARS+=("KEYCLOAK_TEST_CLIENT_ID=$(get_env_var KEYCLOAK_TEST_CLIENT_ID)")
42+
ENV_VARS+=("KEYCLOAK_TEST_USER=$(get_env_var KEYCLOAK_TEST_USER)")
4343
ENV_VARS+=("KEYCLOAK_TEST_PASSWORD=$(get_env_var KEYCLOAK_TEST_PASSWORD)")
44-
ENV_VARS+=("KEYCLOAK_TEST_HOST=$(get_env_var OIDC_HOST)")
45-
ENV_VARS+=("KEYCLOAK_TEST_PORT=80")
46-
ENV_VARS+=("KEYCLOAK_TEST_GRANT_TYPE=password")
44+
ENV_VARS+=("KEYCLOAK_TEST_HOST=$(get_env_var KEYCLOAK_TEST_HOST)")
4745
ENV_VARS+=("AZURE_ACCOUNT_NAME=$(get_env_var AZURE_ACCOUNT_NAME)")
4846
ENV_VARS+=("AZURE_SECRET_KEY=$(get_env_var AZURE_SECRET_KEY)")
4947
ENV_VARS+=("AZURE_BACKEND_ENDPOINT=$(get_env_var AZURE_BACKEND_ENDPOINT)")

.github/scripts/end2end/run-e2e-ctst.sh

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ ADMIN_PRA_SECRET_ACCESS_KEY=$(kubectl get secret end2end-pra-management-vault-ad
3232

3333
VAULT_AUTH_HOST="${ZENKO_NAME}-connector-vault-auth-api.default.svc.cluster.local"
3434
# ZENKO_PORT="80"
35-
KEYCLOAK_TEST_USER=${OIDC_USERNAME}
35+
# KEYCLOAK_TEST_USER=${OIDC_USERNAME}
3636
# KEYCLOAK_TEST_PASSWORD=${OIDC_PASSWORD}
37-
KEYCLOAK_TEST_HOST=${OIDC_HOST}
38-
KEYCLOAK_TEST_PORT="80"
39-
KEYCLOAK_TEST_REALM_NAME=${OIDC_REALM}
40-
KEYCLOAK_TEST_CLIENT_ID=${OIDC_CLIENT_ID}
41-
KEYCLOAK_TEST_GRANT_TYPE="password"
37+
# KEYCLOAK_TEST_HOST=${OIDC_HOST}
38+
# KEYCLOAK_TEST_PORT="80"
39+
# KEYCLOAK_TEST_REALM_NAME=${OIDC_REALM}
40+
# KEYCLOAK_TEST_CLIENT_ID=${OIDC_CLIENT_ID}
41+
# KEYCLOAK_TEST_GRANT_TYPE="password"
4242

4343
# get Zenko service users credentials
4444
BACKBEAT_LCBP_1_CREDS=$(kubectl get secret -l app.kubernetes.io/name=backbeat-lcbp-user-creds,app.kubernetes.io/instance=end2end -o jsonpath='{.items[0].data.backbeat-lifecycle-bp-1\.json}' | base64 -d)
@@ -105,12 +105,6 @@ WORLD_PARAMETERS="$(jq -c <<EOF
105105
"PrometheusService":"${PROMETHEUS_NAME}-operated.default.svc.cluster.local",
106106
"KafkaHosts":"${KAFKA_HOST_PORT}",
107107
"KafkaAuthHosts":"${KAFKA_AUTH_HOST_PORT}",
108-
"KeycloakUsername":"${KEYCLOAK_TEST_USER}",
109-
"KeycloakHost":"${KEYCLOAK_TEST_HOST}",
110-
"KeycloakPort":"${KEYCLOAK_TEST_PORT}",
111-
"KeycloakRealm":"${KEYCLOAK_TEST_REALM_NAME}",
112-
"KeycloakClientId":"${KEYCLOAK_TEST_CLIENT_ID}",
113-
"KeycloakGrantType":"${KEYCLOAK_TEST_GRANT_TYPE}",
114108
"StorageManagerUsername":"ctst_storage_manager",
115109
"StorageAccountOwnerUsername":"ctst_storage_account_owner",
116110
"DataConsumerUsername":"ctst_data_consumer",
@@ -151,7 +145,7 @@ docker run \
151145
--rm \
152146
--network=host \
153147
"${E2E_IMAGE}" /bin/bash \
154-
-c "SUBDOMAIN=${SUBDOMAIN} CONTROL_PLANE_INGRESS_ENDPOINT=${OIDC_ENDPOINT} ACCOUNT=${ZENKO_ACCOUNT_NAME} KEYCLOAK_REALM=${KEYCLOAK_TEST_REALM_NAME} STORAGE_MANAGER=ctst_storage_manager STORAGE_ACCOUNT_OWNER=ctst_storage_account_owner DATA_CONSUMER=ctst_data_consumer DATA_ACCESSOR=ctst_data_accessor /ctst/node_modules/cli-testing/bin/seedKeycloak.sh"; [[ $? -eq 1 ]] && exit 1 || echo 'Keycloak Configured!'
148+
-c "SUBDOMAIN=${SUBDOMAIN} CONTROL_PLANE_INGRESS_ENDPOINT=${KEYCLOAK_TEST_ENDPOINT} ACCOUNT=${ZENKO_ACCOUNT_NAME} KEYCLOAK_REALM=${KEYCLOAK_TEST_REALM_NAME} STORAGE_MANAGER=ctst_storage_manager STORAGE_ACCOUNT_OWNER=ctst_storage_account_owner DATA_CONSUMER=ctst_data_consumer DATA_ACCESSOR=ctst_data_accessor /ctst/node_modules/cli-testing/bin/seedKeycloak.sh"; [[ $? -eq 1 ]] && exit 1 || echo 'Keycloak Configured!'
155149

156150
# Grant access to Kube API (insecure, only for testing)
157151
kubectl create clusterrolebinding serviceaccounts-cluster-admin \

.github/scripts/end2end/run-e2e-test.sh

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ DESTINATION_SESSION_TOKEN=$(kubectl get secret "end2end-account-${CRR_DESTINATIO
5151
DESTINATION_ACCOUNT_ID=$(kubectl get secret "end2end-account-${CRR_DESTINATION_ACCOUNT_NAME}" -o jsonpath='{.data.AccountId}' | base64 -d)
5252
CRR_DESTINATION_INFO="{\"AccessKeyId\":\"${DESTINATION_ACCESS_KEY}\",\"SecretAccessKey\":\"${DESTINATION_SECRET_KEY}\",\"SessionToken\":\"${DESTINATION_SESSION_TOKEN}\",\"AccountId\":\"${DESTINATION_ACCOUNT_ID}\"}"
5353
OIDC_FULLNAME="${OIDC_FIRST_NAME} ${OIDC_LAST_NAME}"
54-
KEYCLOAK_TEST_USER="${OIDC_USERNAME}-norights"
55-
KEYCLOAK_TEST_HOST=${OIDC_ENDPOINT}
56-
KEYCLOAK_TEST_PORT="80"
57-
KEYCLOAK_TEST_REALM_NAME=${OIDC_REALM}
58-
KEYCLOAK_TEST_CLIENT_ID=${OIDC_CLIENT_ID}
59-
KEYCLOAK_TEST_GRANT_TYPE="password"
54+
KEYCLOAK_TEST_USER="${KEYCLOAK_TEST_USER}-norights"
55+
# KEYCLOAK_TEST_HOST=${OIDC_ENDPOINT}
56+
# KEYCLOAK_TEST_PORT="80"
57+
# KEYCLOAK_TEST_REALM_NAME=${OIDC_REALM}
58+
# KEYCLOAK_TEST_CLIENT_ID=${OIDC_CLIENT_ID}
59+
# KEYCLOAK_TEST_GRANT_TYPE="password"
6060
MOCHA_FILE=${MOCHA_FILE:-}
6161

6262
run_e2e_test() {
@@ -81,11 +81,11 @@ run_e2e_test() {
8181
--env=TOKEN=${TOKEN} \
8282
--env=STAGE=${STAGE} \
8383
--env=CYPRESS_KEYCLOAK_USER_FULLNAME="${OIDC_FULLNAME}" \
84-
--env=CYPRESS_KEYCLOAK_USERNAME=${OIDC_USERNAME} \
84+
--env=CYPRESS_KEYCLOAK_USERNAME=${KEYCLOAK_TEST_USER} \
8585
--env=CYPRESS_KEYCLOAK_PASSWORD=${KEYCLOAK_TEST_PASSWORD} \
86-
--env=CYPRESS_KEYCLOAK_ROOT=${OIDC_ENDPOINT} \
87-
--env=CYPRESS_KEYCLOAK_CLIENT_ID=${OIDC_CLIENT_ID} \
88-
--env=CYPRESS_KEYCLOAK_REALM=${OIDC_REALM} \
86+
--env=CYPRESS_KEYCLOAK_ROOT=${KEYCLOAK_TEST_ENDPOINT} \
87+
--env=CYPRESS_KEYCLOAK_CLIENT_ID=${KEYCLOAK_TEST_CLIENT_ID} \
88+
--env=CYPRESS_KEYCLOAK_REALM=${KEYCLOAK_TEST_REALM_NAME} \
8989
--env=AWS_BACKEND_SOURCE_LOCATION=${AWS_BACKEND_SOURCE_LOCATION} \
9090
--env=AWS_BACKEND_DESTINATION_LOCATION=${AWS_BACKEND_DESTINATION_LOCATION} \
9191
--env=AWS_S3_FAIL_BACKEND_DESTINATION_LOCATION=${AWS_BACKEND_DESTINATION_FAIL_LOCATION} \
@@ -125,10 +125,8 @@ run_e2e_test() {
125125
--env=KEYCLOAK_TEST_USER=${KEYCLOAK_TEST_USER} \
126126
--env=KEYCLOAK_TEST_PASSWORD=${KEYCLOAK_TEST_PASSWORD} \
127127
--env=KEYCLOAK_TEST_HOST=${KEYCLOAK_TEST_HOST} \
128-
--env=KEYCLOAK_TEST_PORT=${KEYCLOAK_TEST_PORT} \
129128
--env=KEYCLOAK_TEST_REALM_NAME=${KEYCLOAK_TEST_REALM_NAME} \
130129
--env=KEYCLOAK_TEST_CLIENT_ID=${KEYCLOAK_TEST_CLIENT_ID} \
131-
--env=KEYCLOAK_TEST_GRANT_TYPE=${KEYCLOAK_TEST_GRANT_TYPE} \
132130
--env=BACKBEAT_BUCKET_CHECK_TIMEOUT_S=${BACKBEAT_BUCKET_CHECK_TIMEOUT_S} \
133131
--env=MONGO_DATABASE=${MONGO_DATABASE} \
134132
--env=MONGO_READ_PREFERENCE=${MONGO_READ_PREFERENCE} \

.github/workflows/end2end.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ env:
1818
OPERATOR_IMAGE: ""
1919
KIND_NODE_IMAGE: "kindest/node:v1.32.8@sha256:abd489f042d2b644e2d033f5c2d900bc707798d075e8186cb65e3f1367a9d5a1"
2020
VOLUME_ROOT: /artifacts
21-
OIDC_REALM: "zenko"
22-
OIDC_CLIENT_ID: "zenko-ui"
23-
OIDC_USERNAME: 'storage_manager'
21+
KEYCLOAK_TEST_REALM_NAME: "zenko"
22+
KEYCLOAK_TEST_CLIENT_ID: "zenko-ui"
23+
KEYCLOAK_TEST_USER: 'storage_manager'
2424
KEYCLOAK_TEST_PASSWORD: '123'
2525
OIDC_FIRST_NAME: 'hello'
2626
OIDC_LAST_NAME: 'world'
@@ -35,8 +35,8 @@ env:
3535
VAULT_TEST_IMAGE_NAME: ""
3636
VAULT_TEST_IMAGE_TAG: ""
3737
# http-env
38-
OIDC_ENDPOINT: 'http://keycloak.zenko.local'
39-
OIDC_HOST: 'keycloak.zenko.local'
38+
KEYCLOAK_TEST_ENDPOINT: 'http://keycloak.zenko.local'
39+
KEYCLOAK_TEST_HOST: 'keycloak.zenko.local'
4040
ENABLE_KEYCLOAK_HTTPS: 'false'
4141
KEYCLOAK_VERSION: '18.4.4'
4242
PROMETHEUS_NAME: "prometheus"
@@ -482,14 +482,14 @@ jobs:
482482
shell: bash
483483
run: bash keycloak-helper.sh add-user default end2end-pra
484484
env:
485-
OIDC_USERNAME: 'zenko-end2end-pra'
485+
KEYCLOAK_TEST_USER: 'zenko-end2end-pra'
486486
OIDC_EMAIL: 'e2e-pra@zenko.local'
487487
working-directory: ./.github/scripts/end2end
488488
- name: Configure E2E PRA test environment
489489
run: bash configure-e2e.sh end2end-pra ${E2E_IMAGE_NAME}:${E2E_IMAGE_TAG} default
490490
working-directory: ./.github/scripts/end2end
491491
env:
492-
OIDC_USERNAME: 'zenko-end2end-pra'
492+
KEYCLOAK_TEST_USER: 'zenko-end2end-pra'
493493
- name: Configure E2E CTST test environment
494494
run: bash configure-e2e-ctst.sh
495495
working-directory: ./.github/scripts/end2end

tests/ctst/world/Zenko.ts

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@ export interface ZenkoWorldParameters extends ClientOptions {
6363
KafkaHosts: string;
6464
KafkaAuthHosts: string;
6565
PrometheusService: string;
66-
KeycloakUsername: string;
67-
KeycloakPassword: string;
68-
KeycloakHost: string;
69-
KeycloakPort: string;
70-
KeycloakRealm: string;
71-
KeycloakClientId: string;
72-
KeycloakGrantType: string;
66+
// KeycloakUsername: string;
67+
// KeycloakPassword: string;
68+
// KeycloakHost: string;
69+
// KeycloakPort: string;
70+
// KeycloakRealm: string;
71+
// KeycloakClientId: string;
72+
// KeycloakGrantType: string;
7373
// KeycloakTestPassword: string;
7474
StorageManagerUsername: string;
7575
StorageAccountOwnerUsername: string;
@@ -265,19 +265,19 @@ export default class Zenko extends World<ZenkoWorldParameters> {
265265
break;
266266
case EntityType.STORAGE_MANAGER:
267267
await this.prepareARWWI(this.parameters.StorageManagerUsername || 'storage_manager',
268-
'storage-manager-role', this.parameters.KeycloakTestPassword);
268+
'storage-manager-role', process.env.KEYCLOAK_TEST_PASSWORD);
269269
break;
270270
case EntityType.STORAGE_ACCOUNT_OWNER:
271271
await this.prepareARWWI(this.parameters.StorageAccountOwnerUsername || 'storage_account_owner',
272-
'storage-account-owner-role', this.parameters.KeycloakTestPassword);
272+
'storage-account-owner-role', process.env.KEYCLOAK_TEST_PASSWORD);
273273
break;
274274
case EntityType.DATA_CONSUMER:
275275
await this.prepareARWWI(this.parameters.DataConsumerUsername || 'data_consumer',
276-
'data-consumer-role', this.parameters.KeycloakTestPassword);
276+
'data-consumer-role', process.env.KEYCLOAK_TEST_PASSWORD);
277277
break;
278278
case EntityType.DATA_ACCESSOR:
279279
await this.prepareARWWI(this.parameters.DataAccessorUsername || 'data_accessor',
280-
'data-accessor-role', this.parameters.KeycloakTestPassword);
280+
'data-accessor-role', process.env.KEYCLOAK_TEST_PASSWORD);
281281
break;
282282
case EntityType.ASSUME_ROLE_USER:
283283
await this.prepareAssumeRole(false);
@@ -314,11 +314,11 @@ export default class Zenko extends World<ZenkoWorldParameters> {
314314
const webIdentityToken = await this.getWebIdentityToken(
315315
ARWWIName,
316316
ARWWIPassword || '123',
317-
this.parameters.KeycloakHost || 'keycloak.zenko.local',
318-
this.parameters.KeycloakPort || '80',
319-
`/auth/realms/${this.parameters.KeycloakRealm || 'zenko'}/protocol/openid-connect/token`,
320-
this.parameters.KeycloakClientId || Constants.K_CLIENT,
321-
this.parameters.KeycloakGrantType || 'password',
317+
process.env.KEYCLOAK_TEST_HOST,
318+
'80',
319+
`/auth/realms/${process.env.KEYCLOAK_TEST_REALM_NAME}/protocol/openid-connect/token`,
320+
process.env.KEYCLOAK_TEST_CLIENT_ID || Constants.K_CLIENT,
321+
'password',
322322
);
323323
if (!webIdentityToken) {
324324
throw new Error('Error when trying to get a WebIdentity token.');
@@ -946,13 +946,13 @@ export default class Zenko extends World<ZenkoWorldParameters> {
946946
payload: object | string = {},
947947
): Promise<{ statusCode: number; data: object } | { statusCode: number; err: unknown }> {
948948
const token = await this.getWebIdentityToken(
949-
this.parameters.KeycloakUsername || 'storage_manager',
949+
process.env.KEYCLOAK_TEST_USER,
950950
process.env.KEYCLOAK_TEST_PASSWORD,
951-
this.parameters.KeycloakHost || 'keycloak.zenko.local',
952-
this.parameters.KeycloakPort || '80',
953-
`/auth/realms/${this.parameters.KeycloakRealm || 'zenko'}/protocol/openid-connect/token`,
954-
this.parameters.KeycloakClientId || Constants.K_CLIENT,
955-
this.parameters.KeycloakGrantType || 'password',
951+
process.env.KEYCLOAK_TEST_HOST,
952+
'80',
953+
`/auth/realms/${process.env.KEYCLOAK_TEST_REALM_NAME || 'zenko'}/protocol/openid-connect/token`,
954+
process.env.KEYCLOAK_TEST_CLIENT_ID || Constants.K_CLIENT,
955+
'password',
956956
);
957957
const axiosInstance = axios.create();
958958
const protocol = process.env.SSL === 'false' ? 'http://' : 'https://';

tests/zenko_tests/node_tests/utils/getWebIdentityToken.js

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ const querystring = require('querystring');
22
const http = require('http');
33
const assert = require('assert');
44

5-
const HOST_1_URL = process.env.KEYCLOAK_TEST_HOST || 'http://keycloak.zenko.local';
6-
const HOST_1_PORT = parseInt(process.env.KEYCLOAK_TEST_PORT, 10) || 80;
5+
const HOST_1 = process.env.KEYCLOAK_TEST_HOST;
6+
const HOST_1_PORT = 80;
77
const REALM_NAME = process.env.KEYCLOAK_TEST_REALM_NAME || 'zenko';
88
const KEYCLOAK_PATH = `/auth/realms/${REALM_NAME}/protocol/openid-connect/token`;
99
const CLIENT_ID = process.env.KEYCLOAK_TEST_CLIENT_ID || 'zenko-ui';
10-
const GRANT_TYPE = process.env.KEYCLOAK_TEST_GRANT_TYPE || 'password';
10+
const GRANT_TYPE = 'password';
1111

1212

1313
/**
@@ -33,9 +33,6 @@ function getWebIdentityToken(
3333
grandType,
3434
callback,
3535
) {
36-
// In Zenko, we are using an endpoint as the `KEYCLOAK_TEST_HOST` env variable
37-
// So we should remove any existing http of https prefix in HOST_1_URL.
38-
host = host.replace('https://', '').replace('http://', '');
3936
const userData = querystring.stringify({
4037
username,
4138
password,
@@ -82,7 +79,7 @@ function getTokenForIdentity(identity, callback) {
8279
getWebIdentityToken(
8380
identity,
8481
process.env.KEYCLOAK_TEST_PASSWORD,
85-
HOST_1_URL,
82+
HOST_1,
8683
HOST_1_PORT,
8784
KEYCLOAK_PATH,
8885
CLIENT_ID,

0 commit comments

Comments
 (0)