Merge pull request #320 from Sage-Bionetworks-Workflows/bwmac/live_up…

…grade Undo Broken Formatting Changes
Sage-Bionetworks-Workflows · Jun 20, 2024 · 6c5c318 · 6c5c318
2 parents de2595b + 1787a9e
commit 6c5c318
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 24 deletions.
diff --git a/config/infra-dev/nextflow-ecs-task-definition.yaml b/config/infra-dev/nextflow-ecs-task-definition.yaml
@@ -7,10 +7,10 @@ dependencies:
   - infra-dev/nextflow-elasticache-cluster.yaml
 
 parameters:
-  TowerSmtpHost: "email-smtp.us-east-1.amazonaws.com"
-  TowerSmtpPort: "587"
-  TowerSmtpUser: !ssm "smtp-username"
-  TowerSmtpPassword: !ssm "smtp-password"
+  TowerSmtpHost: 'email-smtp.us-east-1.amazonaws.com'
+  TowerSmtpPort: '587'
+  TowerSmtpUser: !ssm 'smtp-username'
+  TowerSmtpPassword: !ssm 'smtp-password'
   TowerContactEmail: nextflow-admins@sagebase.org
   TowerServerUrl: https://tower-dev.sagebionetworks.org
   TowerRedisUrl: !stack_output_external nextflow-elasticache-cluster::RedisEndpoint
@@ -22,19 +22,20 @@ parameters:
   TowerDbPassword: !aws_secrets_manager nextflow-aurora-mysql-NextflowTowerDatabaseUserSecret::SecretString::password
   TowerGoogleClientId: !aws_secrets_manager nextflow/google_oauth_app::SecretString::client
   TowerGoogleSecret: !aws_secrets_manager nextflow/google_oauth_app::SecretString::secret
-  CronContainerImage: "cr.seqera.io/private/nf-tower-enterprise/backend:{{stack_group_config.tower_version}}"
-  FrontendContainerImage: "cr.seqera.io/private/nf-tower-enterprise/frontend:{{stack_group_config.tower_version}}"
-  BackendContainerImage: "cr.seqera.io/private/nf-tower-enterprise/backend:{{stack_group_config.tower_version}}"
-  MigrateDBContainerImage: "cr.seqera.io/private/nf-tower-enterprise/migrate-db:{{stack_group_config.tower_version}}"
+  CronContainerImage: 'cr.seqera.io/private/nf-tower-enterprise/backend:{{stack_group_config.tower_version}}'
+  FrontendContainerImage: 'cr.seqera.io/private/nf-tower-enterprise/frontend:{{stack_group_config.tower_version}}'
+  BackendContainerImage: 'cr.seqera.io/private/nf-tower-enterprise/backend:{{stack_group_config.tower_version}}'
+  MigrateDBContainerImage: 'cr.seqera.io/private/nf-tower-enterprise/migrate-db:{{stack_group_config.tower_version}}'
   EfsFileSystemId: !stack_output_external nextflow-efs-file-system::FileSystemId
-  EfsVolumeMountPath: "/efs"
-  TowerUserWorkspace: "false"
+  EfsVolumeMountPath: '/efs'
+  TowerUserWorkspace: 'false'
   TowerRootUsers:
     - thomas.yu@sagebase.org
     - khai.do@sagebase.org
-  TowerConfigFileName: "tower.yaml"
+  TowerConfigFileName: 'tower.yaml'
 
-stack_tags: { { stack_group_config.default_stack_tags } }
+stack_tags:
+  {{stack_group_config.default_stack_tags}}
 
 sceptre_user_data:
   environment: !file src/tower/resources/environment.yaml

diff --git a/config/infra-prod/nextflow-ecs-task-definition.yaml b/config/infra-prod/nextflow-ecs-task-definition.yaml
@@ -7,10 +7,10 @@ dependencies:
   - infra-prod/nextflow-elasticache-cluster.yaml
 
 parameters:
-  TowerSmtpHost: "email-smtp.us-east-1.amazonaws.com"
-  TowerSmtpPort: "587"
-  TowerSmtpUser: !ssm "smtp-username"
-  TowerSmtpPassword: !ssm "smtp-password"
+  TowerSmtpHost: 'email-smtp.us-east-1.amazonaws.com'
+  TowerSmtpPort: '587'
+  TowerSmtpUser: !ssm 'smtp-username'
+  TowerSmtpPassword: !ssm 'smtp-password'
   TowerContactEmail: nextflow-admins@sagebase.org
   TowerServerUrl: https://tower.sagebionetworks.org
   TowerRedisUrl: !stack_output_external nextflow-elasticache-cluster::RedisEndpoint
@@ -22,18 +22,19 @@ parameters:
   TowerDbPassword: !aws_secrets_manager nextflow-aurora-mysql-NextflowTowerDatabaseUserSecret::SecretString::password
   TowerGoogleClientId: !aws_secrets_manager nextflow/google_oauth_app::SecretString::client
   TowerGoogleSecret: !aws_secrets_manager nextflow/google_oauth_app::SecretString::secret
-  CronContainerImage: "cr.seqera.io/private/nf-tower-enterprise/backend:{{stack_group_config.tower_version}}"
-  FrontendContainerImage: "cr.seqera.io/private/nf-tower-enterprise/frontend:{{stack_group_config.tower_version}}"
-  BackendContainerImage: "cr.seqera.io/private/nf-tower-enterprise/backend:{{stack_group_config.tower_version}}"
-  MigrateDBContainerImage: "cr.seqera.io/private/nf-tower-enterprise/migrate-db:{{stack_group_config.tower_version}}"
+  CronContainerImage: 'cr.seqera.io/private/nf-tower-enterprise/backend:{{stack_group_config.tower_version}}'
+  FrontendContainerImage: 'cr.seqera.io/private/nf-tower-enterprise/frontend:{{stack_group_config.tower_version}}'
+  BackendContainerImage: 'cr.seqera.io/private/nf-tower-enterprise/backend:{{stack_group_config.tower_version}}'
+  MigrateDBContainerImage: 'cr.seqera.io/private/nf-tower-enterprise/migrate-db:{{stack_group_config.tower_version}}'
   EfsFileSystemId: !stack_output_external nextflow-efs-file-system::FileSystemId
-  EfsVolumeMountPath: "/efs"
-  TowerUserWorkspace: "false"
+  EfsVolumeMountPath: '/efs'
+  TowerUserWorkspace: 'false'
   TowerRootUsers:
     - thomas.yu@sagebase.org
-  TowerConfigFileName: "tower.yaml"
+  TowerConfigFileName: 'tower.yaml'
 
-stack_tags: { { stack_group_config.default_stack_tags } }
+stack_tags:
+  {{stack_group_config.default_stack_tags}}
 
 sceptre_user_data:
   environment: !file src/tower/resources/environment.yaml