Skip to content

Commit 94061d5

Browse files
authored
Merge pull request #7 from worldcoin/hotfix/deprication-warning
removes one of the annoying warnings in TF logs
2 parents b085cd9 + 0c97cd0 commit 94061d5

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ index a95261645..9cf8d04b9 100644
322322
- source = "git@github.com:worldcoin/terraform-aws-eks?ref=v4.4.2"
323323
+ source = "git@github.com:worldcoin/terraform-aws-eks?ref=v4.5.0"
324324
325-
cluster_name = format("tools-%s-%s", var.environment, data.aws_region.current.name)
325+
cluster_name = format("tools-%s-%s", var.environment, data.aws_region.current.region)
326326
cluster_version = "1.32"
327327
```
328328

@@ -334,7 +334,7 @@ index a95261645..9cf8d04b9 100644
334334
@@ -17,7 +17,7 @@ module "eks" {
335335
source = "git@github.com:worldcoin/terraform-aws-eks?ref=v4.5.0"
336336
337-
cluster_name = format("tools-%s-%s", var.environment, data.aws_region.current.name)
337+
cluster_name = format("tools-%s-%s", var.environment, data.aws_region.current.region)
338338
- cluster_version = "1.31"
339339
+ cluster_version = "1.32"
340340
environment = var.environment

iam-karpenter.tf

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ data "aws_iam_policy_document" "karpenter" {
6666
sid = "EKSClusterEndpointLookup"
6767
effect = "Allow"
6868
actions = ["eks:DescribeCluster"]
69-
resources = ["arn:aws:eks:${data.aws_region.current.name}:${data.aws_caller_identity.account.id}:cluster/${var.cluster_name}"]
69+
resources = ["arn:aws:eks:${data.aws_region.current.region}:${data.aws_caller_identity.account.id}:cluster/${var.cluster_name}"]
7070
}
7171
statement {
7272
sid = "AllowScopedInstanceProfileCreationActions"
@@ -83,7 +83,7 @@ data "aws_iam_policy_document" "karpenter" {
8383
condition {
8484
test = "StringEquals"
8585
variable = "aws:RequestTag/topology.kubernetes.io/region"
86-
values = [data.aws_region.current.name]
86+
values = [data.aws_region.current.region]
8787
}
8888
condition {
8989
test = "StringLike"
@@ -106,7 +106,7 @@ data "aws_iam_policy_document" "karpenter" {
106106
condition {
107107
test = "StringEquals"
108108
variable = "aws:RequestTag/topology.kubernetes.io/region"
109-
values = [data.aws_region.current.name]
109+
values = [data.aws_region.current.region]
110110
}
111111
condition {
112112
test = "StringEquals"
@@ -116,7 +116,7 @@ data "aws_iam_policy_document" "karpenter" {
116116
condition {
117117
test = "StringEquals"
118118
variable = "aws:ResourceTag/topology.kubernetes.io/region"
119-
values = [data.aws_region.current.name]
119+
values = [data.aws_region.current.region]
120120
}
121121
condition {
122122
test = "StringLike"
@@ -146,7 +146,7 @@ data "aws_iam_policy_document" "karpenter" {
146146
condition {
147147
test = "StringEquals"
148148
variable = "aws:ResourceTag/topology.kubernetes.io/region"
149-
values = [data.aws_region.current.name]
149+
values = [data.aws_region.current.region]
150150
}
151151
condition {
152152
test = "StringLike"

kms.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ data "aws_iam_policy_document" "kms" {
2727
condition {
2828
test = "ArnLike"
2929
variable = "kms:EncryptionContext:aws:logs:arn"
30-
values = ["arn:aws:logs:${data.aws_region.current.name}:${data.aws_caller_identity.account.account_id}:log-group:/aws/eks/${var.cluster_name}/cluster"]
30+
values = ["arn:aws:logs:${data.aws_region.current.region}:${data.aws_caller_identity.account.account_id}:log-group:/aws/eks/${var.cluster_name}/cluster"]
3131
}
3232

3333
principals {
3434
type = "Service"
35-
identifiers = ["logs.${data.aws_region.current.name}.amazonaws.com"]
35+
identifiers = ["logs.${data.aws_region.current.region}.amazonaws.com"]
3636
}
3737
}
3838
}

modules/identity/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 5.0.0"
7+
version = ">= 6.0.0"
88
}
99
}
1010
}

secrets.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ resource "aws_secretsmanager_secret" "this" {
2525
recovery_window_in_days = 0 # Force instant deletion
2626

2727
dynamic "replica" {
28-
for_each = setsubtract(local.replica_regions, [data.aws_region.current.name])
28+
for_each = setsubtract(local.replica_regions, [data.aws_region.current.region])
2929
content {
3030
region = replica.value
3131
}

versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 5.5"
7+
version = ">= 6.0"
88
}
99
kubernetes = {
1010
source = "hashicorp/kubernetes"

0 commit comments

Comments
 (0)