From 59f1564986d33d3b23c22606b680541a3c2c184b Mon Sep 17 00:00:00 2001 From: badra001 Date: Tue, 11 May 2021 11:00:44 -0400 Subject: [PATCH] fix; enable tags --- iam-general-policies/README.md | 1 - iam-general-policies/main.tf | 12 ++++++------ iam-general-policies/policy_data.tf | 12 ------------ 3 files changed, 6 insertions(+), 19 deletions(-) diff --git a/iam-general-policies/README.md b/iam-general-policies/README.md index 3eda451..b26ef1c 100644 --- a/iam-general-policies/README.md +++ b/iam-general-policies/README.md @@ -110,7 +110,6 @@ No modules. | Name | Type | |------|------| | [aws_iam_policy.general](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_policy) | resource | -| [aws_iam_policy.policy_network-admin](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_policy) | resource | | [aws_arn.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/arn) | data source | | [aws_caller_identity.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/caller_identity) | data source | | [aws_iam_policy_document.deny_billing](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy_document) | data source | diff --git a/iam-general-policies/main.tf b/iam-general-policies/main.tf index e00bcda..e021bf0 100644 --- a/iam-general-policies/main.tf +++ b/iam-general-policies/main.tf @@ -133,11 +133,11 @@ resource "aws_iam_policy" "general" { description = lookup(each.value, "description", "${each.key} policy") policy = each.value["policy"] - # tags = merge( - # var.tags, - # local.base_tags, - # lookup(var.component_tags, "policy", {}), - # map("Name",format("%vinf-%v", lookup(local._prefixes, "policy", ""), each.value["name"])) - # ) + tags = merge( + var.tags, + local.base_tags, + lookup(var.component_tags, "policy", {}), + map("Name", format("%vinf-%v", lookup(local._prefixes, "policy", ""), each.value["name"])) + ) } diff --git a/iam-general-policies/policy_data.tf b/iam-general-policies/policy_data.tf index 307748a..8e5b2fd 100644 --- a/iam-general-policies/policy_data.tf +++ b/iam-general-policies/policy_data.tf @@ -117,18 +117,6 @@ data "aws_iam_policy_document" "network_admin" { } } -resource "aws_iam_policy" "policy_network-admin" { - name = format("%vinf-%v", "p-", "network-admin") - path = "/" - description = "inf-network-admin policy" - policy = data.aws_iam_policy_document.policy_network-admin.json - - tags = merge( - local.common_tags, - tomap({ "boc:created_by" = "terraform" }), - tomap({ "Name" = format("%vinf-%v", "p-", "network-admin") }), - ) -} #--- # sts (for roles) #---