refactor: autofix by golangci-lint

Author: EtienneM

CHANGELOG.md

@@ -6,7 +6,7 @@
 * build(deps): update `github.com/golang-jwt/jwt` from v4 to v5
 * refactor: replace `errgo` with `github.com/Scalingo/go-utils/errors/v3` (breaking change)
 * feat(logs): `LogsURL` returns a parsed structure (breaking change)
-* refactor: autofix by `go fix`
+* refactor: autofix by `go fix` and `golangci-lint`
 
 ## 9.2.0
 

alerts_test.go

@@ -1,7 +1,6 @@
 package scalingo
 
 import (
-	"context"
 	"encoding/json"
 	"net/http"
 	"net/http/httptest"
@@ -13,7 +12,7 @@ import (
 )
 
 func TestAlertsClient(t *testing.T) {
-	ctx := context.Background()
+	ctx := t.Context()
 	const appName = "my-app"
 	alertID := "my-id"
 

apps_test.go

@@ -2,7 +2,6 @@ package scalingo
 
 import (
 	"bytes"
-	"context"
 	"encoding/json"
 	"net/http"
 	"net/http/httptest"
@@ -14,7 +13,7 @@ import (
 )
 
 func TestAppsClient_Update(t *testing.T) {
-	ctx := context.Background()
+	ctx := t.Context()
 	const appName = "my-app"
 
 	runs := map[string]struct {

cron_tasks_test.go

@@ -1,7 +1,6 @@
 package scalingo
 
 import (
-	"context"
 	"encoding/json"
 	"net/http"
 	"net/http/httptest"
@@ -13,7 +12,7 @@ import (
 )
 
 func TestCronTasksClient_CronTasksGet(t *testing.T) {
-	ctx := context.Background()
+	ctx := t.Context()
 	const appName = "my-app"
 
 	tests := []struct {

domains_test.go

@@ -2,7 +2,6 @@ package scalingo
 
 import (
 	"bytes"
-	"context"
 	"encoding/json"
 	"net/http"
 	"net/http/httptest"
@@ -14,7 +13,7 @@ import (
 )
 
 func TestDomainsClient_Domain_Updates(t *testing.T) {
-	ctx := context.Background()
+	ctx := t.Context()
 	appName := "my-app"
 	domainID := "domain-id"
 

events_account.go

@@ -4,6 +4,7 @@ import "fmt"
 
 type EventLoginSuccessType struct {
 	Event
+
 	TypeData EventLoginSuccessTypeData `json:"type_data"`
 }
 type EventLoginSuccessTypeData EventSecurityTypeData
@@ -14,6 +15,7 @@ func (ev *EventLoginSuccessType) String() string {
 
 type EventLoginFailureType struct {
 	Event
+
 	TypeData EventLoginFailureTypeData `json:"type_data"`
 }
 type EventLoginFailureTypeData EventSecurityTypeData
@@ -24,6 +26,7 @@ func (ev *EventLoginFailureType) String() string {
 
 type EventLoginLockType struct {
 	Event
+
 	TypeData EventLoginLockTypeData `json:"type_data"`
 }
 type EventLoginLockTypeData EventSecurityTypeData
@@ -34,6 +37,7 @@ func (ev *EventLoginLockType) String() string {
 
 type EventLoginUnlockSuccessType struct {
 	Event
+
 	TypeData EventLoginUnlockSuccessTypeData `json:"type_data"`
 }
 type EventLoginUnlockSuccessTypeData EventSecurityTypeData
@@ -44,6 +48,7 @@ func (ev *EventLoginUnlockSuccessType) String() string {
 
 type EventPasswordResetQueryType struct {
 	Event
+
 	TypeData EventPasswordResetQueryTypeData `json:"type_data"`
 }
 type EventPasswordResetQueryTypeData EventSecurityTypeData
@@ -54,6 +59,7 @@ func (ev *EventPasswordResetQueryType) String() string {
 
 type EventPasswordResetSuccessType struct {
 	Event
+
 	TypeData EventPasswordResetSuccessTypeData `json:"type_data"`
 }
 type EventPasswordResetSuccessTypeData EventSecurityTypeData

events_addon.go

@@ -17,6 +17,7 @@ type EventNewAddonTypeData struct {
 
 type EventNewAddonType struct {
 	Event
+
 	TypeData EventNewAddonTypeData `json:"type_data"`
 }
 
@@ -29,12 +30,14 @@ func (ev *EventNewAddonType) String() string {
 
 type EventUpgradeAddonTypeData struct {
 	EventAddon
+
 	OldPlanName string `json:"old_plan_name"`
 	NewPlanName string `json:"new_plan_name"`
 }
 
 type EventUpgradeAddonType struct {
 	Event
+
 	TypeData EventUpgradeAddonTypeData `json:"type_data"`
 }
 
@@ -60,6 +63,7 @@ type EventAddonUpdatedTypeData struct {
 
 type EventAddonUpdatedType struct {
 	Event
+
 	TypeData EventAddonUpdatedTypeData `json:"type_data"`
 }
 
@@ -77,6 +81,7 @@ type EventDeleteAddonTypeData struct {
 
 type EventDeleteAddonType struct {
 	Event
+
 	TypeData EventDeleteAddonTypeData `json:"type_data"`
 }
 
@@ -93,6 +98,7 @@ type EventResumeAddonTypeData struct {
 
 type EventResumeAddonType struct {
 	Event
+
 	TypeData EventResumeAddonTypeData `json:"type_data"`
 }
 
@@ -105,11 +111,13 @@ func (ev *EventResumeAddonType) String() string {
 
 type EventSuspendAddonTypeData struct {
 	EventAddon
+
 	Reason string `json:"reason"`
 }
 
 type EventSuspendAddonType struct {
 	Event
+
 	TypeData EventSuspendAddonTypeData `json:"type_data"`
 }
 
@@ -122,6 +130,7 @@ func (ev *EventSuspendAddonType) String() string {
 
 type EventDatabaseAddFeatureType struct {
 	Event
+
 	TypeData EventDatabaseAddFeatureTypeData `json:"type_data"`
 }
 
@@ -142,6 +151,7 @@ func (ev *EventDatabaseAddFeatureType) String() string {
 
 type EventDatabaseRemoveFeatureType struct {
 	Event
+
 	TypeData EventDatabaseRemoveFeatureTypeData `json:"type_data"`
 }
 
@@ -162,6 +172,7 @@ func (ev *EventDatabaseRemoveFeatureType) String() string {
 
 type EventDatabaseBackupSucceededType struct {
 	Event
+
 	TypeData EventDatabaseBackupSucceededTypeData `json:"type_data"`
 }
 
@@ -203,6 +214,7 @@ type EventDatabaseBackupSucceededTypeData struct {
 
 type EventDatabaseBackupFailedType struct {
 	Event
+
 	TypeData EventDatabaseBackupFailedTypeData `json:"type_data"`
 }
 

events_alert.go

@@ -17,6 +17,7 @@ type EventAlertTypeData struct {
 
 type EventAlertType struct {
 	Event
+
 	TypeData EventAlertTypeData `json:"type_data"`
 }
 
@@ -49,6 +50,7 @@ type EventNewAlertTypeData struct {
 
 type EventNewAlertType struct {
 	Event
+
 	TypeData EventNewAlertTypeData `json:"type_data"`
 }
 
@@ -64,6 +66,7 @@ type EventDeleteAlertTypeData struct {
 
 type EventDeleteAlertType struct {
 	Event
+
 	TypeData EventDeleteAlertTypeData `json:"type_data"`
 }
 

events_app.go

@@ -11,6 +11,7 @@ type EventNewAppTypeData struct {
 
 type EventNewAppType struct {
 	Event
+
 	TypeData EventNewAppTypeData `json:"type_data"`
 }
 
@@ -24,6 +25,7 @@ type EventEditAppTypeData struct {
 
 type EventEditAppType struct {
 	Event
+
 	TypeData EventEditAppTypeData `json:"type_data"`
 }
 
@@ -54,6 +56,7 @@ type EventRenameAppTypeData struct {
 
 type EventRenameAppType struct {
 	Event
+
 	TypeData EventRenameAppTypeData `json:"type_data"`
 }
 
@@ -73,6 +76,7 @@ type EventUpdateAppProjectTypeData struct {
 
 type EventUpdateAppProjectType struct {
 	Event
+
 	TypeData EventUpdateAppProjectTypeData `json:"type_data"`
 }
 
@@ -90,6 +94,7 @@ type EventTransferAppTypeData struct {
 
 type EventTransferAppType struct {
 	Event
+
 	TypeData EventTransferAppTypeData `json:"type_data"`
 }
 
@@ -107,6 +112,7 @@ type EventRestartTypeData struct {
 
 type EventRestartType struct {
 	Event
+
 	TypeData EventRestartTypeData `json:"type_data"`
 }
 
@@ -119,7 +125,7 @@ func (ev *EventRestartType) String() string {
 
 func (ev *EventRestartType) Who() string {
 	if ev.TypeData.AddonName != "" {
-		return fmt.Sprintf("Addon %s", ev.TypeData.AddonName)
+		return "Addon " + ev.TypeData.AddonName
 	}
 	return ev.Event.Who()
 }
@@ -130,6 +136,7 @@ type EventStopAppTypeData struct {
 
 type EventStopAppType struct {
 	Event
+
 	TypeData EventStopAppTypeData `json:"type_data"`
 }
 
@@ -152,6 +159,7 @@ type EventScaleTypeData struct {
 
 type EventScaleType struct {
 	Event
+
 	TypeData EventScaleTypeData `json:"type_data"`
 }
 
@@ -171,6 +179,7 @@ type EventCrashTypeData struct {
 
 type EventCrashType struct {
 	Event
+
 	TypeData EventCrashTypeData `json:"type_data"`
 }
 
@@ -192,6 +201,7 @@ type EventRepeatedCrashTypeData struct {
 
 type EventRepeatedCrashType struct {
 	Event
+
 	TypeData EventRepeatedCrashTypeData `json:"type_data"`
 }
 
@@ -216,6 +226,7 @@ type EventDeploymentTypeData struct {
 
 type EventDeploymentType struct {
 	Event
+
 	TypeData EventDeploymentTypeData `json:"type_data"`
 }
 

events_billing.go

@@ -8,6 +8,7 @@ import (
 
 type EventAddCreditType struct {
 	Event
+
 	TypeData EventAddCreditTypeData `json:"type_data"`
 }
 
@@ -24,16 +25,17 @@ type EventAddCreditTypeData struct {
 
 type EventAddPaymentMethodType struct {
 	Event
+
 	TypeData EventAddPaymentMethodTypeData `json:"type_data"`
 }
 
 func (ev *EventAddPaymentMethodType) String() string {
-	if ev.TypeData.Profile.PaymentMethodType == billing.Stripe {
-		p := ev.TypeData.Profile.Stripe
+	if ev.TypeData.PaymentMethodType == billing.Stripe {
+		p := ev.TypeData.Stripe
 		return fmt.Sprintf("%s card ending with ...%s, expiring in %s", p.Brand, p.Last4, p.Exp)
 	}
 
-	return fmt.Sprintf("'%s' payment method added", ev.TypeData.Profile.PaymentMethodType)
+	return fmt.Sprintf("'%s' payment method added", ev.TypeData.PaymentMethodType)
 }
 
 type EventAddPaymentMethodTypeData struct {
@@ -42,6 +44,7 @@ type EventAddPaymentMethodTypeData struct {
 
 type EventAddVoucherType struct {
 	Event
+
 	TypeData EventAddVoucherTypeData `json:"type_data"`
 }