-
Notifications
You must be signed in to change notification settings - Fork 148
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into marrobi/service-bus-standard
- Loading branch information
Showing
38 changed files
with
557 additions
and
569 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| data "local_file" "airlock_processor_version" { | ||
| filename = "${path.root}/../../airlock_processor/_version.py" | ||
| } | ||
|
|
||
| data "azurerm_private_dns_zone" "eventgrid" { | ||
| name = module.terraform_azurerm_environment_configuration.private_links["privatelink.eventgrid.azure.net"] | ||
| resource_group_name = var.resource_group_name | ||
| } | ||
|
|
||
| data "azurerm_container_registry" "mgmt_acr" { | ||
| name = var.mgmt_acr_name | ||
| resource_group_name = var.mgmt_resource_group_name | ||
| } | ||
|
|
||
| data "azurerm_monitor_diagnostic_categories" "eventgrid_custom_topics" { | ||
| resource_id = azurerm_eventgrid_topic.airlock_notification.id | ||
| } | ||
|
|
||
| data "azurerm_monitor_diagnostic_categories" "eventgrid_system_topics" { | ||
| resource_id = azurerm_eventgrid_system_topic.export_approved_blob_created.id | ||
| } |
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 was deleted.
Oops, something went wrong.
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 |
|---|---|---|
| @@ -1 +1 @@ | ||
| __version__ = "0.11.15" | ||
| __version__ = "0.11.17" |
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,61 @@ | ||
| #!/bin/bash | ||
| set -e | ||
|
|
||
| # This script is used to upgrade terraform providers in a specified directory | ||
|
|
||
| # Usage: ./upgrade.sh <directory> | ||
|
|
||
| DIR=$1 | ||
|
|
||
| # Load environment variables from .env file | ||
| if [ -f "$DIR/.env" ]; then | ||
| set -a | ||
| # shellcheck source=/dev/null | ||
| . "$DIR/.env" | ||
| set +a | ||
| fi | ||
|
|
||
| # Ensure TF_VAR_mgmt_resource_group_name is set | ||
| if [ -z "${TF_VAR_mgmt_resource_group_name}" ]; then | ||
| echo "Error: TF_VAR_mgmt_resource_group_name is not set." | ||
| exit 1 | ||
| fi | ||
|
|
||
| # Ensure TF_VAR_mgmt_storage_account_name is set | ||
| if [ -z "${TF_VAR_mgmt_storage_account_name}" ]; then | ||
| echo "Error: TF_VAR_mgmt_storage_account_name is not set." | ||
| exit 1 | ||
| fi | ||
|
|
||
| # Ensure TF_VAR_terraform_state_container_name is set | ||
| if [ -z "${TF_VAR_terraform_state_container_name}" ]; then | ||
| echo "Error: TF_VAR_terraform_state_container_name is not set." | ||
| exit 1 | ||
| fi | ||
|
|
||
| # Ensure TRE_ID is set | ||
| if [ -z "${TRE_ID}" ]; then | ||
| echo "Error: TRE_ID is not set." | ||
| exit 1 | ||
| fi | ||
|
|
||
| # Infer the key from the directory names | ||
| PARENT_DIR=$(basename "$(dirname "$DIR")") | ||
| GRANDPARENT_DIR=$(basename "$(dirname "$(dirname "$DIR")")") | ||
|
|
||
| if [[ "$GRANDPARENT_DIR" == "workspaces" || "$GRANDPARENT_DIR" == "shared_services" ]]; then | ||
| KEY="${TRE_ID?}_${TF_VAR_id?}_${PARENT_DIR}" | ||
| elif [[ "$GRANDPARENT_DIR" == "workspace_services" ]]; then | ||
| KEY="${TRE_ID?}_${TF_VAR_workspace_id?}_${TF_VAR_id?}_${PARENT_DIR}" | ||
| elif [[ "$GRANDPARENT_DIR" == "user_resources" ]]; then | ||
| KEY="${TRE_ID?}_${TF_VAR_workspace_id?}_${TF_VAR_workspace_service_id?}_${TF_VAR_id?}_${PARENT_DIR}" | ||
| else | ||
| KEY="${TRE_ID?}_${PARENT_DIR}" | ||
| fi | ||
|
|
||
| # Run terraform init with upgrade and reconfigure options | ||
| terraform -chdir="$DIR/terraform" init -upgrade -reconfigure -input=false -backend=true \ | ||
| -backend-config="resource_group_name=${TF_VAR_mgmt_resource_group_name}" \ | ||
| -backend-config="storage_account_name=${TF_VAR_mgmt_storage_account_name}" \ | ||
| -backend-config="container_name=${TF_VAR_terraform_state_container_name}" \ | ||
| -backend-config="key=${KEY}" |
This file was deleted.
Oops, something went wrong.
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,21 @@ | ||
| # Forced Tunneling to External Firewall in TRE | ||
|
|
||
| Azure TRE deploys and manages an Azure firewall to ensure creation of workspace level rules can be automated when TRE workspaces and other services are created without manual intervention. | ||
| It is highly recommended leaving the Azure TRE firewall in place. If there is still the requirement to send all traffic through a centralized enterprise firewall, such as that deployed as part of an Azure landing zone, then forced tunnelling should be used. The centralized firewall will need a superset of rules used by the TRE. | ||
|
|
||
| To setup forced tunneling to an external firewall, follow these steps: | ||
|
|
||
| ## 1. Set the firewall_force_tunnel_ip parameter in the config.yaml file | ||
| Provide the external firewall's IP address: | ||
|
|
||
| ```json | ||
| firewall_force_tunnel_ip: 192.168.0.4 | ||
| ``` | ||
| This automatically creates a route table to direct TRE’s traffic to the specified IP. | ||
|
|
||
| ## 2. Manually Connect TRE to Your Firewall | ||
| Configure connectivity between TRE’s VNet and your external firewall using one of the following methods: | ||
|
|
||
| 1. **VNet Peering**: Peer the TRE VNet with your firewall’s VNet. | ||
| 1. **ExpressRoute**: Use a private connection for firewalls located on-premises. | ||
| 1. **Site-to-Site VPN**: Establish a VPN connection as an alternative. |
Oops, something went wrong.