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.

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

Tag Inheritance solution #214

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 templates/workspace_services/azureml/terraform/locals.tf
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,6 @@ locals {
tre_id = var.tre_id
tre_workspace_id = var.workspace_id
tre_workspace_service_id = var.tre_resource_id
workspace = "${data.azurerm_resource_group.ws.tags["workspace"]}"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,6 @@ locals {
tre_workspace_id = var.workspace_id
tre_workspace_service_id = var.parent_service_id
tre_user_resource_id = var.tre_resource_id
workspace = "${data.azurerm_resource_group.ws.tags["workspace"]}"
}
}
1 change: 1 addition & 0 deletions templates/workspace_services/azuresql/terraform/locals.tf
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@ locals {
tre_id = var.tre_id
tre_workspace_id = var.workspace_id
tre_workspace_service_id = var.tre_resource_id
workspace = "${data.azurerm_resource_group.ws.tags["workspace"]}"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@ locals {
tre_id = var.tre_id
tre_workspace_id = var.workspace_id
tre_workspace_service_id = var.tre_resource_id
workspace = "${data.azurerm_resource_group.ws.tags["workspace"]}"
}
}
1 change: 1 addition & 0 deletions templates/workspace_services/gitea/terraform/locals.tf
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ locals {
tre_id = var.tre_id
tre_workspace_id = var.workspace_id
tre_workspace_service_id = var.id
workspace = "${data.azurerm_resource_group.ws.tags["workspace"]}"
}
web_app_diagnostic_categories_enabled = [
"AppServiceHTTPLogs", "AppServiceConsoleLogs", "AppServiceAppLogs",
Expand Down
1 change: 1 addition & 0 deletions templates/workspace_services/guacamole/terraform/locals.tf
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ locals {
tre_id = var.tre_id
tre_workspace_id = var.workspace_id
tre_workspace_service_id = var.tre_resource_id
workspace = "${data.azurerm_resource_group.ws.tags["workspace"]}"
}
guacamole_diagnostic_categories_enabled = [
"AppServiceHTTPLogs", "AppServiceConsoleLogs", "AppServiceAppLogs",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ locals {
tre_workspace_id = var.workspace_id
tre_workspace_service_id = var.parent_service_id
tre_user_resource_id = var.tre_resource_id
workspace = "${data.azurerm_resource_group.ws.tags["workspace"]}"
}

# Load VM SKU/image details from porter.yaml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ locals {
tre_workspace_id = var.workspace_id
tre_workspace_service_id = var.parent_service_id
tre_user_resource_id = var.tre_resource_id
workspace = "${data.azurerm_resource_group.ws.tags["workspace"]}"
}

# Load VM SKU/image details from porter.yaml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ locals {
tre_workspace_id = var.workspace_id
tre_workspace_service_id = var.parent_service_id
tre_user_resource_id = var.tre_resource_id
workspace = "${data.azurerm_resource_group.ws.tags["workspace"]}"
}
nexus_proxy_url = "https://nexus-${data.azurerm_public_ip.app_gateway_ip.fqdn}"
# Load VM SKU/image details from porter.yaml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ locals {
tre_workspace_id = var.workspace_id
tre_workspace_service_id = var.parent_service_id
tre_user_resource_id = var.tre_resource_id
workspace = "${data.azurerm_resource_group.ws.tags["workspace"]}"
}
nexus_proxy_url = "https://nexus-${data.azurerm_public_ip.app_gateway_ip.fqdn}"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@ locals {
tre_id = var.tre_id
tre_workspace_id = var.workspace_id
tre_workspace_service_id = var.tre_resource_id
workspace = "${data.azurerm_resource_group.ws.tags["workspace"]}"
}
}
1 change: 1 addition & 0 deletions templates/workspace_services/innereye/terraform/locals.tf
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@ locals {
tre_id = var.tre_id
tre_workspace_id = var.workspace_id
tre_workspace_service_id = var.tre_resource_id
workspace = "${data.azurerm_resource_group.ws.tags["workspace"]}"
}
}
1 change: 1 addition & 0 deletions templates/workspace_services/mlflow/terraform/locals.tf
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ locals {
tre_id = var.tre_id
tre_workspace_id = var.workspace_id
tre_workspace_service_id = var.tre_resource_id
workspace = "${data.azurerm_resource_group.ws.tags["workspace"]}"
}
web_app_diagnostic_categories_enabled = [
"AppServiceHTTPLogs", "AppServiceConsoleLogs", "AppServiceAppLogs",
Expand Down
1 change: 1 addition & 0 deletions templates/workspace_services/mysql/terraform/locals.tf
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@ locals {
tre_id = var.tre_id
tre_workspace_id = var.workspace_id
tre_workspace_service_id = var.tre_resource_id
workspace = "${data.azurerm_resource_group.ws.tags["workspace"]}"
}
}
1 change: 1 addition & 0 deletions templates/workspace_services/ohdsi/terraform/locals.tf
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ locals {
tre_id = var.tre_id
tre_workspace_id = var.workspace_id
tre_workspace_service_id = var.tre_resource_id
workspace = "${data.azurerm_resource_group.ws.tags["workspace"]}"
}

# Data Source configuration
Expand Down
6 changes: 6 additions & 0 deletions templates/workspaces/base-adf/parameters.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,12 @@
"env": "MGMT_STORAGE_ACCOUNT_NAME"
}
},
{
"name": "display_name",
"source": {
"env": "DISPLAY_NAME"
}
},
{
"name": "shared_storage_quota",
"source": {
Expand Down
6 changes: 6 additions & 0 deletions templates/workspaces/base-adf/porter.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ parameters:
- name: arm_use_msi
type: boolean
default: false
- name: display_name
type: string
description: "The display name for base workspace"
- name: shared_storage_quota
type: integer
default: 50
Expand Down Expand Up @@ -164,6 +167,7 @@ install:
tre_resource_id: ${ bundle.parameters.id }
location: ${ bundle.parameters.azure_location }
address_spaces: ${ bundle.parameters.address_spaces }
display_name: ${ bundle.parameters.display_name }
shared_storage_quota: ${ bundle.parameters.shared_storage_quota }
enable_local_debugging: ${ bundle.parameters.enable_local_debugging }
register_aad_application: ${ bundle.parameters.register_aad_application }
Expand Down Expand Up @@ -208,6 +212,7 @@ upgrade:
tre_resource_id: ${ bundle.parameters.id }
location: ${ bundle.parameters.azure_location }
address_spaces: ${ bundle.parameters.address_spaces }
display_name: ${ bundle.parameters.display_name }
shared_storage_quota: ${ bundle.parameters.shared_storage_quota }
enable_local_debugging: ${ bundle.parameters.enable_local_debugging }
register_aad_application: ${ bundle.parameters.register_aad_application }
Expand Down Expand Up @@ -276,6 +281,7 @@ uninstall:
tre_resource_id: ${ bundle.parameters.id }
location: ${ bundle.parameters.azure_location }
address_spaces: ${ bundle.parameters.address_spaces }
display_name: ${ bundle.parameters.display_name }
shared_storage_quota: ${ bundle.parameters.shared_storage_quota }
enable_local_debugging: ${ bundle.parameters.enable_local_debugging }
register_aad_application: ${ bundle.parameters.register_aad_application }
Expand Down
5 changes: 5 additions & 0 deletions templates/workspaces/base-adf/template_schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@
],
"authorizedRoles": [],
"properties": {
"display_name": {
"type": "string",
"title": "Display Name",
"description": "Display name for Base Workspace."
},
"shared_storage_quota": {
"type": "integer",
"title": "Shared Storage Quota",
Expand Down
1 change: 1 addition & 0 deletions templates/workspaces/base-adf/terraform/locals.tf
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@ locals {
tre_workspace_tags = {
tre_id = var.tre_id
tre_workspace_id = var.tre_resource_id
workspace = var.display_name
}
}
5 changes: 5 additions & 0 deletions templates/workspaces/base-adf/terraform/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ variable "tre_resource_id" {
description = "Resource ID"
}

variable "display_name" {
type = string
description = "Display name for Base Workspace."
}

variable "shared_storage_quota" {
type = number
default = 50
Expand Down
6 changes: 6 additions & 0 deletions templates/workspaces/base/parameters.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,12 @@
"env": "MGMT_STORAGE_ACCOUNT_NAME"
}
},
{
"name": "display_name",
"source": {
"env": "DISPLAY_NAME"
}
},
{
"name": "shared_storage_quota",
"source": {
Expand Down
7 changes: 6 additions & 1 deletion templates/workspaces/base/porter.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ parameters:
- name: arm_use_msi
type: boolean
default: false
- name: display_name
type: string
description: "The display name for base workspace"
- name: shared_storage_quota
type: integer
default: 50
Expand Down Expand Up @@ -164,6 +167,7 @@ install:
tre_resource_id: ${ bundle.parameters.id }
location: ${ bundle.parameters.azure_location }
address_spaces: ${ bundle.parameters.address_spaces }
display_name: ${ bundle.parameters.display_name }
shared_storage_quota: ${ bundle.parameters.shared_storage_quota }
enable_local_debugging: ${ bundle.parameters.enable_local_debugging }
register_aad_application: ${ bundle.parameters.register_aad_application }
Expand Down Expand Up @@ -204,6 +208,7 @@ upgrade:
tre_resource_id: ${ bundle.parameters.id }
location: ${ bundle.parameters.azure_location }
address_spaces: ${ bundle.parameters.address_spaces }
display_name: ${ bundle.parameters.display_name }
shared_storage_quota: ${ bundle.parameters.shared_storage_quota }
enable_local_debugging: ${ bundle.parameters.enable_local_debugging }
register_aad_application: ${ bundle.parameters.register_aad_application }
Expand Down Expand Up @@ -267,7 +272,7 @@ uninstall:
tre_id: ${ bundle.parameters.tre_id }
tre_resource_id: ${ bundle.parameters.id }
location: ${ bundle.parameters.azure_location }
address_spaces: ${ bundle.parameters.address_spaces }
display_name: ${ bundle.parameters.display_name }
shared_storage_quota: ${ bundle.parameters.shared_storage_quota }
enable_local_debugging: ${ bundle.parameters.enable_local_debugging }
register_aad_application: ${ bundle.parameters.register_aad_application }
Expand Down
5 changes: 5 additions & 0 deletions templates/workspaces/base/template_schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@
],
"authorizedRoles": [],
"properties": {
"display_name": {
"type": "string",
"title": "Display Name",
"description": "Display name for Base Workspace."
},
"shared_storage_quota": {
"type": "integer",
"title": "Shared Storage Quota",
Expand Down
5 changes: 5 additions & 0 deletions templates/workspaces/base/terraform/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ variable "tre_resource_id" {
description = "Resource ID"
}

variable "display_name" {
type = string
description = "Display name for Base Workspace."
}

variable "shared_storage_quota" {
type = number
default = 50
Expand Down
6 changes: 6 additions & 0 deletions templates/workspaces/unrestricted/parameters.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,12 @@
"env": "MGMT_STORAGE_ACCOUNT_NAME"
}
},
{
"name": "display_name",
"source": {
"env": "DISPLAY_NAME"
}
},
{
"name": "shared_storage_quota",
"source": {
Expand Down
6 changes: 6 additions & 0 deletions templates/workspaces/unrestricted/porter.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ parameters:
env: ARM_ENVIRONMENT
type: string
default: "public"
- name: display_name
type: string
description: "The display name for base workspace"
- name: shared_storage_quota
type: integer
default: 50
Expand Down Expand Up @@ -166,6 +169,7 @@ install:
tre_resource_id: ${ bundle.parameters.id }
location: ${ bundle.parameters.azure_location }
address_spaces: ${ bundle.parameters.address_spaces }
display_name: ${ bundle.parameters.display_name }
shared_storage_quota: ${ bundle.parameters.shared_storage_quota }
enable_local_debugging: ${ bundle.parameters.enable_local_debugging }
register_aad_application: ${ bundle.parameters.register_aad_application }
Expand Down Expand Up @@ -206,6 +210,7 @@ upgrade:
tre_resource_id: ${ bundle.parameters.id }
location: ${ bundle.parameters.azure_location }
address_spaces: ${ bundle.parameters.address_spaces }
display_name: ${ bundle.parameters.display_name }
shared_storage_quota: ${ bundle.parameters.shared_storage_quota }
enable_local_debugging: ${ bundle.parameters.enable_local_debugging }
register_aad_application: ${ bundle.parameters.register_aad_application }
Expand Down Expand Up @@ -270,6 +275,7 @@ uninstall:
tre_resource_id: ${ bundle.parameters.id }
location: ${ bundle.parameters.azure_location }
address_spaces: ${ bundle.parameters.address_spaces }
display_name: ${ bundle.parameters.display_name }
shared_storage_quota: ${ bundle.parameters.shared_storage_quota }
enable_local_debugging: ${ bundle.parameters.enable_local_debugging }
register_aad_application: ${ bundle.parameters.register_aad_application }
Expand Down
5 changes: 5 additions & 0 deletions templates/workspaces/unrestricted/template_schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@
],
"authorizedRoles": [],
"properties": {
"display_name": {
"type": "string",
"title": "Display Name",
"description": "Display name for Base Workspace."
},
"shared_storage_quota": {
"type": "integer",
"title": "Shared Storage Quota",
Expand Down
Loading