Skip to content
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

Fail if fence-create client fails in kube-setup-ohdsi #2514

Merged
merged 3 commits into from
Apr 4, 2024
Merged

Fail if fence-create client fails in kube-setup-ohdsi #2514

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a90c1f7
Fail if fence-create client fails in kube-setup-ohdsi
jawadqur Mar 27, 2024
707cb41
Merge branch 'master' into fix/ohdsi-client
jawadqur Mar 29, 2024
1cc6430
Merge branch 'master' into fix/ohdsi-client
AidanHilt Apr 4, 2024
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
9 changes: 2 additions & 7 deletions gen3/bin/kube-setup-ohdsi.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,8 @@ new_client() {
local secrets=$(g3kubectl exec -c fence $(gen3 pod fence) -- fence-create client-create --client atlas --urls https://${atlas_hostname}/WebAPI/user/oauth/callback?client_name=OidcClient --username atlas --allowed-scopes openid profile email user | tail -1)
# secrets looks like ('CLIENT_ID', 'CLIENT_SECRET')
if [[ ! $secrets =~ (\'(.*)\', \'(.*)\') ]]; then
# try delete client
g3kubectl exec -c fence $(gen3 pod fence) -- fence-create client-delete --client atlas > /dev/null 2>&1
secrets=$(g3kubectl exec -c fence $(gen3 pod fence) -- fence-create client-create --client atlas --urls https://${atlas_hostname}/WebAPI/user/oauth/callback?client_name=OidcClient --username atlas --allowed-scopes openid profile email user | tail -1)
if [[ ! $secrets =~ (\'(.*)\', \'(.*)\') ]]; then
gen3_log_err "kube-setup-ohdsi" "Failed generating oidc client for atlas: $secrets"
return 1
fi
gen3_log_err "kube-setup-ohdsi" "Failed generating oidc client for atlas: $secrets"
return 1
fi
local FENCE_CLIENT_ID="${BASH_REMATCH[2]}"
local FENCE_CLIENT_SECRET="${BASH_REMATCH[3]}"
Expand Down
Loading