Merge branch 'master' into feat-support-per-subnet-name-tags

fatmcgav · web-flow · commit 5c8c99e47eb4 · 2024-12-20T07:01:39.000Z
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/antonbabenko/pre-commit-terraform
-    rev: v1.96.1
+    rev: v1.96.2
     hooks:
       - id: terraform_fmt
       - id: terraform_docs
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file.
 
+## [5.17.0](https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v5.16.0...v5.17.0) (2024-12-18)
+
+
+### Features
+
+* Define default name for VPC endpoint ([#1151](https://github.com/terraform-aws-modules/terraform-aws-vpc/issues/1151)) ([41348d3](https://github.com/terraform-aws-modules/terraform-aws-vpc/commit/41348d36b3fee6bc5cd58fed18c1210401ea128e))
+
 ## [5.16.0](https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v5.15.0...v5.16.0) (2024-11-18)
 
 
diff --git a/modules/vpc-endpoints/main.tf b/modules/vpc-endpoints/main.tf
@@ -44,7 +44,11 @@ resource "aws_vpc_endpoint" "this" {
     }
   }
 
-  tags = merge(var.tags, try(each.value.tags, {}))
+  tags = merge(
+    var.tags,
+    { "Name" = replace(each.key, ".", "-") },
+    try(each.value.tags, {}),
+  )
 
   timeouts {
     create = try(var.timeouts.create, "10m")

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,11 @@ resource "aws_vpc_endpoint" "this" {`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`
`47`		`- tags = merge(var.tags, try(each.value.tags, {}))`
	`47`	`+ tags = merge(`
	`48`	`+ var.tags,`
	`49`	`+ { "Name" = replace(each.key, ".", "-") },`
	`50`	`+ try(each.value.tags, {}),`
	`51`	`+ )`
`48`	`52`
`49`	`53`	`timeouts {`
`50`	`54`	`create = try(var.timeouts.create, "10m")`