From 3df98c8feba71fc46212b6096c23738041d5b103 Mon Sep 17 00:00:00 2001 From: Julio Castillo Date: Mon, 31 Jul 2023 17:25:25 +0200 Subject: [PATCH 1/2] Fix permadiff in artifact-registry --- modules/artifact-registry/main.tf | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/artifact-registry/main.tf b/modules/artifact-registry/main.tf index 1a1476bf..5ead711d 100644 --- a/modules/artifact-registry/main.tf +++ b/modules/artifact-registry/main.tf @@ -30,7 +30,12 @@ resource "google_artifact_registry_repository" "registry" { kms_key_name = var.encryption_key dynamic "docker_config" { - for_each = local.format_string == "docker" ? [""] : [] + # TODO: open a bug on the provider for this permadiff + for_each = ( + local.format_string == "docker" && var.format.docker.immutable_tags == true + ? [""] + : [] + ) content { immutable_tags = var.format.docker.immutable_tags } From bd0fe1f92847319f9d3a3e0c3197360fbc341c9a Mon Sep 17 00:00:00 2001 From: Julio Castillo Date: Mon, 31 Jul 2023 18:03:31 +0200 Subject: [PATCH 2/2] Fix tests --- modules/artifact-registry/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/artifact-registry/main.tf b/modules/artifact-registry/main.tf index 5ead711d..5b23a193 100644 --- a/modules/artifact-registry/main.tf +++ b/modules/artifact-registry/main.tf @@ -32,7 +32,7 @@ resource "google_artifact_registry_repository" "registry" { dynamic "docker_config" { # TODO: open a bug on the provider for this permadiff for_each = ( - local.format_string == "docker" && var.format.docker.immutable_tags == true + local.format_string == "docker" && try(var.format.docker.immutable_tags, null) == true ? [""] : [] )