Skip to content

UID2-6621: Fix bore setup race condition and missing operator config guard #202

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sunnywu wants to merge 1 commit into
base: main
Choose a base branch
from
Open

UID2-6621: Fix bore setup race condition and missing operator config guard #202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion scripts/prepare_resources_for_e2e_docker_compose.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,9 @@ if [ ${OPERATOR_TYPE} != "public" ]; then
jq_string_update ${DOCKER_OPTOUT_CONFIG_FILE} optout_url "${BORE_URL_OPTOUT}"
fi

jq_string_update ${DOCKER_OPERATOR_CONFIG_FILE} identity_scope ${IDENTITY_SCOPE}
if [ -f "${DOCKER_OPERATOR_CONFIG_FILE}" ]; then
jq_string_update ${DOCKER_OPERATOR_CONFIG_FILE} identity_scope ${IDENTITY_SCOPE}
fi

cat ${DOCKER_CORE_CONFIG_FILE}
cat ${DOCKER_OPTOUT_CONFIG_FILE}
Expand Down
6 changes: 4 additions & 2 deletions scripts/setup_bore.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,11 @@ if [ "${TARGET_ENVIRONMENT}" == "mock" ]; then
docker run --init --rm --network e2e_default ekzhang/bore local --local-host core --to ${BORE_URL} --secret ${BORE_SECRET} 8088 > ${ROOT}/bore_core.out &
docker run --init --rm --network e2e_default ekzhang/bore local --local-host optout --to ${BORE_URL} --secret ${BORE_SECRET} 8081 > ${ROOT}/bore_optout.out &

until [ -f ${ROOT}/bore_localstack.out ] && [ -f ${ROOT}/bore_core.out ] && [ -f ${ROOT}/bore_optout.out ]
until grep -q " at " ${ROOT}/bore_localstack.out 2>/dev/null && \
grep -q " at " ${ROOT}/bore_core.out 2>/dev/null && \
grep -q " at " ${ROOT}/bore_optout.out 2>/dev/null
do
sleep 5
sleep 1
done

cat ${ROOT}/bore_localstack.out
Expand Down
Loading