From 485442af0367f607683da7e5e7b6c9f60ae416fb Mon Sep 17 00:00:00 2001 From: Ludovico Magnocavallo Date: Sat, 20 Jul 2024 08:49:59 +0200 Subject: [PATCH] reintroduce docker image path output in AR module (#2433) --- blueprints/gke/patterns/autopilot-cluster/outputs.tf | 2 +- modules/artifact-registry/README.md | 7 ++++--- modules/artifact-registry/outputs.tf | 10 ++++++++++ 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/blueprints/gke/patterns/autopilot-cluster/outputs.tf b/blueprints/gke/patterns/autopilot-cluster/outputs.tf index aec20706a..8b72b1461 100644 --- a/blueprints/gke/patterns/autopilot-cluster/outputs.tf +++ b/blueprints/gke/patterns/autopilot-cluster/outputs.tf @@ -25,7 +25,7 @@ output "created_resources" { vpc_id = module.vpc[0].id }, !var.registry_create ? {} : { - registry = module.registry[0].image_path + registry = module.registry[0].docker_image_path }, !local.cluster_create ? {} : { cluster = module.cluster[0].id diff --git a/modules/artifact-registry/README.md b/modules/artifact-registry/README.md index 7e99a4e1b..da2f4ee5d 100644 --- a/modules/artifact-registry/README.md +++ b/modules/artifact-registry/README.md @@ -230,7 +230,8 @@ module "registry-docker" { | name | description | sensitive | |---|---|:---:| -| [id](outputs.tf#L17) | Fully qualified repository id. | | -| [name](outputs.tf#L22) | Repository name. | | -| [repository](outputs.tf#L27) | Repository object. | | +| [docker_image_path](outputs.tf#L17) | Repository path for Docker images. | | +| [id](outputs.tf#L27) | Fully qualified repository id. | | +| [name](outputs.tf#L32) | Repository name. | | +| [repository](outputs.tf#L37) | Repository object. | | diff --git a/modules/artifact-registry/outputs.tf b/modules/artifact-registry/outputs.tf index 29462e358..51c2ea0d7 100644 --- a/modules/artifact-registry/outputs.tf +++ b/modules/artifact-registry/outputs.tf @@ -14,6 +14,16 @@ * limitations under the License. */ +output "docker_image_path" { + description = "Repository path for Docker images." + value = join("/", [ + "${var.location}-${local.format_string}.pkg.dev", + var.project_id, + var.name + ]) + depends_on = [google_artifact_registry_repository.registry] +} + output "id" { description = "Fully qualified repository id." value = google_artifact_registry_repository.registry.id