Skip to content

Commit

Permalink
Add bastion service to workspace services
Browse files Browse the repository at this point in the history
  • Loading branch information
martins-vds committed Dec 9, 2023
1 parent fb714e9 commit d80a9fa
Show file tree
Hide file tree
Showing 7 changed files with 352 additions and 33 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/deploy_tre_reusable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,8 @@ jobs:
BUNDLE_DIR: "./templates/workspace_services/gitea"}
- {BUNDLE_TYPE: "workspace_service",
BUNDLE_DIR: "./templates/workspace_services/rshiny"}
- {BUNDLE_TYPE: "workspace_service",
BUNDLE_DIR: "./templates/workspace_services/bastion"}
- {BUNDLE_TYPE: "workspace_service",
BUNDLE_DIR: "./templates/workspace_services/mlflow"}
- {BUNDLE_TYPE: "workspace_service",
Expand Down Expand Up @@ -551,6 +553,8 @@ jobs:
BUNDLE_DIR: "./templates/workspace_services/gitea"}
- {BUNDLE_TYPE: "workspace_service",
BUNDLE_DIR: "./templates/workspace_services/rshiny"}
- {BUNDLE_TYPE: "workspace_service",
BUNDLE_DIR: "./templates/workspace_services/bastion"}
- {BUNDLE_TYPE: "workspace_service",
BUNDLE_DIR: "./templates/workspace_services/mlflow"}
- {BUNDLE_TYPE: "workspace_service",
Expand Down
123 changes: 123 additions & 0 deletions templates/workspace_services/bastion/parameters.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
{
"schemaType": "ParameterSet",
"schemaVersion": "1.0.1",
"namespace": "",
"name": "tre-service-bastion",
"parameters": [
{
"name": "id",
"source": {
"env": "ID"
}
}, {
"name": "workspace_id",
"source": {
"env": "WORKSPACE_ID"
}
},
{
"name": "tre_id",
"source": {
"env": "TRE_ID"
}
},
{
"name": "mgmt_acr_name",
"source": {
"env": "ACR_NAME"
}
},
{
"name": "mgmt_resource_group_name",
"source": {
"env": "MGMT_RESOURCE_GROUP_NAME"
}
},
{
"name": "tfstate_container_name",
"source": {
"env": "TERRAFORM_STATE_CONTAINER_NAME"
}
},
{
"name": "tfstate_resource_group_name",
"source": {
"env": "MGMT_RESOURCE_GROUP_NAME"
}
},
{
"name": "tfstate_storage_account_name",
"source": {
"env": "MGMT_STORAGE_ACCOUNT_NAME"
}
},

{
"name": "bastion_disable_copy",
"source": {
"env": "GUAC_DISABLE_COPY"
}
},
{
"name": "bastion_disable_download",
"source": {
"env": "GUAC_DISABLE_DOWNLOAD"
}
},
{
"name": "bastion_disable_upload",
"source": {
"env": "GUAC_DISABLE_UPLOAD"
}
},
{
"name": "bastion_disable_paste",
"source": {
"env": "GUAC_DISABLE_PASTE"
}
},
{
"name": "bastion_drive_name",
"source": {
"env": "GUAC_DRIVE_NAME"
}
},
{
"name": "bastion_drive_path",
"source": {
"env": "GUAC_DRIVE_PATH"
}
},
{
"name": "bastion_enable_drive",
"source": {
"env": "GUAC_ENABLE_DRIVE"
}
},
{
"name": "image_tag",
"source": {
"env": "IMAGE_TAG"
}
},
{
"name": "is_exposed_externally",
"source": {
"env": "IS_EXPOSED_EXTERNALLY"
}
},
{
"name": "aad_authority_url",
"source": {
"env": "AAD_AUTHORITY_URL"
}
},
{
"name": "arm_environment",
"source": {
"env": "ARM_ENVIRONMENT"
}
}
]
}

48 changes: 24 additions & 24 deletions templates/workspace_services/bastion/porter.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -129,21 +129,21 @@ mixins:

install:
- terraform:
description: "Deploy Guacamole Service"
description: "Deploy Bastion Service"
vars:
workspace_id: ${ bundle.parameters.workspace_id }
tre_id: ${ bundle.parameters.tre_id }
image_name: ${ bundle.custom.runtime_image.name }
image_tag: ${ bundle.parameters.image_tag }
mgmt_acr_name: ${ bundle.parameters.mgmt_acr_name }
mgmt_resource_group_name: ${ bundle.parameters.mgmt_resource_group_name }
guac_disable_copy: ${ bundle.parameters.guac_disable_copy }
guac_disable_paste: ${ bundle.parameters.guac_disable_paste }
guac_enable_drive: ${ bundle.parameters.guac_enable_drive }
guac_drive_name: ${ bundle.parameters.guac_drive_name }
guac_drive_path: ${ bundle.parameters.guac_drive_path }
guac_disable_download: ${ bundle.parameters.guac_disable_download }
guac_disable_upload: ${ bundle.parameters.guac_disable_upload }
bastio_disable_copy: ${ bundle.parameters.bastio_disable_copy }
bastio_disable_paste: ${ bundle.parameters.bastio_disable_paste }
bastio_enable_drive: ${ bundle.parameters.bastio_enable_drive }
bastio_drive_name: ${ bundle.parameters.bastio_drive_name }
bastio_drive_path: ${ bundle.parameters.bastio_drive_path }
bastio_disable_download: ${ bundle.parameters.bastio_disable_download }
bastio_disable_upload: ${ bundle.parameters.bastio_disable_upload }
is_exposed_externally: ${ bundle.parameters.is_exposed_externally }
tre_resource_id: ${ bundle.parameters.id }
aad_authority_url: ${ bundle.parameters.aad_authority_url }
Expand All @@ -160,21 +160,21 @@ install:

upgrade:
- terraform:
description: "Upgrade Guacamole Service"
description: "Upgrade Bastion Service"
vars:
workspace_id: ${ bundle.parameters.workspace_id }
tre_id: ${ bundle.parameters.tre_id }
image_name: ${ bundle.custom.runtime_image.name }
image_tag: ${ bundle.parameters.image_tag }
mgmt_acr_name: ${ bundle.parameters.mgmt_acr_name }
mgmt_resource_group_name: ${ bundle.parameters.mgmt_resource_group_name }
guac_disable_copy: ${ bundle.parameters.guac_disable_copy }
guac_disable_paste: ${ bundle.parameters.guac_disable_paste }
guac_enable_drive: ${ bundle.parameters.guac_enable_drive }
guac_drive_name: ${ bundle.parameters.guac_drive_name }
guac_drive_path: ${ bundle.parameters.guac_drive_path }
guac_disable_download: ${ bundle.parameters.guac_disable_download }
guac_disable_upload: ${ bundle.parameters.guac_disable_upload }
bastio_disable_copy: ${ bundle.parameters.bastio_disable_copy }
bastio_disable_paste: ${ bundle.parameters.bastio_disable_paste }
bastio_enable_drive: ${ bundle.parameters.bastio_enable_drive }
bastio_drive_name: ${ bundle.parameters.bastio_drive_name }
bastio_drive_path: ${ bundle.parameters.bastio_drive_path }
bastio_disable_download: ${ bundle.parameters.bastio_disable_download }
bastio_disable_upload: ${ bundle.parameters.bastio_disable_upload }
is_exposed_externally: ${ bundle.parameters.is_exposed_externally }
tre_resource_id: ${ bundle.parameters.id }
aad_authority_url: ${ bundle.parameters.aad_authority_url }
Expand All @@ -191,21 +191,21 @@ upgrade:

uninstall:
- terraform:
description: "Delete the Guacamole Service"
description: "Delete the Bastion Service"
vars:
workspace_id: ${ bundle.parameters.workspace_id }
tre_id: ${ bundle.parameters.tre_id }
image_name: ${ bundle.custom.runtime_image.name }
image_tag: ${ bundle.parameters.image_tag }
mgmt_acr_name: ${ bundle.parameters.mgmt_acr_name }
mgmt_resource_group_name: ${ bundle.parameters.mgmt_resource_group_name }
guac_disable_copy: ${ bundle.parameters.guac_disable_copy }
guac_disable_paste: ${ bundle.parameters.guac_disable_paste }
guac_enable_drive: ${ bundle.parameters.guac_enable_drive }
guac_drive_name: ${ bundle.parameters.guac_drive_name }
guac_drive_path: ${ bundle.parameters.guac_drive_path }
guac_disable_download: ${ bundle.parameters.guac_disable_download }
guac_disable_upload: ${ bundle.parameters.guac_disable_upload }
bastio_disable_copy: ${ bundle.parameters.bastio_disable_copy }
bastio_disable_paste: ${ bundle.parameters.bastio_disable_paste }
bastio_enable_drive: ${ bundle.parameters.bastio_enable_drive }
bastio_drive_name: ${ bundle.parameters.bastio_drive_name }
bastio_drive_path: ${ bundle.parameters.bastio_drive_path }
bastio_disable_download: ${ bundle.parameters.bastio_disable_download }
bastio_disable_upload: ${ bundle.parameters.bastio_disable_upload }
is_exposed_externally: ${ bundle.parameters.is_exposed_externally }
tre_resource_id: ${ bundle.parameters.id }
aad_authority_url: ${ bundle.parameters.aad_authority_url }
Expand Down
Loading

0 comments on commit d80a9fa

Please sign in to comment.