Added index check at output level

umarali-nagoor · hkantare · commit 5c9855249592 · 2021-05-31T13:02:06.000+05:30
diff --git a/.gitignore b/.gitignore
@@ -11,4 +11,4 @@ crash.log
 # control as they are data points which are potentially sensitive and subject
 # to change depending on the environment.
 #
-*.tfvars
+
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # IBM Cloud Observability - Terraform Module
 
-This is a collection of modules that make it easier to provision Observability services like logging, monitor and activity tracker on IBM Cloud Platform:
+This is a collection of modules that make it easier to provision observability services like logging, monitor and activity tracker on IBM Cloud Platform:
 * [logging-logdna](modules/logging-logdna)
 * [monitoring-sysdig](modules/monitoring-sysdig)
 * [activity-tracker-logdna](modules/activity-tracker-logdna)
diff --git a/examples/activity-tracker-logdna-instance/input.tfvars b/examples/activity-tracker-logdna-instance/input.tfvars
@@ -8,13 +8,15 @@ Example Usage
 
 tags = ["T1","T2"]
 
+parameters = {
+  "service_supertenant"    = "<service_name>"
+  "associated_logging_crn" = "<logdna_crn>"
+  "provision_key"          = "<provision_key>"
+}
+
 ******************************************************/
 
 tags = ["T1", "T2"]
 
-parameters = {
-  "service_supertenant"    = "schematics"
-  "associated_logging_crn" = "1126fa03-7df6-4096-802a-8b1df3b06398"
-  "provision_key"          = "fcdb7641"
-}
+
 
diff --git a/examples/activity-tracker-logdna-instance/main.tf b/examples/activity-tracker-logdna-instance/main.tf
@@ -11,8 +11,10 @@ data "ibm_resource_group" "res_group" {
 }
 
 module "activity-tracker_instance" {
-  source = "terraform-ibm-modules/observability/ibm//modules/activity-tracker-logdna"
+  //Uncomment the following line to point the source to registry level
+  //source = "terraform-ibm-modules/observability/ibm//modules/activity-tracker-logdna"
 
+  source            = "../../modules/activity-tracker-logdna"
   service_name      = var.service_name
   plan              = var.plan
   region            = var.region
diff --git a/examples/logging-logdna-hippa-instance/main.tf b/examples/logging-logdna-hippa-instance/main.tf
@@ -11,8 +11,10 @@ data "ibm_resource_group" "logdna" {
 }
 
 module "logdna_instance" {
-  source = "terraform-ibm-modules/observability/ibm//modules/logging-logdna"
+  //Uncomment the following line to point the source to registry level
+  //source = "terraform-ibm-modules/observability/ibm//modules/logging-logdna"
 
+  source            = "../../modules/logging-logdna"
   bind_resource_key = var.bind_resource_key
   service_name      = var.service_name
   resource_group_id = data.ibm_resource_group.logdna.id
diff --git a/examples/logging-logdna-instance/input.tfvars b/examples/logging-logdna-instance/input.tfvars
@@ -0,0 +1,25 @@
+#####################################################
+# logdna as a service
+# Copyright 2020 IBM
+#####################################################
+
+/****************************************************
+Example Usage
+
+* tags = ["T1","T2"]
+
+* default_receiver is set to false by default.
+  Set to true to collect platform metrics automatically through this instance in a region.
+
+* API_AUTH is set to the authorization model that is enabled to authenticate with the IBM Cloud Monitoring service when you use Python
+  scripts or the REST API. Valid values are: ANY, and IAM_ONLY.
+
+  parameters = {
+  "service_supertenant"    = "<service_name>"
+  "associated_logging_crn" = "<logdna_crn>"
+  "provision_key"          = "<provision_key>"
+}
+
+******************************************************/
+
+tags = ["T1", "T2"]
diff --git a/examples/logging-logdna-instance/main.tf b/examples/logging-logdna-instance/main.tf
@@ -11,8 +11,10 @@ data "ibm_resource_group" "logdna" {
 }
 
 module "logdna_instance" {
-  source = "terraform-ibm-modules/observability/ibm//modules/logging-logdna"
+  //Uncomment the following line to point the source to registry level
+  //source = "terraform-ibm-modules/observability/ibm//modules/logging-logdna"
 
+  source            = "../../modules/logging-logdna"
   bind_resource_key = var.bind_resource_key
   service_name      = var.service_name
   resource_group_id = data.ibm_resource_group.logdna.id
diff --git a/examples/logging-logdna-instance/variables.tf b/examples/logging-logdna-instance/variables.tf
@@ -14,7 +14,7 @@ variable "service_name" {
 }
 
 variable "plan" {
-  description = "plan type"
+  description = "plan type (14-day, 30-day, 7-day, hipaa-30-day and lite)"
   type        = string
 }
 
diff --git a/examples/sysdig-instance/input.tfvars b/examples/sysdig-instance/input.tfvars
@@ -0,0 +1,20 @@
+#####################################################
+# sysdig instance creation
+# Copyright 2020 IBM
+#####################################################
+
+/****************************************************
+Example Usage
+
+tags = ["T1","T2"]
+
+parameters = {
+  "default_receiver" = false
+  "API_AUTH"         = "API_AUTH"
+}
+
+******************************************************/
+
+tags = ["T1", "T2"]
+
+
diff --git a/examples/sysdig-instance/main.tf b/examples/sysdig-instance/main.tf
@@ -11,8 +11,10 @@ data "ibm_resource_group" "sysdig" {
 }
 
 module "sysdig_instance" {
-  source = "terraform-ibm-modules/observability/ibm//modules/monitoring-sysdig"
+  //Uncomment the following line to point the source to registry level
+  //source = "terraform-ibm-modules/observability/ibm//modules/monitoring-sysdig"
 
+  source            = "../../modules/monitoring-sysdig"
   bind_resource_key = var.bind_resource_key
   service_name      = var.service_name
   resource_group_id = data.ibm_resource_group.sysdig.id
diff --git a/examples/sysdig-instance/variables.tf b/examples/sysdig-instance/variables.tf
@@ -14,7 +14,7 @@ variable "service_name" {
 }
 
 variable "plan" {
-  description = "plan type"
+  description = "plan type (graduated-tier, graduated-tier-sysdig-secure-plus-monitor and lite)"
   type        = string
 }
 
diff --git a/modules/logging-logdna/output.tf b/modules/logging-logdna/output.tf
@@ -15,5 +15,5 @@ output "logdna_instance_guid" {
 
 output "logdna_instance_key_id" {
   description = "The ID of the logdna instance key"
-  value       = ibm_resource_key.logdnaKey[0].id
+  value       = concat(ibm_resource_key.logdnaKey.*.id, [""])[0]
 }
diff --git a/modules/monitoring-sysdig/output.tf b/modules/monitoring-sysdig/output.tf
@@ -5,7 +5,7 @@
 
 output "sysdig_key_id" {
   description = "The ID of the sysdig key"
-  value       = ibm_resource_key.sysdigKey[0].id
+  value       = concat(ibm_resource_key.sysdigKey.*.id, [""])[0]
 }
 
 output "sysdig_guid" {
diff --git a/versions.tf b/versions.tf
@@ -0,0 +1,28 @@
+#####################################################
+# activity tracker as a service
+# Copyright 2020 IBM
+#####################################################
+
+/***************************************************
+NOTE: To source a particular version of IBM terraform provider version, configure the parameter `version`.
+
+terraform {
+  required_version = ">=0.13"
+  required_providers {
+    ibm = {
+      source = "IBM-Cloud/ibm"
+      version = "1.20.0"
+    }
+  }
+}
+If we dont configure the version parameter, it fetched latest provider version.
+****************************************************/
+
+terraform {
+  required_version = ">=0.13"
+  required_providers {
+    ibm = {
+      source = "IBM-Cloud/ibm"
+    }
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -11,4 +11,4 @@ crash.log`
`11`	`11`	`# control as they are data points which are potentially sensitive and subject`
`12`	`12`	`# to change depending on the environment.`
`13`	`13`	`#`
`14`		`-*.tfvars`
	`14`	`+`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ variable "service_name" {`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`variable "plan" {`
`17`		`- description = "plan type"`
	`17`	`+ description = "plan type (14-day, 30-day, 7-day, hipaa-30-day and lite)"`
`18`	`18`	`type = string`
`19`	`19`	`}`
`20`	`20`