forked from microsoft/AzureTRE
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
11 changed files
with
221 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| #!/bin/bash | ||
|
|
||
| function main() { | ||
|
|
||
| set -o errexit | ||
| set -o pipefail | ||
|
|
||
| # attempt to determine our tre id | ||
| # | ||
| local TRE_ID_LOCAL="${TRE_ID:-}" | ||
|
|
||
| if [[ -z "$TRE_ID_LOCAL" ]]; then | ||
| if [[ "${core_tre_rg:-}" == rg-* ]]; then # TRE_ID may not be available when called from destroy_env_no_terraform.sh | ||
| TRE_ID_LOCAL="${core_tre_rg#rg-}" | ||
| fi | ||
| fi | ||
|
|
||
| if [[ -z "$TRE_ID_LOCAL" ]]; then | ||
| echo -e "Could not add keyvault deployment network exception: TRE_ID is not set\nExiting...\n" | ||
| exit 1 | ||
| fi | ||
|
|
||
| # set up variables | ||
| # | ||
| local RG_NAME="rg-${TRE_ID_LOCAL}" | ||
| local KV_NAME="kv-${TRE_ID_LOCAL}" | ||
| local MY_IP="${PUBLIC_DEPLOYMENT_IP_ADDRESS:-}" | ||
|
|
||
| if [[ -z "$MY_IP" ]]; then | ||
| MY_IP=$(curl -s "ipecho.net/plain"; echo) | ||
| fi | ||
|
|
||
|
|
||
| # add keyvault network exception | ||
| # | ||
| echo -e "\nAdding deployment network exception to key vault $KV_NAME..." | ||
|
|
||
| if [[ -z "$(az group list --query "[?name=='$RG_NAME']" --output tsv)" ]]; then | ||
| echo -e " Core resource group $RG_NAME not found\n" | ||
| return 0 | ||
| fi | ||
|
|
||
| if [[ -z "$(az keyvault list --resource-group "$RG_NAME" --query "[?name=='$KV_NAME'].id" --output tsv)" ]]; then | ||
| echo -e " Core key vault $KV_NAME not found\n" | ||
| return 0 | ||
| fi | ||
|
|
||
| az keyvault network-rule add --resource-group "$RG_NAME" --name "$KV_NAME" --ip-address "$MY_IP" --output none | ||
|
|
||
| local ATTEMPT=1 | ||
| local MAX_ATTEMPTS=10 | ||
|
|
||
| while true; do | ||
|
|
||
| if KV_OUTPUT=$(az keyvault secret list --vault-name "$KV_NAME" --query '[].name' --output tsv 2>&1); then | ||
| echo -e " Keyvault $KV_NAME is now accessible\n" | ||
| break | ||
| fi | ||
|
|
||
| if [ $ATTEMPT -eq $MAX_ATTEMPTS ]; then | ||
| echo -e "Could not add deployment network exception for $KV_NAME" | ||
| echo -e "Unable to access keyvault $KV_NAME after $ATTEMPT/$MAX_ATTEMPTS.\n" | ||
| echo -e "$KV_OUTPUT\n" | ||
|
|
||
| exit 1 | ||
| fi | ||
|
|
||
| echo " Unable to access keyvault $KV_NAME after $ATTEMPT/$MAX_ATTEMPTS. Waiting for network rules to take effect." | ||
| sleep 5 | ||
| ((ATTEMPT++)) | ||
|
|
||
| done | ||
|
|
||
| } | ||
|
|
||
| main "$@" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| #!/bin/bash | ||
|
|
||
| function main() { | ||
|
|
||
| set -o errexit | ||
| set -o pipefail | ||
|
|
||
| # attempt to determine our tre id | ||
| # | ||
| local TRE_ID_LOCAL="${TRE_ID:-}" | ||
|
|
||
| if [[ -z "$TRE_ID_LOCAL" ]]; then | ||
| if [[ "${core_tre_rg:-}" == rg-* ]]; then # TRE_ID may not be available when called from destroy_env_no_terraform.sh | ||
| TRE_ID_LOCAL="${core_tre_rg#rg-}" | ||
| fi | ||
| fi | ||
|
|
||
| if [[ -z "$TRE_ID_LOCAL" ]]; then | ||
| echo -e "Could not remove keyvault deployment network exception: TRE_ID is not set\nExiting...\n" | ||
| exit 1 | ||
| fi | ||
|
|
||
| # set up variables | ||
| # | ||
| local RG_NAME="rg-${TRE_ID_LOCAL}" | ||
| local KV_NAME="kv-${TRE_ID_LOCAL}" | ||
| local MY_IP="${PUBLIC_DEPLOYMENT_IP_ADDRESS:-}" | ||
|
|
||
| if [[ -z "$MY_IP" ]]; then | ||
| MY_IP=$(curl -s "ipecho.net/plain"; echo) | ||
| fi | ||
|
|
||
|
|
||
| # remove keyvault network exception | ||
| # | ||
| echo -e "\nRemoving deployment network exception to key vault $KV_NAME..." | ||
|
|
||
| if [[ -z "$(az group list --query "[?name=='$RG_NAME']" --output tsv)" ]]; then | ||
| echo -e " Core resource group $RG_NAME not found\n" | ||
| return 0 | ||
| fi | ||
|
|
||
| if [[ -z "$(az keyvault list --resource-group "$RG_NAME" --query "[?name=='$KV_NAME'].id" --output tsv)" ]]; then | ||
| echo -e " Core key vault $KV_NAME not found\n" | ||
| return 0 | ||
| fi | ||
|
|
||
| az keyvault network-rule remove --name "$KV_NAME" --ip-address "$MY_IP" --output none | ||
| echo -e " Deployment network exception removed\n" | ||
|
|
||
| } | ||
|
|
||
| main "$@" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters