Merge pull request #125 from materials-data-facility/SubmittingUserV2

Change all SubmittingUser to SubmittingUserV2
materials-data-facility · Feb 6, 2025 · 1f679a7 · 1f679a7
2 parents 44804f0 + 3204e5b
commit 1f679a7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/automate/create_new_flow.py b/automate/create_new_flow.py
@@ -64,12 +64,12 @@
 mdf_flow.save_flow("mdf_flow_info.prod.json")
 
 print("MDF Flow deployed", mdf_flow)
-submitting_user_scope_id = mdf_flow.get_scope_id_for_runAs_role("SubmittingUser")[
+submitting_user_scope_id = mdf_flow.get_scope_id_for_runAs_role("SubmittingUserV2")[
     "scopes"
 ][0]["id"]
 print(f"RunAs Dependent scope ID = {submitting_user_scope_id}")
 
-submitting_user_scope_uri = mdf_flow.get_scope_uri_for_runAs_role("SubmittingUser")
+submitting_user_scope_uri = mdf_flow.get_scope_uri_for_runAs_role("SubmittingUserV2")
 print(
     f"RunAs Dependent Scope URI (will appear in the dict of dependent scopes in the authorizer) = {submitting_user_scope_uri}"
 )

diff --git a/automate/deploy_mdf_flow.py b/automate/deploy_mdf_flow.py
@@ -67,10 +67,10 @@
     ]))
 
 mdf_flow.save_flow(flow_info_file)
-print("scope = ", mdf_flow.get_scope_id_for_runAs_role('SubmittingUser')['scopes'][0]['id'])
+print("scope = ", mdf_flow.get_scope_id_for_runAs_role('SubmittingUserV2')['scopes'][0]['id'])
 
 print("MDF Flow deployed", mdf_flow)
-submitting_user_scope_id = mdf_flow.get_scope_id_for_runAs_role('SubmittingUser')['scopes'][0]['id']
+submitting_user_scope_id = mdf_flow.get_scope_id_for_runAs_role('SubmittingUserV2')['scopes'][0]['id']
 
 connect_scope_def = {
     "scope": {

diff --git a/automate/minimus_mdf_flow.py b/automate/minimus_mdf_flow.py
@@ -143,7 +143,7 @@ def file_transfer_steps():
             "Type": "Action",
             "ActionUrl": "https://transfer.actions.globus.org/transfer",
             "WaitTime": 86400,
-            "RunAs": "SubmittingUser",
+            "RunAs": "SubmittingUserV2",
             "Parameters": {
                 "source_endpoint.$": "$.user_transfer_inputs.source_endpoint_id",
                 "destination_endpoint.$": "$.user_transfer_inputs.destination_endpoint_id",

diff --git a/aws/automate_manager.py b/aws/automate_manager.py
@@ -148,7 +148,7 @@ def submit(self, mdf_rec, organization,
             "datacite_prefix": self.datacite_prefix,
             "datacite_as_test": is_test,
             "_tokens": {
-                'SubmittingUser': submitting_user_token['access_token']
+                'SubmittingUserV2': submitting_user_token['access_token']
             }
         }