fix lint

Author: piotrek-janus

internal/cac/client/errors.go

@@ -3,26 +3,26 @@ package client
 import (
 	"reflect"
 
-	"github.com/cloudentity/acp-client-go/clients/hub/client/workspace_configuration"
 	"github.com/go-openapi/runtime"
 	"golang.org/x/exp/slog"
 )
 
 func logErr(err error) {
-	switch e := err.(type) {
-	case *runtime.APIError:
+	if e, ok := err.(*runtime.APIError); ok {
 		traceID := ""
 		resp, ok := e.Response.(runtime.ClientResponse)
 		if ok {
 			traceID = resp.GetHeader("X-Trace-ID")
 		}
 		slog.Error("Request failed", "code", e.Code, "trace.id", traceID)
-	case *workspace_configuration.PatchWorkspaceConfigRfc7396UnprocessableEntity:
-	case *workspace_configuration.PatchWorkspaceConfigRfc6902BadRequest:
-	case *workspace_configuration.ImportWorkspaceConfigBadRequest:
-	case *workspace_configuration.ImportWorkspaceConfigUnprocessableEntity:
-		slog.Error("Request failed", "code", e.Code, "message", e.Payload.Error)
-	default:
+	} else if e, ok := err.(errr); ok{
+		slog.Error("Request failed", "code", e.Code(), "message", e.Error())
+	} else {
 		slog.Error("Request failed", "error", reflect.TypeOf(err), "message", err.Error())
 	}
+}
+
+type errr interface {
+	Error() string
+	Code() int
 }

internal/cac/client/secrets_client.go

@@ -78,7 +78,7 @@ func (s *SecretsClient) Update(ctx context.Context, wid string, payload models.S
 
 func (s *SecretsClient) UpdateAll(ctx context.Context, wid string, payload []models.Secret) error {
 	return s.patchAll(ctx, wid, payload, func(dest *models.Secret, source models.Secret) error {
-		dest = &source 
+		*dest = source 
 		return nil
 	})
 }

internal/cac/client/tenant_client.go

@@ -48,7 +48,7 @@ func (t *TenantClient) Read(ctx context.Context, opts ...api.SourceOpt) (api.Pat
 	}
 
 	if options.Secrets {
-		for id, _ := range ok.Payload.Servers {
+		for id := range ok.Payload.Servers {
 			var secrets map[string]*smodels.Secret
 
 			slog.Info("Pulling all server secrets", "server", id)

internal/cac/logging/logging.go

@@ -1,6 +1,7 @@
 package logging
 
 import (
+	"context"
 	"os"
 	"strings"
 
@@ -59,5 +60,5 @@ func InitLogging(config *Configuration) (err error) {
 }
 
 func Trace(msg string, args... any) {
-	slog.Log(nil, LevelTrace, msg, args...)
+	slog.Log(context.TODO(), LevelTrace, msg, args...)
 }

internal/cac/storage/dry.go

@@ -23,19 +23,7 @@ func InitDryStorage(out string, constr Constructor) (*DryStorage, error) {
 
 	if out == "-" {
 		logging.Trace("Writing to stdout")
-		delegatedWriter = func(ctx context.Context, data api.Patch, opts ...api.SourceOpt) error {
-			var (
-				bts []byte
-				err error
-			)
-
-			if bts, err = utils.ToYaml(data); err != nil {
-				return err
-			}
-
-			_, err = os.Stdout.Write(bts)
-			return err
-		}
+		delegatedWriter = stdWriter
 	} else if out != "" {
 		var (
 			file *os.File
@@ -46,6 +34,8 @@ func InitDryStorage(out string, constr Constructor) (*DryStorage, error) {
 			return nil, err
 		} else if err == nil {
 			// file already exists
+
+			//nolint:errcheck
 			defer file.Close()
 
 			if info, err = file.Stat(); err != nil {
@@ -85,7 +75,7 @@ func (d *DryStorage) Read(ctx context.Context, opts ...api.SourceOpt) (api.Patch
 	panic("read operation is not implemented for dry storage")
 }
 
-var stdWriter = func(ctx context.Context, data *api.PatchImpl[any], opts ...api.SourceOpt) error {
+var stdWriter = func(ctx context.Context, data api.Patch, opts ...api.SourceOpt) error {
 	var (
 		bts []byte
 		err error

internal/cac/storage/secrets_test.go

@@ -83,7 +83,8 @@ func TestReadingSecrets(t *testing.T) {
 
 	require.NoError(t, err)
 
-	os.MkdirAll(tmpDir+"/workspaces/demo/secrets", 0755)
+	err = os.MkdirAll(tmpDir+"/workspaces/demo/secrets", 0755)
+	require.NoError(t, err)
 
 	err = os.WriteFile(tmpDir+"/workspaces/demo/secrets/Some_secret.yaml", yml, 0644)
 	require.NoError(t, err)

internal/cac/storage/writer.go

@@ -137,6 +137,7 @@ func RawWriter(dirPath string) (Writer[[]byte], error) {
 			return errors.Wrapf(err, "failed to create file %s", filepath.Join(dirPath, name))
 		}
 
+		//nolint:errcheck
 		defer file.Close()
 
 		if _, err = file.Write(bts); err != nil {

internal/cac/templates/functions.go

@@ -62,7 +62,7 @@ func env(key string) (any, error) {
 
 func nindent(spaces int, v string) string {
 	pad := strings.Repeat(" ", spaces)
-	return "|-\n" + pad + strings.Replace(v, "\n", "\n"+pad, -1)
+	return "|-\n" + pad + strings.ReplaceAll(v, "\n", "\n"+pad)
 }