diff --git a/changelog.d/20231207_140648_ada_remove_tutorial_endpoints.md b/changelog.d/20231207_140648_ada_remove_tutorial_endpoints.md new file mode 100644 index 000000000..aac5abb6f --- /dev/null +++ b/changelog.d/20231207_140648_ada_remove_tutorial_endpoints.md @@ -0,0 +1,3 @@ +### Other + +* Replaced all references to the tutorial endpoints. diff --git a/src/globus_cli/commands/bookmark/create.py b/src/globus_cli/commands/bookmark/create.py index 6d28f4801..5b5ffcf02 100644 --- a/src/globus_cli/commands/bookmark/create.py +++ b/src/globus_cli/commands/bookmark/create.py @@ -19,7 +19,7 @@ [source,bash] ---- -$ globus bookmark create 'ddb59aef-6d04-11e5-ba46-22000b92c6ec:/~/' mybookmark +$ globus bookmark create 'aa752cea-8222-5bc8-acd9-555b090c0ccb:/~/' mybookmark ---- Take a specific field from the JSON output and format it into unix-friendly @@ -28,7 +28,7 @@ [source,bash] ---- $ globus bookmark create \ - 'ddb59aef-6d04-11e5-ba46-22000b92c6ec:/~/' mybookmark \ + 'aa752cea-8222-5bc8-acd9-555b090c0ccb:/~/' mybookmark \ -F unix --jmespath 'id' ---- """, diff --git a/src/globus_cli/commands/delete.py b/src/globus_cli/commands/delete.py index 06ad6b3ab..da35c0fb8 100644 --- a/src/globus_cli/commands/delete.py +++ b/src/globus_cli/commands/delete.py @@ -33,7 +33,7 @@ [source,bash] ---- -$ ep_id=ddb59af0-6d04-11e5-ba46-22000b92c6ec +$ ep_id=313ce13e-b597-5858-ae13-29e46fea26e6 $ globus delete $ep_id:~/myfile.txt ---- @@ -41,7 +41,7 @@ [source,bash] ---- -$ ep_id=ddb59af0-6d04-11e5-ba46-22000b92c6ec +$ ep_id=313ce13e-b597-5858-ae13-29e46fea26e6 $ globus delete $ep_id:~/mydir --recursive ---- @@ -49,7 +49,7 @@ [source,bash] ---- -$ ep_id=ddb59af0-6d04-11e5-ba46-22000b92c6ec +$ ep_id=313ce13e-b597-5858-ae13-29e46fea26e6 $ globus delete $ep_id --batch - --recursive ~/myfile1.txt ~/myfile2.txt @@ -62,7 +62,7 @@ [source,bash] ---- -$ ep_id=ddb59af0-6d04-11e5-ba46-22000b92c6ec +$ ep_id=313ce13e-b597-5858-ae13-29e46fea26e6 $ task_id="$(globus delete $ep_id:~/mydir --recursive \ --jmespath 'task_id' --format unix)" $ echo "Waiting on $task_id" diff --git a/src/globus_cli/commands/endpoint/activate.py b/src/globus_cli/commands/endpoint/activate.py index 7ff3a2611..c85bca5bd 100644 --- a/src/globus_cli/commands/endpoint/activate.py +++ b/src/globus_cli/commands/endpoint/activate.py @@ -17,7 +17,7 @@ [source,bash] ---- -$ ep_id=ddb59aef-6d04-11e5-ba46-22000b92c6ec +$ ep_id=aa752cea-8222-5bc8-acd9-555b090c0ccb $ globus endpoint activate $ep_id ---- @@ -25,7 +25,7 @@ [source,bash] ---- -$ ep_id=ddb59aef-6d04-11e5-ba46-22000b92c6ec +$ ep_id=aa752cea-8222-5bc8-acd9-555b090c0ccb $ globus endpoint activate $ep_id --web ---- @@ -33,7 +33,7 @@ [source,bash] ---- -$ ep_id=ddb59aef-6d04-11e5-ba46-22000b92c6ec +$ ep_id=aa752cea-8222-5bc8-acd9-555b090c0ccb $ globus endpoint activate $ep_id --myproxy -U username ---- """, diff --git a/src/globus_cli/commands/endpoint/deactivate.py b/src/globus_cli/commands/endpoint/deactivate.py index e1b2fe892..dacdda4d0 100644 --- a/src/globus_cli/commands/endpoint/deactivate.py +++ b/src/globus_cli/commands/endpoint/deactivate.py @@ -12,7 +12,7 @@ [source,bash] ---- -$ ep_id=ddb59aef-6d04-11e5-ba46-22000b92c6ec +$ ep_id=aa752cea-8222-5bc8-acd9-555b090c0ccb $ globus endpoint deactivate $ep_id ---- """, diff --git a/src/globus_cli/commands/endpoint/delete.py b/src/globus_cli/commands/endpoint/delete.py index 0c8c444fc..ee36da32b 100644 --- a/src/globus_cli/commands/endpoint/delete.py +++ b/src/globus_cli/commands/endpoint/delete.py @@ -11,7 +11,7 @@ short_help="Delete an endpoint", adoc_examples="""[source,bash] ---- -$ ep_id=ddb59aef-6d04-11e5-ba46-22000b92c6ec +$ ep_id=aa752cea-8222-5bc8-acd9-555b090c0ccb $ globus endpoint delete $ep_id ---- """, diff --git a/src/globus_cli/commands/endpoint/is_activated.py b/src/globus_cli/commands/endpoint/is_activated.py index 64af416ef..55fd2c711 100644 --- a/src/globus_cli/commands/endpoint/is_activated.py +++ b/src/globus_cli/commands/endpoint/is_activated.py @@ -22,7 +22,7 @@ """, adoc_examples=r"""[source,bash] ---- -$ ep_id=ddb59aef-6d04-11e5-ba46-22000b92c6ec +$ ep_id=aa752cea-8222-5bc8-acd9-555b090c0ccb $ globus endpoint is-activated $ep_id ---- @@ -30,7 +30,7 @@ [source,bash] ---- -ep_id=ddb59aef-6d04-11e5-ba46-22000b92c6ec +ep_id=aa752cea-8222-5bc8-acd9-555b090c0ccb globus endpoint is-activated $ep_id if [ $? -ne 0 ]; then echo "$ep_id is not activated! This script cannot run!" @@ -46,7 +46,7 @@ [source,bash] ---- -ep_id=ddb59aef-6d04-11e5-ba46-22000b92c6ec +ep_id=aa752cea-8222-5bc8-acd9-555b090c0ccb output="$(globus endpoint is-activated "$ep_id" \ --jmespath expires_in --format unix)" if [ $? -eq 0 ]; then diff --git a/src/globus_cli/commands/endpoint/my_shared_endpoint_list.py b/src/globus_cli/commands/endpoint/my_shared_endpoint_list.py index 0f1aa77b9..75398d421 100644 --- a/src/globus_cli/commands/endpoint/my_shared_endpoint_list.py +++ b/src/globus_cli/commands/endpoint/my_shared_endpoint_list.py @@ -10,7 +10,7 @@ short_help="List all shared endpoints on an endpoint by the current user", adoc_examples="""[source,bash] ---- -$ ep_id=ddb59aef-6d04-11e5-ba46-22000b92c6ec +$ ep_id=aa752cea-8222-5bc8-acd9-555b090c0ccb $ globus endpoint my-shared-endpoint-list $ep_id ---- """, diff --git a/src/globus_cli/commands/endpoint/permission/create.py b/src/globus_cli/commands/endpoint/permission/create.py index bf78a2442..f0288e0d5 100644 --- a/src/globus_cli/commands/endpoint/permission/create.py +++ b/src/globus_cli/commands/endpoint/permission/create.py @@ -22,7 +22,7 @@ [source,bash] ---- -$ ep_id=ddb59aef-6d04-11e5-ba46-22000b92c6ec +$ ep_id=aa752cea-8222-5bc8-acd9-555b090c0ccb $ globus endpoint permission create $ep_id:/dir --permissions r --anonymous ---- @@ -30,7 +30,7 @@ [source,bash] ---- -$ ep_id=ddb59aef-6d04-11e5-ba46-22000b92c6ec +$ ep_id=aa752cea-8222-5bc8-acd9-555b090c0ccb $ globus endpoint permission create $ep_id:/ --permissions rw --identity go@globusid.org ---- """, diff --git a/src/globus_cli/commands/endpoint/permission/delete.py b/src/globus_cli/commands/endpoint/permission/delete.py index 9c5084df6..01692817f 100644 --- a/src/globus_cli/commands/endpoint/permission/delete.py +++ b/src/globus_cli/commands/endpoint/permission/delete.py @@ -12,7 +12,7 @@ short_help="Delete an access control rule", adoc_examples="""[source,bash] ---- -$ ep_id=ddb59aef-6d04-11e5-ba46-22000b92c6ec +$ ep_id=aa752cea-8222-5bc8-acd9-555b090c0ccb $ rule_id=1ddeddda-1ae8-11e7-bbe4-22000b9a448b $ globus endpoint permission delete $ep_id $rule_id ---- diff --git a/src/globus_cli/commands/endpoint/permission/list.py b/src/globus_cli/commands/endpoint/permission/list.py index 0d68196d9..525b596a5 100644 --- a/src/globus_cli/commands/endpoint/permission/list.py +++ b/src/globus_cli/commands/endpoint/permission/list.py @@ -14,7 +14,7 @@ short_help="List access control rules", adoc_examples="""[source,bash] ---- -$ ep_id=ddb59aef-6d04-11e5-ba46-22000b92c6ec +$ ep_id=aa752cea-8222-5bc8-acd9-555b090c0ccb $ globus endpoint permission list $ep_id ---- """, diff --git a/src/globus_cli/commands/endpoint/permission/show.py b/src/globus_cli/commands/endpoint/permission/show.py index 61b6794c5..e6d73ffed 100644 --- a/src/globus_cli/commands/endpoint/permission/show.py +++ b/src/globus_cli/commands/endpoint/permission/show.py @@ -16,7 +16,7 @@ short_help="Display an access control rule", adoc_examples="""[source,bash] ---- -$ ep_id=ddb59aef-6d04-11e5-ba46-22000b92c6ec +$ ep_id=aa752cea-8222-5bc8-acd9-555b090c0ccb $ rule_id=1ddeddda-1ae8-11e7-bbe4-22000b9a448b $ globus endpoint permission show $ep_id $rule_id ---- diff --git a/src/globus_cli/commands/endpoint/permission/update.py b/src/globus_cli/commands/endpoint/permission/update.py index d3e8e63e3..3624bdbf1 100644 --- a/src/globus_cli/commands/endpoint/permission/update.py +++ b/src/globus_cli/commands/endpoint/permission/update.py @@ -20,7 +20,7 @@ [source,bash] ---- -$ ep_id=ddb59aef-6d04-11e5-ba46-22000b92c6ec +$ ep_id=aa752cea-8222-5bc8-acd9-555b090c0ccb $ rule_id=1ddeddda-1ae8-11e7-bbe4-22000b9a448b $ globus endpoint permission update $ep_id $rule_id --permissions r ---- diff --git a/src/globus_cli/commands/endpoint/role/create.py b/src/globus_cli/commands/endpoint/role/create.py index 27aa11891..1d638719c 100644 --- a/src/globus_cli/commands/endpoint/role/create.py +++ b/src/globus_cli/commands/endpoint/role/create.py @@ -23,11 +23,11 @@ "containing the ID of the created role." ), adoc_examples="""Grant 'demo@globus.org' the 'activity_monitor' role on -'ddb59aef-6d04-11e5-ba46-22000b92c6ec': +'aa752cea-8222-5bc8-acd9-555b090c0ccb': [source,bash] ---- -$ globus endpoint role create 'ddb59aef-6d04-11e5-ba46-22000b92c6ec' \ +$ globus endpoint role create 'aa752cea-8222-5bc8-acd9-555b090c0ccb' \ --identity 'demo@globus.org' --role activity_monitor ---- """, diff --git a/src/globus_cli/commands/endpoint/role/delete.py b/src/globus_cli/commands/endpoint/role/delete.py index 55ba3f2cd..c14ad1d2b 100644 --- a/src/globus_cli/commands/endpoint/role/delete.py +++ b/src/globus_cli/commands/endpoint/role/delete.py @@ -12,11 +12,11 @@ short_help="Remove a role from an endpoint", adoc_output="Textual output is a simple success message in the absence of errors.", adoc_examples="""Delete role '0f007eec-1aeb-11e7-aec4-3c970e0c9cc4' on endpoint -'ddb59aef-6d04-11e5-ba46-22000b92c6ec': +'aa752cea-8222-5bc8-acd9-555b090c0ccb': [source,bash] ---- -$ globus endpoint role delete 'ddb59aef-6d04-11e5-ba46-22000b92c6ec' \ +$ globus endpoint role delete 'aa752cea-8222-5bc8-acd9-555b090c0ccb' \ '0f007eec-1aeb-11e7-aec4-3c970e0c9cc4' ---- """, diff --git a/src/globus_cli/commands/endpoint/role/list.py b/src/globus_cli/commands/endpoint/role/list.py index c23995df5..80637e772 100644 --- a/src/globus_cli/commands/endpoint/role/list.py +++ b/src/globus_cli/commands/endpoint/role/list.py @@ -21,11 +21,11 @@ types the principal is. The term "Principal" is used in the sense of "a security principal", an entity which has some privileges associated with it. """, - adoc_examples="""Show all roles on 'ddb59aef-6d04-11e5-ba46-22000b92c6ec': + adoc_examples="""Show all roles on 'aa752cea-8222-5bc8-acd9-555b090c0ccb': [source,bash] ---- -$ globus endpoint role list 'ddb59aef-6d04-11e5-ba46-22000b92c6ec' +$ globus endpoint role list 'aa752cea-8222-5bc8-acd9-555b090c0ccb' ---- """, ) diff --git a/src/globus_cli/commands/endpoint/server/add.py b/src/globus_cli/commands/endpoint/server/add.py index e96f758da..fba1bbd0d 100644 --- a/src/globus_cli/commands/endpoint/server/add.py +++ b/src/globus_cli/commands/endpoint/server/add.py @@ -22,7 +22,7 @@ [source,bash] ---- -$ ep_id=ddb59aef-6d04-11e5-ba46-22000b92c6ec +$ ep_id=aa752cea-8222-5bc8-acd9-555b090c0ccb $ globus endpoint server add $ep_id --hostname gridftp.example.org ---- """, diff --git a/src/globus_cli/commands/endpoint/server/delete.py b/src/globus_cli/commands/endpoint/server/delete.py index 70bf5063c..08f9be0d9 100644 --- a/src/globus_cli/commands/endpoint/server/delete.py +++ b/src/globus_cli/commands/endpoint/server/delete.py @@ -68,7 +68,7 @@ def _detect_mode(server: str) -> Literal["id", "uri", "hostname", "hostname_port short_help="Delete a server belonging to an endpoint", adoc_examples="""[source,bash] ---- -$ ep_id=ddb59aef-6d04-11e5-ba46-22000b92c6ec +$ ep_id=aa752cea-8222-5bc8-acd9-555b090c0ccb $ server_id=294682 $ globus endpoint server delete $ep_id $server_id ---- diff --git a/src/globus_cli/commands/endpoint/server/list.py b/src/globus_cli/commands/endpoint/server/list.py index 25c6972cc..2b8d7bec2 100644 --- a/src/globus_cli/commands/endpoint/server/list.py +++ b/src/globus_cli/commands/endpoint/server/list.py @@ -24,7 +24,7 @@ def parse(self, value: t.Any) -> str: short_help="List all servers for an endpoint", adoc_examples="""[source,bash] ---- -$ ep_id=ddb59aef-6d04-11e5-ba46-22000b92c6ec +$ ep_id=aa752cea-8222-5bc8-acd9-555b090c0ccb $ globus endpoint server list $ep_id ---- """, diff --git a/src/globus_cli/commands/endpoint/server/show.py b/src/globus_cli/commands/endpoint/server/show.py index 1db275495..9674dc1e2 100644 --- a/src/globus_cli/commands/endpoint/server/show.py +++ b/src/globus_cli/commands/endpoint/server/show.py @@ -57,7 +57,7 @@ def render(self, value: tuple[PORT_RANGE_T, PORT_RANGE_T]) -> str: short_help="Show an endpoint server", adoc_examples="""[source,bash] ---- -$ ep_id=ddb59aef-6d04-11e5-ba46-22000b92c6ec +$ ep_id=aa752cea-8222-5bc8-acd9-555b090c0ccb $ server_id=207976 $ globus endpoint server show $ep_id $server_id ---- diff --git a/src/globus_cli/commands/endpoint/server/update.py b/src/globus_cli/commands/endpoint/server/update.py index 198b3d3c6..6e5d7afd1 100644 --- a/src/globus_cli/commands/endpoint/server/update.py +++ b/src/globus_cli/commands/endpoint/server/update.py @@ -22,7 +22,7 @@ [source,bash] ---- -$ ep_id=ddb59aef-6d04-11e5-ba46-22000b92c6ec +$ ep_id=aa752cea-8222-5bc8-acd9-555b090c0ccb $ server_id=294682 $ globus endpoint server update $ep_id $server_id --scheme ftp ---- diff --git a/src/globus_cli/commands/ls.py b/src/globus_cli/commands/ls.py index 5c13ffbd3..fe01676be 100644 --- a/src/globus_cli/commands/ls.py +++ b/src/globus_cli/commands/ls.py @@ -50,7 +50,7 @@ def parse(self, data: t.Any) -> str: [source,bash] ---- -$ ep_id=ddb59aef-6d04-11e5-ba46-22000b92c6ec +$ ep_id=aa752cea-8222-5bc8-acd9-555b090c0ccb $ globus ls $ep_id ---- @@ -58,7 +58,7 @@ def parse(self, data: t.Any) -> str: [source,bash] ---- -$ ep_id=ddb59aef-6d04-11e5-ba46-22000b92c6ec +$ ep_id=aa752cea-8222-5bc8-acd9-555b090c0ccb $ globus ls $ep_id:/share/godata/ ---- @@ -75,7 +75,7 @@ def parse(self, data: t.Any) -> str: [source,bash] ---- -$ ep_id=ddb59aef-6d04-11e5-ba46-22000b92c6ec +$ ep_id=aa752cea-8222-5bc8-acd9-555b090c0ccb $ globus ls $ep_id:/share/godata/ \ --jmespath 'DATA[*].[type, permissions, name, last_modified]' \ --format UNIX @@ -88,7 +88,7 @@ def parse(self, data: t.Any) -> str: [source,bash] ---- -$ ep_id=ddb59aef-6d04-11e5-ba46-22000b92c6ec +$ ep_id=aa752cea-8222-5bc8-acd9-555b090c0ccb $ globus ls $ep_id:/share/godata/ --filter '~*.txt' # all txt files $ globus ls $ep_id:/share/godata/ --filter '!~file1.*' # not starting in "file1." $ globus ls $ep_id:/share/godata/ --filter '~*ile3.tx*' # anything with "ile3.tx" @@ -103,7 +103,7 @@ def parse(self, data: t.Any) -> str: [source,bash] ---- -$ ep_id=ddb59aef-6d04-11e5-ba46-22000b92c6ec +$ ep_id=aa752cea-8222-5bc8-acd9-555b090c0ccb $ globus ls $ep_id:/share/godata/ | egrep '.*\.txt$' # done with grep, okay $ globus ls $ep_id:/share/godata/ --filter '~*.txt' # done with --filter, better ---- diff --git a/src/globus_cli/commands/mkdir.py b/src/globus_cli/commands/mkdir.py index e7b2ecc3d..d5cf4b47a 100644 --- a/src/globus_cli/commands/mkdir.py +++ b/src/globus_cli/commands/mkdir.py @@ -16,7 +16,7 @@ [source,bash] ---- -$ ep_id=ddb59aef-6d04-11e5-ba46-22000b92c6ec +$ ep_id=aa752cea-8222-5bc8-acd9-555b090c0ccb $ mkdir ep_id:~/testfolder ---- """, diff --git a/src/globus_cli/commands/rename.py b/src/globus_cli/commands/rename.py index 3f48f1eb2..cfb640c1e 100644 --- a/src/globus_cli/commands/rename.py +++ b/src/globus_cli/commands/rename.py @@ -16,7 +16,7 @@ [source,bash] ---- -$ ep_id=ddb59aef-6d04-11e5-ba46-22000b92c6ec +$ ep_id=aa752cea-8222-5bc8-acd9-555b090c0ccb $ globus rename $ep_id:~/tempdir $ep_id:~/project-foo ---- """, diff --git a/src/globus_cli/commands/rm.py b/src/globus_cli/commands/rm.py index 727f448af..a780f6a26 100644 --- a/src/globus_cli/commands/rm.py +++ b/src/globus_cli/commands/rm.py @@ -27,7 +27,7 @@ [source,bash] ---- -$ ep_id=ddb59af0-6d04-11e5-ba46-22000b92c6ec +$ ep_id=313ce13e-b597-5858-ae13-29e46fea26e6 $ globus rm $ep_id:~/myfile.txt ---- @@ -35,7 +35,7 @@ [source,bash] ---- -$ ep_id=ddb59af0-6d04-11e5-ba46-22000b92c6ec +$ ep_id=313ce13e-b597-5858-ae13-29e46fea26e6 $ globus rm $ep_id:~/mydir --recursive ---- """, diff --git a/src/globus_cli/commands/transfer.py b/src/globus_cli/commands/transfer.py index 95f08ff80..25305ecfa 100644 --- a/src/globus_cli/commands/transfer.py +++ b/src/globus_cli/commands/transfer.py @@ -44,8 +44,8 @@ [source,bash] ---- -$ source_ep=ddb59aef-6d04-11e5-ba46-22000b92c6ec -$ dest_ep=ddb59af0-6d04-11e5-ba46-22000b92c6ec +$ source_ep=aa752cea-8222-5bc8-acd9-555b090c0ccb +$ dest_ep=313ce13e-b597-5858-ae13-29e46fea26e6 $ globus transfer $source_ep:/share/godata/file1.txt $dest_ep:~/mynewfile.txt ---- @@ -53,8 +53,8 @@ [source,bash] ---- -$ source_ep=ddb59aef-6d04-11e5-ba46-22000b92c6ec -$ dest_ep=ddb59af0-6d04-11e5-ba46-22000b92c6ec +$ source_ep=aa752cea-8222-5bc8-acd9-555b090c0ccb +$ dest_ep=313ce13e-b597-5858-ae13-29e46fea26e6 $ globus transfer $source_ep:/share/godata/ $dest_ep:~/mynewdir/ --recursive ---- @@ -62,8 +62,8 @@ [source,bash] ---- -$ source_ep=ddb59aef-6d04-11e5-ba46-22000b92c6ec -$ dest_ep=ddb59af0-6d04-11e5-ba46-22000b92c6ec +$ source_ep=aa752cea-8222-5bc8-acd9-555b090c0ccb +$ dest_ep=313ce13e-b597-5858-ae13-29e46fea26e6 $ globus transfer $source_ep $dest_ep --batch - # lines starting with '#' are comments # and blank lines (for spacing) are allowed @@ -85,8 +85,8 @@ [source,bash] ---- -$ source_ep=ddb59aef-6d04-11e5-ba46-22000b92c6ec -$ dest_ep=ddb59af0-6d04-11e5-ba46-22000b92c6ec +$ source_ep=aa752cea-8222-5bc8-acd9-555b090c0ccb +$ dest_ep=313ce13e-b597-5858-ae13-29e46fea26e6 $ globus transfer $source_ep:/share/ $dest_ep:~/ --batch - godata/file1.txt myfile1.txt godata/file2.txt myfile2.txt @@ -111,8 +111,8 @@ [source,bash] ---- -source_ep=ddb59aef-6d04-11e5-ba46-22000b92c6ec -dest_ep=ddb59af0-6d04-11e5-ba46-22000b92c6ec +source_ep=aa752cea-8222-5bc8-acd9-555b090c0ccb +dest_ep=313ce13e-b597-5858-ae13-29e46fea26e6 task_id="$(globus transfer $source_ep $dest_ep \ --jmespath 'task_id' --format=UNIX \ diff --git a/tests/conftest.py b/tests/conftest.py index 3c54b22df..ba55e3463 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -59,12 +59,12 @@ def fake_validate_token(self, token): @pytest.fixture(scope="session") def go_ep1_id(): - return "ddb59aef-6d04-11e5-ba46-22000b92c6ec" + return "aa752cea-8222-5bc8-acd9-555b090c0ccb" @pytest.fixture(scope="session") def go_ep2_id(): - return "ddb59af0-6d04-11e5-ba46-22000b92c6ec" + return "313ce13e-b597-5858-ae13-29e46fea26e6" def _mock_token_response_data(rs_name, scope, token_blob=None): diff --git a/tests/files/api_fixtures/all_authentication_failed.yaml b/tests/files/api_fixtures/all_authentication_failed.yaml index 17fd5b2c2..86a6f8883 100644 --- a/tests/files/api_fixtures/all_authentication_failed.yaml +++ b/tests/files/api_fixtures/all_authentication_failed.yaml @@ -1,8 +1,8 @@ metadata: - endpoint_id: ddb59aef-6d04-11e5-ba46-22000b92c6ec + endpoint_id: aa752cea-8222-5bc8-acd9-555b090c0ccb transfer: - - path: /endpoint/ddb59aef-6d04-11e5-ba46-22000b92c6ec/autoactivate + - path: /endpoint/aa752cea-8222-5bc8-acd9-555b090c0ccb/autoactivate method: post status: 401 json: diff --git a/tests/files/api_fixtures/bookmark_operations.yaml b/tests/files/api_fixtures/bookmark_operations.yaml index b6e14fd2d..acaacb602 100644 --- a/tests/files/api_fixtures/bookmark_operations.yaml +++ b/tests/files/api_fixtures/bookmark_operations.yaml @@ -11,7 +11,7 @@ transfer: "DATA_TYPE": "bookmark", "id": "1405823f-0597-4a16-b296-46d4f0ae4b15", "name": "sharebm", - "endpoint_id": "ddb59aef-6d04-11e5-ba46-22000b92c6ec", + "endpoint_id": "aa752cea-8222-5bc8-acd9-555b090c0ccb", "path": "/share/" } - path: /bookmark/1405823f-0597-4a16-b296-46d4f0ae4b15 @@ -20,7 +20,7 @@ transfer: "DATA_TYPE": "bookmark", "id": "1405823f-0597-4a16-b296-46d4f0ae4b15", "name": "sharebm", - "endpoint_id": "ddb59aef-6d04-11e5-ba46-22000b92c6ec", + "endpoint_id": "aa752cea-8222-5bc8-acd9-555b090c0ccb", "path": "/share/" } - path: /bookmark/1405823f-0597-4a16-b296-46d4f0ae4b15 @@ -30,7 +30,7 @@ transfer: "DATA_TYPE": "bookmark", "id": "1405823f-0597-4a16-b296-46d4f0ae4b15", "name": "updated_sharebm", - "endpoint_id": "ddb59aef-6d04-11e5-ba46-22000b92c6ec", + "endpoint_id": "aa752cea-8222-5bc8-acd9-555b090c0ccb", "path": "/share/" } - path: /bookmark/1405823f-0597-4a16-b296-46d4f0ae4b15 @@ -52,7 +52,7 @@ transfer: "DATA_TYPE": "bookmark", "id": "1405823f-0597-4a16-b296-46d4f0ae4b15", "name": "sharebm", - "endpoint_id": "ddb59aef-6d04-11e5-ba46-22000b92c6ec", + "endpoint_id": "aa752cea-8222-5bc8-acd9-555b090c0ccb", "path": "/share/" } ] diff --git a/tests/files/api_fixtures/endpoint_operations.yaml b/tests/files/api_fixtures/endpoint_operations.yaml index 669b233d0..1d91a4b20 100644 --- a/tests/files/api_fixtures/endpoint_operations.yaml +++ b/tests/files/api_fixtures/endpoint_operations.yaml @@ -2,7 +2,7 @@ metadata: endpoint_id: "1405823f-0597-4a16-b296-46d4f0ae4b15" gcp_endpoint_id: "06e2c959-d311-4bab-b2ea-25ad77d9fc12" share_id: "b379e973-f5c5-4501-8377-5a0ecf37a99b" - go_ep2_id: "ddb59af0-6d04-11e5-ba46-22000b92c6ec" + go_ep2_id: "313ce13e-b597-5858-ae13-29e46fea26e6" transfer: - path: /endpoint @@ -244,7 +244,7 @@ transfer: } ] } - - path: /endpoint/ddb59af0-6d04-11e5-ba46-22000b92c6ec + - path: /endpoint/313ce13e-b597-5858-ae13-29e46fea26e6 json: { "DATA": [ @@ -293,7 +293,7 @@ transfer: "host_endpoint_id": null, "host_path": null, "https_server": null, - "id": "ddb59af0-6d04-11e5-ba46-22000b92c6ec", + "id": "313ce13e-b597-5858-ae13-29e46fea26e6", "in_use": false, "info_link": null, "is_globus_connect": false, @@ -440,7 +440,7 @@ transfer: "host_endpoint_id": null, "host_path": null, "https_server": null, - "id": "ddb59aef-6d04-11e5-ba46-22000b92c6ec", + "id": "aa752cea-8222-5bc8-acd9-555b090c0ccb", "in_use": false, "info_link": null, "is_globus_connect": false, @@ -510,7 +510,7 @@ transfer: "host_endpoint_id": null, "host_path": null, "https_server": null, - "id": "ddb59af0-6d04-11e5-ba46-22000b92c6ec", + "id": "313ce13e-b597-5858-ae13-29e46fea26e6", "in_use": false, "info_link": null, "is_globus_connect": false, diff --git a/tests/files/api_fixtures/ls_results.yaml b/tests/files/api_fixtures/ls_results.yaml index 4f8f6abe7..dbf4dc4e1 100644 --- a/tests/files/api_fixtures/ls_results.yaml +++ b/tests/files/api_fixtures/ls_results.yaml @@ -1,10 +1,10 @@ metadata: - endpoint_id: ddb59aef-6d04-11e5-ba46-22000b92c6ec + endpoint_id: aa752cea-8222-5bc8-acd9-555b090c0ccb # this file was primarily generated by copying real API responses verbatim transfer: # listing on "/" - - path: /operation/endpoint/ddb59aef-6d04-11e5-ba46-22000b92c6ec/ls + - path: /operation/endpoint/aa752cea-8222-5bc8-acd9-555b090c0ccb/ls query_params: path: "/" show_hidden: 0 @@ -74,7 +74,7 @@ transfer: ], "DATA_TYPE": "file_list", "absolute_path": null, - "endpoint": "ddb59aef-6d04-11e5-ba46-22000b92c6ec", + "endpoint": "aa752cea-8222-5bc8-acd9-555b090c0ccb", "length": 4, "path": "/", "rename_supported": true, @@ -82,7 +82,7 @@ transfer: "total": 4 } # recursive listing on "/share" - - path: /operation/endpoint/ddb59aef-6d04-11e5-ba46-22000b92c6ec/ls + - path: /operation/endpoint/aa752cea-8222-5bc8-acd9-555b090c0ccb/ls query_params: path: "/share" show_hidden: 0 @@ -107,14 +107,14 @@ transfer: ], "DATA_TYPE": "file_list", "absolute_path": null, - "endpoint": "ddb59aef-6d04-11e5-ba46-22000b92c6ec", + "endpoint": "aa752cea-8222-5bc8-acd9-555b090c0ccb", "length": 1, "path": "/share/", "rename_supported": true, "symlink_supported": true, "total": 1 } - - path: /operation/endpoint/ddb59aef-6d04-11e5-ba46-22000b92c6ec/ls + - path: /operation/endpoint/aa752cea-8222-5bc8-acd9-555b090c0ccb/ls query_params: path: "/share/godata" show_hidden: 0 @@ -169,7 +169,7 @@ transfer: ], "DATA_TYPE": "file_list", "absolute_path": null, - "endpoint": "ddb59aef-6d04-11e5-ba46-22000b92c6ec", + "endpoint": "aa752cea-8222-5bc8-acd9-555b090c0ccb", "length": 3, "path": "/share/godata/", "rename_supported": true, @@ -177,7 +177,7 @@ transfer: "total": 3 } # recursive listing on / with depth 1, covered by above, plus these... - - path: /operation/endpoint/ddb59aef-6d04-11e5-ba46-22000b92c6ec/ls + - path: /operation/endpoint/aa752cea-8222-5bc8-acd9-555b090c0ccb/ls query_params: path: "/home" show_hidden: 0 @@ -202,14 +202,14 @@ transfer: ], "DATA_TYPE": "file_list", "absolute_path": null, - "endpoint": "ddb59aef-6d04-11e5-ba46-22000b92c6ec", + "endpoint": "aa752cea-8222-5bc8-acd9-555b090c0ccb", "length": 1, "path": "/home/", "rename_supported": true, "symlink_supported": true, "total": 1 } - - path: /operation/endpoint/ddb59aef-6d04-11e5-ba46-22000b92c6ec/ls + - path: /operation/endpoint/aa752cea-8222-5bc8-acd9-555b090c0ccb/ls query_params: path: "/mnt" show_hidden: 0 @@ -218,14 +218,14 @@ transfer: "DATA": [], "DATA_TYPE": "file_list", "absolute_path": null, - "endpoint": "ddb59aef-6d04-11e5-ba46-22000b92c6ec", + "endpoint": "aa752cea-8222-5bc8-acd9-555b090c0ccb", "length": 0, "path": "/mnt/", "rename_supported": true, "symlink_supported": true, "total": 0 } - - path: /operation/endpoint/ddb59aef-6d04-11e5-ba46-22000b92c6ec/ls + - path: /operation/endpoint/aa752cea-8222-5bc8-acd9-555b090c0ccb/ls query_params: path: "/not shareable" show_hidden: 0 @@ -250,14 +250,14 @@ transfer: ], "DATA_TYPE": "file_list", "absolute_path": null, - "endpoint": "ddb59aef-6d04-11e5-ba46-22000b92c6ec", + "endpoint": "aa752cea-8222-5bc8-acd9-555b090c0ccb", "length": 1, "path": "/not shareable/", "rename_supported": true, "symlink_supported": true, "total": 1 } - - path: /operation/endpoint/ddb59aef-6d04-11e5-ba46-22000b92c6ec/ls + - path: /operation/endpoint/aa752cea-8222-5bc8-acd9-555b090c0ccb/ls query_params: path: "/~/" show_hidden: 0 @@ -283,7 +283,7 @@ transfer: ], "DATA_TYPE": "file_list", "absolute_path": null, - "endpoint": "ddb59aef-6d04-11e5-ba46-22000b92c6ec", + "endpoint": "aa752cea-8222-5bc8-acd9-555b090c0ccb", "length": 1, "path": "/~/", "rename_supported": true, diff --git a/tests/files/api_fixtures/rename_result.yaml b/tests/files/api_fixtures/rename_result.yaml index f0752acec..3e3400878 100644 --- a/tests/files/api_fixtures/rename_result.yaml +++ b/tests/files/api_fixtures/rename_result.yaml @@ -1,8 +1,8 @@ metadata: - endpoint_id: ddb59aef-6d04-11e5-ba46-22000b92c6ec + endpoint_id: aa752cea-8222-5bc8-acd9-555b090c0ccb transfer: - - path: /operation/endpoint/ddb59aef-6d04-11e5-ba46-22000b92c6ec/rename + - path: /operation/endpoint/aa752cea-8222-5bc8-acd9-555b090c0ccb/rename method: post json: { @@ -10,5 +10,5 @@ transfer: "code": "FileRenamed", "message": "File or directory renamed successfully", "request_id": "PL6I0Gsll", - "resource": "/operation/endpoint/ddb59aef-6d04-11e5-ba46-22000b92c6ec/rename" + "resource": "/operation/endpoint/aa752cea-8222-5bc8-acd9-555b090c0ccb/rename" } diff --git a/tests/files/api_fixtures/submit_delete_failed.yaml b/tests/files/api_fixtures/submit_delete_failed.yaml index 53a45cb7b..4f2a916e3 100644 --- a/tests/files/api_fixtures/submit_delete_failed.yaml +++ b/tests/files/api_fixtures/submit_delete_failed.yaml @@ -61,7 +61,7 @@ transfer: "request_time": "2021-01-15T18:13:10+00:00", "source_endpoint": "go#ep1", "source_endpoint_display_name": "Globus Tutorial Endpoint 1", - "source_endpoint_id": "ddb59aef-6d04-11e5-ba46-22000b92c6ec", + "source_endpoint_id": "aa752cea-8222-5bc8-acd9-555b090c0ccb", "status": "FAILED", "subtasks_canceled": 0, "subtasks_expired": 0, diff --git a/tests/files/api_fixtures/submit_delete_queued.yaml b/tests/files/api_fixtures/submit_delete_queued.yaml index 6f1f85c59..12b8ef10e 100644 --- a/tests/files/api_fixtures/submit_delete_queued.yaml +++ b/tests/files/api_fixtures/submit_delete_queued.yaml @@ -58,7 +58,7 @@ transfer: "request_time": "2021-01-15T18:13:10+00:00", "source_endpoint": "go#ep1", "source_endpoint_display_name": "Globus Tutorial Endpoint 1", - "source_endpoint_id": "ddb59aef-6d04-11e5-ba46-22000b92c6ec", + "source_endpoint_id": "aa752cea-8222-5bc8-acd9-555b090c0ccb", "status": "ACTIVE", "subtasks_canceled": 0, "subtasks_expired": 0, diff --git a/tests/files/api_fixtures/submit_delete_success.yaml b/tests/files/api_fixtures/submit_delete_success.yaml index 3680feb79..69671f48b 100644 --- a/tests/files/api_fixtures/submit_delete_success.yaml +++ b/tests/files/api_fixtures/submit_delete_success.yaml @@ -58,7 +58,7 @@ transfer: "request_time": "2021-01-15T18:11:31+00:00", "source_endpoint": "go#ep1", "source_endpoint_display_name": "Globus Tutorial Endpoint 1", - "source_endpoint_id": "ddb59aef-6d04-11e5-ba46-22000b92c6ec", + "source_endpoint_id": "aa752cea-8222-5bc8-acd9-555b090c0ccb", "status": "SUCCEEDED", "subtasks_canceled": 0, "subtasks_expired": 0, diff --git a/tests/files/api_fixtures/task_cancel.yaml b/tests/files/api_fixtures/task_cancel.yaml index 90b550c20..4ccca0061 100644 --- a/tests/files/api_fixtures/task_cancel.yaml +++ b/tests/files/api_fixtures/task_cancel.yaml @@ -17,7 +17,7 @@ transfer: "delete_destination_extra": false, "destination_endpoint": "go#ep2", "destination_endpoint_display_name": "Globus Tutorial Endpoint 2", - "destination_endpoint_id": "ddb59af0-6d04-11e5-ba46-22000b92c6ec", + "destination_endpoint_id": "313ce13e-b597-5858-ae13-29e46fea26e6", "directories": 0, "effective_bytes_per_second": 3, "encrypt_data": false, @@ -43,7 +43,7 @@ transfer: "skip_source_errors": false, "source_endpoint": "go#ep1", "source_endpoint_display_name": "Globus Tutorial Endpoint 1", - "source_endpoint_id": "ddb59aef-6d04-11e5-ba46-22000b92c6ec", + "source_endpoint_id": "aa752cea-8222-5bc8-acd9-555b090c0ccb", "status": "SUCCEEDED", "subtasks_canceled": 0, "subtasks_expired": 0, diff --git a/tests/files/api_fixtures/task_event_list.yaml b/tests/files/api_fixtures/task_event_list.yaml index 8cc2c24ed..1f87eae42 100644 --- a/tests/files/api_fixtures/task_event_list.yaml +++ b/tests/files/api_fixtures/task_event_list.yaml @@ -23,7 +23,7 @@ transfer: "DATA_TYPE": "event", "code": "PERMISSION_DENIED", "description": "permission denied", - "details": "Error (make directories)\nEndpoint: Globus Tutorial Endpoint 1 (ddb59aef-6d04-11e5-ba46-22000b92c6ec)\nServer: ep1.transfer.globus.org:2811\nFile: /foo/\nCommand: MKD /foo\nMessage: Fatal FTP response\n---\nDetails: 550-GlobusError: v=1 c=PERMISSION_DENIED\\r\\n550-GridFTP-Error: Path not allowed.\\r\\n550 End.\\r\\n", + "details": "Error (make directories)\nEndpoint: Globus Tutorial Endpoint 1 (aa752cea-8222-5bc8-acd9-555b090c0ccb)\nServer: ep1.transfer.globus.org:2811\nFile: /foo/\nCommand: MKD /foo\nMessage: Fatal FTP response\n---\nDetails: 550-GlobusError: v=1 c=PERMISSION_DENIED\\r\\n550-GridFTP-Error: Path not allowed.\\r\\n550 End.\\r\\n", "is_error": true, "time": "2021-10-06T16:13:57+00:00" }, diff --git a/tests/files/api_fixtures/task_list.yaml b/tests/files/api_fixtures/task_list.yaml index f627afb09..653ab8577 100644 --- a/tests/files/api_fixtures/task_list.yaml +++ b/tests/files/api_fixtures/task_list.yaml @@ -14,7 +14,7 @@ transfer: "delete_destination_extra": false, "destination_endpoint": "go#ep2", "destination_endpoint_display_name": "Globus Tutorial Endpoint 2", - "destination_endpoint_id": "ddb59af0-6d04-11e5-ba46-22000b92c6ec", + "destination_endpoint_id": "313ce13e-b597-5858-ae13-29e46fea26e6", "directories": 0, "effective_bytes_per_second": 3, "encrypt_data": false, @@ -40,7 +40,7 @@ transfer: "skip_source_errors": false, "source_endpoint": "go#ep1", "source_endpoint_display_name": "Globus Tutorial Endpoint 1", - "source_endpoint_id": "ddb59aef-6d04-11e5-ba46-22000b92c6ec", + "source_endpoint_id": "aa752cea-8222-5bc8-acd9-555b090c0ccb", "status": "SUCCEEDED", "subtasks_canceled": 0, "subtasks_expired": 0, diff --git a/tests/files/api_fixtures/transfer_activate_success.yaml b/tests/files/api_fixtures/transfer_activate_success.yaml index a78ac7f43..b43d92a9e 100644 --- a/tests/files/api_fixtures/transfer_activate_success.yaml +++ b/tests/files/api_fixtures/transfer_activate_success.yaml @@ -1,15 +1,15 @@ metadata: - endpoint_id: "ddb59aef-6d04-11e5-ba46-22000b92c6ec" - go_ep2_id: "ddb59af0-6d04-11e5-ba46-22000b92c6ec" + endpoint_id: "aa752cea-8222-5bc8-acd9-555b090c0ccb" + go_ep2_id: "313ce13e-b597-5858-ae13-29e46fea26e6" sdk_endpoint_id: "00000000-0000-0000-0005-4925541e7725" transfer: - - path: /endpoint/ddb59aef-6d04-11e5-ba46-22000b92c6ec/autoactivate + - path: /endpoint/aa752cea-8222-5bc8-acd9-555b090c0ccb/autoactivate method: post # exact data doesn't matter, just not the failure code json: {"code": "AutoActivated.BogusCode"} - - path: /endpoint/ddb59af0-6d04-11e5-ba46-22000b92c6ec/autoactivate + - path: /endpoint/313ce13e-b597-5858-ae13-29e46fea26e6/autoactivate method: post # exact data doesn't matter, just not the failure code json: {"code": "AutoActivated.BogusCode"} diff --git a/tests/functional/timer/test_job_operations.py b/tests/functional/timer/test_job_operations.py index 8ec1d936e..c2b29bfc7 100644 --- a/tests/functional/timer/test_job_operations.py +++ b/tests/functional/timer/test_job_operations.py @@ -30,7 +30,7 @@ ], "DATA_TYPE": "transfer", "delete_destination_extra": False, - "destination_endpoint": "ddb59af0-6d04-11e5-ba46-22000b92c6ec", + "destination_endpoint": "313ce13e-b597-5858-ae13-29e46fea26e6", "encrypt_data": False, "fail_on_quota_errors": False, "notify_on_failed": True, @@ -39,7 +39,7 @@ "preserve_timestamp": False, "recursive_symlinks": "ignore", "skip_source_errors": False, - "source_endpoint": "ddb59aef-6d04-11e5-ba46-22000b92c6ec", + "source_endpoint": "aa752cea-8222-5bc8-acd9-555b090c0ccb", "submission_id": "548ec2d3-b4fd-11ec-b87f-3912f602f346", "verify_checksum": False, } diff --git a/tests/functional/timer/test_job_resume.py b/tests/functional/timer/test_job_resume.py index 0f1567d83..71ef6a986 100644 --- a/tests/functional/timer/test_job_resume.py +++ b/tests/functional/timer/test_job_resume.py @@ -91,8 +91,8 @@ def test_resume_inactive_gare_session_identity_but_skip_check(run_line): "skip_source_errors": True, "sync_level": 3, "verify_checksum": True, - "source_endpoint_id": "ddb59aef-6d04-11e5-ba46-22000b92c6ec", - "destination_endpoint_id": "ddb59af0-6d04-11e5-ba46-22000b92c6ec", + "source_endpoint_id": "aa752cea-8222-5bc8-acd9-555b090c0ccb", + "destination_endpoint_id": "313ce13e-b597-5858-ae13-29e46fea26e6", "transfer_items": [ { "source_path": "/share/godata/file1.txt",