Fix auth0 and cli linting errors

Author: carabasdaniel

.golangci.yaml

@@ -28,6 +28,15 @@ linters:
     - wrapcheck
 
   settings:
+    ireturn:
+      allow:
+        - error
+        - empty
+        - generic
+        - proto.Message
+        - plugins.Plugin
+        - stdlib
+        - v3.ImporterClient
     gomoddirectives:
       replace-local: true
     lll:

cli/cmd/ds-load/main.go

@@ -13,18 +13,26 @@ import (
 	"github.com/aserto-dev/ds-load/sdk/common/kongyaml"
 )
 
+const errWritingToStdErr = 2
+
 func main() {
 	pluginEnum := ""
 
 	pluginFinder, err := plugin.NewHomeDirFinder(true)
 	if err != nil {
-		os.Stderr.WriteString(err.Error())
+		if _, err := os.Stderr.WriteString(err.Error()); err != nil {
+			os.Exit(errWritingToStdErr)
+		}
+
 		os.Exit(1)
 	}
 
 	plugins, err := pluginFinder.Find()
 	if err != nil {
-		os.Stderr.WriteString(err.Error())
+		if _, err := os.Stderr.WriteString(err.Error()); err != nil {
+			os.Exit(errWritingToStdErr)
+		}
+
 		os.Exit(1)
 	}
 

cli/pkg/app/cli.go

@@ -51,7 +51,9 @@ func (listPlugins *ListPluginsCmd) Run(c *cc.CommonCtx) error {
 	}
 
 	for _, p := range plugins {
-		os.Stdout.WriteString(p.Name + " " + p.Path + "\n")
+		if _, err := os.Stdout.WriteString(p.Name + " " + p.Path + "\n"); err != nil {
+			return err
+		}
 	}
 
 	return nil

cli/pkg/app/exec.go

@@ -155,7 +155,9 @@ func listenOnStderr(c *cc.CommonCtx, wg *sync.WaitGroup, stderr io.ReadCloser) {
 
 	for {
 		line, err := scanner.ReadBytes('\n')
-		os.Stderr.Write(line)
+		if _, err := os.Stderr.Write(line); err != nil {
+			c.Log.Fatal().Err(err).Send()
+		}
 
 		if len(line) > 0 {
 			gotError = true
@@ -169,7 +171,7 @@ func listenOnStderr(c *cc.CommonCtx, wg *sync.WaitGroup, stderr io.ReadCloser) {
 
 			break
 		} else if err != nil {
-			c.Log.Fatal().Err(err)
+			c.Log.Fatal().Err(err).Send()
 		}
 	}
 

cli/pkg/publish/publisher_v3.go

@@ -49,7 +49,7 @@ func (p *DirectoryPublisher) Publish(ctx context.Context, reader io.Reader) erro
 		var message msg.Transform
 
 		err := jsonReader.ReadProtoMessage(&message)
-		if err == io.EOF {
+		if errors.Is(err, io.EOF) {
 			break
 		}
 
@@ -91,23 +91,23 @@ func (p *DirectoryPublisher) publishMessages(ctx context.Context, message *msg.T
 
 	errGroup.Go(p.doneHandler(stream.Context()))
 
-	opCode := message.OpCode
+	opCode := message.GetOpCode()
 	if opCode == dsi3.Opcode_OPCODE_UNKNOWN {
 		opCode = dsi3.Opcode_OPCODE_SET
 	}
 
 	// import objects
-	for _, object := range message.Objects {
+	for _, object := range message.GetObjects() {
 		if err := validator.Object(object); err != nil {
-			fmt.Fprintf(os.Stderr, "validation failed, object: [%s] type [%s]\n", object.Id, object.Type)
+			fmt.Fprintf(os.Stderr, "validation failed, object: [%s] type [%s]\n", object.GetId(), object.GetType())
 			continue
 		}
 
-		if (opCode == dsi3.Opcode_OPCODE_DELETE || opCode == dsi3.Opcode_OPCODE_DELETE_WITH_RELATIONS) && object.Type == "group" {
+		if (opCode == dsi3.Opcode_OPCODE_DELETE || opCode == dsi3.Opcode_OPCODE_DELETE_WITH_RELATIONS) && object.GetType() == "group" {
 			continue
 		}
 
-		fmt.Fprintf(os.Stdout, "object: [%s] type [%s]\n", object.Id, object.Type)
+		fmt.Fprintf(os.Stdout, "object: [%s] type [%s]\n", object.GetId(), object.GetType())
 		sErr := stream.Send(&dsi3.ImportRequest{
 			Msg: &dsi3.ImportRequest_Object{
 				Object: object,
@@ -119,13 +119,14 @@ func (p *DirectoryPublisher) publishMessages(ctx context.Context, message *msg.T
 	}
 
 	// import relations
-	for _, relation := range message.Relations {
+	for _, relation := range message.GetRelations() {
 		if err := validator.Relation(relation); err != nil {
-			fmt.Fprintf(os.Stderr, "validation failed, relation: [%s] obj: [%s] subj [%s]\n", relation.Relation, relation.ObjectId, relation.SubjectId)
+			fmt.Fprintf(os.Stderr, "validation failed, relation: [%s] obj: [%s] subj [%s]\n",
+				relation.GetRelation(), relation.GetObjectId(), relation.GetSubjectId())
 			continue
 		}
 
-		fmt.Fprintf(os.Stdout, "relation: [%s] obj: [%s] subj [%s]\n", relation.Relation, relation.ObjectId, relation.SubjectId)
+		fmt.Fprintf(os.Stdout, "relation: [%s] obj: [%s] subj [%s]\n", relation.GetRelation(), relation.GetObjectId(), relation.GetSubjectId())
 		sErr := stream.Send(&dsi3.ImportRequest{
 			Msg: &dsi3.ImportRequest_Relation{
 				Relation: relation,
@@ -154,15 +155,15 @@ func (p *DirectoryPublisher) handleStreamError(err error) {
 		return
 	}
 
-	p.Log.Err(err)
+	p.Log.Err(err).Msg("stream error")
 	common.SetExitCode(1)
 }
 
 func (p *DirectoryPublisher) receiver(stream dsi3.Importer_ImportClient) func() error {
 	return func() error {
 		for {
 			result, err := stream.Recv()
-			if err == io.EOF {
+			if errors.Is(err, io.EOF) {
 				return nil
 			}
 
@@ -171,13 +172,13 @@ func (p *DirectoryPublisher) receiver(stream dsi3.Importer_ImportClient) func()
 			}
 
 			if result != nil {
-				switch m := result.Msg.(type) {
+				switch m := result.GetMsg().(type) {
 				case *dsi3.ImportResponse_Status:
 					p.errs = true
 
 					printStatus(os.Stderr, m.Status)
 				case *dsi3.ImportResponse_Counter:
-					switch m.Counter.Type {
+					switch m.Counter.GetType() {
 					case objectsCounter:
 						p.objCounter = m.Counter
 					case relationsCounter:
@@ -206,17 +207,17 @@ func (p *DirectoryPublisher) doneHandler(ctx context.Context) func() error {
 func printStatus(w io.Writer, status *dsi3.ImportStatus) {
 	fmt.Fprintf(w, "%-9s : %s - %s (%d)\n",
 		"error",
-		status.Msg,
-		codes.Code(status.Code).String(),
-		status.Code)
+		status.GetMsg(),
+		codes.Code(status.GetCode()).String(),
+		status.GetCode())
 }
 
 func printCounter(w io.Writer, ctr *dsi3.ImportCounter) {
 	fmt.Fprintf(w, "%-9s : %d (set:%d delete:%d error:%d)\n",
-		ctr.Type,
-		ctr.Recv,
-		ctr.Set,
-		ctr.Delete,
-		ctr.Error,
+		ctr.GetType(),
+		ctr.GetRecv(),
+		ctr.GetSet(),
+		ctr.GetDelete(),
+		ctr.GetError(),
 	)
 }