Fix datadog components (#679)

aknysh · web-flow · commit c75793bddc41 · 2023-05-18T10:51:47.000-04:00
diff --git a/modules/datadog-configuration/modules/datadog_keys/README.md b/modules/datadog-configuration/modules/datadog_keys/README.md
@@ -8,6 +8,7 @@ Useful submodule for other modules to quickly configure the datadog provider
 module "datadog_configuration" {
   source  = "../datadog-configuration/modules/datadog_keys"
   context = module.this.context
+  enabled = true
 }
 
 provider "datadog" {
diff --git a/modules/datadog-configuration/variables.tf b/modules/datadog-configuration/variables.tf
@@ -19,6 +19,7 @@ variable "datadog_site_url" {
     error_message = "Allowed values: null, `datadoghq.com`, `us3.datadoghq.com`, `us5.datadoghq.com`, `datadoghq.eu`, `ddog-gov.com`."
   }
 }
+
 variable "datadog_secrets_store_type" {
   type        = string
   description = "Secret Store type for Datadog API and app keys. Valid values: `SSM`, `ASM`"
diff --git a/modules/datadog-integration/provider-datadog.tf b/modules/datadog-integration/provider-datadog.tf
@@ -1,7 +1,7 @@
 module "datadog_configuration" {
   source  = "../datadog-configuration/modules/datadog_keys"
-  region  = var.region
   context = module.this.context
+  enabled = true
 }
 
 provider "datadog" {
diff --git a/modules/datadog-lambda-forwarder/provider-datadog.tf b/modules/datadog-lambda-forwarder/provider-datadog.tf
@@ -1,7 +1,7 @@
 module "datadog_configuration" {
   source  = "../datadog-configuration/modules/datadog_keys"
-  region  = var.region
   context = module.this.context
+  enabled = true
 }
 
 provider "datadog" {
diff --git a/modules/datadog-logs-archive/provider-datadog.tf b/modules/datadog-logs-archive/provider-datadog.tf
@@ -1,6 +1,5 @@
 module "datadog_configuration" {
   source  = "../datadog-configuration/modules/datadog_keys"
-  region  = var.region
   context = module.this.context
   enabled = true
 }
diff --git a/modules/datadog-monitor/provider-datadog.tf b/modules/datadog-monitor/provider-datadog.tf
@@ -1,7 +1,7 @@
 module "datadog_configuration" {
   source  = "../datadog-configuration/modules/datadog_keys"
-  region  = var.region
   context = module.this.context
+  enabled = true
 }
 
 provider "datadog" {
diff --git a/modules/datadog-private-location-ecs/README.md b/modules/datadog-private-location-ecs/README.md
@@ -1,4 +1,4 @@
-# Component: `ecs-service`
+# Component: `datadog-private-location-ecs`
 
 This component is responsible for creating a datadog private location and deploying it to ECS (EC2 / Fargate)
 
diff --git a/modules/datadog-private-location-ecs/provider-datadog.tf b/modules/datadog-private-location-ecs/provider-datadog.tf
@@ -1,7 +1,7 @@
 module "datadog_configuration" {
   source  = "../datadog-configuration/modules/datadog_keys"
-  region  = var.region
   context = module.this.context
+  enabled = true
 }
 
 provider "datadog" {
diff --git a/modules/datadog-synthetics-private-location/provider-datadog.tf b/modules/datadog-synthetics-private-location/provider-datadog.tf
@@ -1,7 +1,7 @@
 module "datadog_configuration" {
   source  = "../datadog-configuration/modules/datadog_keys"
-  region  = var.region
   context = module.this.context
+  enabled = true
 }
 
 provider "datadog" {
diff --git a/modules/datadog-synthetics/provider-datadog.tf b/modules/datadog-synthetics/provider-datadog.tf
@@ -1,9 +1,7 @@
 module "datadog_configuration" {
-  source = "../datadog-configuration/modules/datadog_keys"
-
-  region = var.region
-
+  source  = "../datadog-configuration/modules/datadog_keys"
   context = module.this.context
+  enabled = true
 }
 
 provider "datadog" {

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ Useful submodule for other modules to quickly configure the datadog provider`
`8`	`8`	`module "datadog_configuration" {`
`9`	`9`	`source = "../datadog-configuration/modules/datadog_keys"`
`10`	`10`	`context = module.this.context`
	`11`	`+ enabled = true`
`11`	`12`	`}`
`12`	`13`
`13`	`14`	`provider "datadog" {`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ variable "datadog_site_url" {`
`19`	`19`	error_message = "Allowed values: null, `datadoghq.com`, `us3.datadoghq.com`, `us5.datadoghq.com`, `datadoghq.eu`, `ddog-gov.com`."
`20`	`20`	`}`
`21`	`21`	`}`
	`22`	`+`
`22`	`23`	`variable "datadog_secrets_store_type" {`
`23`	`24`	`type = string`
`24`	`25`	description = "Secret Store type for Datadog API and app keys. Valid values: `SSM`, `ASM`"
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`module "datadog_configuration" {`
`2`	`2`	`source = "../datadog-configuration/modules/datadog_keys"`
`3`		`- region = var.region`
`4`	`3`	`context = module.this.context`
	`4`	`+ enabled = true`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`provider "datadog" {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`module "datadog_configuration" {`
`2`	`2`	`source = "../datadog-configuration/modules/datadog_keys"`
`3`		`- region = var.region`
`4`	`3`	`context = module.this.context`
`5`	`4`	`enabled = true`
`6`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		-# Component: `ecs-service`
	`1`	+# Component: `datadog-private-location-ecs`
`2`	`2`
`3`	`3`	`This component is responsible for creating a datadog private location and deploying it to ECS (EC2 / Fargate)`
`4`	`4`