lint: execute pre-commit hooks

Author: tembleking

sysdig/data_source_sysdig_fargate_ECS_test.go

@@ -42,14 +42,12 @@ func sortAndCompare(t *testing.T, expected []byte, actual []byte) {
 // getKiltRecipe returns the default json Kilt recipe
 func getKiltRecipe(t *testing.T) string {
 	recipeConfig := KiltRecipeConfig{
-		SysdigAccessKey:  "sysdig_access_key",
-		AgentImage:       "workload_agent_image",
-		OrchestratorHost: "orchestrator_host",
-		OrchestratorPort: "orchestrator_port",
-		CollectorHost:    "collector_host",
-		CollectorPort:    "collector_port",
-		SysdigLogging:    "sysdig_logging",
-		Priority:         "priority",
+		SysdigAccessKey: "sysdig_access_key",
+		AgentImage:      "workload_agent_image",
+		CollectorHost:   "collector_host",
+		CollectorPort:   "collector_port",
+		SysdigLogging:   "sysdig_logging",
+		Priority:        "priority",
 	}
 
 	jsonRecipeConfig, err := json.Marshal(&recipeConfig)

sysdig/data_source_sysdig_fargate_workload_agent.go

@@ -346,13 +346,13 @@ func patchFargateTaskDefinition(ctx context.Context, containerDefinitions string
 }
 
 type KiltRecipeConfig struct {
-	SysdigAccessKey  string `json:"sysdig_access_key"`
-	AgentImage       string `json:"agent_image"`
-	CollectorHost    string `json:"collector_host"`
-	CollectorPort    string `json:"collector_port"`
-	SysdigLogging    string `json:"sysdig_logging"`
-	Sidecar          string `json:"sidecar"`
-	Priority         string `json:"priority"`
+	SysdigAccessKey string `json:"sysdig_access_key"`
+	AgentImage      string `json:"agent_image"`
+	CollectorHost   string `json:"collector_host"`
+	CollectorPort   string `json:"collector_port"`
+	SysdigLogging   string `json:"sysdig_logging"`
+	Sidecar         string `json:"sidecar"`
+	Priority        string `json:"priority"`
 }
 
 type patchOptions struct {
@@ -427,13 +427,13 @@ func dataSourceSysdigFargateWorkloadAgentRead(ctx context.Context, d *schema.Res
 	}
 
 	recipeConfig := KiltRecipeConfig{
-		SysdigAccessKey:  d.Get("sysdig_access_key").(string),
-		AgentImage:       d.Get("workload_agent_image").(string),
-		CollectorHost:    d.Get("collector_host").(string),
-		CollectorPort:    d.Get("collector_port").(string),
-		SysdigLogging:    d.Get("sysdig_logging").(string),
-		Sidecar:          d.Get("sidecar").(string),
-		Priority:         priority,
+		SysdigAccessKey: d.Get("sysdig_access_key").(string),
+		AgentImage:      d.Get("workload_agent_image").(string),
+		CollectorHost:   d.Get("collector_host").(string),
+		CollectorPort:   d.Get("collector_port").(string),
+		SysdigLogging:   d.Get("sysdig_logging").(string),
+		Sidecar:         d.Get("sidecar").(string),
+		Priority:        priority,
 	}
 
 	jsonConf, err := json.Marshal(&recipeConfig)

sysdig/internal/client/v2/users.go

@@ -152,7 +152,7 @@ func (c *Client) DeleteUser(ctx context.Context, id int) (err error) {
 func (c *Client) GetCurrentUser(ctx context.Context) (u *User, err error) {
 	response, err := c.requester.Request(ctx, http.MethodGet, c.getCurrentUserURL(), nil)
 	if err != nil {
-		return
+		return u, err
 	}
 	defer func() {
 		if dErr := response.Body.Close(); dErr != nil {
@@ -162,7 +162,7 @@ func (c *Client) GetCurrentUser(ctx context.Context) (u *User, err error) {
 
 	if response.StatusCode != http.StatusOK {
 		err = c.ErrorFromResponse(response)
-		return
+		return u, err
 	}
 
 	wrapper, err := Unmarshal[userWrapper](response.Body)

sysdig/resource_sysdig_monitor_alert_v2_prometheus.go

@@ -33,10 +33,10 @@ func resourceSysdigMonitorAlertV2Prometheus() *schema.Resource {
 
 		Schema: createAlertV2Schema(map[string]*schema.Schema{
 			"duration_seconds": {
-				Type:          schema.TypeInt,
-				Optional:      true,
-				Computed:      true, // computed if trigger_after_minutes is defined
-				ValidateFunc:  validation.IntAtLeast(0),
+				Type:         schema.TypeInt,
+				Optional:     true,
+				Computed:     true, // computed if trigger_after_minutes is defined
+				ValidateFunc: validation.IntAtLeast(0),
 			},
 			"query": {
 				Type:     schema.TypeString,
@@ -173,7 +173,7 @@ func buildAlertV2PrometheusStruct(d *schema.ResourceData) *v2.AlertV2Prometheus
 func updateAlertV2PrometheusState(d *schema.ResourceData, alert *v2.AlertV2Prometheus) (err error) {
 	err = updateAlertV2CommonState(d, &alert.AlertV2Common)
 	if err != nil {
-		return
+		return err
 	}
 
 	_ = d.Set("duration_seconds", alert.Config.Duration)
@@ -186,5 +186,5 @@ func updateAlertV2PrometheusState(d *schema.ResourceData, alert *v2.AlertV2Prome
 		_ = d.Set("keep_firing_for_minutes", nil)
 	}
 
-	return
+	return err
 }

sysdig/resource_sysdig_monitor_dashboard.go

@@ -428,7 +428,7 @@ func sharingFromResourceData(data *schema.ResourceData) (sharingSettings []*v2.S
 				Role: shareInfo["role"].(string),
 			})
 	}
-	return
+	return sharingSettings, err
 }
 
 func panelsFromResourceData(data *schema.ResourceData) (panels []*v2.Panels, err error) {
@@ -452,7 +452,7 @@ func panelsFromResourceData(data *schema.ResourceData) (panels []*v2.Panels, err
 
 		panels = append(panels, panel)
 	}
-	return
+	return panels, err
 }
 
 func defaultLegendConfiguration() *v2.LegendConfiguration {
@@ -726,7 +726,7 @@ func queriesFromResourceData(panelInfo map[string]any, panel *v2.Panels) (newQue
 
 		newQueries = append(newQueries, promqlQuery)
 	}
-	return
+	return newQueries, err
 }
 
 func dashboardToResourceData(dashboard *v2.Dashboard, data *schema.ResourceData) (err error) {

sysdig/resource_sysdig_monitor_notification_channel_common.go

@@ -66,7 +66,7 @@ func monitorNotificationChannelFromResourceData(d *schema.ResourceData, teamID i
 			SendTestNotification: d.Get("send_test_notification").(bool),
 		},
 	}
-	return
+	return nc, err
 }
 
 func monitorNotificationChannelToResourceData(nc *v2.NotificationChannel, data *schema.ResourceData) (err error) {
@@ -86,7 +86,7 @@ func monitorNotificationChannelToResourceData(nc *v2.NotificationChannel, data *
 	_ = data.Set("notify_when_resolved", nc.Options.NotifyOnResolve)
 	// do not update "send_test_notification" from the api response as it will always be "false" on subsequent reads because the fields is not persisted
 
-	return
+	return err
 }
 
 func getMonitorNotificationChannelClient(c SysdigClients) (v2.NotificationChannelInterface, error) {

sysdig/resource_sysdig_monitor_notification_channel_custom_webhook.go

@@ -156,7 +156,7 @@ func resourceSysdigMonitorNotificationChannelCustomWebhookDelete(ctx context.Con
 func monitorNotificationChannelCustomWebhookFromResourceData(d *schema.ResourceData, teamID int) (nc v2.NotificationChannel, err error) {
 	nc, err = monitorNotificationChannelFromResourceData(d, teamID)
 	if err != nil {
-		return
+		return nc, err
 	}
 
 	nc.Type = notificationChannelTypeCustomWebhook
@@ -166,13 +166,13 @@ func monitorNotificationChannelCustomWebhookFromResourceData(d *schema.ResourceD
 	nc.Options.AdditionalHeaders = d.Get("additional_headers").(map[string]any)
 	allowInsecureConnections := d.Get("allow_insecure_connections").(bool)
 	nc.Options.AllowInsecureConnections = &allowInsecureConnections
-	return
+	return nc, err
 }
 
 func monitorNotificationChannelCustomWebhookToResourceData(nc *v2.NotificationChannel, d *schema.ResourceData) (err error) {
 	err = monitorNotificationChannelToResourceData(nc, d)
 	if err != nil {
-		return
+		return err
 	}
 
 	_ = d.Set("url", nc.Options.URL)
@@ -183,5 +183,5 @@ func monitorNotificationChannelCustomWebhookToResourceData(nc *v2.NotificationCh
 		_ = d.Set("allow_insecure_connections", *nc.Options.AllowInsecureConnections)
 	}
 
-	return
+	return err
 }

sysdig/resource_sysdig_monitor_notification_channel_email.go

@@ -138,21 +138,21 @@ func resourceSysdigMonitorNotificationChannelEmailDelete(ctx context.Context, d
 func monitorNotificationChannelEmailFromResourceData(d *schema.ResourceData, teamID int) (nc v2.NotificationChannel, err error) {
 	nc, err = monitorNotificationChannelFromResourceData(d, teamID)
 	if err != nil {
-		return
+		return nc, err
 	}
 
 	nc.Type = notificationChannelTypeEmail
 	nc.Options.EmailRecipients = cast.ToStringSlice(d.Get("recipients").(*schema.Set).List())
-	return
+	return nc, err
 }
 
 func monitorNotificationChannelEmailToResourceData(nc *v2.NotificationChannel, d *schema.ResourceData) (err error) {
 	err = monitorNotificationChannelToResourceData(nc, d)
 	if err != nil {
-		return
+		return err
 	}
 
 	_ = d.Set("recipients", nc.Options.EmailRecipients)
 
-	return
+	return err
 }

sysdig/resource_sysdig_monitor_notification_channel_google_chat.go

@@ -145,21 +145,21 @@ func resourceSysdigMonitorNotificationChannelGoogleChatDelete(ctx context.Contex
 func monitorNotificationChannelGoogleChatFromResourceData(d *schema.ResourceData, teamID int) (nc v2.NotificationChannel, err error) {
 	nc, err = monitorNotificationChannelFromResourceData(d, teamID)
 	if err != nil {
-		return
+		return nc, err
 	}
 
 	nc.Type = notificationChannelTypeGChat
 	nc.Options.URL = d.Get("url").(string)
-	return
+	return nc, err
 }
 
 func monitorNotificationChannelGoogleChatToResourceData(nc *v2.NotificationChannel, d *schema.ResourceData) (err error) {
 	err = monitorNotificationChannelToResourceData(nc, d)
 	if err != nil {
-		return
+		return err
 	}
 
 	_ = d.Set("url", nc.Options.URL)
 
-	return
+	return err
 }

sysdig/resource_sysdig_monitor_notification_channel_ibm_event_notification.go

@@ -145,21 +145,21 @@ func resourceSysdigMonitorNotificationChannelIBMEventNotificationDelete(ctx cont
 func monitorNotificationChannelIBMEventNotificationFromResourceData(d *schema.ResourceData, teamID int) (nc v2.NotificationChannel, err error) {
 	nc, err = monitorNotificationChannelFromResourceData(d, teamID)
 	if err != nil {
-		return
+		return nc, err
 	}
 
 	nc.Type = notificationChannelTypeIBMEventNotification
 	nc.Options.InstanceID = d.Get("instance_id").(string)
-	return
+	return nc, err
 }
 
 func monitorNotificationChannelIBMEventNotificationToResourceData(nc *v2.NotificationChannel, d *schema.ResourceData) (err error) {
 	err = monitorNotificationChannelToResourceData(nc, d)
 	if err != nil {
-		return
+		return err
 	}
 
 	_ = d.Set("instance_id", nc.Options.InstanceID)
 
-	return
+	return err
 }