CCM-5100: Fix file formatting

NHSDigital · Jul 3, 2024 · ac42e10 · ac42e10
1 parent 75b7172
commit ac42e10
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 23 deletions.
diff --git a/amplify/tsconfig.json b/amplify/tsconfig.json
@@ -14,4 +14,4 @@
       ]
     }
   }
-}
+}
diff --git a/infrastructure/modules/amplify-app/amplify-app.tf b/infrastructure/modules/amplify-app/amplify-app.tf
@@ -1,9 +1,9 @@
 resource "aws_amplify_app" "app" {
-  name = "${local.csi}"
+  name = local.csi
 
   iam_service_role_arn = aws_iam_role.service_role.arn
 
-  repository = var.repository
+  repository   = var.repository
   access_token = var.github_pat
 
   # Only enable automation for dev environment

diff --git a/infrastructure/modules/amplify-app/variables.tf b/infrastructure/modules/amplify-app/variables.tf
@@ -16,7 +16,7 @@ variable "module" {
 }
 
 variable "stage" {
-  type = string
+  type        = string
   description = "The domain PTL stage (prod|nonprod)"
 }
 
@@ -25,7 +25,7 @@ variable "cognito_user_pool_id" {
 }
 
 variable "cognito_hosted_login_domain" {
-  type = string
+  type        = string
   description = "The domain assigned to the cognito user pool to handle login callbacks"
 }
 
@@ -39,6 +39,6 @@ variable "domain_name" {
 }
 
 variable "github_pat" {
-  type = string
+  type        = string
   description = "GitHub Personal Access Token used to initialise a new Amplify app"
 }
diff --git a/infrastructure/modules/amplify-branch/amplify-branch.tf b/infrastructure/modules/amplify-branch/amplify-branch.tf
@@ -1,8 +1,8 @@
 resource "aws_amplify_branch" "branch" {
-  app_id       = var.amplify_app_id
-  branch_name  = var.branch
-  display_name = var.subdomain
-  description  = "${var.branch}"
+  app_id                      = var.amplify_app_id
+  branch_name                 = var.branch
+  display_name                = var.subdomain
+  description                 = var.branch
   enable_pull_request_preview = false # PR previews are not supported for public repos
 
   environment_variables = {
@@ -14,8 +14,8 @@ resource "aws_amplify_branch" "branch" {
 }
 
 resource "aws_amplify_domain_association" "domain" {
-  app_id      = var.amplify_app_id
-  domain_name = "${var.subdomain}.${var.domain_name}"
+  app_id                 = var.amplify_app_id
+  domain_name            = "${var.subdomain}.${var.domain_name}"
   enable_auto_sub_domain = false
 
   # Wait for domain verification in prod stage environments

diff --git a/infrastructure/modules/amplify-branch/cognito-userpool-client.tf b/infrastructure/modules/amplify-branch/cognito-userpool-client.tf
@@ -4,11 +4,11 @@ resource "aws_cognito_user_pool_client" "client" {
 
   callback_urls = flatten([
     ["https://${var.subdomain}.${var.domain_name}/auth/", "https://${var.subdomain}.${var.amplify_app_id}.amplifyapp.com/auth/"],
-      var.stage == "nonprod" ? ["http://localhost:3000/auth/"] :
-        var.environment == "prod" ? ["https://notify.nhs.net/auth/"] : []
+    var.stage == "nonprod" ? ["http://localhost:3000/auth/"] :
+    var.environment == "prod" ? ["https://notify.nhs.net/auth/"] : []
   ])
   supported_identity_providers = flatten([
-      var.stage == "nonprod" ? ["COGNITO"] : [],
+    var.stage == "nonprod" ? ["COGNITO"] : [],
     var.cognito_user_pool_identity_provider_names
   ])
   allowed_oauth_flows = ["code"]

diff --git a/infrastructure/modules/route53-zone/locals.tf b/infrastructure/modules/route53-zone/locals.tf
@@ -13,7 +13,7 @@ locals {
   )
 
   deployment_default_tags = {
-    Domain     = var.domain
+    Domain      = var.domain
     Environment = var.environment
     Component   = var.component
     Module      = var.module

diff --git a/infrastructure/modules/route53-zone/variables.tf b/infrastructure/modules/route53-zone/variables.tf
@@ -16,6 +16,6 @@ variable "module" {
 }
 
 variable "stage" {
-  type = string
+  type        = string
   description = "The domain PTL stage (prod|nonprod)"
 }
diff --git a/infrastructure/modules/userpool/cognito-userpool.tf b/infrastructure/modules/userpool/cognito-userpool.tf
@@ -1,5 +1,5 @@
 resource "aws_cognito_user_pool" "userpool" {
-  name = "${local.csi}"
+  name = local.csi
 
   username_attributes = ["email"]
 

diff --git a/infrastructure/modules/userpool/locals.tf b/infrastructure/modules/userpool/locals.tf
@@ -13,7 +13,7 @@ locals {
   )
 
   deployment_default_tags = {
-    Domain     = var.domain
+    Domain      = var.domain
     Environment = var.environment
     Component   = var.component
     Module      = var.module

diff --git a/infrastructure/modules/userpool/output.tf b/infrastructure/modules/userpool/output.tf
@@ -8,5 +8,5 @@ output "identity_provider_names" {
 
 output "hosted_login_domain" {
   # TODO does not need suffix after switching to custom FQDN
-  value = "${ aws_cognito_user_pool_domain.domain.domain }.auth.eu-west-2.amazoncognito.com"
+  value = "${aws_cognito_user_pool_domain.domain.domain}.auth.eu-west-2.amazoncognito.com"
 }
diff --git a/infrastructure/modules/userpool/variables.tf b/infrastructure/modules/userpool/variables.tf
@@ -11,16 +11,16 @@ variable "component" {
 }
 
 variable "module" {
-  type = string
+  type    = string
   default = "userpool"
 }
 
 variable "stage" {
-  type = string
+  type        = string
   description = "The domain PTL stage (prod|nonprod)"
 }
 
 variable "app_url" {
-  type = string
+  type        = string
   description = "URL of web application used for auth callbacks"
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,4 +14,4 @@ @@
           ]
         }
       }
-    }
+    }