diff --git a/.gitignore b/.gitignore index b1d1cc4..ce12a80 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ logs common/README.md OLD/ +X diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ce3418..36df038 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Versions -* v1.0.0 -- {{ yyyy-mm-dd }} - - initial creation +* 1.0.0 -- 2022-02-23 + - initial +* 1.1.0 -- 2026-02-06 + - remove data.aws_vpc_endpoint stuff from example + - force TF 1.x diff --git a/examples/fargate-cluster-tf-upgrade/locals.tf b/examples/fargate-cluster-tf-upgrade/locals.tf index 786f6c2..714a380 100644 --- a/examples/fargate-cluster-tf-upgrade/locals.tf +++ b/examples/fargate-cluster-tf-upgrade/locals.tf @@ -1,5 +1,7 @@ locals { base_tags = { +# "boc:tf_module_name" = local._module_name + "boc:tf_module_version" = local._module_version "boc:created_by" = "terraform" } diff --git a/examples/fargate-cluster-tf-upgrade/roles.tf b/examples/fargate-cluster-tf-upgrade/roles.tf index 0edcc40..f58ace5 100644 --- a/examples/fargate-cluster-tf-upgrade/roles.tf +++ b/examples/fargate-cluster-tf-upgrade/roles.tf @@ -4,27 +4,27 @@ #--- locals { vpc_short_name = var.vpc_short_name - vpc_endpoints = ["ecr.api", "ecr.dkr", "ecs", "logs", "secretsmanager", "ssm", ] +## vpc_endpoints = ["ecr.api", "ecr.dkr", "ecs", "logs", "secretsmanager", "ssm", ] task_base_format = "%v-ecs-task-execution-%v-%v" task_base_name = format(local.task_base_format, var.app_name, var.vpc_short_name, local.region) task_policy_name = format("p-%v", local.task_base_name) } -data "aws_vpc_endpoint_service" "vpc_endpoints" { - for_each = toset(local.vpc_endpoints) - service = each.key - filter { - name = "service-type" - values = ["Interface"] - } -} - -data "aws_vpc_endpoint" "vpc_endpoints" { - for_each = data.aws_vpc_endpoint_service.vpc_endpoints - service_name = each.value.service_name - vpc_id = data.aws_vpc.ecs_vpc.id -} +## data "aws_vpc_endpoint_service" "vpc_endpoints" { +## for_each = toset(local.vpc_endpoints) +## service = each.key +## filter { +## name = "service-type" +## values = ["Interface"] +## } +## } +## +## data "aws_vpc_endpoint" "vpc_endpoints" { +## for_each = data.aws_vpc_endpoint_service.vpc_endpoints +## service_name = each.value.service_name +## vpc_id = data.aws_vpc.ecs_vpc.id +## } # note you have to create the policy before creating the role module # tf-apply -target=aws_iam_policy.ecr_policy @@ -87,11 +87,11 @@ data "aws_iam_policy_document" "ecr_task_policy" { "ecr:BatchGetImage", ] resources = ["*"] - condition { - test = "StringEquals" - variable = "aws:sourceVpce" - values = [for k, v in data.aws_vpc_endpoint.vpc_endpoints : v.id] - } +## condition { +## test = "StringEquals" +## variable = "aws:sourceVpce" +## values = [for k, v in data.aws_vpc_endpoint.vpc_endpoints : v.id] +## } condition { test = "StringEquals" variable = "aws:sourceVpc" diff --git a/examples/fargate-cluster-tf-upgrade/version.tf b/examples/fargate-cluster-tf-upgrade/version.tf new file mode 120000 index 0000000..e7654bf --- /dev/null +++ b/examples/fargate-cluster-tf-upgrade/version.tf @@ -0,0 +1 @@ +../../version.tf \ No newline at end of file diff --git a/examples/fargate-cluster-tf-upgrade/versions.tf b/examples/fargate-cluster-tf-upgrade/versions.tf index 1fe34ba..0000921 100644 --- a/examples/fargate-cluster-tf-upgrade/versions.tf +++ b/examples/fargate-cluster-tf-upgrade/versions.tf @@ -1,13 +1,13 @@ terraform { + required_version = ">= 1.0" required_providers { aws = { source = "hashicorp/aws" - version = ">= 3.0" + version = ">= 6.0" } ldap = { source = "trevex/ldap" version = ">= 0.5.4" } } - required_version = ">= 0.13" } diff --git a/version.tf b/version.tf index a0cd862..9c489cd 100644 --- a/version.tf +++ b/version.tf @@ -1,3 +1,3 @@ locals { - _module_version = "0.0.0" + _module_version = "1.1.0" } diff --git a/versions.tf b/versions.tf index 4ba10ce..9052b1e 100644 --- a/versions.tf +++ b/versions.tf @@ -2,7 +2,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 3.66.0" + version = ">= 6.0" } } # required_version = ">= 0.13"