From 183b4281bca809a198c44bebda341f499c1060ad Mon Sep 17 00:00:00 2001 From: marrobi Date: Fri, 4 Aug 2023 16:05:11 +0000 Subject: [PATCH 1/5] RP now needs KV URI rather than name, need IPC variable in dev container --- core/terraform/json-to-env.sh | 4 ++++ core/terraform/outputs.tf | 4 ++++ core/version.txt | 2 +- devops/scripts/setup_local_debugging.sh | 25 +++++++++++++++++++++++++ resource_processor/_version.py | 2 +- resource_processor/shared/config.py | 14 +++++++++++++- 6 files changed, 48 insertions(+), 3 deletions(-) diff --git a/core/terraform/json-to-env.sh b/core/terraform/json-to-env.sh index e3fe6c7423..b6c17f534f 100755 --- a/core/terraform/json-to-env.sh +++ b/core/terraform/json-to-env.sh @@ -25,6 +25,10 @@ jq -r ' "path": "keyvault_name", "env_var": "KEYVAULT" }, + { + "path": "keyvault_uri", + "env_var": "KEYVAULT_URI" + }, { "path": "azure_tre_fqdn", "env_var": "FQDN" diff --git a/core/terraform/outputs.tf b/core/terraform/outputs.tf index 5b7b6a0e54..7e02c66aa5 100644 --- a/core/terraform/outputs.tf +++ b/core/terraform/outputs.tf @@ -26,6 +26,10 @@ output "keyvault_name" { value = azurerm_key_vault.kv.name } +output "keyvault_uri" { + value = azurerm_key_vault.kv.vault_uri +} + output "service_bus_resource_id" { value = azurerm_servicebus_namespace.sb.id } diff --git a/core/version.txt b/core/version.txt index deded3247f..732155f8df 100644 --- a/core/version.txt +++ b/core/version.txt @@ -1 +1 @@ -__version__ = "0.8.2" +__version__ = "0.8.3" diff --git a/devops/scripts/setup_local_debugging.sh b/devops/scripts/setup_local_debugging.sh index cc5f0e011e..b9d8ecb9b6 100755 --- a/devops/scripts/setup_local_debugging.sh +++ b/devops/scripts/setup_local_debugging.sh @@ -13,6 +13,8 @@ private_env_path="./core/private.env" : "${AZURE_SUBSCRIPTION_ID?"Check AZURE_SUBSCRIPTION_ID is defined in ${private_env_path}"}" : "${EVENT_GRID_STATUS_CHANGED_TOPIC_RESOURCE_ID?"Check EVENT_GRID_STATUS_CHANGED_TOPIC_RESOURCE_ID is defined in ${private_env_path}"}" : "${EVENT_GRID_AIRLOCK_NOTIFICATION_TOPIC_RESOURCE_ID?"Check EVENT_GRID_AIRLOCK_NOTIFICATION_TOPIC_RESOURCE_ID is defined in ${private_env_path}"}" +: "${KEYVAULT_URI?"Check KEYVAULT_URI is defined in ${private_env_path}"}" +: "${KEYVAULT?"Check KEYVAULT is defined in ${private_env_path}"}" set -o pipefail set -o nounset @@ -51,6 +53,12 @@ az eventgrid topic update \ --inbound-ip-rules "${IPADDR}" allow \ --ids "${EVENT_GRID_STATUS_CHANGED_TOPIC_RESOURCE_ID}" "${EVENT_GRID_AIRLOCK_NOTIFICATION_TOPIC_RESOURCE_ID}" +echo "Allow data ingestion to App Insights from public networks not connected through a Private Link Scope" +az monitor app-insights component update \ + --resource-group "${RESOURCE_GROUP_NAME}" \ + --app "appi-${TRE_ID}" \ + --ingestion-access enabled + # Get the object id of the currently logged-in identity if [[ -n ${ARM_CLIENT_ID:-} ]]; then @@ -115,15 +123,32 @@ az role assignment create \ --assignee "${RP_TESTING_SP_APP_ID}" \ --scope "${SERVICE_BUS_RESOURCE_ID}" + +# Assign get permissions on the keyvault +az keyvault set-policy \ + --name "${KEYVAULT}" \ + --application-id "${RP_TESTING_SP_APP_ID}" \ + --secret-permissions get + + # Write the appId and secret to the private.env file which is used for RP debugging # First check if the env vars are there already and delete them sed -i '/ARM_CLIENT_ID/d' "${private_env_path}" sed -i '/ARM_CLIENT_SECRET/d' "${private_env_path}" +sed -i '/AAD_TENANT_ID/d' "${private_env_path}" +sed -i '/APPLICATION_ADMIN_CLIENT_ID/d' "${private_env_path}" +sed -i '/APPLICATION_ADMIN_CLIENT_SECRET/d' "${private_env_path}" # Append them to the TRE file so that the Resource Processor can use them tee -a "${private_env_path}" < dict: config["service_bus_namespace"] = os.environ["SERVICE_BUS_FULLY_QUALIFIED_NAMESPACE"] config["vmss_msi_id"] = os.environ.get("VMSS_MSI_ID", None) config["number_processes"] = os.environ.get("NUMBER_PROCESSES", "1") - config["key_vault_url"] = os.environ.get("KEY_VAULT_URL", os.environ.get("KEYVAULT", None)) + config["key_vault_url"] = os.environ.get("KEY_VAULT_URL", os.environ.get("KEYVAULT_URI", None)) config["arm_environment"] = os.environ.get("ARM_ENVIRONMENT", "public") config["azure_environment"] = os.environ.get("AZURE_ENVIRONMENT", "AzureCloud") config["aad_authority_url"] = os.environ.get("AAD_AUTHORITY_URL", "https://login.microsoftonline.com") @@ -45,6 +45,10 @@ def get_config(logger_adapter) -> dict: else: config["arm_client_secret"] = "" # referenced in the credential set + # when running in vscode devcontainer + if "DEVCONTAINER" in os.environ: + config["remote_containers_ipc"] = os.environ["REMOTE_CONTAINERS_IPC"] + # Create env dict for porter config["porter_env"] = { "HOME": os.environ["HOME"], @@ -69,6 +73,14 @@ def get_config(logger_adapter) -> dict: } ) + # when running in vscode devcontainer + if "DEVCONTAINER" in os.environ: + config["porter_env"].update( + { + "REMOTE_CONTAINERS_IPC": config["remote_containers_ipc"] + } + ) + # Load env vars for bundles def envvar_to_key(name: str) -> str: return name[len("RP_BUNDLE_"):].lower() From c35b359459bc25256002c4f06cc7c0756e54348d Mon Sep 17 00:00:00 2001 From: marrobi Date: Fri, 4 Aug 2023 16:10:00 +0000 Subject: [PATCH 2/5] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 309f8ee11d..00ed8a3e6b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ ENHANCEMENTS: BUG FIXES: * Custom actions fail on resources with a pipeline ([#3646](https://github.com/microsoft/AzureTRE/issues/3646)) +* Fix ability to debug resource processor locally ([#3426](https://github.com/microsoft/AzureTRE/issues/4426)) ## 0.12.0 (July 27, 2023) From c2695e88a6859eca56210c712a3892a018b411ce Mon Sep 17 00:00:00 2001 From: marrobi Date: Tue, 8 Aug 2023 11:16:05 +0000 Subject: [PATCH 3/5] Upgrade to base 0.12.0 --- .../airlock-import-review/Dockerfile.tmpl | 2 +- .../airlock-import-review/porter.yaml | 20 +++--------------- .../import_review_resources.terraform | 2 -- .../workspaces/unrestricted/Dockerfile.tmpl | 7 +++---- templates/workspaces/unrestricted/porter.yaml | 21 ++++++------------- 5 files changed, 13 insertions(+), 39 deletions(-) diff --git a/templates/workspaces/airlock-import-review/Dockerfile.tmpl b/templates/workspaces/airlock-import-review/Dockerfile.tmpl index b98e44f011..c8346e1d3e 100644 --- a/templates/workspaces/airlock-import-review/Dockerfile.tmpl +++ b/templates/workspaces/airlock-import-review/Dockerfile.tmpl @@ -9,7 +9,7 @@ RUN rm -f /etc/apt/apt.conf.d/docker-clean; echo 'Binary::apt::APT::Keep-Downloa RUN --mount=type=cache,target=/var/cache/apt --mount=type=cache,target=/var/lib/apt \ apt-get update && apt-get install -y git jq curl ca-certificates patch --no-install-recommends -ARG AZURE_TRE_VERSION="0.9.0" +ARG AZURE_TRE_VERSION="0.12.0" WORKDIR ${BUNDLE_DIR} diff --git a/templates/workspaces/airlock-import-review/porter.yaml b/templates/workspaces/airlock-import-review/porter.yaml index 39d1b9567f..3a7ffe0f13 100644 --- a/templates/workspaces/airlock-import-review/porter.yaml +++ b/templates/workspaces/airlock-import-review/porter.yaml @@ -1,7 +1,7 @@ --- schemaVersion: 1.0.0 name: tre-workspace-airlock-import-review -version: 0.10.1 +version: 0.11.2 description: "A workspace to do Airlock Data Import Reviews for Azure TRE" dockerfile: Dockerfile.tmpl registry: azuretre @@ -112,8 +112,6 @@ parameters: type: string description: "The SKU used when deploying an Azure App Service Plan" default: "P1v3" - - name: arm_environment - type: string outputs: - name: app_role_id_workspace_owner @@ -144,9 +142,9 @@ outputs: mixins: - exec - terraform: - clientVersion: 1.3.6 + clientVersion: 1.4.6 - az: - clientVersion: 2.37.0 + clientVersion: 2.49.0 install: - terraform: @@ -159,10 +157,6 @@ install: enable_local_debugging: ${ bundle.parameters.enable_local_debugging } register_aad_application: ${ bundle.parameters.register_aad_application } create_aad_groups: ${ bundle.parameters.create_aad_groups } - arm_tenant_id: ${ bundle.credentials.azure_tenant_id } - arm_client_id: ${ bundle.credentials.azure_client_id } - arm_client_secret: ${ bundle.credentials.azure_client_secret } - arm_use_msi: ${ bundle.parameters.arm_use_msi } auth_client_id: ${ bundle.credentials.auth_client_id } auth_client_secret: ${ bundle.credentials.auth_client_secret } auth_tenant_id: ${ bundle.credentials.auth_tenant_id } @@ -202,10 +196,6 @@ upgrade: enable_local_debugging: ${ bundle.parameters.enable_local_debugging } register_aad_application: ${ bundle.parameters.register_aad_application } create_aad_groups: ${ bundle.parameters.create_aad_groups } - arm_tenant_id: ${ bundle.credentials.azure_tenant_id } - arm_client_id: ${ bundle.credentials.azure_client_id } - arm_client_secret: ${ bundle.credentials.azure_client_secret } - arm_use_msi: ${ bundle.parameters.arm_use_msi } auth_client_id: ${ bundle.credentials.auth_client_id } auth_client_secret: ${ bundle.credentials.auth_client_secret } auth_tenant_id: ${ bundle.credentials.auth_tenant_id } @@ -269,10 +259,6 @@ uninstall: enable_local_debugging: ${ bundle.parameters.enable_local_debugging } register_aad_application: ${ bundle.parameters.register_aad_application } create_aad_groups: ${ bundle.parameters.create_aad_groups } - arm_tenant_id: ${ bundle.credentials.azure_tenant_id } - arm_client_id: ${ bundle.credentials.azure_client_id } - arm_client_secret: ${ bundle.credentials.azure_client_secret } - arm_use_msi: ${ bundle.parameters.arm_use_msi } auth_client_id: ${ bundle.credentials.auth_client_id } auth_client_secret: ${ bundle.credentials.auth_client_secret } auth_tenant_id: ${ bundle.credentials.auth_tenant_id } diff --git a/templates/workspaces/airlock-import-review/terraform/import_review_resources.terraform b/templates/workspaces/airlock-import-review/terraform/import_review_resources.terraform index 76c5e9edde..fb6d441ebb 100644 --- a/templates/workspaces/airlock-import-review/terraform/import_review_resources.terraform +++ b/templates/workspaces/airlock-import-review/terraform/import_review_resources.terraform @@ -7,8 +7,6 @@ locals { import_in_progress_storage_name = lower(replace("stalimip${var.tre_id}", "-", "")) } -variable "arm_environment" {} - module "terraform_azurerm_environment_configuration" { source = "git::https://github.com/microsoft/terraform-azurerm-environment-configuration.git?ref=0.2.0" arm_environment = var.arm_environment diff --git a/templates/workspaces/unrestricted/Dockerfile.tmpl b/templates/workspaces/unrestricted/Dockerfile.tmpl index b4f8213142..23a4cb76f0 100644 --- a/templates/workspaces/unrestricted/Dockerfile.tmpl +++ b/templates/workspaces/unrestricted/Dockerfile.tmpl @@ -5,12 +5,11 @@ FROM debian:bullseye-slim RUN rm -f /etc/apt/apt.conf.d/docker-clean; echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache -# Install jq +# Git is required for terraform_azurerm_environment_configuration RUN --mount=type=cache,target=/var/cache/apt --mount=type=cache,target=/var/lib/apt \ - apt-get update && \ - apt-get install -y jq="1.6-2.1" curl ca-certificates patch --no-install-recommends + apt-get update && apt-get install -y git jq curl ca-certificates patch --no-install-recommends -ARG AZURE_TRE_VERSION="0.8.0" +ARG AZURE_TRE_VERSION="0.12.0" WORKDIR $BUNDLE_DIR diff --git a/templates/workspaces/unrestricted/porter.yaml b/templates/workspaces/unrestricted/porter.yaml index 6d19b52954..7748b7f521 100644 --- a/templates/workspaces/unrestricted/porter.yaml +++ b/templates/workspaces/unrestricted/porter.yaml @@ -1,7 +1,7 @@ --- schemaVersion: 1.0.0 name: tre-workspace-unrestricted -version: 0.9.0 +version: 0.10.2 description: "A base Azure TRE workspace" dockerfile: Dockerfile.tmpl registry: azuretre @@ -148,9 +148,9 @@ outputs: mixins: - exec - terraform: - clientVersion: 1.3.6 + clientVersion: 1.4.6 - az: - clientVersion: 2.37.0 + clientVersion: 2.49.0 install: - terraform: @@ -164,10 +164,6 @@ install: enable_local_debugging: ${ bundle.parameters.enable_local_debugging } register_aad_application: ${ bundle.parameters.register_aad_application } create_aad_groups: ${ bundle.parameters.create_aad_groups } - arm_tenant_id: ${ bundle.credentials.azure_tenant_id } - arm_client_id: ${ bundle.credentials.azure_client_id } - arm_client_secret: ${ bundle.credentials.azure_client_secret } - arm_use_msi: ${ bundle.parameters.arm_use_msi } auth_client_id: ${ bundle.credentials.auth_client_id } auth_client_secret: ${ bundle.credentials.auth_client_secret } auth_tenant_id: ${ bundle.credentials.auth_tenant_id } @@ -182,6 +178,7 @@ install: aad_redirect_uris_b64: ${ bundle.parameters.aad_redirect_uris } app_service_plan_sku: ${ bundle.parameters.app_service_plan_sku } enable_airlock: ${ bundle.parameters.enable_airlock } + arm_environment: ${ bundle.parameters.arm_environment } backendConfig: resource_group_name: ${ bundle.parameters.tfstate_resource_group_name } storage_account_name: ${ bundle.parameters.tfstate_storage_account_name } @@ -207,10 +204,6 @@ upgrade: enable_local_debugging: ${ bundle.parameters.enable_local_debugging } register_aad_application: ${ bundle.parameters.register_aad_application } create_aad_groups: ${ bundle.parameters.create_aad_groups } - arm_tenant_id: ${ bundle.credentials.azure_tenant_id } - arm_client_id: ${ bundle.credentials.azure_client_id } - arm_client_secret: ${ bundle.credentials.azure_client_secret } - arm_use_msi: ${ bundle.parameters.arm_use_msi } auth_client_id: ${ bundle.credentials.auth_client_id } auth_client_secret: ${ bundle.credentials.auth_client_secret } auth_tenant_id: ${ bundle.credentials.auth_tenant_id } @@ -225,6 +218,7 @@ upgrade: aad_redirect_uris_b64: ${ bundle.parameters.aad_redirect_uris } app_service_plan_sku: ${ bundle.parameters.app_service_plan_sku } enable_airlock: ${ bundle.parameters.enable_airlock } + arm_environment: ${ bundle.parameters.arm_environment } backendConfig: resource_group_name: ${ bundle.parameters.tfstate_resource_group_name } storage_account_name: ${ bundle.parameters.tfstate_storage_account_name } @@ -274,10 +268,6 @@ uninstall: enable_local_debugging: ${ bundle.parameters.enable_local_debugging } register_aad_application: ${ bundle.parameters.register_aad_application } create_aad_groups: ${ bundle.parameters.create_aad_groups } - arm_tenant_id: ${ bundle.credentials.azure_tenant_id } - arm_client_id: ${ bundle.credentials.azure_client_id } - arm_client_secret: ${ bundle.credentials.azure_client_secret } - arm_use_msi: ${ bundle.parameters.arm_use_msi } auth_client_id: ${ bundle.credentials.auth_client_id } auth_client_secret: ${ bundle.credentials.auth_client_secret } auth_tenant_id: ${ bundle.credentials.auth_tenant_id } @@ -291,6 +281,7 @@ uninstall: aad_redirect_uris_b64: ${ bundle.parameters.aad_redirect_uris } app_service_plan_sku: ${ bundle.parameters.app_service_plan_sku } enable_airlock: ${ bundle.parameters.enable_airlock } + arm_environment: ${ bundle.parameters.arm_environment } backendConfig: resource_group_name: ${ bundle.parameters.tfstate_resource_group_name } storage_account_name: ${ bundle.parameters.tfstate_storage_account_name } From af258bd8e20d5827aaeb6efab3579c6a701ff78e Mon Sep 17 00:00:00 2001 From: marrobi Date: Tue, 8 Aug 2023 11:20:24 +0000 Subject: [PATCH 4/5] Updated changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 00ed8a3e6b..95d38a406f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ ENHANCEMENTS: BUG FIXES: * Custom actions fail on resources with a pipeline ([#3646](https://github.com/microsoft/AzureTRE/issues/3646)) * Fix ability to debug resource processor locally ([#3426](https://github.com/microsoft/AzureTRE/issues/4426)) +* Upgrade airlock and unrestricted workspaces to base workspace version 0.12.0 ([#3659](https://github.com/microsoft/AzureTRE/pull/3659)) ## 0.12.0 (July 27, 2023) From 5f5b64202679c528fd0b3726f61a50283bb291c2 Mon Sep 17 00:00:00 2001 From: marrobi Date: Tue, 8 Aug 2023 16:40:46 +0000 Subject: [PATCH 5/5] revert changes that shouldn't be in the branch. --- CHANGELOG.md | 1 - core/terraform/json-to-env.sh | 4 ---- core/terraform/outputs.tf | 4 ---- devops/scripts/setup_local_debugging.sh | 25 ------------------------- resource_processor/_version.py | 2 +- resource_processor/shared/config.py | 14 +------------- 6 files changed, 2 insertions(+), 48 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 95d38a406f..a531ef6f3d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,6 @@ ENHANCEMENTS: BUG FIXES: * Custom actions fail on resources with a pipeline ([#3646](https://github.com/microsoft/AzureTRE/issues/3646)) -* Fix ability to debug resource processor locally ([#3426](https://github.com/microsoft/AzureTRE/issues/4426)) * Upgrade airlock and unrestricted workspaces to base workspace version 0.12.0 ([#3659](https://github.com/microsoft/AzureTRE/pull/3659)) ## 0.12.0 (July 27, 2023) diff --git a/core/terraform/json-to-env.sh b/core/terraform/json-to-env.sh index b6c17f534f..e3fe6c7423 100755 --- a/core/terraform/json-to-env.sh +++ b/core/terraform/json-to-env.sh @@ -25,10 +25,6 @@ jq -r ' "path": "keyvault_name", "env_var": "KEYVAULT" }, - { - "path": "keyvault_uri", - "env_var": "KEYVAULT_URI" - }, { "path": "azure_tre_fqdn", "env_var": "FQDN" diff --git a/core/terraform/outputs.tf b/core/terraform/outputs.tf index 7e02c66aa5..5b7b6a0e54 100644 --- a/core/terraform/outputs.tf +++ b/core/terraform/outputs.tf @@ -26,10 +26,6 @@ output "keyvault_name" { value = azurerm_key_vault.kv.name } -output "keyvault_uri" { - value = azurerm_key_vault.kv.vault_uri -} - output "service_bus_resource_id" { value = azurerm_servicebus_namespace.sb.id } diff --git a/devops/scripts/setup_local_debugging.sh b/devops/scripts/setup_local_debugging.sh index b9d8ecb9b6..cc5f0e011e 100755 --- a/devops/scripts/setup_local_debugging.sh +++ b/devops/scripts/setup_local_debugging.sh @@ -13,8 +13,6 @@ private_env_path="./core/private.env" : "${AZURE_SUBSCRIPTION_ID?"Check AZURE_SUBSCRIPTION_ID is defined in ${private_env_path}"}" : "${EVENT_GRID_STATUS_CHANGED_TOPIC_RESOURCE_ID?"Check EVENT_GRID_STATUS_CHANGED_TOPIC_RESOURCE_ID is defined in ${private_env_path}"}" : "${EVENT_GRID_AIRLOCK_NOTIFICATION_TOPIC_RESOURCE_ID?"Check EVENT_GRID_AIRLOCK_NOTIFICATION_TOPIC_RESOURCE_ID is defined in ${private_env_path}"}" -: "${KEYVAULT_URI?"Check KEYVAULT_URI is defined in ${private_env_path}"}" -: "${KEYVAULT?"Check KEYVAULT is defined in ${private_env_path}"}" set -o pipefail set -o nounset @@ -53,12 +51,6 @@ az eventgrid topic update \ --inbound-ip-rules "${IPADDR}" allow \ --ids "${EVENT_GRID_STATUS_CHANGED_TOPIC_RESOURCE_ID}" "${EVENT_GRID_AIRLOCK_NOTIFICATION_TOPIC_RESOURCE_ID}" -echo "Allow data ingestion to App Insights from public networks not connected through a Private Link Scope" -az monitor app-insights component update \ - --resource-group "${RESOURCE_GROUP_NAME}" \ - --app "appi-${TRE_ID}" \ - --ingestion-access enabled - # Get the object id of the currently logged-in identity if [[ -n ${ARM_CLIENT_ID:-} ]]; then @@ -123,32 +115,15 @@ az role assignment create \ --assignee "${RP_TESTING_SP_APP_ID}" \ --scope "${SERVICE_BUS_RESOURCE_ID}" - -# Assign get permissions on the keyvault -az keyvault set-policy \ - --name "${KEYVAULT}" \ - --application-id "${RP_TESTING_SP_APP_ID}" \ - --secret-permissions get - - # Write the appId and secret to the private.env file which is used for RP debugging # First check if the env vars are there already and delete them sed -i '/ARM_CLIENT_ID/d' "${private_env_path}" sed -i '/ARM_CLIENT_SECRET/d' "${private_env_path}" -sed -i '/AAD_TENANT_ID/d' "${private_env_path}" -sed -i '/APPLICATION_ADMIN_CLIENT_ID/d' "${private_env_path}" -sed -i '/APPLICATION_ADMIN_CLIENT_SECRET/d' "${private_env_path}" # Append them to the TRE file so that the Resource Processor can use them tee -a "${private_env_path}" < dict: config["service_bus_namespace"] = os.environ["SERVICE_BUS_FULLY_QUALIFIED_NAMESPACE"] config["vmss_msi_id"] = os.environ.get("VMSS_MSI_ID", None) config["number_processes"] = os.environ.get("NUMBER_PROCESSES", "1") - config["key_vault_url"] = os.environ.get("KEY_VAULT_URL", os.environ.get("KEYVAULT_URI", None)) + config["key_vault_url"] = os.environ.get("KEY_VAULT_URL", os.environ.get("KEYVAULT", None)) config["arm_environment"] = os.environ.get("ARM_ENVIRONMENT", "public") config["azure_environment"] = os.environ.get("AZURE_ENVIRONMENT", "AzureCloud") config["aad_authority_url"] = os.environ.get("AAD_AUTHORITY_URL", "https://login.microsoftonline.com") @@ -45,10 +45,6 @@ def get_config(logger_adapter) -> dict: else: config["arm_client_secret"] = "" # referenced in the credential set - # when running in vscode devcontainer - if "DEVCONTAINER" in os.environ: - config["remote_containers_ipc"] = os.environ["REMOTE_CONTAINERS_IPC"] - # Create env dict for porter config["porter_env"] = { "HOME": os.environ["HOME"], @@ -73,14 +69,6 @@ def get_config(logger_adapter) -> dict: } ) - # when running in vscode devcontainer - if "DEVCONTAINER" in os.environ: - config["porter_env"].update( - { - "REMOTE_CONTAINERS_IPC": config["remote_containers_ipc"] - } - ) - # Load env vars for bundles def envvar_to_key(name: str) -> str: return name[len("RP_BUNDLE_"):].lower()