Skip to content

Commit 96b9dcc

Browse files
Support other AWS partitions other than Commercial (#93)
* Support other AWS partitions than just commercial. Most likely to be useful for deploying to GovCloud since there partition there is "aws-us-gov" instead of just "aws" * Auto Format Co-authored-by: cloudpossebot <11232728+cloudpossebot@users.noreply.github.com>
1 parent cc91434 commit 96b9dcc

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

.github/auto-release.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ version-resolver:
1717
- 'bugfix'
1818
- 'bug'
1919
- 'hotfix'
20-
- 'no-release'
2120
default: 'minor'
2221

2322
categories:

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,7 @@ Available targets:
227227
| [aws_ami.eks_worker](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/ami) | data source |
228228
| [aws_iam_instance_profile.default](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_instance_profile) | data source |
229229
| [aws_iam_policy_document.assume_role](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy_document) | data source |
230+
| [aws_partition.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/partition) | data source |
230231

231232
## Inputs
232233

docs/terraform.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
| [aws_ami.eks_worker](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/ami) | data source |
4040
| [aws_iam_instance_profile.default](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_instance_profile) | data source |
4141
| [aws_iam_policy_document.assume_role](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy_document) | data source |
42+
| [aws_partition.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/partition) | data source |
4243

4344
## Inputs
4445

main.tf

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ module "label" {
2828
context = module.this.context
2929
}
3030

31+
data "aws_partition" "current" {}
32+
3133
data "aws_iam_policy_document" "assume_role" {
3234
count = local.enabled && var.use_existing_aws_iam_instance_profile == false ? 1 : 0
3335

@@ -51,19 +53,19 @@ resource "aws_iam_role" "default" {
5153

5254
resource "aws_iam_role_policy_attachment" "amazon_eks_worker_node_policy" {
5355
count = local.enabled && var.use_existing_aws_iam_instance_profile == false ? 1 : 0
54-
policy_arn = "arn:aws:iam::aws:policy/AmazonEKSWorkerNodePolicy"
56+
policy_arn = "arn:${data.aws_partition.current.partition}:iam::aws:policy/AmazonEKSWorkerNodePolicy"
5557
role = join("", aws_iam_role.default.*.name)
5658
}
5759

5860
resource "aws_iam_role_policy_attachment" "amazon_eks_cni_policy" {
5961
count = local.enabled && var.use_existing_aws_iam_instance_profile == false ? 1 : 0
60-
policy_arn = "arn:aws:iam::aws:policy/AmazonEKS_CNI_Policy"
62+
policy_arn = "arn:${data.aws_partition.current.partition}:iam::aws:policy/AmazonEKS_CNI_Policy"
6163
role = join("", aws_iam_role.default.*.name)
6264
}
6365

6466
resource "aws_iam_role_policy_attachment" "amazon_ec2_container_registry_read_only" {
6567
count = local.enabled && var.use_existing_aws_iam_instance_profile == false ? 1 : 0
66-
policy_arn = "arn:aws:iam::aws:policy/AmazonEC2ContainerRegistryReadOnly"
68+
policy_arn = "arn:${data.aws_partition.current.partition}:iam::aws:policy/AmazonEC2ContainerRegistryReadOnly"
6769
role = join("", aws_iam_role.default.*.name)
6870
}
6971

0 commit comments

Comments
 (0)