fix dash

Signed-off-by: Kenny Leung <kleung@chainguard.dev>

modules/bucket-events/dashboard.tf

@@ -38,8 +38,8 @@ module "layout" {
   ]
 }
 
-module "dashboard-json" {
-  source = "../dashboard/json"
+module "dashboard" {
+  source = "../dashboard"
 
   object = {
     displayName = "GCS Bucket Events: ${var.bucket} in ${local.region}"
@@ -61,6 +61,7 @@ module "dashboard-json" {
   }
 }
 
-resource "google_monitoring_dashboard" "dashboard" {
-  dashboard_json = module.dashboard-json.json
+moved {
+  from = google_monitoring_dashboard.dashboard
+  to = module.dashboard.google_monitoring_dashboard.dashboard
 }

modules/cloudevent-broker/ingress.tf

@@ -95,8 +95,8 @@ module "layout" {
   ]
 }
 
-module "dashboard-json" {
-  source = "../dashboard/json"
+module "dashboard" {
+  source = "../dashboard"
 
   object = {
     displayName = "Cloud Events Broker Ingress: ${var.name}"
@@ -118,6 +118,7 @@ module "dashboard-json" {
   }
 }
 
-resource "google_monitoring_dashboard" "dashboard" {
-  dashboard_json = module.dashboard-json.json
+moved {
+  from = google_monitoring_dashboard.dashboard
+  to = module.dashboard.google_monitoring_dashboard.dashboard
 }

modules/dashboard/README.md

@@ -2,6 +2,60 @@
 
 The modules in this directory define [`google_monitoring_dashboard`](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/monitoring_dashboard) resources in a repeatable structured way.
 
+This module itself creates a dashboard that cleans up defaulted no-op changes.
+
 - The [Service](service/README.md) and [Job](job/README.md) modules define pre-configured dashboards for Cloud Run services and Cloud Run jobs, respectively.
 - The [`cloudevent-receiver`](cloudevent-receiver/README.md) module defines a pre-configured dashboard for a Cloud Run-based event handler receiving events from a `cloudevent-trigger`.
 - The modules in [`./widgets`](widgets/) define the widgets used by the dashboards, in a way that can be reused to create custom dashboards.
+
+```hcl
+// Call module to generate cleaned up json
+module "dashboard" {
+  source = "chainguard-dev/common/infra//modules/dashboard"
+
+  object = {
+    displayName      = "Elastic Build"
+    labels           = { "elastic-builds" : "" }
+    dashboardFilters = []
+
+    mosaicLayout = {
+      columns = module.width.size
+      tiles   = module.layout.tiles,
+    }
+  }
+}
+```
+
+The dashboard resource should now diff properly.
+
+<!-- BEGIN_TF_DOCS -->
+## Requirements
+
+No requirements.
+
+## Providers
+
+| Name | Version |
+|------|---------|
+| <a name="provider_google"></a> [google](#provider\_google) | n/a |
+
+## Modules
+
+No modules.
+
+## Resources
+
+| Name | Type |
+|------|------|
+| [google_monitoring_dashboard.dashboard](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/monitoring_dashboard) | resource |
+
+## Inputs
+
+| Name | Description | Type | Default | Required |
+|------|-------------|------|---------|:--------:|
+| <a name="input_object"></a> [object](#input\_object) | Object to encode into JSON | `object({})` | n/a | yes |
+
+## Outputs
+
+No outputs.
+<!-- END_TF_DOCS -->

modules/dashboard/alerts/dashboard.tf

@@ -28,8 +28,8 @@ locals {
   }]
 }
 
-module "dashboard-json" {
-  source = "../json"
+module "dashboard" {
+  source = ".."
 
   object = {
     displayName = var.title
@@ -43,6 +43,7 @@ module "dashboard-json" {
   }
 }
 
-resource "google_monitoring_dashboard" "dashboard" {
-  dashboard_json = module.dashboard-json.json
+moved {
+  from = google_monitoring_dashboard.dashboard
+  to = module.dashboard.google_monitoring_dashboard.dashboard
 }

modules/dashboard/cloudevent-receiver/dashboard.tf

@@ -55,7 +55,8 @@ module "width" { source = "../sections/width" }
 
 module "layout" {
   // This funky for_each just creates one instance when split_triggers is false
-  for_each = var.split_triggers ? {} : {(var.service_name): ""}
+  for_each = toset(var.split_triggers ? [] : [var.service_name])
+
   source = "../sections/layout"
   sections = concat(
     [for key in sort(keys(var.triggers)) : module.subscription[key].section],
@@ -70,10 +71,10 @@ module "layout" {
   )
 }
 
-module "dashboard-json" {
-  for_each = var.split_triggers ? {} : {(var.service_name): ""}
+module "dashboard" {
+  for_each = toset(var.split_triggers ? [] : [var.service_name])
 
-  source = "../json"
+  source = "../"
 
   // This funky for_each just creates one instance when split_triggers is false
   object = {
@@ -96,10 +97,15 @@ module "dashboard-json" {
   }
 }
 
-resource "google_monitoring_dashboard" "dashboard" {
-  for_each = var.split_triggers ? {} : {(var.service_name): ""}
+moved {
+  from = google_monitoring_dashboard.dashboard
+  to = module.trigger_dashboard.google_monitoring_dashboard.dashboard
+}
 
-  dashboard_json = module.dashboard-json[each.key].json
+output "json" {
+  value = {
+    for k,v in module.dashboard : k => v.json
+  }
 }
 
 // Google cloud has a limit of 50 widgets per dashboard so we create a dashboard
@@ -109,6 +115,7 @@ resource "google_monitoring_dashboard" "dashboard" {
 // This module is opt-in and will replace the layout module above
 module "trigger_layout" {
   for_each = var.split_triggers ? var.triggers : {}
+
   source   = "../sections/layout"
   sections = concat([module.subscription[each.key].section],
     [
@@ -127,10 +134,10 @@ module "trigger_layout" {
 // do not hit the widget limit.
 //
 // This resource is opt-in and will replace the dashboard resource above
-module "trigger-dashboard-jsons" {
+module "trigger-dashboards" {
   for_each = var.split_triggers ? var.triggers : {}
 
-  source = "../json"
+  source = "../"
 
   object = {
     displayName = "Cloud Event Receiver: ${var.service_name} (${each.key})"
@@ -152,8 +159,7 @@ module "trigger-dashboard-jsons" {
   }
 }
 
-resource "google_monitoring_dashboard" "trigger_dashboards" {
-  for_each = var.split_triggers ? var.triggers : {}
-
-  dashboard_json = module.trigger-dashboard-jsons[each.key].json
+moved {
+  from = google_monitoring_dashboard.trigger_dashboards
+  to = module.trigger_dashboards.google_monitoring_dashboard.dashboard
 }

modules/dashboard/job/dashboard.tf

@@ -35,8 +35,8 @@ module "layout" {
   ]
 }
 
-module "dashboard-json" {
-  source = "../json"
+module "dashboard" {
+  source = ".."
 
   object = {
     displayName = "Cloud Run Job: ${var.job_name}"
@@ -57,6 +57,7 @@ module "dashboard-json" {
   }
 }
 
-resource "google_monitoring_dashboard" "dashboard" {
-  dashboard_json = module.dashboard-json.json
+moved {
+  from = google_monitoring_dashboard.dashboard
+  to = module.dashboard.google_monitoring_dashboard.dashboard
 }

modules/dashboard/json/main.tf → modules/dashboard/main.tf

@@ -1,16 +1,24 @@
 variable "object" {
   description = "Object to encode into JSON"
-  type        = object({})
 }
 
-output "json" {
-  value = replace(replace(replace(replace(replace(replace(replace(
+locals {
+  json = replace(replace(replace(replace(replace(replace(replace(replace(
     jsonencode(var.object),
-    "\"collapsibleGroup\":{\"collapsed\":false},", ""),
+    "\"collapsed\":false", ""),
     ",\"xPos\":0", ""),
     ",\"yPos\":0", ""),
     ",\"thresholds\":[]", ""),
     ",\"crossSeriesReducer\":\"REDUCE_NONE\"", ""),
     ",\"perSeriesAligner\":\"ALIGN_NONE\"", ""),
+    "\"dashboardFilters\":[],", ""),
   ",\"groupByFields\":[]", "")
 }
+
+resource "google_monitoring_dashboard" "dashboard" {
+  dashboard_json = local.json
+}
+
+output "json" {
+  value = local.json
+}

modules/dashboard/service/dashboard.tf

@@ -72,8 +72,8 @@ module "layout" {
   )
 }
 
-module "dashboard-json" {
-  source = "../json"
+module "dashboard" {
+  source = ".."
 
   object = {
     displayName = "Cloud Run Service: ${var.service_name}"
@@ -94,6 +94,7 @@ module "dashboard-json" {
   }
 }
 
-resource "google_monitoring_dashboard" "dashboard" {
-  dashboard_json = module.dashboard-json.json
+moved {
+  from = google_monitoring_dashboard.dashboard
+  to = module.dashboard.google_monitoring_dashboard.dashboard
 }

modules/github-bots/main.tf

@@ -76,7 +76,7 @@ module "cloudevent-trigger" {
 }
 
 module "dashboard" {
-  source = "chainguard-dev/common/infra//modules/dashboard/cloudevent-receiver"
+  source = "../dashboard/cloudevent-receiver"
 
   project_id   = var.project_id
   service_name = var.name
@@ -90,3 +90,7 @@ module "dashboard" {
 
   notification_channels = var.notification_channels
 }
+
+output "json" {
+  value = module.dashboard.json
+}

modules/github-events/dashboard.tf

@@ -31,8 +31,8 @@ module "layout" {
   ]
 }
 
-module "dashboard-json" {
-  source = "../dashboard/json"
+module "dashboard" {
+  source = "../dashboard"
 
   object = {
     displayName = "GitHub Webhook Events"
@@ -54,6 +54,7 @@ module "dashboard-json" {
   }
 }
 
-resource "google_monitoring_dashboard" "dashboard" {
-  dashboard_json = module.dashboard-json.json
+moved {
+  from = google_monitoring_dashboard.dashboard
+  to = module.dashboard.google_monitoring_dashboard.dashboard
 }

modules/workqueue/dashboard.tf

@@ -174,8 +174,8 @@ module "layout" {
   ]
 }
 
-module "dashboard-json" {
-  source = "../dashboard/json"
+module "dashboard" {
+  source = "../dashboard"
 
   object = {
     displayName = "Cloud Workqueue: ${var.name}"
@@ -192,6 +192,7 @@ module "dashboard-json" {
   }
 }
 
-resource "google_monitoring_dashboard" "dashboard" {
-  dashboard_json = module.dashboard-json.json
+moved {
+  from = google_monitoring_dashboard.dashboard
+  to = module.dashboard.google_monitoring_dashboard.dashboard
 }