Skip to content

Commit 7d14440

Browse files
authored
Merge pull request #478 from OWASP/dependabot/terraform/aws/hashicorp/http-3.4.2
build(deps): bump hashicorp/http from 3.4.1 to 3.4.2 in /aws
2 parents 0609783 + 85a158e commit 7d14440

15 files changed

+135
-132
lines changed

aws/.terraform.lock.hcl

+30-30
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

aws/README.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -150,18 +150,18 @@ The documentation below is auto-generated to give insight on what's created via
150150

151151
| Name | Version |
152152
|------|---------|
153-
| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.34.0 |
154-
| <a name="provider_http"></a> [http](#provider\_http) | 3.4.1 |
153+
| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.39.0 |
154+
| <a name="provider_http"></a> [http](#provider\_http) | 3.4.2 |
155155
| <a name="provider_random"></a> [random](#provider\_random) | 3.6.0 |
156156

157157
## Modules
158158

159159
| Name | Source | Version |
160160
|------|--------|---------|
161-
| <a name="module_cluster_autoscaler_irsa_role"></a> [cluster\_autoscaler\_irsa\_role](#module\_cluster\_autoscaler\_irsa\_role) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | ~> 5.33.1 |
162-
| <a name="module_ebs_csi_irsa_role"></a> [ebs\_csi\_irsa\_role](#module\_ebs\_csi\_irsa\_role) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | ~> 5.33.1 |
163-
| <a name="module_eks"></a> [eks](#module\_eks) | terraform-aws-modules/eks/aws | 19.21.0 |
164-
| <a name="module_load_balancer_controller_irsa_role"></a> [load\_balancer\_controller\_irsa\_role](#module\_load\_balancer\_controller\_irsa\_role) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | ~> 5.33.1 |
161+
| <a name="module_cluster_autoscaler_irsa_role"></a> [cluster\_autoscaler\_irsa\_role](#module\_cluster\_autoscaler\_irsa\_role) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | ~> 5.35.0 |
162+
| <a name="module_ebs_csi_irsa_role"></a> [ebs\_csi\_irsa\_role](#module\_ebs\_csi\_irsa\_role) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | ~> 5.35.0 |
163+
| <a name="module_eks"></a> [eks](#module\_eks) | terraform-aws-modules/eks/aws | 20.5.0 |
164+
| <a name="module_load_balancer_controller_irsa_role"></a> [load\_balancer\_controller\_irsa\_role](#module\_load\_balancer\_controller\_irsa\_role) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | ~> 5.35.0 |
165165
| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 5.5.1 |
166166

167167
## Resources

aws/build-and-deploy-aws.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ wait
119119

120120
if [[ -z $APP_PASSWORD ]]; then
121121
echo "No app password passed, creating a new one"
122-
APP_PASSWORD="$(uuidgen)"
122+
APP_PASSWORD="$(openssl rand -base64 12 | tr -d '\n' )"
123123
else
124124
echo "App password already set"
125125
fi

aws/iam_policy.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@
3838
"elasticloadbalancing:DescribeTargetGroups",
3939
"elasticloadbalancing:DescribeTargetGroupAttributes",
4040
"elasticloadbalancing:DescribeTargetHealth",
41-
"elasticloadbalancing:DescribeTags"
41+
"elasticloadbalancing:DescribeTags",
42+
"elasticloadbalancing:DescribeTrustStores"
4243
],
4344
"Resource": "*"
4445
},

aws/k8s-aws-alb-script.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ fi
2323
ACCOUNT_ID=$(aws sts get-caller-identity | jq '.Account' -r)
2424
echo "ACCOUNT_ID=${ACCOUNT_ID}"
2525

26-
LBC_VERSION="v2.4.1"
26+
LBC_VERSION="v2.7.1"
2727
echo "LBC_VERSION=$LBC_VERSION"
2828

2929
echo "setting up kubectl"
@@ -34,7 +34,7 @@ export KUBECONFIG=~/.kube/wrongsecrets
3434

3535
echo "applying aws-lbc with kubectl"
3636

37-
kubectl apply -k "github.com/aws/eks-charts/stable/aws-load-balancer-controller//crds?ref=master"
37+
# kubectl apply -k "https://raw.githubusercontent.com/aws/eks-charts/master/stable/aws-load-balancer-controller/crds/crds.yaml"
3838

3939
kubectl get crd
4040

aws/main.tf

+6-4
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ module "vpc" {
6262

6363
module "eks" {
6464
source = "terraform-aws-modules/eks/aws"
65-
version = "19.21.0"
65+
version = "20.5.0"
6666

6767
cluster_name = var.cluster_name
6868
cluster_version = var.cluster_version
@@ -85,6 +85,8 @@ module "eks" {
8585

8686
enable_irsa = true
8787

88+
enable_cluster_creator_admin_permissions = true
89+
8890
create_cloudwatch_log_group = true
8991
cluster_enabled_log_types = ["api", "audit", "authenticator"]
9092
cloudwatch_log_group_retention_in_days = 14 #it's a ctf , we don't need non-necessary costs!
@@ -142,7 +144,7 @@ module "eks" {
142144
# Cluster Autoscaler IRSA
143145
module "cluster_autoscaler_irsa_role" {
144146
source = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks"
145-
version = "~> 5.33.1"
147+
version = "~> 5.35.0"
146148

147149

148150
role_name = "wrongsecrets-cluster-autoscaler"
@@ -159,7 +161,7 @@ module "cluster_autoscaler_irsa_role" {
159161

160162
module "ebs_csi_irsa_role" {
161163
source = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks"
162-
version = "~> 5.33.1"
164+
version = "~> 5.35.0"
163165

164166
role_name = "wrongsecrets-ebs-csi"
165167
attach_ebs_csi_policy = true
@@ -174,7 +176,7 @@ module "ebs_csi_irsa_role" {
174176

175177
module "load_balancer_controller_irsa_role" {
176178
source = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks"
177-
version = "~> 5.33.1"
179+
version = "~> 5.35.0"
178180

179181
role_name = "wrongsecrets-load-balancer-controller"
180182
attach_load_balancer_controller_policy = true

azure/.terraform.lock.hcl

+29-29
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

azure/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -161,16 +161,16 @@ The documentation below is auto-generated to give insight on what's created via
161161
| Name | Version |
162162
|------|---------|
163163
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | ~> 1.1 |
164-
| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | ~> 3.89.0 |
164+
| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | ~> 3.94.0 |
165165
| <a name="requirement_http"></a> [http](#requirement\_http) | ~> 3.4.0 |
166166
| <a name="requirement_random"></a> [random](#requirement\_random) | ~> 3.6.0 |
167167

168168
## Providers
169169

170170
| Name | Version |
171171
|------|---------|
172-
| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 3.89.0 |
173-
| <a name="provider_http"></a> [http](#provider\_http) | 3.4.1 |
172+
| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 3.94.0 |
173+
| <a name="provider_http"></a> [http](#provider\_http) | 3.4.2 |
174174
| <a name="provider_random"></a> [random](#provider\_random) | 3.6.0 |
175175

176176
## Modules

azure/versions.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ terraform {
88
}
99
azurerm = {
1010
source = "hashicorp/azurerm"
11-
version = "~> 3.89.0"
11+
version = "~> 3.94.0"
1212
}
1313
http = {
1414
source = "hashicorp/http"

0 commit comments

Comments
 (0)