From a4dcc6b5929a754e35d451760f4052fee5b3f467 Mon Sep 17 00:00:00 2001 From: Heather Ward Date: Wed, 16 Aug 2023 18:59:14 -0400 Subject: [PATCH 1/3] Use ExitException rather than Exception when encountering request issues --- src/wdlci/auth/refresh_token_auth.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wdlci/auth/refresh_token_auth.py b/src/wdlci/auth/refresh_token_auth.py index 2afa29c..6f6fc57 100644 --- a/src/wdlci/auth/refresh_token_auth.py +++ b/src/wdlci/auth/refresh_token_auth.py @@ -2,7 +2,7 @@ import datetime import requests from wdlci.config import Config -from wdlci.exception.wdl_test_cli_exit_exception import WdlTestCliException +from wdlci.exception.wdl_test_cli_exit_exception import WdlTestCliExitException class RefreshTokenAuth(object): @@ -46,7 +46,7 @@ def __obtain_access_token(self): response = requests.post(url, params=params, headers=headers) if response.status_code != 200: - raise WdlTestCliException( + raise WdlTestCliExitException( "could not obtain access token from refresh token", 1 ) From 2beba859567c5970c94812fd7415f42bc8ec5ab5 Mon Sep 17 00:00:00 2001 From: Heather Ward Date: Tue, 21 Nov 2023 15:06:59 -0500 Subject: [PATCH 2/3] Use the latest version of the test workflow rather than a specific version The default version for new workflows has changed from v1_0_0 to 1.0.0; by omitting the workflow version in the submission we'll hit the latest version of the workflow regardless of what it's named. --- src/wdlci/workbench/ewes_client.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wdlci/workbench/ewes_client.py b/src/wdlci/workbench/ewes_client.py index 0bdfe0d..1b3190d 100644 --- a/src/wdlci/workbench/ewes_client.py +++ b/src/wdlci/workbench/ewes_client.py @@ -34,7 +34,7 @@ def submit_workflow_run(self, workflow_run): } form_data = { - "workflow_url": f"{env.workbench_workflow_service_url}/{env.workbench_namespace}/workflows/{workflow_run._workflow_id}/versions/v1_0_0/descriptor", + "workflow_url": workflow_run._workflow_id, "workflow_type": "WDL", "workflow_type_version": "1.0", "workflow_params": {**workflow_run._inputs, **output_test_task_params}, From 6c6ed7cee1b8e0eed8de83cb8de48df413aefdda Mon Sep 17 00:00:00 2001 From: Heather Ward Date: Tue, 21 Nov 2023 15:17:57 -0500 Subject: [PATCH 3/3] Bump version --- README.md | 8 ++++---- action.yml | 10 +++++----- pyproject.toml | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 69138bf..2b0c635 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ If any step of the action fails, the check will fail; however if some task tests # GitHub action usage ```yaml -- uses: dnastack/wdl-ci@v0.2.0 +- uses: dnastack/wdl-ci@v1.0.0 with: # Configuration file where tests can be found # Default: wdl-ci.config.json @@ -86,7 +86,7 @@ jobs: with: submodules: true - name: wdl-ci - uses: dnastack/wdl-ci@v0.2.0 + uses: dnastack/wdl-ci@v1.0.0 with: wallet-url: ${{ secrets.WALLET_URL }} wallet-client-id: ${{ secrets.WALLET_CLIENT_ID }} @@ -114,7 +114,7 @@ jobs: repository: ${{ github.event.pull_request.head.repo.full_name }} ref: ${{ github.event.pull_request.head.ref }} - name: wdl-ci - uses: dnastack/wdl-ci@v0.2.0 + uses: dnastack/wdl-ci@v1.0.0 with: wallet-url: ${{ secrets.WALLET_URL }} wallet-client-id: ${{ secrets.WALLET_CLIENT_ID }} @@ -144,7 +144,7 @@ jobs: repository: ${{ github.event.pull_request.head.repo.full_name }} ref: ${{ github.event.pull_request.head.ref }} - name: wdl-ci - uses: dnastack/wdl-ci@v0.2.0 + uses: dnastack/wdl-ci@v1.0.0 with: wallet-url: ${{ secrets.WALLET_URL }} wallet-client-id: ${{ secrets.WALLET_CLIENT_ID }} diff --git a/action.yml b/action.yml index 038314b..e897f5d 100644 --- a/action.yml +++ b/action.yml @@ -50,19 +50,19 @@ runs: echo "WDL_CI_CUSTOM_TEST_WDL_DIR"=${{ inputs.wdl_ci_custom_test_wdl_dir }} >> $GITHUB_ENV fi - name: lint - uses: docker://dnastack/wdl-ci:v0.2.0 + uses: docker://dnastack/wdl-ci:v1.0.0 with: args: lint - name: detect-changes - uses: docker://dnastack/wdl-ci:v0.2.0 + uses: docker://dnastack/wdl-ci:v1.0.0 with: args: detect-changes - name: submit - uses: docker://dnastack/wdl-ci:v0.2.0 + uses: docker://dnastack/wdl-ci:v1.0.0 with: args: submit - name: monitor - uses: docker://dnastack/wdl-ci:v0.2.0 + uses: docker://dnastack/wdl-ci:v1.0.0 with: args: monitor --update-digests # If a test fails, still update task digests for any tests that succeeded @@ -76,6 +76,6 @@ runs: default_author: github_actions - name: cleanup if: always() - uses: docker://dnastack/wdl-ci:v0.2.0 + uses: docker://dnastack/wdl-ci:v1.0.0 with: args: cleanup diff --git a/pyproject.toml b/pyproject.toml index 76eb23f..e751156 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [project] name = "wdl-testing-cli" description = "DNAstack WDL testing CLI" -version = "v0.2.0" +version = "1.0.0" authors = [ { name = "DNAstack", email = "devs@dnastack.com" } ]