updating regexps in go test and updating unit test module code

ministryofjustice · Dec 20, 2023 · a91e434 · a91e434
1 parent bc304b7
commit a91e434
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/test/lambda_test.go b/test/lambda_test.go
@@ -23,10 +23,13 @@ func TestLambdaCreation(t *testing.T) {
 
 	checkSubnetId := terraform.Output(t, terraformOptions, "subnet_ids")
 	checkSecurityGroupId := terraform.Output(t, terraformOptions, "security_group_ids")
+	re := regexp.MustCompile(`[{}\[\]\s]`)
+	SubnetID = re.ReplaceAllString(checkSubnetID, "")
+	SecurityGroupID = re.ReplaceAllString(checkSecurityGroupID, "")
 
 	assert.Regexp(t, regexp.MustCompile(`^instance-scheduler-lambda-function*`), functionName)
 	assert.Regexp(t, regexp.MustCompile(`^200*`), resultCode)
 
-	assert.Regexp(t, regexp.MustCompile(`^subnet-\w+$`), checkSubnetId)
-	assert.Regexp(t, regexp.MustCompile(`^sg-\d+$`), checkSecurityGroupId)
+	assert.Regexp(t, regexp.MustCompile(`^subnet-\w+$`), SubnetId)
+	assert.Regexp(t, regexp.MustCompile(`^sg-\d+$`), SecurityGroupId)
 }
diff --git a/test/unit-test/main.tf b/test/unit-test/main.tf
@@ -88,8 +88,6 @@ data "aws_iam_policy_document" "AWSLambdaVPCAccessExecutionRole" {
   statement {
     sid       = "AWSLambdaVPCAccessExecutionRole"
     effect    = "Allow"
-    resources = ["*"]
-
     actions = [
       "logs:CreateLogGroup",
       "logs:CreateLogStream",
@@ -100,6 +98,9 @@ data "aws_iam_policy_document" "AWSLambdaVPCAccessExecutionRole" {
       "ec2:AssignPrivateIpAddresses",
       "ec2:UnassignPrivateIpAddresses",
     ]
+    resources = [
+      format("arn:aws:logs:eu-west-2:%s:aws/lambda/fake", data.aws_caller_identity.current.account_id)
+    ]
   }
 }
 
@@ -212,6 +213,7 @@ resource "aws_security_group" "lambda_security_group_test" {
   vpc_id      = data.aws_vpc.platforms-test.id
 
   egress {
+    description = "Allow all outbound traffic"
     from_port = 0
     to_port   = 0
     protocol  = "-1"