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

Registering a user_resource needs the Workspace Service Name #1989

Merged
merged 3 commits into from
Jun 7, 2022
Merged

Registering a user_resource needs the Workspace Service Name #1989

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
894ad4a
WORKSPACE_SERVICE_NAME
ross-p-smith Jun 7, 2022
ee0d17a
run command needs WORKSPACE_SERVICE_NAME
ross-p-smith Jun 7, 2022
ecf2748
And added to the docker run
ross-p-smith Jun 7, 2022
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
4 changes: 4 additions & 0 deletions .github/actions/devcontainer_run_command/action.yml
View file
Open in desktop
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:
ross-p-smith marked this conversation as resolved.
Show resolved Hide resolved
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
View file
Open in desktop
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