From 0c21fecff8fafc1e2c7152a6bd6551527b0c1505 Mon Sep 17 00:00:00 2001
From: Julio Castillo <jccb@google.com>
Date: Tue, 21 Dec 2021 09:22:10 +0100
Subject: [PATCH] Add metric scopes support (#397)

* Add metric scopes support

* Fix typo

* new tfdoc block in README

Co-authored-by: Ludovico Magnocavallo <ludomagno@google.com>
---
 CHANGELOG.md                 | 1 +
 modules/project/README.md    | 1 +
 modules/project/main.tf      | 7 +++++++
 modules/project/variables.tf | 6 ++++++
 4 files changed, 15 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dc86b8faa..0a5078b68 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ All notable changes to this project will be documented in this file.
 - **incompatible change** renamed `private_service_networking_range` variable to `psc_ranges` in `net-vpc`module, and changed its type to `list(string)`
 - added a firewall policy factory to `organization` module
 - refactored `tfdoc`
+- added support for metric scopes to the `project` module
 
 ## [8.0.0] - 2021-10-21
 
diff --git a/modules/project/README.md b/modules/project/README.md
index aa21fa773..d07d1ffb1 100644
--- a/modules/project/README.md
+++ b/modules/project/README.md
@@ -193,6 +193,7 @@ module "project" {
 | lien_reason | If non-empty, creates a project lien with this description. | <code>string</code> |  | <code>&#34;&#34;</code> |
 | logging_exclusions | Logging exclusions for this project in the form {NAME -> FILTER}. | <code>map&#40;string&#41;</code> |  | <code>&#123;&#125;</code> |
 | logging_sinks | Logging sinks to create for this project. | <code title="map&#40;object&#40;&#123;&#10;  destination   &#61; string&#10;  type          &#61; string&#10;  filter        &#61; string&#10;  iam           &#61; bool&#10;  unique_writer &#61; bool&#10;  exclusions &#61; map&#40;string&#41;&#10;&#125;&#41;&#41;">map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> |  | <code>&#123;&#125;</code> |
+| metric_scopes | List of projects that will act as metric scopes for this project. | <code>list&#40;string&#41;</code> |  | <code>null</code> |
 | oslogin | Enable OS Login. | <code>bool</code> |  | <code>false</code> |
 | oslogin_admins | List of IAM-style identities that will be granted roles necessary for OS Login administrators. | <code>list&#40;string&#41;</code> |  | <code>&#91;&#93;</code> |
 | oslogin_users | List of IAM-style identities that will be granted roles necessary for OS Login users. | <code>list&#40;string&#41;</code> |  | <code>&#91;&#93;</code> |
diff --git a/modules/project/main.tf b/modules/project/main.tf
index bb4ca986d..abd15fed2 100644
--- a/modules/project/main.tf
+++ b/modules/project/main.tf
@@ -389,3 +389,10 @@ resource "google_kms_crypto_key_iam_member" "crypto_key" {
     data.google_storage_project_service_account.gcs_sa,
   ]
 }
+
+resource "google_monitoring_monitored_project" "primary" {
+  provider      = google-beta
+  for_each      = toset(coalesce(var.metric_scopes, []))
+  metrics_scope = each.value
+  name          = local.project.project_id
+}
diff --git a/modules/project/variables.tf b/modules/project/variables.tf
index 0db919757..34db467bf 100644
--- a/modules/project/variables.tf
+++ b/modules/project/variables.tf
@@ -100,6 +100,12 @@ variable "logging_sinks" {
   default = {}
 }
 
+variable "metric_scopes" {
+  description = "List of projects that will act as metric scopes for this project."
+  type        = list(string)
+  default     = null
+}
+
 variable "name" {
   description = "Project name and id suffix."
   type        = string