Skip to content

Commit

Permalink
Registering a user_resource needs the Workspace Service Name (#1989)
Browse files Browse the repository at this point in the history
* WORKSPACE_SERVICE_NAME

* run command needs WORKSPACE_SERVICE_NAME

* And added to the docker run
  • Loading branch information
ross-p-smith authored Jun 7, 2022
1 parent d8fccb0 commit 65b9ffb
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
4 changes: 4 additions & 0 deletions .github/actions/devcontainer_run_command/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,9 @@ inputs:
BUNDLE_TYPE:
description: "The Bundle type (workspace / Workspace-service / User Resource)."
required: false
WORKSPACE_SERVICE_NAME:
description: "The workspace service name for the bundle you are registering."
required: false
IS_API_SECURED:
description: "Indicates if the API endpoint has valid TLS certificate and if we validate it during E2E."
required: false
Expand Down Expand Up @@ -174,6 +177,7 @@ runs:
-e TF_IN_AUTOMATION="${{ inputs.TF_IN_AUTOMATION }}" \
-e USE_ENV_VARS_NOT_FILES="${{ inputs.USE_ENV_VARS_NOT_FILES }}" \
-e BUNDLE_TYPE="${{ inputs.BUNDLE_TYPE }}" \
-e WORKSPACE_SERVICE_NAME="${{ inputs.WORKSPACE_SERVICE_NAME }}" \
-e LOCATION="${{ inputs.LOCATION }}" \
-e TF_VAR_location="${{ inputs.LOCATION }}" \
-e RESOURCE_LOCATION="${{ inputs.LOCATION }}" \
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/deploy_tre_reusable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -492,6 +492,7 @@ jobs:
- {BUNDLE_TYPE: "shared_service",
BUNDLE_DIR: "./templates/shared_services/gitea"}
- {BUNDLE_TYPE: "user_resource",
WORKSPACE_SERVICE_NAME: "tre-service-guacamole",
BUNDLE_DIR: "./templates/workspace_services/guacamole/user_resources/guacamole-azure-windowsvm"}
environment: CICD
steps:
Expand Down Expand Up @@ -523,6 +524,7 @@ jobs:
TRE_ID: "${{ secrets.TRE_ID }}"
LOCATION: "${{ secrets.LOCATION }}"
BUNDLE_TYPE: ${{ matrix.BUNDLE_TYPE }}
WORKSPACE_SERVICE_NAME: ${{ matrix.WORKSPACE_SERVICE_NAME }}

deploy_shared_services:
name: Deploy shared services
Expand Down

0 comments on commit 65b9ffb

Please sign in to comment.