Updated awso tf code for korea deployment

himsharma01 · himsharma01 · commit cecbcd38b461 · 2024-09-03T18:20:40.000+05:30
diff --git a/aws-observability-terraform/README.md b/aws-observability-terraform/README.md
@@ -5,14 +5,14 @@
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.0 |
 | <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.16.2, < 6.0.0 |
 | <a name="requirement_random"></a> [random](#requirement\_random) | >= 3.1.0 |
-| <a name="requirement_sumologic"></a> [sumologic](#requirement\_sumologic) | >= 2.31.0, < 3.0.0 |
+| <a name="requirement_sumologic"></a> [sumologic](#requirement\_sumologic) | >= 2.31.3, < 3.0.0 |
 | <a name="requirement_time"></a> [time](#requirement\_time) | >= 0.11.1 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_sumologic"></a> [sumologic](#provider\_sumologic) | 2.31.0 |
+| <a name="provider_sumologic"></a> [sumologic](#provider\_sumologic) | 2.31.3 |
 | <a name="provider_time"></a> [time](#provider\_time) | 0.11.1 |
 
 ## Modules
diff --git a/aws-observability-terraform/app-modules/README.md b/aws-observability-terraform/app-modules/README.md
@@ -4,13 +4,13 @@
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.0 |
 | <a name="requirement_null"></a> [null](#requirement\_null) | >= 2.1 |
-| <a name="requirement_sumologic"></a> [sumologic](#requirement\_sumologic) | >= 2.31.0, < 3.0.0 |
+| <a name="requirement_sumologic"></a> [sumologic](#requirement\_sumologic) | >= 2.31.3, < 3.0.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_sumologic"></a> [sumologic](#provider\_sumologic) | >= 2.31.0, < 3.0.0 |
+| <a name="provider_sumologic"></a> [sumologic](#provider\_sumologic) | >= 2.31.3, < 3.0.0 |
 | <a name="provider_time"></a> [time](#provider\_time) | n/a |
 
 ## Modules
diff --git a/aws-observability-terraform/app-modules/main.tf b/aws-observability-terraform/app-modules/main.tf
@@ -34,8 +34,14 @@ resource "sumologic_content_permission" "share_with_org" {
 	}
  }
 
+resource "time_sleep" "wait_for_5_minutes" {
+  #depends_on = [module.overview_app]
+  create_duration = "300s"
+}
+
 # Install the overview app and resources.
 module "overview_app" {
+  depends_on = [time_sleep.wait_for_5_minutes]
   source = "./overview"
 
   access_id                = var.access_id
@@ -45,11 +51,6 @@ module "overview_app" {
   app_folder_id            = sumologic_folder.apps_folder.id
 }
 
-resource "time_sleep" "wait_for_5_minutes" {
-  depends_on = [module.overview_app]
-  create_duration = "300s"
-}
-
 # Install the ec2metrics app and resources.
 module "ec2metrics_app" {
   depends_on = [time_sleep.wait_for_5_minutes]
diff --git a/aws-observability-terraform/app-modules/versions.tf b/aws-observability-terraform/app-modules/versions.tf
@@ -7,7 +7,7 @@ terraform {
       version = ">= 2.1"
     }
     sumologic = {
-      version = ">= 2.31.0, < 3.0.0"
+      version = ">= 2.31.3, < 3.0.0"
       source  = "SumoLogic/sumologic"
     }
   }
diff --git a/aws-observability-terraform/cloudformation-module/versions.tf b/aws-observability-terraform/cloudformation-module/versions.tf
@@ -9,7 +9,7 @@ terraform {
       version = "~> 2.1"
     }
     sumologic = {
-      version = ">= 2.31.0, < 3.0.0"
+      version = ">= 2.31.3, < 3.0.0"
       source  = "SumoLogic/sumologic"
     }
   }
diff --git a/aws-observability-terraform/examples/appmodule/README.md b/aws-observability-terraform/examples/appmodule/README.md
@@ -5,14 +5,14 @@
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.0 |
 | <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.42.0, < 4.0.0 |
 | <a name="requirement_random"></a> [random](#requirement\_random) | >= 3.1.0 |
-| <a name="requirement_sumologic"></a> [sumologic](#requirement\_sumologic) | >= 2.31.0, < 3.0.0 |
+| <a name="requirement_sumologic"></a> [sumologic](#requirement\_sumologic) | >= 2.31.3, < 3.0.0 |
 | <a name="requirement_time"></a> [time](#requirement\_time) | >= 0.11.1 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_sumologic"></a> [sumologic](#provider\_sumologic) | >= 2.31.0, < 3.0.0 |
+| <a name="provider_sumologic"></a> [sumologic](#provider\_sumologic) | >= 2.31.3, < 3.0.0 |
 | <a name="provider_time"></a> [time](#provider\_time) | >= 0.11.1 |
 
 ## Modules
diff --git a/aws-observability-terraform/examples/appmodule/variables.tf b/aws-observability-terraform/examples/appmodule/variables.tf
@@ -90,7 +90,7 @@ variable "sumo_api_endpoint" {
   validation {
     condition = contains([
       "https://api.au.sumologic.com/api/",
-    "https://api.ca.sumologic.com/api/", "https://api.de.sumologic.com/api/", "https://api.eu.sumologic.com/api/", "https://api.fed.sumologic.com/api/", "https://api.in.sumologic.com/api/", "https://api.jp.sumologic.com/api/", "https://api.sumologic.com/api/", "https://api.us2.sumologic.com/api/"], var.sumo_api_endpoint)
+    "https://api.ca.sumologic.com/api/", "https://api.de.sumologic.com/api/", "https://api.eu.sumologic.com/api/", "https://api.fed.sumologic.com/api/", "https://api.in.sumologic.com/api/", "https://api.jp.sumologic.com/api/", "https://api.sumologic.com/api/", "https://api.us2.sumologic.com/api/", "https://api.kr.sumologic.com/api/"], var.sumo_api_endpoint)
     error_message = "Argument \"sumo_api_endpoint\" must be one of the values specified at https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security."
   }
 }
diff --git a/aws-observability-terraform/examples/appmodule/versions.tf b/aws-observability-terraform/examples/appmodule/versions.tf
@@ -7,7 +7,7 @@ terraform {
       version = ">= 5.16.2, < 6.0.0"
     }
     sumologic = {
-      version = ">= 2.31.0, < 3.0.0"
+      version = ">= 2.31.3, < 3.0.0"
       source  = "SumoLogic/sumologic"
     }
     time = {
diff --git a/aws-observability-terraform/examples/sourcemodule/overrideSources/README.md b/aws-observability-terraform/examples/sourcemodule/overrideSources/README.md
@@ -5,14 +5,14 @@
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.0 |
 | <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.42.0, < 4.0.0 |
 | <a name="requirement_random"></a> [random](#requirement\_random) | >= 3.1.0 |
-| <a name="requirement_sumologic"></a> [sumologic](#requirement\_sumologic) | >= 2.31.0, < 3.0.0 |
+| <a name="requirement_sumologic"></a> [sumologic](#requirement\_sumologic) | >= 2.31.3, < 3.0.0 |
 | <a name="requirement_time"></a> [time](#requirement\_time) | >= 0.11.1 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_sumologic"></a> [sumologic](#provider\_sumologic) | >= 2.31.0, < 3.0.0 |
+| <a name="provider_sumologic"></a> [sumologic](#provider\_sumologic) | >= 2.31.3, < 3.0.0 |
 | <a name="provider_time"></a> [time](#provider\_time) | >= 0.11.1 |
 
 ## Modules
diff --git a/aws-observability-terraform/examples/sourcemodule/overrideSources/variables.tf b/aws-observability-terraform/examples/sourcemodule/overrideSources/variables.tf
@@ -90,7 +90,7 @@ variable "sumo_api_endpoint" {
   validation {
     condition = contains([
       "https://api.au.sumologic.com/api/",
-    "https://api.ca.sumologic.com/api/", "https://api.de.sumologic.com/api/", "https://api.eu.sumologic.com/api/", "https://api.fed.sumologic.com/api/", "https://api.in.sumologic.com/api/", "https://api.jp.sumologic.com/api/", "https://api.sumologic.com/api/", "https://api.us2.sumologic.com/api/"], var.sumo_api_endpoint)
+    "https://api.ca.sumologic.com/api/", "https://api.de.sumologic.com/api/", "https://api.eu.sumologic.com/api/", "https://api.fed.sumologic.com/api/", "https://api.in.sumologic.com/api/", "https://api.jp.sumologic.com/api/", "https://api.sumologic.com/api/", "https://api.us2.sumologic.com/api/", "https://api.kr.sumologic.com/api/"], var.sumo_api_endpoint)
     error_message = "Argument \"sumo_api_endpoint\" must be one of the values specified at https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security."
   }
 }
diff --git a/aws-observability-terraform/examples/sourcemodule/overrideSources/versions.tf b/aws-observability-terraform/examples/sourcemodule/overrideSources/versions.tf
@@ -7,7 +7,7 @@ terraform {
       version = ">= 5.16.2, < 6.0.0"
     }
     sumologic = {
-      version = ">= 2.31.0, < 3.0.0"
+      version = ">= 2.31.3, < 3.0.0"
       source  = "SumoLogic/sumologic"
     }
     time = {
diff --git a/aws-observability-terraform/examples/sourcemodule/testSource/README.md b/aws-observability-terraform/examples/sourcemodule/testSource/README.md
@@ -5,14 +5,14 @@
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.0 |
 | <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.42.0, < 4.0.0 |
 | <a name="requirement_random"></a> [random](#requirement\_random) | >= 3.1.0 |
-| <a name="requirement_sumologic"></a> [sumologic](#requirement\_sumologic) | >= 2.31.0, < 3.0.0 |
+| <a name="requirement_sumologic"></a> [sumologic](#requirement\_sumologic) | >= 2.31.3, < 3.0.0 |
 | <a name="requirement_time"></a> [time](#requirement\_time) | >= 0.11.1 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_sumologic"></a> [sumologic](#provider\_sumologic) | >= 2.31.0, < 3.0.0 |
+| <a name="provider_sumologic"></a> [sumologic](#provider\_sumologic) | >= 2.31.3, < 3.0.0 |
 | <a name="provider_time"></a> [time](#provider\_time) | >= 0.11.1 |
 
 ## Modules
diff --git a/aws-observability-terraform/examples/sourcemodule/testSource/versions.tf b/aws-observability-terraform/examples/sourcemodule/testSource/versions.tf
@@ -7,7 +7,7 @@ terraform {
       version = ">= 5.16.2, < 6.0.0"
     }
     sumologic = {
-      version = ">= 2.31.0, < 3.0.0"
+      version = ">= 2.31.3, < 3.0.0"
       source  = "SumoLogic/sumologic"
     }
     time = {
diff --git a/aws-observability-terraform/source-module/README.md b/aws-observability-terraform/source-module/README.md
@@ -5,7 +5,7 @@
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.0          |
 | <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.16.2, < 6.0.0 |
 | <a name="requirement_random"></a> [random](#requirement\_random) | >= 3.1.0           |
-| <a name="requirement_sumologic"></a> [sumologic](#requirement\_sumologic) | >= 2.31.0, < 3.0.0 |
+| <a name="requirement_sumologic"></a> [sumologic](#requirement\_sumologic) | >= 2.31.3, < 3.0.0 |
 | <a name="requirement_time"></a> [time](#requirement\_time) | >= 0.11.1          |
 
 ## Providers
@@ -15,7 +15,7 @@
 | <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.16.2, < 6.0.0 |
 | <a name="provider_null"></a> [null](#provider\_null) | n/a |
 | <a name="provider_random"></a> [random](#provider\_random) | >= 3.1.0 |
-| <a name="provider_sumologic"></a> [sumologic](#provider\_sumologic) | >= 2.31.0, < 3.0.0 |
+| <a name="provider_sumologic"></a> [sumologic](#provider\_sumologic) | >= 2.31.3, < 3.0.0 |
 | <a name="provider_time"></a> [time](#provider\_time) | >= 0.11.1 |
 
 ## Modules
diff --git a/aws-observability-terraform/source-module/main.tf b/aws-observability-terraform/source-module/main.tf
@@ -25,9 +25,7 @@ resource "time_sleep" "wait_for_minutes" {
 module "cloudtrail_module" {
   depends_on = [time_sleep.wait_for_minutes]
   for_each   = toset(local.create_cloudtrail_source ? ["cloudtrail_module"] : [])
-  source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//aws/cloudtrail?ref=sumo_246624"
-  
-  # source = "SumoLogic/sumo-logic-integrations/sumologic//aws/cloudtrail"
+  source = "SumoLogic/sumo-logic-integrations/sumologic//aws/cloudtrail"
 
   create_collector          = false
   create_trail              = var.cloudtrail_source_details.bucket_details.create_bucket ? true : false
@@ -65,8 +63,7 @@ module "cloudtrail_module" {
 module "elb_module" {
   depends_on = [time_sleep.wait_for_minutes]
   for_each   = toset(local.create_elb_source ? ["elb_module"] : [])
-  source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//aws/elb?ref=sumo_246624"
-  #source = "SumoLogic/sumo-logic-integrations/sumologic//aws/elb"
+  source = "SumoLogic/sumo-logic-integrations/sumologic//aws/elb"
 
   create_collector          = false
   sumologic_organization_id = var.sumologic_organization_id
@@ -99,7 +96,7 @@ module "elb_module" {
   }
 
   auto_enable_access_logs = var.auto_enable_access_logs
-  app_semantic_version = "1.0.12"
+  app_semantic_version = "1.0.14"
   auto_enable_access_logs_options = {
     filter                 = "'Type': 'application'|'type': 'application'"
     remove_on_delete_stack = true
@@ -111,8 +108,7 @@ module "classic_lb_module" {
   depends_on = [time_sleep.wait_for_minutes]
   for_each   = toset(local.create_classic_lb_source ? ["classic_lb_module"] : [])
 
-  source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//aws/elasticloadbalancing?ref=sumo_246624"
-  #source = "SumoLogic/sumo-logic-integrations/sumologic//aws/elasticloadbalancing"
+  source = "SumoLogic/sumo-logic-integrations/sumologic//aws/elasticloadbalancing"
 
   create_collector          = false
   sumologic_organization_id = var.sumologic_organization_id
@@ -144,7 +140,7 @@ module "classic_lb_module" {
     }
   }
   auto_enable_access_logs = var.auto_enable_classic_lb_access_logs
-  app_semantic_version = "1.0.12"
+  app_semantic_version = "1.0.14"
   auto_enable_access_logs_options = {
     bucket_prefix          = local.auto_classic_lb_path_exp
     auto_enable_logging    = "ELB"
@@ -156,8 +152,7 @@ module "classic_lb_module" {
 module "cloudwatch_metrics_source_module" {
   depends_on = [time_sleep.wait_for_minutes]
   for_each   = local.create_cw_metrics_source ? toset(var.cloudwatch_metrics_source_details.limit_to_namespaces) : []
-  source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//aws/cloudwatchmetrics?ref=sumo_246624"
-  #source = "SumoLogic/sumo-logic-integrations/sumologic//aws/cloudwatchmetrics"
+  source = "SumoLogic/sumo-logic-integrations/sumologic//aws/cloudwatchmetrics"
 
   create_collector          = false
   sumologic_organization_id = var.sumologic_organization_id
@@ -184,8 +179,7 @@ module "cloudwatch_metrics_source_module" {
 module "kinesis_firehose_for_metrics_source_module" {
   depends_on = [time_sleep.wait_for_minutes]
   for_each   = toset(local.create_kf_metrics_source ? ["kinesis_firehose_for_metrics_source_module"] : [])
-  source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//aws/kinesisfirehoseformetrics?ref=sumo_246624"
-  #source = "SumoLogic/sumo-logic-integrations/sumologic//aws/kinesisfirehoseformetrics"
+  source = "SumoLogic/sumo-logic-integrations/sumologic//aws/kinesisfirehoseformetrics"
 
   create_collector          = false
   sumologic_organization_id = var.sumologic_organization_id
@@ -216,8 +210,7 @@ module "cloudwatch_logs_lambda_log_forwarder_module" {
   depends_on = [time_sleep.wait_for_minutes]
   for_each   = toset(local.create_llf_logs_source ? ["cloudwatch_logs_lambda_log_forwarder_module"] : [])
 
-  source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//aws/cloudwatchlogsforwarder?ref=sumo_246624"
-  #source = "SumoLogic/sumo-logic-integrations/sumologic//aws/cloudwatchlogsforwarder"
+  source = "SumoLogic/sumo-logic-integrations/sumologic//aws/cloudwatchlogsforwarder"
 
   create_collector = false
 
@@ -247,8 +240,7 @@ module "kinesis_firehose_for_logs_module" {
   depends_on = [time_sleep.wait_for_minutes]
   for_each   = toset(local.create_kf_logs_source ? ["kinesis_firehose_for_logs_module"] : [])
 
-  source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//aws/kinesisfirehoseforlogs?ref=sumo_246624"
-  #source = "SumoLogic/sumo-logic-integrations/sumologic//aws/kinesisfirehoseforlogs"
+  source = "SumoLogic/sumo-logic-integrations/sumologic//aws/kinesisfirehoseforlogs"
 
   create_collector = false
 
@@ -277,8 +269,7 @@ module "root_cause_sources_module" {
   depends_on = [time_sleep.wait_for_minutes]
   for_each   = toset(local.create_root_cause_source ? ["root_cause_sources_module"] : [])
 
-  source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//aws/rootcause?ref=sumo_246624"
-  #source = "SumoLogic/sumo-logic-integrations/sumologic//aws/rootcause"
+  source = "SumoLogic/sumo-logic-integrations/sumologic//aws/rootcause"
 
   create_collector          = false
   sumologic_organization_id = var.sumologic_organization_id
diff --git a/aws-observability-terraform/source-module/versions.tf b/aws-observability-terraform/source-module/versions.tf
@@ -7,7 +7,7 @@ terraform {
       version = ">= 5.16.2, < 6.0.0"
     }
     sumologic = {
-      version = ">= 2.31.0, < 3.0.0"
+      version = ">= 2.31.3, < 3.0.0"
       source  = "SumoLogic/sumologic"
     }
     time = {
diff --git a/aws-observability-terraform/versions.tf b/aws-observability-terraform/versions.tf
@@ -7,7 +7,7 @@ terraform {
       version = ">= 5.16.2, < 6.0.0"
     }
     sumologic = {
-      version = ">= 2.31.0, < 3.0.0"
+      version = ">= 2.31.3, < 3.0.0"
       source  = "SumoLogic/sumologic"
     }
     time = {

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ terraform {`
`7`	`7`	`version = ">= 2.1"`
`8`	`8`	`}`
`9`	`9`	`sumologic = {`
`10`		`- version = ">= 2.31.0, < 3.0.0"`
	`10`	`+ version = ">= 2.31.3, < 3.0.0"`
`11`	`11`	`source = "SumoLogic/sumologic"`
`12`	`12`	`}`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ terraform {`
`9`	`9`	`version = "~> 2.1"`
`10`	`10`	`}`
`11`	`11`	`sumologic = {`
`12`		`- version = ">= 2.31.0, < 3.0.0"`
	`12`	`+ version = ">= 2.31.3, < 3.0.0"`
`13`	`13`	`source = "SumoLogic/sumologic"`
`14`	`14`	`}`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ variable "sumo_api_endpoint" {`
`90`	`90`	`validation {`
`91`	`91`	`condition = contains([`
`92`	`92`	`"https://api.au.sumologic.com/api/",`
`93`		`- "https://api.ca.sumologic.com/api/", "https://api.de.sumologic.com/api/", "https://api.eu.sumologic.com/api/", "https://api.fed.sumologic.com/api/", "https://api.in.sumologic.com/api/", "https://api.jp.sumologic.com/api/", "https://api.sumologic.com/api/", "https://api.us2.sumologic.com/api/"], var.sumo_api_endpoint)`
	`93`	`+ "https://api.ca.sumologic.com/api/", "https://api.de.sumologic.com/api/", "https://api.eu.sumologic.com/api/", "https://api.fed.sumologic.com/api/", "https://api.in.sumologic.com/api/", "https://api.jp.sumologic.com/api/", "https://api.sumologic.com/api/", "https://api.us2.sumologic.com/api/", "https://api.kr.sumologic.com/api/"], var.sumo_api_endpoint)`
`94`	`94`	`error_message = "Argument \"sumo_api_endpoint\" must be one of the values specified at https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security."`
`95`	`95`	`}`
`96`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ terraform {`
`7`	`7`	`version = ">= 5.16.2, < 6.0.0"`
`8`	`8`	`}`
`9`	`9`	`sumologic = {`
`10`		`- version = ">= 2.31.0, < 3.0.0"`
	`10`	`+ version = ">= 2.31.3, < 3.0.0"`
`11`	`11`	`source = "SumoLogic/sumologic"`
`12`	`12`	`}`
`13`	`13`	`time = {`