feat: support "graduated-tier-sysdig-secure-plus-monitor" plan (#61)

Author: whoffler

README.md

@@ -172,7 +172,7 @@ You need the following permissions to run this module.
 | <a name="input_instance_name"></a> [instance\_name](#input\_instance\_name) | The name of the IBM Cloud Monitoring instance to create. Defaults to 'cloud-monitoring-<region>' | `string` | `null` | no |
 | <a name="input_manager_key_name"></a> [manager\_key\_name](#input\_manager\_key\_name) | The name to give the IBM Cloud Monitoring manager key. | `string` | `"SysdigManagerKey"` | no |
 | <a name="input_manager_key_tags"></a> [manager\_key\_tags](#input\_manager\_key\_tags) | Tags associated with the IBM Cloud Monitoring manager key. | `list(string)` | `[]` | no |
-| <a name="input_plan"></a> [plan](#input\_plan) | The IBM Cloud Monitoring plan to provision. Available: lite, graduated-tier | `string` | `"lite"` | no |
+| <a name="input_plan"></a> [plan](#input\_plan) | The IBM Cloud Monitoring plan to provision. Available: lite, graduated-tier and graduated-tier-sysdig-secure-plus-monitor (available in region eu-fr2 only) | `string` | `"lite"` | no |
 | <a name="input_region"></a> [region](#input\_region) | The IBM Cloud region where Cloud Monitoring instance will be created. | `string` | `"us-south"` | no |
 | <a name="input_resource_group_id"></a> [resource\_group\_id](#input\_resource\_group\_id) | The id of the IBM Cloud resource group where the Cloud Monitoring instance will be created. | `string` | n/a | yes |
 | <a name="input_resource_tags"></a> [resource\_tags](#input\_resource\_tags) | Tags associated with the IBM Cloud Monitoring instance (Optional, array of strings). | `list(string)` | `[]` | no |

ibm_catalog.json

@@ -134,12 +134,16 @@
               "required": true,
               "options": [
                 {
-                  "displayname": "graduated-tier",
+                  "displayname": "Graduated tier",
                   "value": "graduated-tier"
                 },
                 {
-                  "displayname": "lite",
+                  "displayname": "Lite",
                   "value": "lite"
+                },
+                {
+                  "displayname": "Graduated tier Sysdig Secure plus Monitor",
+                  "value": "graduated-tier-sysdig-secure-plus-monitor"
                 }
               ]
             },

solutions/fully-configurable/variables.tf

@@ -79,12 +79,17 @@ variable "cloud_monitoring_access_tags" {
 
 variable "cloud_monitoring_plan" {
   type        = string
-  description = "The IBM Cloud Monitoring plan to provision. Available values are `lite` and `graduated-tier`."
+  description = "The IBM Cloud Monitoring plan to provision. Available values are `lite` and `graduated-tier` and graduated-tier-sysdig-secure-plus-monitor (available in region eu-fr2 only)."
   default     = "graduated-tier"
 
   validation {
-    condition     = can(regex("^lite$|^graduated-tier$", var.cloud_monitoring_plan))
-    error_message = "Specify one of the following values for the `cloud_monitoring_plan`: `lite` or `graduated-tier`."
+    condition     = can(regex("^lite$|^graduated-tier$|^graduated-tier-sysdig-secure-plus-monitor$", var.cloud_monitoring_plan))
+    error_message = "The plan value must be one of the following: lite, graduated-tier and graduated-tier-sysdig-secure-plus-monitor (available in region eu-fr2 only)."
+  }
+
+  validation {
+    condition     = (var.cloud_monitoring_plan != "graduated-tier-sysdig-secure-plus-monitor") || var.region == "eu-fr2"
+    error_message = "When cloud_monitoring_plan is graduated-tier-sysdig-secure-plus-monitor region should be set to eu-fr2."
   }
 }
 

tests/pr_test.go

@@ -29,6 +29,7 @@ var validRegions = []string{
 	"ca-tor",
 	"eu-de",
 	"eu-gb",
+	"eu-fr2",
 	"jp-osa",
 	"jp-tok",
 	"us-south",
@@ -40,6 +41,12 @@ func TestRunFullyConfigurable(t *testing.T) {
 
 	region := validRegions[rand.Intn(len(validRegions))]
 	prefix := "icm-da"
+	plan := "lite"
+
+	// when region is 'eu-fr2' take opportunity to test 'graduated-tier-sysdig-secure-plus-monitor' plan
+	if region == "eu-fr2" {
+		plan = "graduated-tier-sysdig-secure-plus-monitor"
+	}
 
 	// Verify ibmcloud_api_key variable is set
 	checkVariable := "TF_VAR_ibmcloud_api_key"
@@ -68,6 +75,7 @@ func TestRunFullyConfigurable(t *testing.T) {
 		{Name: "region", Value: region, DataType: "string"},
 		{Name: "cloud_monitoring_resource_tags", Value: options.Tags, DataType: "list(string)"},
 		{Name: "prefix", Value: options.Prefix, DataType: "string"},
+		{Name: "cloud_monitoring_plan", Value: plan, DataType: "string"},
 	}
 
 	err := options.RunSchematicTest()

variables.tf

@@ -17,12 +17,17 @@ variable "instance_name" {
 
 variable "plan" {
   type        = string
-  description = "The IBM Cloud Monitoring plan to provision. Available: lite, graduated-tier"
+  description = "The IBM Cloud Monitoring plan to provision. Available: lite, graduated-tier and graduated-tier-sysdig-secure-plus-monitor (available in region eu-fr2 only)"
   default     = "lite"
 
   validation {
-    condition     = can(regex("^lite$|^graduated-tier$", var.plan))
-    error_message = "The plan value must be one of the following: lite, graduated-tier."
+    condition     = can(regex("^lite$|^graduated-tier$|^graduated-tier-sysdig-secure-plus-monitor$", var.plan))
+    error_message = "The plan value must be one of the following: lite, graduated-tier and graduated-tier-sysdig-secure-plus-monitor (available in region eu-fr2 only)."
+  }
+
+  validation {
+    condition     = (var.plan != "graduated-tier-sysdig-secure-plus-monitor") || var.region == "eu-fr2"
+    error_message = "When plan is graduated-tier-sysdig-secure-plus-monitor region should be set to eu-fr2."
   }
 }