Skip to content

Commit

Permalink
Merge pull request #507 from ScilifelabDataCentre/dev
Browse files Browse the repository at this point in the history
Link to dev instance and error
  • Loading branch information
i-oden authored Aug 1, 2022
2 parents ca01310 + bc7302a commit 4e3e672
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 2 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -168,3 +168,7 @@ Please add a _short_ line describing the PR you make, if the PR implements a spe
- Change token check message for Windows to more user friendly ([#500](https://github.com/ScilifelabDataCentre/dds_cli/pull/500))
- New command: List all users as Super Admin and find existing users ([#504](https://github.com/ScilifelabDataCentre/dds_cli/pull/504))
- Add possibility of allowing group access to authenticated session ([#502](https://github.com/ScilifelabDataCentre/dds_cli/pull/502))

## Summer 2022

- Check for DDS_CLI_ENV = "test-instance" in order to allow testing of features before production ([#506](https://github.com/ScilifelabDataCentre/dds_cli/pull/506))
3 changes: 3 additions & 0 deletions dds_cli/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,13 @@ class DDSEndpoint:
BASE_ENDPOINT_LOCAL = "http://127.0.0.1:5000/api/v1"
BASE_ENDPOINT_DOCKER = "http://dds_backend:5000/api/v1"
BASE_ENDPOINT_REMOTE = "https://delivery.scilifelab.se/api/v1"
BASE_ENDPOINT_REMOTE_TEST = "https://dds-dev.dckube.scilifelab.se/api/v1"
if os.getenv("DDS_CLI_ENV") == "development":
BASE_ENDPOINT = BASE_ENDPOINT_LOCAL
elif os.getenv("DDS_CLI_ENV") == "docker-dev":
BASE_ENDPOINT = BASE_ENDPOINT_DOCKER
elif os.getenv("DDS_CLI_ENV") == "test-instance":
BASE_ENDPOINT = BASE_ENDPOINT_REMOTE_TEST
else:
BASE_ENDPOINT = BASE_ENDPOINT_REMOTE

Expand Down
2 changes: 1 addition & 1 deletion dds_cli/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ def perform_request(
+ (
": The database seems to be down."
if isinstance(err, requests.exceptions.ConnectionError)
else ": Unknown request error."
else f": Unknown request error -- \n {err}"
)
)
)
Expand Down
2 changes: 1 addition & 1 deletion dds_cli/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "1.0.6"
__version__ = "1.0.61"

0 comments on commit 4e3e672

Please sign in to comment.