Merge pull request #3 from sparkfabrik/feat/2762_support_artifact_registry_tags

refs platform/#2762: Add support artifact registry tags

Author: Monska85

README.md

@@ -55,8 +55,9 @@ In the module output you can retrieve all tags keys and values informations.
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
-| <a name="input_buckets_to_be_tagged"></a> [buckets\_to\_be\_tagged](#input\_buckets\_to\_be\_tagged) | A structured list of objects, containing the list of buckets we want to tag and the tag values, in the form `<TAG_KEY_SHORTNAME>/<TAG_VALUE_SHORTNAME>`. If no bucket\_location is specified, the value of default\_location will be used. | <pre>list(object({<br>    bucket_name     = string<br>    tags            = optional(list(string), [])<br>    bucket_location = optional(string, null)<br>  }))</pre> | `[]` | no |
-| <a name="input_cloudsql_instances_to_be_tagged"></a> [cloudsql\_instances\_to\_be\_tagged](#input\_cloudsql\_instances\_to\_be\_tagged) | A structured list of objects, containing the list of cloudSQL instances we want to tag, with instance name, instance location (region) and tag values. | <pre>list(object({<br>    instance_id       = string<br>    tags              = optional(list(string), [])<br>    instance_location = optional(string, null)<br>  }))</pre> | `[]` | no |
+| <a name="input_artifact_registry_repositories_to_be_tagged"></a> [artifact\_registry\_repositories\_to\_be\_tagged](#input\_artifact\_registry\_repositories\_to\_be\_tagged) | A structured list of objects, containing the list of repositories we want to tag, with repository id, repository location (region) and tag values. | <pre>list(object({<br>    repository_id       = string<br>    repository_location = optional(string, null)<br>    tags                = optional(list(string), [])<br>  }))</pre> | `[]` | no |
+| <a name="input_buckets_to_be_tagged"></a> [buckets\_to\_be\_tagged](#input\_buckets\_to\_be\_tagged) | A structured list of objects, containing the list of buckets we want to tag and the tag values, in the form `<TAG_KEY_SHORTNAME>/<TAG_VALUE_SHORTNAME>`. If no bucket\_location is specified, the value of default\_location will be used. | <pre>list(object({<br>    bucket_name     = string<br>    bucket_location = optional(string, null)<br>    tags            = optional(list(string), [])<br>  }))</pre> | `[]` | no |
+| <a name="input_cloudsql_instances_to_be_tagged"></a> [cloudsql\_instances\_to\_be\_tagged](#input\_cloudsql\_instances\_to\_be\_tagged) | A structured list of objects, containing the list of cloudSQL instances we want to tag, with instance name, instance location (region) and tag values. | <pre>list(object({<br>    instance_id       = string<br>    instance_location = optional(string, null)<br>    tags              = optional(list(string), [])<br>  }))</pre> | `[]` | no |
 | <a name="input_default_location"></a> [default\_location](#input\_default\_location) | The default location (region) used for the resources to be tagged. | `string` | n/a | yes |
 | <a name="input_global_tags"></a> [global\_tags](#input\_global\_tags) | A list of tags to be applied to all the resources, in the form tag\_key\_short\_name/tag\_value\_short\_name. If a resource specify a list of tags, the global tags will overridden and replaced by those specified in the resource. | `list(string)` | `[]` | no |
 | <a name="input_project_id"></a> [project\_id](#input\_project\_id) | The Google Cloud project ID. | `string` | n/a | yes |
@@ -74,9 +75,9 @@ In the module output you can retrieve all tags keys and values informations.
 
 | Name | Type |
 |------|------|
+| [google_tags_location_tag_binding.artifact_registry](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/tags_location_tag_binding) | resource |
 | [google_tags_location_tag_binding.buckets](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/tags_location_tag_binding) | resource |
 | [google_tags_location_tag_binding.cloudsql](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/tags_location_tag_binding) | resource |
-| [google_project.project](https://registry.terraform.io/providers/hashicorp/google/latest/docs/data-sources/project) | data source |
 | [google_tags_tag_key.project_tag_keys_to_discover](https://registry.terraform.io/providers/hashicorp/google/latest/docs/data-sources/tags_tag_key) | data source |
 | [google_tags_tag_key.tag_keys](https://registry.terraform.io/providers/hashicorp/google/latest/docs/data-sources/tags_tag_key) | data source |
 | [google_tags_tag_value.project_tag_values_to_be_discovered](https://registry.terraform.io/providers/hashicorp/google/latest/docs/data-sources/tags_tag_value) | data source |

examples/main.tf

@@ -22,21 +22,34 @@ locals {
     {
       bucket_name = "external-website"
       # Here we override the global tags.
-      tags        = [
+      tags = [
         "dev-team/editor", "external-team/editor"
       ]
     },
   ]
+
+  artifact_registry_repositories_to_be_tagged = [
+    {
+      repository_id = "repository-1"
+      tags = [
+        "dev-team/editor", "external-team/editor"
+      ]
+    },
+    {
+      repository_id = "repository-2"
+    }
+  ]
 }
 
 # ------------------------------
 module "project_resources_tags" {
-  source                = "../."
-  default_location      = "europe-west1"
-  project_id            = "my-project-id"
-  tags_to_be_discovered = local.tags_to_discover
-  buckets_to_be_tagged  = local.buckets_to_tag
-  global_tags           = [
+  source                                      = "../."
+  default_location                            = "europe-west1"
+  project_id                                  = "my-project-id"
+  tags_to_be_discovered                       = local.tags_to_discover
+  buckets_to_be_tagged                        = local.buckets_to_tag
+  artifact_registry_repositories_to_be_tagged = local.artifact_registry_repositories_to_be_tagged
+  global_tags = [
     "dev-team/editor", "external-team/viewer"
   ]
 }

main.tf

@@ -38,7 +38,10 @@ locals {
   unique_tags_in_cloudsql_instances = distinct(flatten([
     for cloudsql in var.cloudsql_instances_to_be_tagged : cloudsql.tags
   ]))
-  all_used_unique_tags = distinct(concat(local.unique_tags_in_buckets, local.unique_tags_in_cloudsql_instances, var.global_tags))
+  unique_tags_in_artifact_registry_repositories = distinct(flatten([
+    for repository in var.artifact_registry_repositories_to_be_tagged : repository.tags
+  ]))
+  all_used_unique_tags = distinct(concat(local.unique_tags_in_buckets, local.unique_tags_in_cloudsql_instances, local.unique_tags_in_artifact_registry_repositories, var.global_tags))
 
   # Add the global tags to the buckets we want to tag and populate bucket location.
   buckets_to_be_tagged = [
@@ -92,6 +95,27 @@ locals {
       ]
     ]) : "${obj.instance_id}--${obj.tag_friendly_name}" => obj
   }
+
+  # Add the global tags to the Artifact Registry repository we want to tag.
+  artifact_registry_repositories_to_be_tagged = [
+    for repository in var.artifact_registry_repositories_to_be_tagged : {
+      repository_id       = repository.repository_id
+      repository_location = repository.repository_location != null ? repository.repository_location : var.default_location
+      tags                = length(repository.tags) > 0 ? repository.tags : var.global_tags
+    }
+  ]
+
+  map_of_artifact_registry_repositories_to_be_tagged = {
+    for obj in flatten([
+      for item in local.artifact_registry_repositories_to_be_tagged : [
+        for tag in item.tags : {
+          repository_id       = item.repository_id
+          repository_location = item.repository_location
+          tag_friendly_name   = tag
+        }
+      ]
+    ]) : "${obj.repository_id}--${obj.tag_friendly_name}" => obj
+  }
 }
 
 # Retrieve the tag keys for the tags that we are passing to the resources.
@@ -130,3 +154,12 @@ resource "google_tags_location_tag_binding" "cloudsql" {
   location  = each.value.instance_location
   tag_value = data.google_tags_tag_value.tag_values[each.value.tag_friendly_name].id
 }
+
+# Tag bindings for Artifact Registry repositories.
+resource "google_tags_location_tag_binding" "artifact_registry" {
+  for_each = local.map_of_artifact_registry_repositories_to_be_tagged
+  # Parent full resource name reference: https://cloud.google.com/artifact-registry/docs/repositories/tag-repos#attach
+  parent    = "//artifactregistry.googleapis.com/projects/${var.project_id}/locations/${each.value.repository_location}/repositories/${each.value.repository_id}"
+  location  = each.value.repository_location
+  tag_value = data.google_tags_tag_value.tag_values[each.value.tag_friendly_name].id
+}

variables.tf

@@ -24,8 +24,8 @@ variable "buckets_to_be_tagged" {
   description = "A structured list of objects, containing the list of buckets we want to tag and the tag values, in the form `<TAG_KEY_SHORTNAME>/<TAG_VALUE_SHORTNAME>`. If no bucket_location is specified, the value of default_location will be used."
   type = list(object({
     bucket_name     = string
-    tags            = optional(list(string), [])
     bucket_location = optional(string, null)
+    tags            = optional(list(string), [])
   }))
   default = []
 }
@@ -34,8 +34,18 @@ variable "cloudsql_instances_to_be_tagged" {
   description = "A structured list of objects, containing the list of cloudSQL instances we want to tag, with instance name, instance location (region) and tag values."
   type = list(object({
     instance_id       = string
-    tags              = optional(list(string), [])
     instance_location = optional(string, null)
+    tags              = optional(list(string), [])
+  }))
+  default = []
+}
+
+variable "artifact_registry_repositories_to_be_tagged" {
+  description = "A structured list of objects, containing the list of repositories we want to tag, with repository id, repository location (region) and tag values."
+  type = list(object({
+    repository_id       = string
+    repository_location = optional(string, null)
+    tags                = optional(list(string), [])
   }))
   default = []
 }