From 1df9cbaa655ffc4f9ba868440f921afc4f6baaa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Revuelta?= <46089290+rv0lt@users.noreply.github.com> Date: Thu, 30 May 2024 16:56:02 +0200 Subject: [PATCH 1/2] Revert "New release" --- CHANGELOG.rst | 9 --- SPRINTLOG.md | 5 -- dds_cli/__init__.py | 2 +- dds_cli/version.py | 2 +- docs/testing.rst | 14 ++-- img/dds-help-1.svg | 174 ++++++++++++++++++++-------------------- img/dds-help-2.svg | 174 ++++++++++++++++++++-------------------- img/dds-version.svg | 24 +++--- img/python-version.svg | 18 ++--- img/python3-version.svg | 18 ++--- requirements.txt | 2 +- 11 files changed, 214 insertions(+), 228 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index d8eba296..4cc32bd3 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,15 +1,6 @@ Changelog ========== -.. _2.7.0: - -2.7.0 - 2024-05-29 -~~~~~~~~~~~~~~~~~~~ -- New features: - - The URL for the testing instance has been updated to https://testing.delivery.scilifelab.se/ -- Dependencies: - - `requests` from `2.31.0` to `2.32.0` - .. _2.6.4: 2.6.4 - 2024-04-09 diff --git a/SPRINTLOG.md b/SPRINTLOG.md index c6d671bf..841dc11b 100644 --- a/SPRINTLOG.md +++ b/SPRINTLOG.md @@ -349,8 +349,3 @@ _Empty sprint_ # 2024-04-8 - 2024-04-19 - New version: 2.6.4 ([#687](https://github.com/ScilifelabDataCentre/dds_cli/pull/687)) - -# 2024-05-20 - 2024-05-31 - -- Update requests to solve CVE ([#690](https://github.com/ScilifelabDataCentre/dds_cli/pull/690)) -- Update docs for Testing instance migration, including removing use of 'dev' ([#691](https://github.com/ScilifelabDataCentre/dds_cli/pull/691)) diff --git a/dds_cli/__init__.py b/dds_cli/__init__.py index 507fc690..2c4b6af4 100644 --- a/dds_cli/__init__.py +++ b/dds_cli/__init__.py @@ -60,7 +60,7 @@ 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://testing.delivery.scilifelab.se/api/v1" + BASE_ENDPOINT_REMOTE_TEST = "https://dds-dev.dckube3.scilifelab.se/api/v1" if os.getenv("DDS_CLI_ENV") == "development": BASE_ENDPOINT = BASE_ENDPOINT_LOCAL elif os.getenv("DDS_CLI_ENV") == "docker-dev": diff --git a/dds_cli/version.py b/dds_cli/version.py index 4253692c..37004aa7 100644 --- a/dds_cli/version.py +++ b/dds_cli/version.py @@ -2,4 +2,4 @@ # Do not change bump the major version unless absolutely necessary - makes incompatible with API # If mid or minor version reaches 9, continue to 10, 11 etc. -__version__ = "2.7.0" +__version__ = "2.6.4" diff --git a/docs/testing.rst b/docs/testing.rst index ef9eabac..fb7a86c2 100644 --- a/docs/testing.rst +++ b/docs/testing.rst @@ -15,7 +15,7 @@ This page will give you information on: .. admonition:: Target audience - This page targets any users invited to the testing instance of the Data Delivery System. If you have an account on the production instead (https://delivery.scilifelab.se), please read the documentation here :ref:`here`. + This page targets any users invited to the development / testing instance of the Data Delivery System. If you have an account on the production instead (https://delivery.scilifelab.se), please read the documentation here :ref:`here`. .. _test-important: @@ -30,9 +30,9 @@ This page will give you information on: * In order to create projects, which is required in order to test the upload / download functionality: * You must have the account role "Unit Admin" or "Unit Personnel" * Your unit must have at least two "Unit Admins" -* When listing your projects you will see your projects, and yours only. However, in order to not create a large number of separate storage locations for testing purposes, the actual storage location is shared by all units in the test setup. In the production instance, there's always a separate storage location per SciLifeLab unit. +* When listing your projects you will see your projects, and yours only. However, in order to not create a large number of separate storage locations for testing purposes, the actual storage location is shared by all units in the test setup. Since the data is always encrypted and another unit would need to hack the DDS and also crack the encryption, there should be no risk of anyone else accessing your data. In the production instance, there's always a separate storage location per SciLifeLab unit. * The storage quota (maximum data volume that can be uploaded in total by all units) for the testing instance is currently set to 5 TB. However, if you receive an error message indicating that the quota is met, contact delivery@scilifelab.se and we will solve this for you. -* Within the testing instance of the DDS, all units have the following settings: +* Within the test instance of the DDS, all units have the following settings: * ``days_in_available``: 7 days. **Explanation:** When data has been uploaded to a project, and the data has been released (the project status has been set to "Available"), the data will be available for download for 7 days. After this, the project will automatically transition to the status "Expired". @@ -43,17 +43,17 @@ This page will give you information on: .. note:: - * These statuses are described in the technical overview, located on the DDS testing web page mentioned above. + * These statuses are described in the technical overview, located on the DDS test web page mentioned above. * The short number of days is only for the test instance, making it easier for you (and us) to test that the statuses work as they should. -* Keep in mind that the testing instance is where we try out new features etc. There may be some unexpected redeployments and there may be bugs in new features. +* Keep in mind that the test instance is where we try out new features etc. There may be some unexpected redeployments and there may be bugs in new features. .. _test-where: 2. Where the DDS Test Instance is located ============================================ -* The testing instance is located at https://testing.delivery.scilifelab.se/ +* The test instance is located at https://dds-dev.dckube3.scilifelab.se/ * Just like on the production site, you can find the following information on that page: * *Documentation*, which points to the ``Welcome page`` in the navigation field to the left. * *Technical overview* @@ -96,7 +96,7 @@ After installing the CLI, you need to complete the following steps before you ca # Windows PowerShell $env:DDS_CLI_ENV = 'test-instance' -2. Verify that the output of the following command contains ``https://testing.delivery.scilifelab.se/`` and **not** ``https://delivery.scilifelab.se/`` +2. Verify that the output of the following command contains ``https://dds-dev.dckube3.scilifelab.se/`` and **not** ``https://delivery.scilifelab.se/`` .. code-block:: bash diff --git a/img/dds-help-1.svg b/img/dds-help-1.svg index 61db45bc..47feca0d 100644 --- a/img/dds-help-1.svg +++ b/img/dds-help-1.svg @@ -19,140 +19,140 @@ font-weight: 700; } - .terminal-3455700917-matrix { + .terminal-1400950712-matrix { font-family: Fira Code, monospace; font-size: 20px; line-height: 24.4px; font-variant-east-asian: full-width; } - .terminal-3455700917-title { + .terminal-1400950712-title { font-size: 18px; font-weight: bold; font-family: arial; } - .terminal-3455700917-r1 { fill: #c5c8c6 } -.terminal-3455700917-r2 { fill: #868887;font-style: italic; } -.terminal-3455700917-r3 { fill: #c5c8c6;font-weight: bold } -.terminal-3455700917-r4 { fill: #d0b344;font-weight: bold } -.terminal-3455700917-r5 { fill: #68a0b3;font-weight: bold } -.terminal-3455700917-r6 { fill: #868887 } -.terminal-3455700917-r7 { fill: #4e707b;font-weight: bold } -.terminal-3455700917-r8 { fill: #98a84b;font-weight: bold } -.terminal-3455700917-r9 { fill: #8d7b39;font-weight: bold } + .terminal-1400950712-r1 { fill: #c5c8c6 } +.terminal-1400950712-r2 { fill: #868887;font-style: italic; } +.terminal-1400950712-r3 { fill: #c5c8c6;font-weight: bold } +.terminal-1400950712-r4 { fill: #d0b344;font-weight: bold } +.terminal-1400950712-r5 { fill: #68a0b3;font-weight: bold } +.terminal-1400950712-r6 { fill: #868887 } +.terminal-1400950712-r7 { fill: #4e707b;font-weight: bold } +.terminal-1400950712-r8 { fill: #98a84b;font-weight: bold } +.terminal-1400950712-r9 { fill: #8d7b39;font-weight: bold } - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -164,46 +164,46 @@ - + - - $ dds -     ︵  - ︵ (  )   ︵  -(  ) ) (  (  )   SciLifeLab Data Delivery System  - ︶  (  ) ) (    https://delivery.scilifelab.se/  -      ︶ (  )    CLI Version 2.7.0  -          ︶ -[..truncated..] -Usage: dds [OPTIONS] COMMAND [ARGS]... - - SciLifeLab Data Delivery System (DDS) command line interface.                                       -Access token is saved in a .dds_cli_token file in the home directory. -The token is valid for 7 days. Make sure your token is valid long enough for the delivery to  -finish. To avoid that a delivery fails because of an expired token, we recommend reauthenticating  -yourself before each delivery ('dds data put' / 'get'). - -╭─ Options ────────────────────────────────────────────────────────────────────────────────────────╮ -│--verbose-v  Print verbose output to the console.                              │ -│--log-file-l<filename>  Save a log to a file.                                             │ -│--no-prompt  Run without any interactive features.                             │ -│--token-path-tpTEXT        The path where the authentication token will be stored. For a     │ -│                                normal use-case, this should not be needed.                       │ -│--version  Display the version of this software.                             │ -│--help  List the options of any DDS subcommand and its default settings.  │ -╰──────────────────────────────────────────────────────────────────────────────────────────────────╯ -╭─ Commands ───────────────────────────────────────────────────────────────────────────────────────╮ -│auth         Group command for creating and managing authenticated sessions (valid for 7 days). │ -│data         Group command for uploading, downloading and managing project data.                │ -│ls           List the active projects you have access to or the project contents.               │ -│maintenance  [Super Admins only] Activate / Deactivate / Display status for Maintenance mode.   │ -│motd         [Super Admins only] Group command for managing Message of the Day within DDS.      │ -│project      Group command for creating and managing projects within the DDS.                   │ -│stats        Get statistics in the DDS.                                                         │ -│unit         [Super Admins only] Group command for managing units.                              │ -│user         Group command for managing user accounts, including your own.                      │ -╰──────────────────────────────────────────────────────────────────────────────────────────────────╯ - + + $ dds +     ︵  + ︵ (  )   ︵  +(  ) ) (  (  )   SciLifeLab Data Delivery System  + ︶  (  ) ) (    https://delivery.scilifelab.se/  +      ︶ (  )    CLI Version 2.6.4  +          ︶ +[..truncated..] +Usage: dds [OPTIONS] COMMAND [ARGS]... + + SciLifeLab Data Delivery System (DDS) command line interface.                                       +Access token is saved in a .dds_cli_token file in the home directory. +The token is valid for 7 days. Make sure your token is valid long enough for the delivery to  +finish. To avoid that a delivery fails because of an expired token, we recommend reauthenticating  +yourself before each delivery ('dds data put' / 'get'). + +╭─ Options ────────────────────────────────────────────────────────────────────────────────────────╮ +│--verbose-v  Print verbose output to the console.                              │ +│--log-file-l<filename>  Save a log to a file.                                             │ +│--no-prompt  Run without any interactive features.                             │ +│--token-path-tpTEXT        The path where the authentication token will be stored. For a     │ +│                                normal use-case, this should not be needed.                       │ +│--version  Display the version of this software.                             │ +│--help  List the options of any DDS subcommand and its default settings.  │ +╰──────────────────────────────────────────────────────────────────────────────────────────────────╯ +╭─ Commands ───────────────────────────────────────────────────────────────────────────────────────╮ +│auth         Group command for creating and managing authenticated sessions (valid for 7 days). │ +│data         Group command for uploading, downloading and managing project data.                │ +│ls           List the active projects you have access to or the project contents.               │ +│maintenance  [Super Admins only] Activate / Deactivate / Display status for Maintenance mode.   │ +│motd         [Super Admins only] Group command for managing Message of the Day within DDS.      │ +│project      Group command for creating and managing projects within the DDS.                   │ +│stats        Get statistics in the DDS.                                                         │ +│unit         [Super Admins only] Group command for managing units.                              │ +│user         Group command for managing user accounts, including your own.                      │ +╰──────────────────────────────────────────────────────────────────────────────────────────────────╯ + diff --git a/img/dds-help-2.svg b/img/dds-help-2.svg index 639213a6..a3484f5e 100644 --- a/img/dds-help-2.svg +++ b/img/dds-help-2.svg @@ -19,140 +19,140 @@ font-weight: 700; } - .terminal-1581765080-matrix { + .terminal-3820999131-matrix { font-family: Fira Code, monospace; font-size: 20px; line-height: 24.4px; font-variant-east-asian: full-width; } - .terminal-1581765080-title { + .terminal-3820999131-title { font-size: 18px; font-weight: bold; font-family: arial; } - .terminal-1581765080-r1 { fill: #c5c8c6 } -.terminal-1581765080-r2 { fill: #868887;font-style: italic; } -.terminal-1581765080-r3 { fill: #c5c8c6;font-weight: bold } -.terminal-1581765080-r4 { fill: #d0b344;font-weight: bold } -.terminal-1581765080-r5 { fill: #68a0b3;font-weight: bold } -.terminal-1581765080-r6 { fill: #868887 } -.terminal-1581765080-r7 { fill: #4e707b;font-weight: bold } -.terminal-1581765080-r8 { fill: #98a84b;font-weight: bold } -.terminal-1581765080-r9 { fill: #8d7b39;font-weight: bold } + .terminal-3820999131-r1 { fill: #c5c8c6 } +.terminal-3820999131-r2 { fill: #868887;font-style: italic; } +.terminal-3820999131-r3 { fill: #c5c8c6;font-weight: bold } +.terminal-3820999131-r4 { fill: #d0b344;font-weight: bold } +.terminal-3820999131-r5 { fill: #68a0b3;font-weight: bold } +.terminal-3820999131-r6 { fill: #868887 } +.terminal-3820999131-r7 { fill: #4e707b;font-weight: bold } +.terminal-3820999131-r8 { fill: #98a84b;font-weight: bold } +.terminal-3820999131-r9 { fill: #8d7b39;font-weight: bold } - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -164,46 +164,46 @@ - + - - $ dds --help -     ︵  - ︵ (  )   ︵  -(  ) ) (  (  )   SciLifeLab Data Delivery System  - ︶  (  ) ) (    https://delivery.scilifelab.se/  -      ︶ (  )    CLI Version 2.7.0  -          ︶ -[..truncated..] -Usage: dds [OPTIONS] COMMAND [ARGS]... - - SciLifeLab Data Delivery System (DDS) command line interface.                                       -Access token is saved in a .dds_cli_token file in the home directory. -The token is valid for 7 days. Make sure your token is valid long enough for the delivery to  -finish. To avoid that a delivery fails because of an expired token, we recommend reauthenticating  -yourself before each delivery ('dds data put' / 'get'). - -╭─ Options ────────────────────────────────────────────────────────────────────────────────────────╮ -│--verbose-v  Print verbose output to the console.                              │ -│--log-file-l<filename>  Save a log to a file.                                             │ -│--no-prompt  Run without any interactive features.                             │ -│--token-path-tpTEXT        The path where the authentication token will be stored. For a     │ -│                                normal use-case, this should not be needed.                       │ -│--version  Display the version of this software.                             │ -│--help  List the options of any DDS subcommand and its default settings.  │ -╰──────────────────────────────────────────────────────────────────────────────────────────────────╯ -╭─ Commands ───────────────────────────────────────────────────────────────────────────────────────╮ -│auth         Group command for creating and managing authenticated sessions (valid for 7 days). │ -│data         Group command for uploading, downloading and managing project data.                │ -│ls           List the active projects you have access to or the project contents.               │ -│maintenance  [Super Admins only] Activate / Deactivate / Display status for Maintenance mode.   │ -│motd         [Super Admins only] Group command for managing Message of the Day within DDS.      │ -│project      Group command for creating and managing projects within the DDS.                   │ -│stats        Get statistics in the DDS.                                                         │ -│unit         [Super Admins only] Group command for managing units.                              │ -│user         Group command for managing user accounts, including your own.                      │ -╰──────────────────────────────────────────────────────────────────────────────────────────────────╯ - + + $ dds --help +     ︵  + ︵ (  )   ︵  +(  ) ) (  (  )   SciLifeLab Data Delivery System  + ︶  (  ) ) (    https://delivery.scilifelab.se/  +      ︶ (  )    CLI Version 2.6.4  +          ︶ +[..truncated..] +Usage: dds [OPTIONS] COMMAND [ARGS]... + + SciLifeLab Data Delivery System (DDS) command line interface.                                       +Access token is saved in a .dds_cli_token file in the home directory. +The token is valid for 7 days. Make sure your token is valid long enough for the delivery to  +finish. To avoid that a delivery fails because of an expired token, we recommend reauthenticating  +yourself before each delivery ('dds data put' / 'get'). + +╭─ Options ────────────────────────────────────────────────────────────────────────────────────────╮ +│--verbose-v  Print verbose output to the console.                              │ +│--log-file-l<filename>  Save a log to a file.                                             │ +│--no-prompt  Run without any interactive features.                             │ +│--token-path-tpTEXT        The path where the authentication token will be stored. For a     │ +│                                normal use-case, this should not be needed.                       │ +│--version  Display the version of this software.                             │ +│--help  List the options of any DDS subcommand and its default settings.  │ +╰──────────────────────────────────────────────────────────────────────────────────────────────────╯ +╭─ Commands ───────────────────────────────────────────────────────────────────────────────────────╮ +│auth         Group command for creating and managing authenticated sessions (valid for 7 days). │ +│data         Group command for uploading, downloading and managing project data.                │ +│ls           List the active projects you have access to or the project contents.               │ +│maintenance  [Super Admins only] Activate / Deactivate / Display status for Maintenance mode.   │ +│motd         [Super Admins only] Group command for managing Message of the Day within DDS.      │ +│project      Group command for creating and managing projects within the DDS.                   │ +│stats        Get statistics in the DDS.                                                         │ +│unit         [Super Admins only] Group command for managing units.                              │ +│user         Group command for managing user accounts, including your own.                      │ +╰──────────────────────────────────────────────────────────────────────────────────────────────────╯ + diff --git a/img/dds-version.svg b/img/dds-version.svg index 75b858cc..9aa17f87 100644 --- a/img/dds-version.svg +++ b/img/dds-version.svg @@ -19,31 +19,31 @@ font-weight: 700; } - .terminal-1540634514-matrix { + .terminal-1543649173-matrix { font-family: Fira Code, monospace; font-size: 20px; line-height: 24.4px; font-variant-east-asian: full-width; } - .terminal-1540634514-title { + .terminal-1543649173-title { font-size: 18px; font-weight: bold; font-family: arial; } - .terminal-1540634514-r1 { fill: #c5c8c6 } -.terminal-1540634514-r2 { fill: #868887;font-style: italic; } + .terminal-1543649173-r1 { fill: #c5c8c6 } +.terminal-1543649173-r2 { fill: #868887;font-style: italic; } - + - + - + @@ -55,12 +55,12 @@ - + - - $ dds --version -[..truncated..] -Data Delivery System, version 2.7.0 + + $ dds --version +[..truncated..] +Data Delivery System, version 2.6.4 diff --git a/img/python-version.svg b/img/python-version.svg index 32066b50..9c22b089 100644 --- a/img/python-version.svg +++ b/img/python-version.svg @@ -19,27 +19,27 @@ font-weight: 700; } - .terminal-624105866-matrix { + .terminal-623057289-matrix { font-family: Fira Code, monospace; font-size: 20px; line-height: 24.4px; font-variant-east-asian: full-width; } - .terminal-624105866-title { + .terminal-623057289-title { font-size: 18px; font-weight: bold; font-family: arial; } - .terminal-624105866-r1 { fill: #c5c8c6 } + .terminal-623057289-r1 { fill: #c5c8c6 } - + - + @@ -51,11 +51,11 @@ - + - - $ python --version -Python 3.12.3 + + $ python --version +Python 3.12.2 diff --git a/img/python3-version.svg b/img/python3-version.svg index d2d71782..e2c1da7b 100644 --- a/img/python3-version.svg +++ b/img/python3-version.svg @@ -19,27 +19,27 @@ font-weight: 700; } - .terminal-935926205-matrix { + .terminal-934877628-matrix { font-family: Fira Code, monospace; font-size: 20px; line-height: 24.4px; font-variant-east-asian: full-width; } - .terminal-935926205-title { + .terminal-934877628-title { font-size: 18px; font-weight: bold; font-family: arial; } - .terminal-935926205-r1 { fill: #c5c8c6 } + .terminal-934877628-r1 { fill: #c5c8c6 } - + - + @@ -51,11 +51,11 @@ - + - - $ python3 --version -Python 3.12.3 + + $ python3 --version +Python 3.12.2 diff --git a/requirements.txt b/requirements.txt index 5b4d0dc7..e76c895d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,7 +11,7 @@ PyNaCl==1.5.0 pytz==2022.2.1 PyYAML==6.0.1 questionary==1.10.0 -requests==2.32.0 +requests==2.31.0 rich==12.5.1 rich-click==1.5.2 simplejson==3.17.6 From 7e363b516ea217c5557581d41c11d85fac3dd11a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Revuelta?= <46089290+rv0lt@users.noreply.github.com> Date: Mon, 3 Jun 2024 13:42:46 +0200 Subject: [PATCH 2/2] Revert "Revert "New release" due to GH-Pages action failing" --- CHANGELOG.rst | 9 +++ SPRINTLOG.md | 5 ++ dds_cli/__init__.py | 2 +- dds_cli/version.py | 2 +- docs/testing.rst | 14 ++-- img/dds-help-1.svg | 174 ++++++++++++++++++++-------------------- img/dds-help-2.svg | 174 ++++++++++++++++++++-------------------- img/dds-version.svg | 24 +++--- img/python-version.svg | 18 ++--- img/python3-version.svg | 18 ++--- requirements.txt | 2 +- 11 files changed, 228 insertions(+), 214 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 4cc32bd3..d8eba296 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,15 @@ Changelog ========== +.. _2.7.0: + +2.7.0 - 2024-05-29 +~~~~~~~~~~~~~~~~~~~ +- New features: + - The URL for the testing instance has been updated to https://testing.delivery.scilifelab.se/ +- Dependencies: + - `requests` from `2.31.0` to `2.32.0` + .. _2.6.4: 2.6.4 - 2024-04-09 diff --git a/SPRINTLOG.md b/SPRINTLOG.md index 841dc11b..c6d671bf 100644 --- a/SPRINTLOG.md +++ b/SPRINTLOG.md @@ -349,3 +349,8 @@ _Empty sprint_ # 2024-04-8 - 2024-04-19 - New version: 2.6.4 ([#687](https://github.com/ScilifelabDataCentre/dds_cli/pull/687)) + +# 2024-05-20 - 2024-05-31 + +- Update requests to solve CVE ([#690](https://github.com/ScilifelabDataCentre/dds_cli/pull/690)) +- Update docs for Testing instance migration, including removing use of 'dev' ([#691](https://github.com/ScilifelabDataCentre/dds_cli/pull/691)) diff --git a/dds_cli/__init__.py b/dds_cli/__init__.py index 2c4b6af4..507fc690 100644 --- a/dds_cli/__init__.py +++ b/dds_cli/__init__.py @@ -60,7 +60,7 @@ 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.dckube3.scilifelab.se/api/v1" + BASE_ENDPOINT_REMOTE_TEST = "https://testing.delivery.scilifelab.se/api/v1" if os.getenv("DDS_CLI_ENV") == "development": BASE_ENDPOINT = BASE_ENDPOINT_LOCAL elif os.getenv("DDS_CLI_ENV") == "docker-dev": diff --git a/dds_cli/version.py b/dds_cli/version.py index 37004aa7..4253692c 100644 --- a/dds_cli/version.py +++ b/dds_cli/version.py @@ -2,4 +2,4 @@ # Do not change bump the major version unless absolutely necessary - makes incompatible with API # If mid or minor version reaches 9, continue to 10, 11 etc. -__version__ = "2.6.4" +__version__ = "2.7.0" diff --git a/docs/testing.rst b/docs/testing.rst index fb7a86c2..ef9eabac 100644 --- a/docs/testing.rst +++ b/docs/testing.rst @@ -15,7 +15,7 @@ This page will give you information on: .. admonition:: Target audience - This page targets any users invited to the development / testing instance of the Data Delivery System. If you have an account on the production instead (https://delivery.scilifelab.se), please read the documentation here :ref:`here`. + This page targets any users invited to the testing instance of the Data Delivery System. If you have an account on the production instead (https://delivery.scilifelab.se), please read the documentation here :ref:`here`. .. _test-important: @@ -30,9 +30,9 @@ This page will give you information on: * In order to create projects, which is required in order to test the upload / download functionality: * You must have the account role "Unit Admin" or "Unit Personnel" * Your unit must have at least two "Unit Admins" -* When listing your projects you will see your projects, and yours only. However, in order to not create a large number of separate storage locations for testing purposes, the actual storage location is shared by all units in the test setup. Since the data is always encrypted and another unit would need to hack the DDS and also crack the encryption, there should be no risk of anyone else accessing your data. In the production instance, there's always a separate storage location per SciLifeLab unit. +* When listing your projects you will see your projects, and yours only. However, in order to not create a large number of separate storage locations for testing purposes, the actual storage location is shared by all units in the test setup. In the production instance, there's always a separate storage location per SciLifeLab unit. * The storage quota (maximum data volume that can be uploaded in total by all units) for the testing instance is currently set to 5 TB. However, if you receive an error message indicating that the quota is met, contact delivery@scilifelab.se and we will solve this for you. -* Within the test instance of the DDS, all units have the following settings: +* Within the testing instance of the DDS, all units have the following settings: * ``days_in_available``: 7 days. **Explanation:** When data has been uploaded to a project, and the data has been released (the project status has been set to "Available"), the data will be available for download for 7 days. After this, the project will automatically transition to the status "Expired". @@ -43,17 +43,17 @@ This page will give you information on: .. note:: - * These statuses are described in the technical overview, located on the DDS test web page mentioned above. + * These statuses are described in the technical overview, located on the DDS testing web page mentioned above. * The short number of days is only for the test instance, making it easier for you (and us) to test that the statuses work as they should. -* Keep in mind that the test instance is where we try out new features etc. There may be some unexpected redeployments and there may be bugs in new features. +* Keep in mind that the testing instance is where we try out new features etc. There may be some unexpected redeployments and there may be bugs in new features. .. _test-where: 2. Where the DDS Test Instance is located ============================================ -* The test instance is located at https://dds-dev.dckube3.scilifelab.se/ +* The testing instance is located at https://testing.delivery.scilifelab.se/ * Just like on the production site, you can find the following information on that page: * *Documentation*, which points to the ``Welcome page`` in the navigation field to the left. * *Technical overview* @@ -96,7 +96,7 @@ After installing the CLI, you need to complete the following steps before you ca # Windows PowerShell $env:DDS_CLI_ENV = 'test-instance' -2. Verify that the output of the following command contains ``https://dds-dev.dckube3.scilifelab.se/`` and **not** ``https://delivery.scilifelab.se/`` +2. Verify that the output of the following command contains ``https://testing.delivery.scilifelab.se/`` and **not** ``https://delivery.scilifelab.se/`` .. code-block:: bash diff --git a/img/dds-help-1.svg b/img/dds-help-1.svg index 47feca0d..61db45bc 100644 --- a/img/dds-help-1.svg +++ b/img/dds-help-1.svg @@ -19,140 +19,140 @@ font-weight: 700; } - .terminal-1400950712-matrix { + .terminal-3455700917-matrix { font-family: Fira Code, monospace; font-size: 20px; line-height: 24.4px; font-variant-east-asian: full-width; } - .terminal-1400950712-title { + .terminal-3455700917-title { font-size: 18px; font-weight: bold; font-family: arial; } - .terminal-1400950712-r1 { fill: #c5c8c6 } -.terminal-1400950712-r2 { fill: #868887;font-style: italic; } -.terminal-1400950712-r3 { fill: #c5c8c6;font-weight: bold } -.terminal-1400950712-r4 { fill: #d0b344;font-weight: bold } -.terminal-1400950712-r5 { fill: #68a0b3;font-weight: bold } -.terminal-1400950712-r6 { fill: #868887 } -.terminal-1400950712-r7 { fill: #4e707b;font-weight: bold } -.terminal-1400950712-r8 { fill: #98a84b;font-weight: bold } -.terminal-1400950712-r9 { fill: #8d7b39;font-weight: bold } + .terminal-3455700917-r1 { fill: #c5c8c6 } +.terminal-3455700917-r2 { fill: #868887;font-style: italic; } +.terminal-3455700917-r3 { fill: #c5c8c6;font-weight: bold } +.terminal-3455700917-r4 { fill: #d0b344;font-weight: bold } +.terminal-3455700917-r5 { fill: #68a0b3;font-weight: bold } +.terminal-3455700917-r6 { fill: #868887 } +.terminal-3455700917-r7 { fill: #4e707b;font-weight: bold } +.terminal-3455700917-r8 { fill: #98a84b;font-weight: bold } +.terminal-3455700917-r9 { fill: #8d7b39;font-weight: bold } - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -164,46 +164,46 @@ - + - - $ dds -     ︵  - ︵ (  )   ︵  -(  ) ) (  (  )   SciLifeLab Data Delivery System  - ︶  (  ) ) (    https://delivery.scilifelab.se/  -      ︶ (  )    CLI Version 2.6.4  -          ︶ -[..truncated..] -Usage: dds [OPTIONS] COMMAND [ARGS]... - - SciLifeLab Data Delivery System (DDS) command line interface.                                       -Access token is saved in a .dds_cli_token file in the home directory. -The token is valid for 7 days. Make sure your token is valid long enough for the delivery to  -finish. To avoid that a delivery fails because of an expired token, we recommend reauthenticating  -yourself before each delivery ('dds data put' / 'get'). - -╭─ Options ────────────────────────────────────────────────────────────────────────────────────────╮ -│--verbose-v  Print verbose output to the console.                              │ -│--log-file-l<filename>  Save a log to a file.                                             │ -│--no-prompt  Run without any interactive features.                             │ -│--token-path-tpTEXT        The path where the authentication token will be stored. For a     │ -│                                normal use-case, this should not be needed.                       │ -│--version  Display the version of this software.                             │ -│--help  List the options of any DDS subcommand and its default settings.  │ -╰──────────────────────────────────────────────────────────────────────────────────────────────────╯ -╭─ Commands ───────────────────────────────────────────────────────────────────────────────────────╮ -│auth         Group command for creating and managing authenticated sessions (valid for 7 days). │ -│data         Group command for uploading, downloading and managing project data.                │ -│ls           List the active projects you have access to or the project contents.               │ -│maintenance  [Super Admins only] Activate / Deactivate / Display status for Maintenance mode.   │ -│motd         [Super Admins only] Group command for managing Message of the Day within DDS.      │ -│project      Group command for creating and managing projects within the DDS.                   │ -│stats        Get statistics in the DDS.                                                         │ -│unit         [Super Admins only] Group command for managing units.                              │ -│user         Group command for managing user accounts, including your own.                      │ -╰──────────────────────────────────────────────────────────────────────────────────────────────────╯ - + + $ dds +     ︵  + ︵ (  )   ︵  +(  ) ) (  (  )   SciLifeLab Data Delivery System  + ︶  (  ) ) (    https://delivery.scilifelab.se/  +      ︶ (  )    CLI Version 2.7.0  +          ︶ +[..truncated..] +Usage: dds [OPTIONS] COMMAND [ARGS]... + + SciLifeLab Data Delivery System (DDS) command line interface.                                       +Access token is saved in a .dds_cli_token file in the home directory. +The token is valid for 7 days. Make sure your token is valid long enough for the delivery to  +finish. To avoid that a delivery fails because of an expired token, we recommend reauthenticating  +yourself before each delivery ('dds data put' / 'get'). + +╭─ Options ────────────────────────────────────────────────────────────────────────────────────────╮ +│--verbose-v  Print verbose output to the console.                              │ +│--log-file-l<filename>  Save a log to a file.                                             │ +│--no-prompt  Run without any interactive features.                             │ +│--token-path-tpTEXT        The path where the authentication token will be stored. For a     │ +│                                normal use-case, this should not be needed.                       │ +│--version  Display the version of this software.                             │ +│--help  List the options of any DDS subcommand and its default settings.  │ +╰──────────────────────────────────────────────────────────────────────────────────────────────────╯ +╭─ Commands ───────────────────────────────────────────────────────────────────────────────────────╮ +│auth         Group command for creating and managing authenticated sessions (valid for 7 days). │ +│data         Group command for uploading, downloading and managing project data.                │ +│ls           List the active projects you have access to or the project contents.               │ +│maintenance  [Super Admins only] Activate / Deactivate / Display status for Maintenance mode.   │ +│motd         [Super Admins only] Group command for managing Message of the Day within DDS.      │ +│project      Group command for creating and managing projects within the DDS.                   │ +│stats        Get statistics in the DDS.                                                         │ +│unit         [Super Admins only] Group command for managing units.                              │ +│user         Group command for managing user accounts, including your own.                      │ +╰──────────────────────────────────────────────────────────────────────────────────────────────────╯ + diff --git a/img/dds-help-2.svg b/img/dds-help-2.svg index a3484f5e..639213a6 100644 --- a/img/dds-help-2.svg +++ b/img/dds-help-2.svg @@ -19,140 +19,140 @@ font-weight: 700; } - .terminal-3820999131-matrix { + .terminal-1581765080-matrix { font-family: Fira Code, monospace; font-size: 20px; line-height: 24.4px; font-variant-east-asian: full-width; } - .terminal-3820999131-title { + .terminal-1581765080-title { font-size: 18px; font-weight: bold; font-family: arial; } - .terminal-3820999131-r1 { fill: #c5c8c6 } -.terminal-3820999131-r2 { fill: #868887;font-style: italic; } -.terminal-3820999131-r3 { fill: #c5c8c6;font-weight: bold } -.terminal-3820999131-r4 { fill: #d0b344;font-weight: bold } -.terminal-3820999131-r5 { fill: #68a0b3;font-weight: bold } -.terminal-3820999131-r6 { fill: #868887 } -.terminal-3820999131-r7 { fill: #4e707b;font-weight: bold } -.terminal-3820999131-r8 { fill: #98a84b;font-weight: bold } -.terminal-3820999131-r9 { fill: #8d7b39;font-weight: bold } + .terminal-1581765080-r1 { fill: #c5c8c6 } +.terminal-1581765080-r2 { fill: #868887;font-style: italic; } +.terminal-1581765080-r3 { fill: #c5c8c6;font-weight: bold } +.terminal-1581765080-r4 { fill: #d0b344;font-weight: bold } +.terminal-1581765080-r5 { fill: #68a0b3;font-weight: bold } +.terminal-1581765080-r6 { fill: #868887 } +.terminal-1581765080-r7 { fill: #4e707b;font-weight: bold } +.terminal-1581765080-r8 { fill: #98a84b;font-weight: bold } +.terminal-1581765080-r9 { fill: #8d7b39;font-weight: bold } - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -164,46 +164,46 @@ - + - - $ dds --help -     ︵  - ︵ (  )   ︵  -(  ) ) (  (  )   SciLifeLab Data Delivery System  - ︶  (  ) ) (    https://delivery.scilifelab.se/  -      ︶ (  )    CLI Version 2.6.4  -          ︶ -[..truncated..] -Usage: dds [OPTIONS] COMMAND [ARGS]... - - SciLifeLab Data Delivery System (DDS) command line interface.                                       -Access token is saved in a .dds_cli_token file in the home directory. -The token is valid for 7 days. Make sure your token is valid long enough for the delivery to  -finish. To avoid that a delivery fails because of an expired token, we recommend reauthenticating  -yourself before each delivery ('dds data put' / 'get'). - -╭─ Options ────────────────────────────────────────────────────────────────────────────────────────╮ -│--verbose-v  Print verbose output to the console.                              │ -│--log-file-l<filename>  Save a log to a file.                                             │ -│--no-prompt  Run without any interactive features.                             │ -│--token-path-tpTEXT        The path where the authentication token will be stored. For a     │ -│                                normal use-case, this should not be needed.                       │ -│--version  Display the version of this software.                             │ -│--help  List the options of any DDS subcommand and its default settings.  │ -╰──────────────────────────────────────────────────────────────────────────────────────────────────╯ -╭─ Commands ───────────────────────────────────────────────────────────────────────────────────────╮ -│auth         Group command for creating and managing authenticated sessions (valid for 7 days). │ -│data         Group command for uploading, downloading and managing project data.                │ -│ls           List the active projects you have access to or the project contents.               │ -│maintenance  [Super Admins only] Activate / Deactivate / Display status for Maintenance mode.   │ -│motd         [Super Admins only] Group command for managing Message of the Day within DDS.      │ -│project      Group command for creating and managing projects within the DDS.                   │ -│stats        Get statistics in the DDS.                                                         │ -│unit         [Super Admins only] Group command for managing units.                              │ -│user         Group command for managing user accounts, including your own.                      │ -╰──────────────────────────────────────────────────────────────────────────────────────────────────╯ - + + $ dds --help +     ︵  + ︵ (  )   ︵  +(  ) ) (  (  )   SciLifeLab Data Delivery System  + ︶  (  ) ) (    https://delivery.scilifelab.se/  +      ︶ (  )    CLI Version 2.7.0  +          ︶ +[..truncated..] +Usage: dds [OPTIONS] COMMAND [ARGS]... + + SciLifeLab Data Delivery System (DDS) command line interface.                                       +Access token is saved in a .dds_cli_token file in the home directory. +The token is valid for 7 days. Make sure your token is valid long enough for the delivery to  +finish. To avoid that a delivery fails because of an expired token, we recommend reauthenticating  +yourself before each delivery ('dds data put' / 'get'). + +╭─ Options ────────────────────────────────────────────────────────────────────────────────────────╮ +│--verbose-v  Print verbose output to the console.                              │ +│--log-file-l<filename>  Save a log to a file.                                             │ +│--no-prompt  Run without any interactive features.                             │ +│--token-path-tpTEXT        The path where the authentication token will be stored. For a     │ +│                                normal use-case, this should not be needed.                       │ +│--version  Display the version of this software.                             │ +│--help  List the options of any DDS subcommand and its default settings.  │ +╰──────────────────────────────────────────────────────────────────────────────────────────────────╯ +╭─ Commands ───────────────────────────────────────────────────────────────────────────────────────╮ +│auth         Group command for creating and managing authenticated sessions (valid for 7 days). │ +│data         Group command for uploading, downloading and managing project data.                │ +│ls           List the active projects you have access to or the project contents.               │ +│maintenance  [Super Admins only] Activate / Deactivate / Display status for Maintenance mode.   │ +│motd         [Super Admins only] Group command for managing Message of the Day within DDS.      │ +│project      Group command for creating and managing projects within the DDS.                   │ +│stats        Get statistics in the DDS.                                                         │ +│unit         [Super Admins only] Group command for managing units.                              │ +│user         Group command for managing user accounts, including your own.                      │ +╰──────────────────────────────────────────────────────────────────────────────────────────────────╯ + diff --git a/img/dds-version.svg b/img/dds-version.svg index 9aa17f87..75b858cc 100644 --- a/img/dds-version.svg +++ b/img/dds-version.svg @@ -19,31 +19,31 @@ font-weight: 700; } - .terminal-1543649173-matrix { + .terminal-1540634514-matrix { font-family: Fira Code, monospace; font-size: 20px; line-height: 24.4px; font-variant-east-asian: full-width; } - .terminal-1543649173-title { + .terminal-1540634514-title { font-size: 18px; font-weight: bold; font-family: arial; } - .terminal-1543649173-r1 { fill: #c5c8c6 } -.terminal-1543649173-r2 { fill: #868887;font-style: italic; } + .terminal-1540634514-r1 { fill: #c5c8c6 } +.terminal-1540634514-r2 { fill: #868887;font-style: italic; } - + - + - + @@ -55,12 +55,12 @@ - + - - $ dds --version -[..truncated..] -Data Delivery System, version 2.6.4 + + $ dds --version +[..truncated..] +Data Delivery System, version 2.7.0 diff --git a/img/python-version.svg b/img/python-version.svg index 9c22b089..32066b50 100644 --- a/img/python-version.svg +++ b/img/python-version.svg @@ -19,27 +19,27 @@ font-weight: 700; } - .terminal-623057289-matrix { + .terminal-624105866-matrix { font-family: Fira Code, monospace; font-size: 20px; line-height: 24.4px; font-variant-east-asian: full-width; } - .terminal-623057289-title { + .terminal-624105866-title { font-size: 18px; font-weight: bold; font-family: arial; } - .terminal-623057289-r1 { fill: #c5c8c6 } + .terminal-624105866-r1 { fill: #c5c8c6 } - + - + @@ -51,11 +51,11 @@ - + - - $ python --version -Python 3.12.2 + + $ python --version +Python 3.12.3 diff --git a/img/python3-version.svg b/img/python3-version.svg index e2c1da7b..d2d71782 100644 --- a/img/python3-version.svg +++ b/img/python3-version.svg @@ -19,27 +19,27 @@ font-weight: 700; } - .terminal-934877628-matrix { + .terminal-935926205-matrix { font-family: Fira Code, monospace; font-size: 20px; line-height: 24.4px; font-variant-east-asian: full-width; } - .terminal-934877628-title { + .terminal-935926205-title { font-size: 18px; font-weight: bold; font-family: arial; } - .terminal-934877628-r1 { fill: #c5c8c6 } + .terminal-935926205-r1 { fill: #c5c8c6 } - + - + @@ -51,11 +51,11 @@ - + - - $ python3 --version -Python 3.12.2 + + $ python3 --version +Python 3.12.3 diff --git a/requirements.txt b/requirements.txt index e76c895d..5b4d0dc7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,7 +11,7 @@ PyNaCl==1.5.0 pytz==2022.2.1 PyYAML==6.0.1 questionary==1.10.0 -requests==2.31.0 +requests==2.32.0 rich==12.5.1 rich-click==1.5.2 simplejson==3.17.6