Fix step function and tf fmt

Crown-Commercial-Service · Mar 26, 2024 · 5607816 · 5607816
1 parent fbd186b
commit 5607816
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 37 deletions.
diff --git a/modules/create-rds-postgres-tester/create_user_task.tf b/modules/create-rds-postgres-tester/create_user_task.tf
@@ -29,4 +29,3 @@ module "create_user_task" {
   task_memory            = var.load_task_memory
   volumes                = []
 }
-
diff --git a/modules/create-rds-postgres-tester/main.tf b/modules/create-rds-postgres-tester/main.tf
@@ -6,45 +6,35 @@ resource "aws_sfn_state_machine" "create_rds_postgres_tester" {
 {
   "StartAt": "RetrieveSSMParameter",
   "States": {
-    "RetrieveSSMParameter": {
+    "CreateUser": {
       "Type": "Task",
-      "Resource": "arn:aws:states:::ssm:getParameter",
+      "Resource": "arn:aws:states:::ecs:runTask.sync",
       "Parameters": {
-        "Name": "/${var.db_name}/sql_script",
-        "WithDecryption": true
-        },
-        "Next": "CreateUser"
-      },
-      "CreateUser": {
-        "Type": "Task",
-        "Resource": "arn:aws:states:::ecs:runTask.sync",
-        "Parameters": {
-          "Cluster": "${aws_ecs_cluster.ecs_cluster.arn}",
-          "LaunchType": "FARGATE",
-          "TaskDefinition": "${aws_ecs_task_definition.create_user_task.arn}",
-          "NetworkConfiguration": {
-            "awsvpcConfiguration": {
-              "Subnets": ["${var.subnet_id}"],
-              "SecurityGroups": ["${aws_security_group.ecs_security_group.id}"],
-              "AssignPublicIp": "ENABLED"
-            }
-          },
-          "Overrides": {
-            "ContainerOverrides": [
-              {
-                "Name": "pg_create_user",
-                "Environment": [
-                  {
-                    "Name": "DB_CONNECTION_URL",
-                    "Value": "${var.target_db_connection_url_ssm_param_arn}"
-                  }
-                ]
-              }
-            ]
+        "Cluster": "${aws_ecs_cluster.ecs_cluster.arn}",
+        "LaunchType": "FARGATE",
+        "TaskDefinition": "${aws_ecs_task_definition.create_user_task.arn}",
+        "NetworkConfiguration": {
+          "awsvpcConfiguration": {
+            "Subnets": ["${var.subnet_id}"],
+            "SecurityGroups": "States.Array('${aws_security_group.ecs_security_group.id}', '${aws_security_group.create_user_task.id}', ${var.db_clients_security_group_id}')",
+            "AssignPublicIp": "ENABLED"
           }
         },
-        "End": true
+        "Overrides": {
+          "ContainerOverrides": [
+            {
+              "Name": "pg_create_user",
+              "Environment": [
+                {
+                  "Name": "DB_CONNECTION_URL",
+                  "Value": "${var.target_db_connection_url_ssm_param_arn}"
+                }
+              ]
+            }
+          ]
+        }
       },
+    },
       "End": true
     }
   }

diff --git a/modules/create-rds-postgres-tester/sg.tf b/modules/create-rds-postgres-tester/sg.tf
@@ -14,4 +14,3 @@ resource "aws_security_group" "create_rds_postgres_tester" {
     cidr_blocks = ["0.0.0.0/0"]
   }
 }
-
diff --git a/modules/create-rds-postgres-tester/variables.tf b/modules/create-rds-postgres-tester/variables.tf
@@ -9,7 +9,7 @@ variable "aws_region" {
 }
 
 variable "db_clients_security_group_id" {
-  type = string
+  type        = string
   description = "ID of the security group that allows access to the RDS instance"
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -29,4 +29,3 @@ module "create_user_task" {
		task_memory = var.load_task_memory
		volumes = []
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -14,4 +14,3 @@ resource "aws_security_group" "create_rds_postgres_tester" {
		cidr_blocks = ["0.0.0.0/0"]
		}
		}