Merge branch 'master' into deprecate-v1-alert-resources

Author: dbonf

sysdig/common.go

@@ -48,6 +48,7 @@ const (
 	SchemaMonitorCloudMetrics       = "monitor_cloud_metrics"
 	SchemaType                      = "type"
 	SchemaInstance                  = "instance"
+	SchemaVersion                   = "version"
 	SchemaCloudConnectorMetadata    = "cloud_connector_metadata"
 	SchemaTrustedRoleMetadata       = "trusted_role_metadata"
 	SchemaEventBridgeMetadata       = "event_bridge_metadata"

sysdig/resource_sysdig_monitor_alert_v2_form_based_prometheus.go

@@ -36,7 +36,7 @@ func resourceSysdigMonitorAlertV2FormBasedPrometheus() *schema.Resource {
 			"operator": {
 				Type:         schema.TypeString,
 				Required:     true,
-				ValidateFunc: validation.StringInSlice([]string{">", ">=", "<", "<=", "=", "!="}, false),
+				ValidateFunc: validation.StringInSlice([]string{">", ">=", "<", "<=", "==", "!="}, false),
 			},
 			"threshold": {
 				Type:     schema.TypeFloat,

sysdig/resource_sysdig_monitor_alert_v2_form_based_prometheus_test.go

@@ -27,6 +27,9 @@ func TestAccAlertV2FormBasedPrometheusTest(t *testing.T) {
 			{
 				Config: alertV2FormBasedPrometheusTest(rText()),
 			},
+			{
+				Config: alertV2FormBasedPrometheusWithEqualOperatorTest(rText()),
+			},
 			{
 				Config: alertV2FormBasedPrometheusTestWithNoData(rText()),
 			},
@@ -77,6 +80,17 @@ resource "sysdig_monitor_alert_v2_form_based_prometheus" "sample" {
 `, name)
 }
 
+func alertV2FormBasedPrometheusWithEqualOperatorTest(name string) string {
+	return fmt.Sprintf(`
+resource "sysdig_monitor_alert_v2_form_based_prometheus" "sample" {
+	name = "TERRAFORM TEST - FORM BASED PROMETHEUS %s"
+	query = "avg_over_time(sysdig_container_cpu_used_percent{container_name=\"test\"}[59s])"
+	operator = "=="
+	threshold = 50
+}
+`, name)
+}
+
 func alertV2FormBasedPrometheusTestWithNoData(name string) string {
 	return fmt.Sprintf(`
 resource "sysdig_monitor_alert_v2_form_based_prometheus" "sample" {

sysdig/resource_sysdig_secure_cloud_auth_account.go

@@ -33,6 +33,10 @@ var (
 				Type:     schema.TypeString,
 				Required: true,
 			},
+			SchemaVersion: {
+				Type:     schema.TypeString,
+				Optional: true,
+			},
 			SchemaCloudConnectorMetadata: {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -216,9 +220,6 @@ func resourceSysdigSecureCloudauthAccountRead(ctx context.Context, data *schema.
 
 	cloudauthAccount, errStatus, err := client.GetCloudauthAccountSecure(ctx, data.Id())
 	if err != nil {
-		if strings.Contains(errStatus, "404") {
-			return nil
-		}
 		return diag.Errorf("Error reading resource: %s %s", errStatus, err)
 	}
 
@@ -238,9 +239,6 @@ func resourceSysdigSecureCloudauthAccountUpdate(ctx context.Context, data *schem
 
 	existingCloudAccount, errStatus, err := client.GetCloudauthAccountSecure(ctx, data.Id())
 	if err != nil {
-		if strings.Contains(errStatus, "404") {
-			return nil
-		}
 		return diag.Errorf("Error reading resource: %s %s", errStatus, err)
 	}
 
@@ -254,9 +252,6 @@ func resourceSysdigSecureCloudauthAccountUpdate(ctx context.Context, data *schem
 
 	_, errStatus, err = client.UpdateCloudauthAccountSecure(ctx, data.Id(), newCloudAccount)
 	if err != nil {
-		if strings.Contains(errStatus, "404") {
-			return nil
-		}
 		return diag.Errorf("Error updating resource: %s %s", errStatus, err)
 	}
 
@@ -382,6 +377,8 @@ func constructAccountComponents(data *schema.ResourceData) []*cloudauth.AccountC
 					component.Type = cloudauth.Component(cloudauth.Component_value[value.(string)])
 				case SchemaInstance:
 					component.Instance = value.(string)
+				case SchemaVersion:
+					component.Version = value.(string)
 				case SchemaCloudConnectorMetadata:
 					component.Metadata = &cloudauth.AccountComponent_CloudConnectorMetadata{CloudConnectorMetadata: &cloudauth.CloudConnectorMetadata{}}
 					err = protojson.Unmarshal([]byte(value.(string)), component.GetCloudConnectorMetadata())
@@ -493,6 +490,7 @@ func componentsToResourceData(components []*cloudauth.AccountComponent) []map[st
 		resourceData := map[string]interface{}{}
 		resourceData[SchemaType] = component.GetType().String()
 		resourceData[SchemaInstance] = component.GetInstance()
+		resourceData[SchemaVersion] = component.GetVersion()
 
 		switch component.GetType() {
 		case cloudauth.Component_COMPONENT_CLOUD_CONNECTOR:

sysdig/resource_sysdig_secure_cloud_auth_account_component.go

@@ -175,6 +175,7 @@ func cloudauthAccountComponentFromResourceData(data *schema.ResourceData) *v2.Cl
 		AccountComponent: cloudauth.AccountComponent{
 			Type:     cloudauth.Component(cloudauth.Component_value[data.Get(SchemaType).(string)]),
 			Instance: data.Get(SchemaInstance).(string),
+			Version:  data.Get(SchemaVersion).(string),
 		},
 	}
 	// XXX: naive but simple approach to read resource data, and check for the metadata schema type passed (only one of the types will be passed)
@@ -243,6 +244,11 @@ func cloudauthAccountComponentToResourceData(data *schema.ResourceData, cloudAcc
 		return err
 	}
 
+	err = data.Set(SchemaVersion, cloudAccountComponent.GetVersion())
+	if err != nil {
+		return err
+	}
+
 	// XXX: naive but simple approach to read accountComponent object from cloudauth, and check for the metadata proto type (only one of the types will be returned)
 	// then, populate the respective appropriate metadata schema in resource data.
 	switch cloudAccountComponent.GetType() {

sysdig/resource_sysdig_secure_cloud_auth_account_component_test.go

@@ -71,6 +71,7 @@ resource "sysdig_secure_cloud_auth_account_component" "azure_service_principal"
   account_id		         = sysdig_secure_cloud_auth_account.azure_sample.id
   type                       = "COMPONENT_SERVICE_PRINCIPAL"
   instance                   = "secure-posture"
+	version										 = "v1.0.0"
   service_principal_metadata = jsonencode({
 	  azure = {
 		  active_directory_service_principal = {

website/docs/r/monitor_alert_v2_form_based_prometheus.md

@@ -74,7 +74,7 @@ By defining this field, the user can add link to notifications.
 ### Form Based Prometheus alert arguments
 
 * `query` - (Required) PromQL-based metric expression to alert on. Example: `sysdig_host_memory_available_bytes / sysdig_host_memory_total_bytes * 100` or `avg_over_time(sysdig_container_cpu_used_percent{}[59s])`.
-* `operator` - (Required) Operator for the condition to alert on. It can be `>`, `>=`, `<`, `<=`, `=` or `!=`.
+* `operator` - (Required) Operator for the condition to alert on. It can be `>`, `>=`, `<`, `<=`, `==` or `!=`.
 * `threshold` - (Required) Threshold used together with `op` to trigger the alert if crossed.
 * `warning_threshold` - (Optional) Warning threshold used together with `op` to trigger the alert if crossed. Must be a number that triggers the alert before reaching the main `threshold`.
 * `no_data_behaviour` - (Optional) behaviour in case of missing data. Can be `DO_NOTHING`, i.e. ignore, or `TRIGGER`, i.e. notify on main threshold. Default: `DO_NOTHING`.