feat: Add policy types support (#93)

tembleking · web-flow · commit 7a7679327c1e · 2021-03-29T21:25:34.000+02:00
* refactor: Move data marshalling to it's own method

* chore: Increase the Secure policy timeout to 5 minutes

* chore: Increase all timeouts to 5 minutes

* feat: Add policy types support
diff --git a/sysdig/data_source_sysdig_current_user.go b/sysdig/data_source_sysdig_current_user.go
@@ -10,7 +10,7 @@ import (
 )
 
 func dataSourceSysdigCurrentUser() *schema.Resource {
-	timeout := 30 * time.Second
+	timeout := 5 * time.Minute
 
 	return &schema.Resource{
 		ReadContext: dataSourceSysdigCurrentUserRead,
diff --git a/sysdig/data_source_sysdig_secure_notification_channel.go b/sysdig/data_source_sysdig_secure_notification_channel.go
@@ -22,7 +22,7 @@ const (
 )
 
 func dataSourceSysdigSecureNotificationChannel() *schema.Resource {
-	timeout := 30 * time.Second
+	timeout := 5 * time.Minute
 
 	return &schema.Resource{
 		ReadContext: dataSourceSysdigNotificationChannelRead,
diff --git a/sysdig/data_source_sysdig_user.go b/sysdig/data_source_sysdig_user.go
@@ -10,7 +10,7 @@ import (
 )
 
 func dataSourceSysdigUser() *schema.Resource {
-	timeout := 30 * time.Second
+	timeout := 5 * time.Minute
 
 	return &schema.Resource{
 		ReadContext: dataSourceSysdigUserRead,
diff --git a/sysdig/internal/client/secure/models.go b/sysdig/internal/client/secure/models.go
@@ -19,6 +19,7 @@ type Policy struct {
 	Scope                  string   `json:"scope,omitempty"`
 	Version                int      `json:"version,omitempty"`
 	NotificationChannelIds []int    `json:"notificationChannelIds"`
+	Type                   string   `json:"type"`
 }
 
 type Action struct {
diff --git a/sysdig/resource_sysdig_monitor_alert_anomaly.go b/sysdig/resource_sysdig_monitor_alert_anomaly.go
@@ -12,7 +12,7 @@ import (
 )
 
 func resourceSysdigMonitorAlertAnomaly() *schema.Resource {
-	timeout := 30 * time.Second
+	timeout := 5 * time.Minute
 
 	return &schema.Resource{
 		CreateContext: resourceSysdigAlertAnomalyCreate,
diff --git a/sysdig/resource_sysdig_monitor_alert_downtime.go b/sysdig/resource_sysdig_monitor_alert_downtime.go
@@ -14,7 +14,7 @@ import (
 )
 
 func resourceSysdigMonitorAlertDowntime() *schema.Resource {
-	timeout := 30 * time.Second
+	timeout := 5 * time.Minute
 
 	return &schema.Resource{
 		CreateContext: resourceSysdigAlertDowntimeCreate,
diff --git a/sysdig/resource_sysdig_monitor_alert_event.go b/sysdig/resource_sysdig_monitor_alert_event.go
@@ -14,7 +14,7 @@ import (
 )
 
 func resourceSysdigMonitorAlertEvent() *schema.Resource {
-	timeout := 30 * time.Second
+	timeout := 5 * time.Minute
 
 	return &schema.Resource{
 		CreateContext: resourceSysdigAlertEventCreate,
diff --git a/sysdig/resource_sysdig_monitor_alert_group_outlier.go b/sysdig/resource_sysdig_monitor_alert_group_outlier.go
@@ -12,7 +12,7 @@ import (
 )
 
 func resourceSysdigMonitorAlertGroupOutlier() *schema.Resource {
-	timeout := 30 * time.Second
+	timeout := 5 * time.Minute
 
 	return &schema.Resource{
 		CreateContext: resourceSysdigAlertGroupOutlierCreate,
diff --git a/sysdig/resource_sysdig_monitor_alert_metric.go b/sysdig/resource_sysdig_monitor_alert_metric.go
@@ -12,7 +12,7 @@ import (
 )
 
 func resourceSysdigMonitorAlertMetric() *schema.Resource {
-	timeout := 30 * time.Second
+	timeout := 5 * time.Minute
 
 	return &schema.Resource{
 		CreateContext: resourceSysdigAlertMetricCreate,
diff --git a/sysdig/resource_sysdig_monitor_dashboard.go b/sysdig/resource_sysdig_monitor_dashboard.go
@@ -16,7 +16,7 @@ import (
 )
 
 func resourceSysdigMonitorDashboard() *schema.Resource {
-	timeout := 30 * time.Second
+	timeout := 5 * time.Minute
 
 	return &schema.Resource{
 		CreateContext: resourceSysdigDashboardCreate,
diff --git a/sysdig/resource_sysdig_monitor_notification_channel_email.go b/sysdig/resource_sysdig_monitor_notification_channel_email.go
@@ -14,7 +14,7 @@ import (
 )
 
 func resourceSysdigMonitorNotificationChannelEmail() *schema.Resource {
-	timeout := 30 * time.Second
+	timeout := 5 * time.Minute
 
 	return &schema.Resource{
 		CreateContext: resourceSysdigMonitorNotificationChannelEmailCreate,
diff --git a/sysdig/resource_sysdig_monitor_notification_channel_opsgenie.go b/sysdig/resource_sysdig_monitor_notification_channel_opsgenie.go
@@ -15,7 +15,7 @@ import (
 )
 
 func resourceSysdigMonitorNotificationChannelOpsGenie() *schema.Resource {
-	timeout := 30 * time.Second
+	timeout := 5 * time.Minute
 
 	return &schema.Resource{
 		CreateContext: resourceSysdigMonitorNotificationChannelOpsGenieCreate,
diff --git a/sysdig/resource_sysdig_monitor_notification_channel_pagerduty.go b/sysdig/resource_sysdig_monitor_notification_channel_pagerduty.go
@@ -13,7 +13,7 @@ import (
 )
 
 func resourceSysdigMonitorNotificationChannelPagerduty() *schema.Resource {
-	timeout := 30 * time.Second
+	timeout := 5 * time.Minute
 
 	return &schema.Resource{
 		CreateContext: resourceSysdigMonitorNotificationChannelPagerdutyCreate,
diff --git a/sysdig/resource_sysdig_monitor_notification_channel_slack.go b/sysdig/resource_sysdig_monitor_notification_channel_slack.go
@@ -12,7 +12,7 @@ import (
 )
 
 func resourceSysdigMonitorNotificationChannelSlack() *schema.Resource {
-	timeout := 30 * time.Second
+	timeout := 5 * time.Minute
 
 	return &schema.Resource{
 		CreateContext: resourceSysdigMonitorNotificationChannelSlackCreate,
diff --git a/sysdig/resource_sysdig_monitor_notification_channel_sns.go b/sysdig/resource_sysdig_monitor_notification_channel_sns.go
@@ -13,7 +13,7 @@ import (
 )
 
 func resourceSysdigMonitorNotificationChannelSNS() *schema.Resource {
-	timeout := 30 * time.Second
+	timeout := 5 * time.Minute
 
 	return &schema.Resource{
 		CreateContext: resourceSysdigMonitorNotificationChannelSNSCreate,
diff --git a/sysdig/resource_sysdig_monitor_notification_channel_victorops.go b/sysdig/resource_sysdig_monitor_notification_channel_victorops.go
@@ -12,7 +12,7 @@ import (
 )
 
 func resourceSysdigMonitorNotificationChannelVictorOps() *schema.Resource {
-	timeout := 30 * time.Second
+	timeout := 5 * time.Minute
 
 	return &schema.Resource{
 		CreateContext: resourceSysdigMonitorNotificationChannelVictorOpsCreate,
diff --git a/sysdig/resource_sysdig_monitor_notification_channel_webhook.go b/sysdig/resource_sysdig_monitor_notification_channel_webhook.go
@@ -13,7 +13,7 @@ import (
 )
 
 func resourceSysdigMonitorNotificationChannelWebhook() *schema.Resource {
-	timeout := 30 * time.Second
+	timeout := 5 * time.Minute
 
 	return &schema.Resource{
 		CreateContext: resourceSysdigMonitorNotificationChannelWebhookCreate,
diff --git a/sysdig/resource_sysdig_monitor_team.go b/sysdig/resource_sysdig_monitor_team.go
@@ -13,7 +13,7 @@ import (
 )
 
 func resourceSysdigMonitorTeam() *schema.Resource {
-	timeout := 30 * time.Second
+	timeout := 5 * time.Minute
 
 	return &schema.Resource{
 		CreateContext: resourceSysdigMonitorTeamCreate,
diff --git a/sysdig/resource_sysdig_secure_notification_channel_email.go b/sysdig/resource_sysdig_secure_notification_channel_email.go
@@ -14,7 +14,7 @@ import (
 )
 
 func resourceSysdigSecureNotificationChannelEmail() *schema.Resource {
-	timeout := 30 * time.Second
+	timeout := 5 * time.Minute
 
 	return &schema.Resource{
 		CreateContext: resourceSysdigSecureNotificationChannelEmailCreate,
diff --git a/sysdig/resource_sysdig_secure_notification_channel_opsgenie.go b/sysdig/resource_sysdig_secure_notification_channel_opsgenie.go
@@ -15,7 +15,7 @@ import (
 )
 
 func resourceSysdigSecureNotificationChannelOpsGenie() *schema.Resource {
-	timeout := 30 * time.Second
+	timeout := 5 * time.Minute
 
 	return &schema.Resource{
 		CreateContext: resourceSysdigSecureNotificationChannelOpsGenieCreate,
diff --git a/sysdig/resource_sysdig_secure_notification_channel_pagerduty.go b/sysdig/resource_sysdig_secure_notification_channel_pagerduty.go
@@ -13,7 +13,7 @@ import (
 )
 
 func resourceSysdigSecureNotificationChannelPagerduty() *schema.Resource {
-	timeout := 30 * time.Second
+	timeout := 5 * time.Minute
 
 	return &schema.Resource{
 		CreateContext: resourceSysdigSecureNotificationChannelPagerdutyCreate,
diff --git a/sysdig/resource_sysdig_secure_notification_channel_slack.go b/sysdig/resource_sysdig_secure_notification_channel_slack.go
@@ -13,7 +13,7 @@ import (
 )
 
 func resourceSysdigSecureNotificationChannelSlack() *schema.Resource {
-	timeout := 30 * time.Second
+	timeout := 5 * time.Minute
 
 	return &schema.Resource{
 		CreateContext: resourceSysdigSecureNotificationChannelSlackCreate,
diff --git a/sysdig/resource_sysdig_secure_notification_channel_sns.go b/sysdig/resource_sysdig_secure_notification_channel_sns.go
@@ -14,7 +14,7 @@ import (
 )
 
 func resourceSysdigSecureNotificationChannelSNS() *schema.Resource {
-	timeout := 30 * time.Second
+	timeout := 5 * time.Minute
 
 	return &schema.Resource{
 		CreateContext: resourceSysdigSecureNotificationChannelSNSCreate,
diff --git a/sysdig/resource_sysdig_secure_notification_channel_victorops.go b/sysdig/resource_sysdig_secure_notification_channel_victorops.go
@@ -13,7 +13,7 @@ import (
 )
 
 func resourceSysdigSecureNotificationChannelVictorOps() *schema.Resource {
-	timeout := 30 * time.Second
+	timeout := 5 * time.Minute
 
 	return &schema.Resource{
 		CreateContext: resourceSysdigSecureNotificationChannelVictorOpsCreate,
diff --git a/sysdig/resource_sysdig_secure_notification_channel_webhook.go b/sysdig/resource_sysdig_secure_notification_channel_webhook.go
@@ -13,7 +13,7 @@ import (
 )
 
 func resourceSysdigSecureNotificationChannelWebhook() *schema.Resource {
-	timeout := 30 * time.Second
+	timeout := 5 * time.Minute
 
 	return &schema.Resource{
 		CreateContext: resourceSysdigSecureNotificationChannelWebhookCreate,
diff --git a/sysdig/resource_sysdig_secure_policy.go b/sysdig/resource_sysdig_secure_policy.go
@@ -27,7 +27,7 @@ var matchActions = map[string]string{
 }
 
 func resourceSysdigSecurePolicy() *schema.Resource {
-	timeout := 30 * time.Second
+	timeout := 5 * time.Minute
 
 	return &schema.Resource{
 		CreateContext: resourceSysdigPolicyCreate,
@@ -54,6 +54,12 @@ func resourceSysdigSecurePolicy() *schema.Resource {
 				Type:     schema.TypeString,
 				Required: true,
 			},
+			"type": {
+				Type:             schema.TypeString,
+				Optional:         true,
+				Default:          "falco",
+				ValidateDiagFunc: validateDiagFunc(validation.StringInSlice([]string{"falco", "list_matching", "k8s_audit"}, false)),
+			},
 			"severity": {
 				Type:             schema.TypeInt,
 				Default:          4,
@@ -135,18 +141,56 @@ func resourceSysdigPolicyCreate(ctx context.Context, d *schema.ResourceData, met
 		return diag.FromErr(err)
 	}
 
-	d.SetId(strconv.Itoa(policy.ID))
-	d.Set("version", policy.Version)
+	policyToResourceData(&policy, d)
 
 	return nil
 }
 
+func policyToResourceData(policy *secure.Policy, d *schema.ResourceData) {
+	if policy.ID != 0 {
+		d.SetId(strconv.Itoa(policy.ID))
+	}
+
+	d.Set("name", policy.Name)
+	d.Set("description", policy.Description)
+	d.Set("scope", policy.Scope)
+	d.Set("enabled", policy.Enabled)
+	d.Set("version", policy.Version)
+	d.Set("severity", policy.Severity)
+
+	if policy.Type != "" {
+		d.Set("type", policy.Type)
+	} else {
+		d.Set("type", "falco")
+	}
+
+	actions := []map[string]interface{}{{}}
+	for _, action := range policy.Actions {
+		if action.Type != "POLICY_ACTION_CAPTURE" {
+			action := strings.Replace(action.Type, "POLICY_ACTION_", "", 1)
+			actions[0]["container"] = strings.ToLower(action)
+			d.Set("actions", actions)
+			//d.Set("actions.0.container", strings.ToLower(action))
+		} else {
+			actions[0]["capture"] = []map[string]interface{}{{
+				"seconds_after_event":  action.AfterEventNs / 1000000000,
+				"seconds_before_event": action.BeforeEventNs / 1000000000,
+			}}
+			d.Set("actions", actions)
+		}
+	}
+
+	d.Set("notification_channels", policy.NotificationChannelIds)
+	d.Set("rule_names", policy.RuleNames)
+}
+
 func policyFromResourceData(d *schema.ResourceData) secure.Policy {
 	policy := secure.Policy{
 		Name:        d.Get("name").(string),
 		Description: d.Get("description").(string),
 		Severity:    d.Get("severity").(int),
 		Enabled:     d.Get("enabled").(bool),
+		Type:        d.Get("type").(string),
 	}
 
 	scope := d.Get("scope").(string)
@@ -211,33 +255,10 @@ func resourceSysdigPolicyRead(ctx context.Context, d *schema.ResourceData, meta
 
 	if err != nil {
 		d.SetId("")
+		return diag.FromErr(err)
 	}
 
-	d.Set("name", policy.Name)
-	d.Set("description", policy.Description)
-	d.Set("scope", policy.Scope)
-	d.Set("enabled", policy.Enabled)
-	d.Set("version", policy.Version)
-	d.Set("severity", policy.Severity)
-
-	actions := []map[string]interface{}{{}}
-	for _, action := range policy.Actions {
-		if action.Type != "POLICY_ACTION_CAPTURE" {
-			action := strings.Replace(action.Type, "POLICY_ACTION_", "", 1)
-			actions[0]["container"] = strings.ToLower(action)
-			d.Set("actions", actions)
-			//d.Set("actions.0.container", strings.ToLower(action))
-		} else {
-			actions[0]["capture"] = []map[string]interface{}{{
-				"seconds_after_event":  action.AfterEventNs / 1000000000,
-				"seconds_before_event": action.BeforeEventNs / 1000000000,
-			}}
-			d.Set("actions", actions)
-		}
-	}
-
-	d.Set("notification_channels", policy.NotificationChannelIds)
-	d.Set("rule_names", policy.RuleNames)
+	policyToResourceData(&policy, d)
 
 	return nil
 }
@@ -254,6 +275,7 @@ func resourceSysdigPolicyDelete(ctx context.Context, d *schema.ResourceData, met
 	if err != nil {
 		return diag.FromErr(err)
 	}
+
 	return nil
 }
 
diff --git a/sysdig/resource_sysdig_secure_rule_filesystem.go b/sysdig/resource_sysdig_secure_rule_filesystem.go
@@ -13,7 +13,7 @@ import (
 )
 
 func resourceSysdigSecureRuleFilesystem() *schema.Resource {
-	timeout := 30 * time.Second
+	timeout := 5 * time.Minute
 
 	return &schema.Resource{
 		CreateContext: resourceSysdigRuleFilesystemCreate,
diff --git a/sysdig/resource_sysdig_secure_rule_network.go b/sysdig/resource_sysdig_secure_rule_network.go
@@ -13,7 +13,7 @@ import (
 )
 
 func resourceSysdigSecureRuleNetwork() *schema.Resource {
-	timeout := 30 * time.Second
+	timeout := 5 * time.Minute
 
 	return &schema.Resource{
 		CreateContext: resourceSysdigRuleNetworkCreate,
diff --git a/sysdig/resource_sysdig_secure_team.go b/sysdig/resource_sysdig_secure_team.go
@@ -13,7 +13,7 @@ import (
 )
 
 func resourceSysdigSecureTeam() *schema.Resource {
-	timeout := 30 * time.Second
+	timeout := 5 * time.Minute
 
 	return &schema.Resource{
 		CreateContext: resourceSysdigSecureTeamCreate,
diff --git a/sysdig/resource_sysdig_secure_vulnerability_exception.go b/sysdig/resource_sysdig_secure_vulnerability_exception.go
@@ -13,7 +13,7 @@ import (
 )
 
 func resourceSysdigSecureVulnerabilityException() *schema.Resource {
-	timeout := 30 * time.Second
+	timeout := 5 * time.Minute
 
 	return &schema.Resource{
 		CreateContext: resourceSysdigVulnerabilityExceptionCreate,
diff --git a/sysdig/resource_sysdig_secure_vulnerability_exception_list.go b/sysdig/resource_sysdig_secure_vulnerability_exception_list.go
@@ -11,7 +11,7 @@ import (
 )
 
 func resourceSysdigSecureVulnerabilityExceptionList() *schema.Resource {
-	timeout := 30 * time.Second
+	timeout := 5 * time.Minute
 
 	return &schema.Resource{
 		CreateContext: resourceSysdigVulnerabilityExceptionListCreate,
diff --git a/sysdig/resource_sysdig_user.go b/sysdig/resource_sysdig_user.go

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import (`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`func dataSourceSysdigCurrentUser() *schema.Resource {`
`13`		`- timeout := 30 * time.Second`
	`13`	`+ timeout := 5 * time.Minute`
`14`	`14`
`15`	`15`	`return &schema.Resource{`
`16`	`16`	`ReadContext: dataSourceSysdigCurrentUserRead,`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ const (`
`22`	`22`	`)`
`23`	`23`
`24`	`24`	`func dataSourceSysdigSecureNotificationChannel() *schema.Resource {`
`25`		`- timeout := 30 * time.Second`
	`25`	`+ timeout := 5 * time.Minute`
`26`	`26`
`27`	`27`	`return &schema.Resource{`
`28`	`28`	`ReadContext: dataSourceSysdigNotificationChannelRead,`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ type Policy struct {`
`19`	`19`	Scope string `json:"scope,omitempty"`
`20`	`20`	Version int `json:"version,omitempty"`
`21`	`21`	NotificationChannelIds []int `json:"notificationChannelIds"`
	`22`	+ Type string `json:"type"`
`22`	`23`	`}`
`23`	`24`
`24`	`25`	`type Action struct {`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import (`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`func resourceSysdigMonitorAlertAnomaly() *schema.Resource {`
`15`		`- timeout := 30 * time.Second`
	`15`	`+ timeout := 5 * time.Minute`
`16`	`16`
`17`	`17`	`return &schema.Resource{`
`18`	`18`	`CreateContext: resourceSysdigAlertAnomalyCreate,`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ import (`
`14`	`14`	`)`
`15`	`15`
`16`	`16`	`func resourceSysdigMonitorAlertDowntime() *schema.Resource {`
`17`		`- timeout := 30 * time.Second`
	`17`	`+ timeout := 5 * time.Minute`
`18`	`18`
`19`	`19`	`return &schema.Resource{`
`20`	`20`	`CreateContext: resourceSysdigAlertDowntimeCreate,`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ import (`
`16`	`16`	`)`
`17`	`17`
`18`	`18`	`func resourceSysdigMonitorDashboard() *schema.Resource {`
`19`		`- timeout := 30 * time.Second`
	`19`	`+ timeout := 5 * time.Minute`
`20`	`20`
`21`	`21`	`return &schema.Resource{`
`22`	`22`	`CreateContext: resourceSysdigDashboardCreate,`