refactor(notificationchannels): refactor secure notification channels to use v2 client (#309)

* refactor(notificationchannels): refactor secure notification channels to v2 client

* refactor(notificationchannels): remove unused code from secure models

Author: filiptubic

sysdig/data_source_sysdig_secure_notification_channel.go

@@ -106,7 +106,7 @@ func dataSourceSysdigSecureNotificationChannel() *schema.Resource {
 
 // Retrieves the information of a resource form the file and loads it in Terraform
 func dataSourceSysdigNotificationChannelRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
-	client, err := meta.(SysdigClients).sysdigSecureClient()
+	client, err := getSecureNotificationChannelClient(meta.(SysdigClients))
 	if err != nil {
 		return diag.FromErr(err)
 	}

sysdig/internal/client/secure/client.go

@@ -22,12 +22,6 @@ type SysdigSecureClient interface {
 	UpdateRule(context.Context, Rule) (Rule, error)
 	DeleteRule(context.Context, int) error
 
-	CreateNotificationChannel(context.Context, NotificationChannel) (NotificationChannel, error)
-	GetNotificationChannelById(context.Context, int) (NotificationChannel, error)
-	GetNotificationChannelByName(context.Context, string) (NotificationChannel, error)
-	DeleteNotificationChannel(context.Context, int) error
-	UpdateNotificationChannel(context.Context, NotificationChannel) (NotificationChannel, error)
-
 	CreateList(context.Context, List) (List, error)
 	GetListById(context.Context, int) (List, error)
 	DeleteList(context.Context, int) error

sysdig/internal/client/secure/models.go

@@ -42,84 +42,6 @@ func PolicyFromJSON(body []byte) (result Policy) {
 	return result
 }
 
-// -------- User Rules File --------
-
-type UserRulesFile struct {
-	Content string `json:"content"`
-	Version int    `json:"version"`
-}
-
-type userRulesFileWrapper struct {
-	UserRulesFile UserRulesFile `json:"userRulesFile"`
-}
-
-func (userRulesFile *UserRulesFile) ToJSON() io.Reader {
-	payload, _ := json.Marshal(userRulesFileWrapper{*userRulesFile})
-	return bytes.NewBuffer(payload)
-}
-
-func UserRulesFileFromJSON(body []byte) UserRulesFile {
-	var result userRulesFileWrapper
-	_ = json.Unmarshal(body, &result)
-
-	return result.UserRulesFile
-}
-
-// -------- Notification Channels --------
-
-type NotificationChannelOptions struct {
-	EmailRecipients []string `json:"emailRecipients,omitempty"` // Type: email
-	SnsTopicARNs    []string `json:"snsTopicARNs,omitempty"`    // Type: SNS
-	APIKey          string   `json:"apiKey,omitempty"`          // Type: VictorOps, OpsGenie
-	RoutingKey      string   `json:"routingKey,omitempty"`      // Type: VictorOps
-	Url             string   `json:"url,omitempty"`             // Type: OpsGenie, Webhook and Slack
-	Channel         string   `json:"channel,omitempty"`         // Type: Slack
-	Account         string   `json:"account,omitempty"`         // Type: PagerDuty
-	ServiceKey      string   `json:"serviceKey,omitempty"`      // Type: PagerDuty
-	ServiceName     string   `json:"serviceName,omitempty"`     // Type: PagerDuty
-	Region          string   `json:"region,omitempty"`          // Type: OpsGenie
-
-	NotifyOnOk           bool `json:"notifyOnOk"`
-	NotifyOnResolve      bool `json:"notifyOnResolve"`
-	SendTestNotification bool `json:"sendTestNotification"`
-}
-
-type NotificationChannel struct {
-	ID      int                        `json:"id,omitempty"`
-	Version int                        `json:"version,omitempty"`
-	Type    string                     `json:"type"`
-	Name    string                     `json:"name"`
-	Enabled bool                       `json:"enabled"`
-	Options NotificationChannelOptions `json:"options"`
-}
-
-func (n *NotificationChannel) ToJSON() io.Reader {
-	payload, _ := json.Marshal(notificationChannelWrapper{*n})
-	return bytes.NewBuffer(payload)
-}
-
-func NotificationChannelFromJSON(body []byte) NotificationChannel {
-	var result notificationChannelWrapper
-	_ = json.Unmarshal(body, &result)
-
-	return result.NotificationChannel
-}
-
-func NotificationChannelListFromJSON(body []byte) []NotificationChannel {
-	var result notificationChannelListWrapper
-	_ = json.Unmarshal(body, &result)
-
-	return result.NotificationChannels
-}
-
-type notificationChannelListWrapper struct {
-	NotificationChannels []NotificationChannel `json:"notificationChannels"`
-}
-
-type notificationChannelWrapper struct {
-	NotificationChannel NotificationChannel `json:"notificationChannel"`
-}
-
 // -------- Rules --------
 
 type Rule struct {
@@ -265,61 +187,6 @@ func MacroFromJSON(body []byte) (macro Macro, err error) {
 	return
 }
 
-// -------- Team --------
-type Team struct {
-	ID                  int         `json:"id,omitempty"`
-	Version             int         `json:"version,omitempty"`
-	Theme               string      `json:"theme"`
-	Name                string      `json:"name"`
-	Description         string      `json:"description"`
-	ScopeBy             string      `json:"show"`
-	Filter              string      `json:"filter"`
-	CanUseSysdigCapture bool        `json:"canUseSysdigCapture"`
-	UserRoles           []UserRoles `json:"userRoles,omitempty"`
-	DefaultTeam         bool        `json:"default"`
-	Products            []string    `json:"products"`
-}
-
-type UserRoles struct {
-	UserId int    `json:"userId"`
-	Email  string `json:"userName,omitempty"`
-	Role   string `json:"role"`
-	Admin  bool   `json:"admin,omitempty"`
-}
-
-func (t *Team) ToJSON() io.Reader {
-	payload, _ := json.Marshal(*t)
-	return bytes.NewBuffer(payload)
-}
-
-func TeamFromJSON(body []byte) Team {
-	var result teamWrapper
-	_ = json.Unmarshal(body, &result)
-
-	return result.Team
-}
-
-type teamWrapper struct {
-	Team Team `json:"team"`
-}
-
-// -------- UsersList --------
-type UsersList struct {
-	ID    int    `json:"id"`
-	Email string `json:"username"`
-}
-
-func UsersListFromJSON(body []byte) []UsersList {
-	var result usersListWrapper
-	_ = json.Unmarshal(body, &result)
-
-	return result.UsersList
-}
-
-type usersListWrapper struct {
-	UsersList []UsersList `json:"users"`
-}
-
 // -------- VulnerabilityExceptionList --------
 
 type VulnerabilityExceptionList struct {
@@ -389,35 +256,6 @@ func CloudAccountFromJSON(body []byte) *CloudAccount {
 	return &result
 }
 
-// -------- BenchmarkTask --------
-
-var SupportedBenchmarkTaskSchemas = []string{
-	"aws_foundations_bench-1.3.0",
-	"gcp_foundations_bench-1.2.0",
-	"azure_foundations_bench-1.3.0",
-}
-
-type BenchmarkTask struct {
-	ID       int    `json:"id,omitempty"`
-	Name     string `json:"name"`
-	Schema   string `json:"schema"`
-	Scope    string `json:"scope"`
-	Schedule string `json:"schedule"`
-	Enabled  bool   `json:"enabled"`
-}
-
-func (t *BenchmarkTask) ToJSON() io.Reader {
-	payload, _ := json.Marshal(*t)
-	return bytes.NewBuffer(payload)
-}
-
-func BenchmarkTaskFromJSON(body []byte) *BenchmarkTask {
-	var result BenchmarkTask
-	_ = json.Unmarshal(body, &result)
-
-	return &result
-}
-
 // -------- Scanning Policies --------
 type ScanningPolicy struct {
 	ID             string         `json:"id,omitempty"`

sysdig/internal/client/secure/notification_channels.go

@@ -1,9 +1,8 @@
 package sysdig
 
 import (
+	v2 "github.com/draios/terraform-provider-sysdig/sysdig/internal/client/v2"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-
-	"github.com/draios/terraform-provider-sysdig/sysdig/internal/client/secure"
 )
 
 func createSecureNotificationChannelSchema(original map[string]*schema.Schema) map[string]*schema.Schema {
@@ -42,11 +41,11 @@ func createSecureNotificationChannelSchema(original map[string]*schema.Schema) m
 	return notificationChannelSchema
 }
 
-func secureNotificationChannelFromResourceData(d *schema.ResourceData) (nc secure.NotificationChannel, err error) {
-	nc = secure.NotificationChannel{
+func secureNotificationChannelFromResourceData(d *schema.ResourceData) (nc v2.NotificationChannel, err error) {
+	nc = v2.NotificationChannel{
 		Name:    d.Get("name").(string),
 		Enabled: d.Get("enabled").(bool),
-		Options: secure.NotificationChannelOptions{
+		Options: v2.NotificationChannelOptions{
 			NotifyOnOk:           d.Get("notify_when_ok").(bool),
 			NotifyOnResolve:      d.Get("notify_when_resolved").(bool),
 			SendTestNotification: d.Get("send_test_notification").(bool),
@@ -55,7 +54,7 @@ func secureNotificationChannelFromResourceData(d *schema.ResourceData) (nc secur
 	return
 }
 
-func secureNotificationChannelToResourceData(nc *secure.NotificationChannel, data *schema.ResourceData) (err error) {
+func secureNotificationChannelToResourceData(nc *v2.NotificationChannel, data *schema.ResourceData) (err error) {
 	_ = data.Set("version", nc.Version)
 	_ = data.Set("name", nc.Name)
 	_ = data.Set("enabled", nc.Enabled)
@@ -65,3 +64,7 @@ func secureNotificationChannelToResourceData(nc *secure.NotificationChannel, dat
 
 	return
 }
+
+func getSecureNotificationChannelClient(c SysdigClients) (v2.NotificationChannelInterface, error) {
+	return c.sysdigSecureClientV2()
+}