Addressed comments

akhil-sumologic · akhil-sumologic · commit fdcf98ab6b6e · 2024-04-09T17:46:38.000+05:30
diff --git a/aws/cloudtrail/examples/default/README.md b/aws/cloudtrail/examples/default/README.md
@@ -4,13 +4,15 @@
 |------|---------|
 | <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.28.3, < 3.0.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
 | <a name="provider_aws"></a> [aws](#provider\_aws) | 5.43.0 |
+| <a name="provider_random"></a> [random](#provider\_random) | 3.6.0 |
 | <a name="provider_sumologic"></a> [sumologic](#provider\_sumologic) | 2.28.3 |
 
 ## Modules
@@ -23,6 +25,7 @@
 
 | Name | Type |
 |------|------|
+| [random_string.aws_random](https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/string) | resource |
 | [aws_caller_identity.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/caller_identity) | data source |
 | [aws_region.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/region) | data source |
 | [sumologic_caller_identity.current](https://registry.terraform.io/providers/SumoLogic/sumologic/latest/docs/data-sources/caller_identity) | data source |
@@ -31,10 +34,8 @@
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
-| <a name="input_sumo_aws_account_id"></a> [sumo\_aws\_account\_id](#input\_sumo\_aws\_account\_id) | Please provide Sumo's AWS account ID | `string` | n/a | yes |
 | <a name="input_sumologic_access_id"></a> [sumologic\_access\_id](#input\_sumologic\_access\_id) | Sumo Logic Access ID. Visit https://help.sumologic.com/Manage/Security/Access-Keys#Create_an_access_key | `string` | n/a | yes |
 | <a name="input_sumologic_access_key"></a> [sumologic\_access\_key](#input\_sumologic\_access\_key) | Sumo Logic Access Key. Visit https://help.sumologic.com/Manage/Security/Access-Keys#Create_an_access_key | `string` | n/a | yes |
-| <a name="input_sumologic_collector_id"></a> [sumologic\_collector\_id](#input\_sumologic\_collector\_id) | Please provide Sumo Collector ID | `string` | n/a | yes |
 | <a name="input_sumologic_environment"></a> [sumologic\_environment](#input\_sumologic\_environment) | Enter au, ca, de, eu, jp, us2, in, fed or us1. For more information on Sumo Logic deployments visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security | `string` | n/a | yes |
 | <a name="input_sumologic_organization_id"></a> [sumologic\_organization\_id](#input\_sumologic\_organization\_id) | You can find your org on the Preferences page in the Sumo Logic UI. For more information, see the Preferences Page topic. Your org ID will be used to configure the IAM Role for Sumo Logic AWS Sources."<br>            For more details, visit https://help.sumologic.com/01Start-Here/05Customize-Your-Sumo-Logic-Experience/Preferences-Page | `string` | n/a | yes |
 
diff --git a/aws/cloudtrail/examples/default/locals.tf b/aws/cloudtrail/examples/default/locals.tf
@@ -4,7 +4,7 @@ locals {
   aws_region = data.aws_region.current.name
 
   # CloudTrail inputs
-  bucket_name          = "aws-observability-random-${var.sumologic_collector_id}"
+  bucket_name          = "aws-observability-random-${random_string.aws_random.id}"
   path_expression      = "AWSLogs/${local.aws_account_id}/CloudTrail/${local.aws_region}/*"
   cloudtrail_fields      = { account = local.aws_account_id }
   cloudtrail_source_bucket_name = "akhil_${local.aws_region}_${var.sumologic_organization_id}"
diff --git a/aws/cloudtrail/examples/default/main.auto.tfvars b/aws/cloudtrail/examples/default/main.auto.tfvars
@@ -3,5 +3,3 @@ sumologic_environment       = "<YOUR SUMO DEPLOYMENT>"   # Please replace <YOUR
 sumologic_organization_id   = "<YOUR SUMO ORG ID>"       # Please replace <YOUR SUMO ORG ID> (including brackets) with your Sumo Logic Organization ID.
 sumologic_access_id         = "<YOUR SUMO ACCESS ID>"    # Please replace <YOUR SUMO ACCESS ID> (including brackets) with your Sumo Logic Access ID.
 sumologic_access_key        = "<YOUR SUMO ACCESS KEY>"   # Please replace <YOUR SUMO ACCESS KEY> (including brackets) with your Sumo Logic Access KEY.
-sumologic_collector_id      = "<YOUR SUMO COLLECTOR ID>" # Please replace <YOUR SUMO COLLECTOR ID> (including brackets) with your Sumo Logic collector ID.
-sumo_aws_account_id         = "<SUMO'S AWS ACCOUNT ID>"  # Please replace <UMO'S AWS ACCOUNT ID> (including brackets) with Sumo Logic's aws account ID.
diff --git a/aws/cloudtrail/examples/default/main.tf b/aws/cloudtrail/examples/default/main.tf
@@ -1,4 +1,10 @@
 
+resource "random_string" "aws_random" {
+  length  = 10
+  upper   = false
+  special = false
+}
+
 module "cloudtrail_module" {
   source = "SumoLogic/sumo-logic-integrations/sumologic//aws/cloudtrail"
 
@@ -11,7 +17,7 @@ module "cloudtrail_module" {
     source_name     = "CloudTrail Logs (Region)"
     source_category = "aws/observability/cloudtrail/logs"
     description     = "This source is created using Sumo Logic terraform AWS Observability module to collect AWS cloudtrail logs."
-    collector_id    = var.sumologic_collector_id
+    collector_id    = module.cloudtrail_module.sumologic_collector.collector.id
     bucket_details = {
       create_bucket        = true
       bucket_name          = local.bucket_name
@@ -20,7 +26,7 @@ module "cloudtrail_module" {
     }
     paused               = false
     scan_interval        = 60000
-    sumo_account_id      = var.sumo_aws_account_id
+    sumo_account_id      = 926226587429
     cutoff_relative_time = "-1d"
     fields               = local.cloudtrail_fields
     iam_details = {
diff --git a/aws/cloudtrail/examples/default/variables.tf b/aws/cloudtrail/examples/default/variables.tf
@@ -49,13 +49,3 @@ variable "sumologic_organization_id" {
     error_message = "The organization ID must contain valid characters."
   }
 }
-
-variable "sumologic_collector_id" {
-  type        = string
-  description = "Please provide Sumo Collector ID"
-}
-
-variable "sumo_aws_account_id" {
-  type        = string
-  description = "Please provide Sumo's AWS account ID"
-}
diff --git a/aws/cloudtrail/examples/default/versions.tf b/aws/cloudtrail/examples/default/versions.tf
@@ -10,5 +10,9 @@ terraform {
       source  = "hashicorp/aws"
       version = ">= 5.16.2, < 6.0.0"
     }
+    random = {
+      source  = "hashicorp/random"
+      version = ">=3.1.0"
+    }
   }
 }
diff --git a/aws/cloudwatchlogsforwarder/examples/default/README.md b/aws/cloudwatchlogsforwarder/examples/default/README.md
@@ -31,7 +31,6 @@
 |------|-------------|------|---------|:--------:|
 | <a name="input_sumologic_access_id"></a> [sumologic\_access\_id](#input\_sumologic\_access\_id) | Sumo Logic Access ID. Visit https://help.sumologic.com/Manage/Security/Access-Keys#Create_an_access_key | `string` | n/a | yes |
 | <a name="input_sumologic_access_key"></a> [sumologic\_access\_key](#input\_sumologic\_access\_key) | Sumo Logic Access Key. Visit https://help.sumologic.com/Manage/Security/Access-Keys#Create_an_access_key | `string` | n/a | yes |
-| <a name="input_sumologic_collector_id"></a> [sumologic\_collector\_id](#input\_sumologic\_collector\_id) | Please provide Sumo Collector ID | `string` | n/a | yes |
 | <a name="input_sumologic_environment"></a> [sumologic\_environment](#input\_sumologic\_environment) | Enter au, ca, de, eu, jp, us2, in, fed or us1. For more information on Sumo Logic deployments visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security | `string` | n/a | yes |
 | <a name="input_sumologic_organization_id"></a> [sumologic\_organization\_id](#input\_sumologic\_organization\_id) | You can find your org on the Preferences page in the Sumo Logic UI. For more information, see the Preferences Page topic. Your org ID will be used to configure the IAM Role for Sumo Logic AWS Sources."<br>            For more details, visit https://help.sumologic.com/01Start-Here/05Customize-Your-Sumo-Logic-Experience/Preferences-Page | `string` | n/a | yes |
 
diff --git a/aws/cloudwatchlogsforwarder/examples/default/main.auto.tfvars b/aws/cloudwatchlogsforwarder/examples/default/main.auto.tfvars
@@ -3,4 +3,3 @@ sumologic_environment       = "<YOUR SUMO DEPLOYMENT>"   # Please replace <YOUR
 sumologic_organization_id   = "<YOUR SUMO ORG ID>"       # Please replace <YOUR SUMO ORG ID> (including brackets) with your Sumo Logic Organization ID.
 sumologic_access_id         = "<YOUR SUMO ACCESS ID>"    # Please replace <YOUR SUMO ACCESS ID> (including brackets) with your Sumo Logic Access ID.
 sumologic_access_key        = "<YOUR SUMO ACCESS KEY>"   # Please replace <YOUR SUMO ACCESS KEY> (including brackets) with your Sumo Logic Access KEY.
-sumologic_collector_id      = "<YOUR SUMO COLLECTOR ID>" # Please replace <YOUR SUMO COLLECTOR ID> (including brackets) with your Sumo Logic collector ID.
diff --git a/aws/cloudwatchlogsforwarder/examples/default/main.tf b/aws/cloudwatchlogsforwarder/examples/default/main.tf
@@ -3,7 +3,7 @@
 module "cloudwatch_logs_lambda_log_forwarder_module" {
   source = "SumoLogic/sumo-logic-integrations/sumologic//aws/cloudwatchlogsforwarder"
 
-  create_collector = false
+  create_collector = true
 
   # Lambda Log Forwarder configurations
   email_id               = "test@gmail.com"
@@ -16,7 +16,7 @@ module "cloudwatch_logs_lambda_log_forwarder_module" {
     source_name     = "CloudWatch Logs (Region)"
     source_category = "Labs/aws/cloudwatch"
     description     = "Provide details for the Sumo Logic HTTP source. If not provided, then defaults will be used."
-    collector_id    = var.sumologic_collector_id
+    collector_id    = module.cloudwatch_logs_lambda_log_forwarder_module.sumologic_collector.collector.id
     fields          = local.cloudwatch_logs_fields
   }
 
diff --git a/aws/cloudwatchlogsforwarder/examples/default/variables.tf b/aws/cloudwatchlogsforwarder/examples/default/variables.tf
@@ -49,8 +49,3 @@ variable "sumologic_organization_id" {
     error_message = "The organization ID must contain valid characters."
   }
 }
-
-variable "sumologic_collector_id" {
-  type        = string
-  description = "Please provide Sumo Collector ID"
-}
diff --git a/aws/rootcause/examples/default/README.md b/aws/rootcause/examples/default/README.md
@@ -31,17 +31,11 @@
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
-| <a name="input_sumo_aws_account_id"></a> [sumo\_aws\_account\_id](#input\_sumo\_aws\_account\_id) | Please provide Sumo's AWS account ID | `string` | n/a | yes |
 | <a name="input_sumologic_access_id"></a> [sumologic\_access\_id](#input\_sumologic\_access\_id) | Sumo Logic Access ID. Visit https://help.sumologic.com/Manage/Security/Access-Keys#Create_an_access_key | `string` | n/a | yes |
 | <a name="input_sumologic_access_key"></a> [sumologic\_access\_key](#input\_sumologic\_access\_key) | Sumo Logic Access Key. Visit https://help.sumologic.com/Manage/Security/Access-Keys#Create_an_access_key | `string` | n/a | yes |
-| <a name="input_sumologic_collector_id"></a> [sumologic\_collector\_id](#input\_sumologic\_collector\_id) | Please provide Sumo Collector ID | `string` | n/a | yes |
 | <a name="input_sumologic_environment"></a> [sumologic\_environment](#input\_sumologic\_environment) | Enter au, ca, de, eu, jp, us2, in, fed or us1. For more information on Sumo Logic deployments visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security | `string` | n/a | yes |
 | <a name="input_sumologic_organization_id"></a> [sumologic\_organization\_id](#input\_sumologic\_organization\_id) | You can find your org on the Preferences page in the Sumo Logic UI. For more information, see the Preferences Page topic. Your org ID will be used to configure the IAM Role for Sumo Logic AWS Sources."<br>            For more details, visit https://help.sumologic.com/01Start-Here/05Customize-Your-Sumo-Logic-Experience/Preferences-Page | `string` | n/a | yes |
 
 ## Outputs
 
-| Name | Description |
-|------|-------------|
-| <a name="output_aws_account_id"></a> [aws\_account\_id](#output\_aws\_account\_id) | n/a |
-| <a name="output_aws_region_data"></a> [aws\_region\_data](#output\_aws\_region\_data) | n/a |
-| <a name="output_sumologic_env"></a> [sumologic\_env](#output\_sumologic\_env) | n/a |
+No outputs.
diff --git a/aws/rootcause/examples/default/data.tf b/aws/rootcause/examples/default/data.tf
@@ -3,15 +3,3 @@ data "aws_region" "current" {}
 data "aws_caller_identity" "current" {}
 
 data "sumologic_caller_identity" "current" {}
-
-output "aws_account_id" {
-  value = data.aws_caller_identity.current.account_id
-}
-
-output "aws_region_data" {
-  value = data.aws_region.current
-}
-
-output "sumologic_env" {
-  value = data.sumologic_caller_identity.current
-}
diff --git a/aws/rootcause/examples/default/main.auto.tfvars b/aws/rootcause/examples/default/main.auto.tfvars
@@ -3,5 +3,3 @@ sumologic_environment       = "<YOUR SUMO DEPLOYMENT>"   # Please replace <YOUR
 sumologic_organization_id   = "<YOUR SUMO ORG ID>"       # Please replace <YOUR SUMO ORG ID> (including brackets) with your Sumo Logic Organization ID.
 sumologic_access_id         = "<YOUR SUMO ACCESS ID>"    # Please replace <YOUR SUMO ACCESS ID> (including brackets) with your Sumo Logic Access ID.
 sumologic_access_key        = "<YOUR SUMO ACCESS KEY>"   # Please replace <YOUR SUMO ACCESS KEY> (including brackets) with your Sumo Logic Access KEY.
-sumologic_collector_id      = "<YOUR SUMO COLLECTOR ID>" # Please replace <YOUR SUMO COLLECTOR ID> (including brackets) with your Sumo Logic collector ID.
-sumo_aws_account_id         = "<SUMO'S AWS ACCOUNT ID>"  # Please replace <UMO'S AWS ACCOUNT ID> (including brackets) with Sumo Logic's aws account ID.         = 926226587429
diff --git a/aws/rootcause/examples/default/main.tf b/aws/rootcause/examples/default/main.tf
@@ -3,7 +3,7 @@
 module "root_cause_sources_module" {
   source = "SumoLogic/sumo-logic-integrations/sumologic//aws/rootcause"
 
-  create_collector          = false
+  create_collector          = true
   sumologic_organization_id = var.sumologic_organization_id
 
   wait_for_seconds = 20
@@ -16,7 +16,7 @@ module "root_cause_sources_module" {
   inventory_source_details = {
     source_name         = "AWS Inventory ${local.aws_region}"
     source_category     = "aws/observability/inventory"
-    collector_id        = var.sumologic_collector_id
+    collector_id        = module.root_cause_sources_module.sumologic_collector.collector.id
     description         = "This source is created using Sumo Logic terraform AWS Observability module to collect AWS inventory metadata."
     limit_to_namespaces = [
       "AWS/ApplicationELB", "AWS/ApiGateway", "AWS/DynamoDB", "AWS/Lambda", "AWS/RDS", "AWS/ECS", "AWS/ElastiCache",
@@ -25,20 +25,20 @@ module "root_cause_sources_module" {
     limit_to_regions    = [local.aws_region]
     paused              = false
     scan_interval       = 300000
-    sumo_account_id     = var.sumo_aws_account_id
+    sumo_account_id     = 926226587429
     fields              = {}
   }
 
   create_xray_source = true
   xray_source_details = {
     source_name      = "AWS Xray ${local.aws_region}"
     source_category  = "aws/observability/xray"
-    collector_id     = var.sumologic_collector_id
+    collector_id     = module.root_cause_sources_module.sumologic_collector.collector.id
     description      = "This source is created using Sumo Logic terraform AWS Observability module to collect AWS Xray metrics."
     limit_to_regions = [local.aws_region]
     paused           = false
     scan_interval    = 300000
-    sumo_account_id  = var.sumo_aws_account_id
+    sumo_account_id  = 926226587429
     fields           = {}
   }
 }
diff --git a/aws/rootcause/examples/default/variables.tf b/aws/rootcause/examples/default/variables.tf
@@ -49,13 +49,3 @@ variable "sumologic_organization_id" {
     error_message = "The organization ID must contain valid characters."
   }
 }
-
-variable "sumologic_collector_id" {
-  type        = string
-  description = "Please provide Sumo Collector ID"
-}
-
-variable "sumo_aws_account_id" {
-  type        = string
-  description = "Please provide Sumo's AWS account ID"
-}

Original file line number	Diff line number	Diff line change
`@@ -49,13 +49,3 @@ variable "sumologic_organization_id" {`
`49`	`49`	`error_message = "The organization ID must contain valid characters."`
`50`	`50`	`}`
`51`	`51`	`}`
`52`		`-`
`53`		`-variable "sumologic_collector_id" {`
`54`		`- type = string`
`55`		`- description = "Please provide Sumo Collector ID"`
`56`		`-}`
`57`		`-`
`58`		`-variable "sumo_aws_account_id" {`
`59`		`- type = string`
`60`		`- description = "Please provide Sumo's AWS account ID"`
`61`		`-}`
Original file line number	Diff line number	Diff line change
`@@ -10,5 +10,9 @@ terraform {`
`10`	`10`	`source = "hashicorp/aws"`
`11`	`11`	`version = ">= 5.16.2, < 6.0.0"`
`12`	`12`	`}`
	`13`	`+ random = {`
	`14`	`+ source = "hashicorp/random"`
	`15`	`+ version = ">=3.1.0"`
	`16`	`+ }`
`13`	`17`	`}`
`14`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,3 @@ variable "sumologic_organization_id" {`
`49`	`49`	`error_message = "The organization ID must contain valid characters."`
`50`	`50`	`}`
`51`	`51`	`}`
`52`		`-`
`53`		`-variable "sumologic_collector_id" {`
`54`		`- type = string`
`55`		`- description = "Please provide Sumo Collector ID"`
`56`		`-}`