Merge branch 'master' into master

antonbabenko · web-flow · commit e81bdba5bdb8 · 2024-01-12T19:19:50.000+01:00
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.83.5
+    rev: v1.86.0
     hooks:
       - id: terraform_fmt
       - id: terraform_wrapper_module_for_each
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file.
 
+## [6.6.0](https://github.com/terraform-aws-modules/terraform-aws-lambda/compare/v6.5.0...v6.6.0) (2024-01-12)
+
+
+### Features
+
+* Added support for triggers on docker_registry_image resource ([#518](https://github.com/terraform-aws-modules/terraform-aws-lambda/issues/518)) ([4ed7d19](https://github.com/terraform-aws-modules/terraform-aws-lambda/commit/4ed7d196dc26ca80daf6d04416e2a9fa91af6c1b))
+
 ## [6.5.0](https://github.com/terraform-aws-modules/terraform-aws-lambda/compare/v6.4.0...v6.5.0) (2023-11-22)
 
 
diff --git a/modules/docker-build/main.tf b/modules/docker-build/main.tf
@@ -29,9 +29,7 @@ resource "docker_registry_image" "this" {
 
   keep_remotely = var.keep_remotely
 
-  triggers = {
-    image_id = docker_image.this.image_id
-  }
+  triggers = length(var.triggers) == 0 ? { image_id = docker_image.this.image_id } : var.triggers
 }
 
 resource "aws_ecr_repository" "this" {

Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,7 @@ resource "docker_registry_image" "this" {`
`29`	`29`
`30`	`30`	`keep_remotely = var.keep_remotely`
`31`	`31`
`32`		`- triggers = {`
`33`		`- image_id = docker_image.this.image_id`
`34`		`- }`
	`32`	`+ triggers = length(var.triggers) == 0 ? { image_id = docker_image.this.image_id } : var.triggers`
`35`	`33`	`}`
`36`	`34`
`37`	`35`	`resource "aws_ecr_repository" "this" {`