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

Upgrade airlock review and unrestricted workspaces to base v0.12.0 #3659

Merged
merged 6 commits into from
Aug 8, 2023
Merged

Upgrade airlock review and unrestricted workspaces to base v0.12.0 #3659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
183b428
RP now needs KV URI rather than name, need IPC variable in dev container
marrobi Aug 4, 2023
c35b359
Update changelog
marrobi Aug 4, 2023
cf7255a
Merge branch 'main' into marrobi/issue3426
marrobi Aug 5, 2023
c2695e8
Upgrade to base 0.12.0
marrobi Aug 8, 2023
af258bd
Updated changelog
marrobi Aug 8, 2023
5f5b642
revert changes that shouldn't be in the branch.
marrobi Aug 8, 2023
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ ENHANCEMENTS:

BUG FIXES:
* Custom actions fail on resources with a pipeline ([#3646](https://github.com/microsoft/AzureTRE/issues/3646))
* 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)

Expand Down
2 changes: 1 addition & 1 deletion core/version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.8.2"
__version__ = "0.8.3"
2 changes: 1 addition & 1 deletion templates/workspaces/airlock-import-review/Dockerfile.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}

Expand Down
20 changes: 3 additions & 17 deletions templates/workspaces/airlock-import-review/porter.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand All @@ -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 }
marrobi marked this conversation as resolved.
Show resolved Hide resolved
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 }
Expand Down Expand Up @@ -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 }
Expand Down Expand Up @@ -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 }
Expand Down
2 changes: 0 additions & 2 deletions templates/workspaces/airlock-import-review/terraform/import_review_resources.terraform
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 3 additions & 4 deletions templates/workspaces/unrestricted/Dockerfile.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
21 changes: 6 additions & 15 deletions templates/workspaces/unrestricted/porter.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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:
Expand All @@ -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 }
Expand All @@ -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 }
Expand All @@ -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 }
Expand All @@ -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 }
Expand Down Expand Up @@ -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 }
Expand All @@ -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 }
Expand Down