From 23d0db998b36dc90492e9a2cdb0de6eb6b18d155 Mon Sep 17 00:00:00 2001
From: David Houck <dhoucgitter@users.noreply.github.com>
Date: Wed, 3 Jul 2024 13:39:28 -0400
Subject: [PATCH 1/2] feat: (IAC-1472) AWS - Security scan 2024.06 (#293)

* feat: (IAC-1472) AWS - Security scan 2024.06

* bump versions for Terraform and AWS cli in container structure test

* remove temp conditional for git config cmd
---
 Dockerfile                    | 6 +++---
 container-structure-test.yaml | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b52bb42b..dcd11118 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,9 @@
-ARG TERRAFORM_VERSION=1.8.3
-ARG AWS_CLI_VERSION=2.15.46
+ARG TERRAFORM_VERSION=1.8.5
+ARG AWS_CLI_VERSION=2.16.5
 FROM hashicorp/terraform:$TERRAFORM_VERSION as terraform
 
 FROM amazon/aws-cli:$AWS_CLI_VERSION
-ARG KUBECTL_VERSION=1.28.7
+ARG KUBECTL_VERSION=1.28.11
 
 WORKDIR /viya4-iac-aws
 
diff --git a/container-structure-test.yaml b/container-structure-test.yaml
index 00fdea4d..3d3d34ea 100644
--- a/container-structure-test.yaml
+++ b/container-structure-test.yaml
@@ -17,14 +17,14 @@ commandTests:
   - name: "terraform version"
     command: "terraform"
     args: ["--version"]
-    expectedOutput: ["Terraform v1.8.3"]
+    expectedOutput: ["Terraform v1.8.5"]
   - name: "aws-cli version"
     command: "sh"
     args:
       - -c
       - |
         aws --version
-    expectedOutput: ["aws-cli/2.15.46"]
+    expectedOutput: ["aws-cli/2.16.5"]
 
 metadataTest:
   workdir: "/viya4-iac-aws"

From 3191d95b657d61b6f397c6c87e7f52d2896ff156 Mon Sep 17 00:00:00 2001
From: David Houck <dhoucgitter@users.noreply.github.com>
Date: Mon, 22 Jul 2024 15:03:39 -0400
Subject: [PATCH 2/2] fix: (IAC-1492) AWS - private endpoint type for S3 should
 be of type Interface (#295)

---
 variables.tf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/variables.tf b/variables.tf
index 324b9325..8a1473e2 100644
--- a/variables.tf
+++ b/variables.tf
@@ -636,7 +636,7 @@ variable "vpc_private_endpoints" { # tflint-ignore: terraform_unused_declaration
     "ec2"                  = "Interface",
     "ecr.api"              = "Interface",
     "ecr.dkr"              = "Interface",
-    "s3"                   = "Gateway",
+    "s3"                   = "Interface",
     "logs"                 = "Interface",
     "sts"                  = "Interface",
     "elasticloadbalancing" = "Interface",