Merge pull request #285 from Sage-Bionetworks-Workflows/bwmac/IT-3385…

…/bump_container_version [IT-3385] Bumps tower_version to Patched version
Sage-Bionetworks-Workflows · Feb 5, 2024 · 1fd5eb4 · 1fd5eb4
2 parents df2fa8d + 72b430e
commit 1fd5eb4
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 3 deletions.
diff --git a/bin/configure-tower-projects.py b/bin/configure-tower-projects.py
@@ -817,12 +817,14 @@ def add_member(self, user: str) -> dict:
         params = {"search": user}
         response = self.tower.paged_request("GET", f"{endpoint}", params=params)
         matches = list(response)
-
+        print(matches)
         if len(matches) == 1 and matches[0]["email"] == user:
             member = matches[0]
         else:
             data = {"user": user}
+            print(data)
             response = self.tower.request("PUT", f"{endpoint}/add", json=data)
+            print(response)
             member = response["member"]
 
         self.members[user] = member

diff --git a/config/config.yaml b/config/config.yaml
@@ -3,7 +3,7 @@ profile: {{ var.profile | default() }}
 region: {{ var.region | default("us-east-1") }}
 aws_infra_templates_root_url: https://raw.githubusercontent.com/Sage-Bionetworks/aws-infra
 admincentral_cf_bucket: bootstrap-awss3cloudformationbucket-19qromfd235z9
-tower_version: v23.3.0
+tower_version: v23.1.4
 default_stack_tags:
   Department: IBC
   Project: Infrastructure

diff --git a/config/projects-prod/iatlas-project.yaml b/config/projects-prod/iatlas-project.yaml
@@ -21,6 +21,7 @@ parameters:
     - "{{stack_group_config.tower_viewer_arn_prefix}}/dbortone@email.unc.edu"
     - "{{stack_group_config.tower_viewer_arn_prefix}}/steven_vensko@med.unc.edu"
     - "{{stack_group_config.tower_viewer_arn_prefix}}/cheimann@isbscience.org"
+    - "{{stack_group_config.tower_viewer_arn_prefix}}/clarisse.lau@isbscience.org"
   AccountAdminArns:
     - "{{stack_group_config.sso_admin_role.arn}}"
     - !stack_output_external sagebase-github-oidc-workflows-prod-nextflow-infra::ProviderRoleArn

diff --git a/config/projects-prod/mc2-mcmicro-project.yaml b/config/projects-prod/mc2-mcmicro-project.yaml
@@ -14,7 +14,7 @@ parameters:
     # However, this will ensure that they are added to the Tower workspace
     # until we find a permanent solution for listing external users.
     - '{{stack_group_config.tower_viewer_arn_prefix}}/clarence@hms.harvard.edu'
-    - '{{stack_group_config.tower_viewer_arn_prefix}}/Jeremy_Muhlich@hms.harvard.edu'
+    - '{{stack_group_config.tower_viewer_arn_prefix}}/jeremy_muhlich@hms.harvard.edu'
   AllowSynapseIndexing: Enabled
   AccountAdminArns:
     - '{{stack_group_config.sso_admin_role.arn}}'

diff --git a/templates/nextflow-tower-config-bucket.yaml b/templates/nextflow-tower-config-bucket.yaml
@@ -68,6 +68,7 @@ Resources:
                 - "*@sagebase.org"
                 - "*@sagebionetworks.org"
                 - "cheimann@isbscience.org"
+                - "clarisse.lau@isbscience.org"
           trustedEmails:
             - "benjamin_vincent@med.unc.edu"
             - "dbortone@email.unc.edu"