Update dependencies

plugins/auth0/pkg/app/fetch.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/aserto-dev/ds-load/plugins/auth0/pkg/auth0client"
 	"github.com/aserto-dev/ds-load/plugins/auth0/pkg/fetch"
+	"github.com/aserto-dev/ds-load/sdk/common"
 	"github.com/aserto-dev/ds-load/sdk/common/cc"
 )
 
@@ -45,5 +46,5 @@ func (f *FetchCmd) Run(ctx *cc.CommonCtx) error {
 		WithSAML(f.SAML).
 		WithConnectionName(f.ConnectionName)
 
-	return fetcher.Fetch(ctx.Context, os.Stdout, os.Stderr)
+	return fetcher.Fetch(ctx.Context, os.Stdout, common.ErrorWriter{Writer: os.Stderr})
 }

plugins/auth0/pkg/fetch/fetch.go

@@ -64,7 +64,7 @@ func (f *Fetcher) WithConnectionName(connectionName string) *Fetcher {
 	return f
 }
 
-func (f *Fetcher) Fetch(ctx context.Context, outputWriter, errorWriter io.Writer) error {
+func (f *Fetcher) Fetch(ctx context.Context, outputWriter io.Writer, errorWriter common.ErrorWriter) error {
 	writer := js.NewJSONArrayWriter(outputWriter)
 	defer writer.Close()
 
@@ -78,7 +78,7 @@ func (f *Fetcher) Fetch(ctx context.Context, outputWriter, errorWriter io.Writer
 	return f.fetchUsers(ctx, writer, errorWriter)
 }
 
-func (f *Fetcher) fetchUsers(ctx context.Context, outputWriter *js.JSONArrayWriter, errorWriter io.Writer) error {
+func (f *Fetcher) fetchUsers(ctx context.Context, outputWriter *js.JSONArrayWriter, errorWriter common.ErrorWriter) error {
 	page := 0
 
 	for {
@@ -89,15 +89,13 @@ func (f *Fetcher) fetchUsers(ctx context.Context, outputWriter *js.JSONArrayWrit
 
 		users, more, err := f.fetchUsersList(ctx, opts)
 		if err != nil {
-			common.WriteErrorWithExitCode(errorWriter, err, 1)
+			errorWriter.Error(err)
 			return err
 		}
 
 		for _, user := range users {
 			obj, err := f.userToMap(ctx, user)
-			if err != nil {
-				common.WriteErrorWithExitCode(errorWriter, err, 1)
-			}
+			errorWriter.Error(err)
 
 			if obj == nil {
 				continue
@@ -156,7 +154,7 @@ func (f *Fetcher) userToMap(ctx context.Context, user *management.User) (map[str
 	return obj, nil
 }
 
-func (f *Fetcher) fetchGroups(ctx context.Context, outputWriter *js.JSONArrayWriter, errorWriter io.Writer) error {
+func (f *Fetcher) fetchGroups(ctx context.Context, outputWriter *js.JSONArrayWriter, errorWriter common.ErrorWriter) error {
 	page := 0
 
 	for f.Roles {
@@ -168,7 +166,7 @@ func (f *Fetcher) fetchGroups(ctx context.Context, outputWriter *js.JSONArrayWri
 
 		roles, more, err := f.fetchRoles(ctx, opts)
 		if err != nil {
-			common.WriteErrorWithExitCode(errorWriter, err, 1)
+			errorWriter.Error(err)
 			return err
 		}
 
@@ -178,7 +176,7 @@ func (f *Fetcher) fetchGroups(ctx context.Context, outputWriter *js.JSONArrayWri
 			var obj map[string]any
 
 			if err := json.Unmarshal([]byte(res), &obj); err != nil {
-				common.WriteErrorWithExitCode(errorWriter, err, 1)
+				errorWriter.Error(err)
 				continue
 			}
 

plugins/azuread/pkg/app/fetch.go

@@ -4,6 +4,7 @@ import (
 	"os"
 
 	"github.com/aserto-dev/ds-load/plugins/azuread/pkg/fetch"
+	"github.com/aserto-dev/ds-load/sdk/common"
 	"github.com/aserto-dev/ds-load/sdk/common/cc"
 )
 
@@ -29,5 +30,5 @@ func (cmd *FetchCmd) Run(ctx *cc.CommonCtx) error {
 		return err
 	}
 
-	return fetcher.WithGroups(cmd.Groups).Fetch(ctx.Context, os.Stdout, os.Stderr)
+	return fetcher.WithGroups(cmd.Groups).Fetch(ctx.Context, os.Stdout, common.ErrorWriter{Writer: os.Stderr})
 }

plugins/azuread/pkg/fetch/fetch.go

@@ -33,30 +33,24 @@ func (f *Fetcher) WithGroups(groups bool) *Fetcher {
 	return f
 }
 
-func (f *Fetcher) Fetch(ctx context.Context, outputWriter, errorWriter io.Writer) error {
+func (f *Fetcher) Fetch(ctx context.Context, outputWriter io.Writer, errorWriter common.ErrorWriter) error {
 	jsonWriter := js.NewJSONArrayWriter(outputWriter)
 	defer jsonWriter.Close()
 
 	if f.Groups {
 		for obj, err := range f.fetchGroups(ctx) {
-			if err != nil {
-				common.WriteErrorWithExitCode(errorWriter, err, 1)
-			}
+			errorWriter.Error(err)
 
-			if err := jsonWriter.Write(obj); err != nil {
-				_, _ = errorWriter.Write([]byte(err.Error()))
-			}
+			err := jsonWriter.Write(obj)
+			errorWriter.ErrorNoExitCode(err)
 		}
 	}
 
 	for user, err := range f.fetchUsers(ctx) {
-		if err != nil {
-			common.WriteErrorWithExitCode(errorWriter, err, 1)
-		}
+		errorWriter.Error(err)
 
-		if err := jsonWriter.Write(user); err != nil {
-			_, _ = errorWriter.Write([]byte(err.Error()))
-		}
+		err := jsonWriter.Write(user)
+		errorWriter.ErrorNoExitCode(err)
 	}
 
 	return nil

plugins/azureadb2c/pkg/app/fetch.go

@@ -4,6 +4,7 @@ import (
 	"os"
 
 	"github.com/aserto-dev/ds-load/plugins/azureadb2c/pkg/fetch"
+	"github.com/aserto-dev/ds-load/sdk/common"
 	"github.com/aserto-dev/ds-load/sdk/common/cc"
 )
 
@@ -29,5 +30,5 @@ func (cmd *FetchCmd) Run(ctx *cc.CommonCtx) error {
 		return err
 	}
 
-	return fetcher.WithGroups(cmd.Groups).Fetch(ctx.Context, os.Stdout, os.Stderr)
+	return fetcher.WithGroups(cmd.Groups).Fetch(ctx.Context, os.Stdout, common.ErrorWriter{Writer: os.Stderr})
 }

plugins/azureadb2c/pkg/fetch/fetch.go

@@ -33,30 +33,24 @@ func (f *Fetcher) WithGroups(groups bool) *Fetcher {
 	return f
 }
 
-func (f *Fetcher) Fetch(ctx context.Context, outputWriter, errorWriter io.Writer) error {
+func (f *Fetcher) Fetch(ctx context.Context, outputWriter io.Writer, errorWriter common.ErrorWriter) error {
 	jsonWriter := js.NewJSONArrayWriter(outputWriter)
 	defer jsonWriter.Close()
 
 	if f.Groups {
 		for obj, err := range f.fetchGroups(ctx) {
-			if err != nil {
-				common.WriteErrorWithExitCode(errorWriter, err, 1)
-			}
+			errorWriter.Error(err)
 
-			if err := jsonWriter.Write(obj); err != nil {
-				_, _ = errorWriter.Write([]byte(err.Error()))
-			}
+			err := jsonWriter.Write(obj)
+			errorWriter.ErrorNoExitCode(err)
 		}
 	}
 
 	for user, err := range f.fetchUsers(ctx) {
-		if err != nil {
-			common.WriteErrorWithExitCode(errorWriter, err, 1)
-		}
+		errorWriter.Error(err)
 
-		if err := jsonWriter.Write(user); err != nil {
-			_, _ = errorWriter.Write([]byte(err.Error()))
-		}
+		err := jsonWriter.Write(user)
+		errorWriter.ErrorNoExitCode(err)
 	}
 
 	return nil

plugins/cognito/pkg/app/fetch.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/aserto-dev/ds-load/plugins/cognito/pkg/cognitoclient"
 	"github.com/aserto-dev/ds-load/plugins/cognito/pkg/fetch"
+	"github.com/aserto-dev/ds-load/sdk/common"
 	"github.com/aserto-dev/ds-load/sdk/common/cc"
 )
 
@@ -29,5 +30,5 @@ func (cmd *FetchCmd) Run(ctx *cc.CommonCtx) error {
 
 	fetcher = fetcher.WithGroups(cmd.Groups)
 
-	return fetcher.Fetch(ctx.Context, os.Stdout, os.Stderr)
+	return fetcher.Fetch(ctx.Context, os.Stdout, common.ErrorWriter{Writer: os.Stderr})
 }

plugins/cognito/pkg/fetch/fetch.go

@@ -29,26 +29,21 @@ func (f *Fetcher) WithGroups(groups bool) *Fetcher {
 	return f
 }
 
-func (f *Fetcher) Fetch(ctx context.Context, outputWriter, errorWriter io.Writer) error {
+func (f *Fetcher) Fetch(ctx context.Context, outputWriter io.Writer, errorWriter common.ErrorWriter) error {
 	writer := js.NewJSONArrayWriter(outputWriter)
 	defer writer.Close()
 
 	if f.groups {
 		for obj, err := range f.fetchGroups() {
-			if err != nil {
-				common.WriteErrorWithExitCode(errorWriter, err, 1)
-			}
+			errorWriter.Error(err)
 
-			if err := writer.Write(obj); err != nil {
-				_, _ = errorWriter.Write([]byte(err.Error()))
-			}
+			err := writer.Write(obj)
+			errorWriter.ErrorNoExitCode(err)
 		}
 	}
 
 	users, err := f.cognitoClient.ListUsers(ctx)
-	if err != nil {
-		_, _ = errorWriter.Write([]byte(err.Error()))
-	}
+	errorWriter.ErrorNoExitCode(err)
 
 	for _, user := range users {
 		attributes := make(map[string]string)
@@ -58,41 +53,38 @@ func (f *Fetcher) Fetch(ctx context.Context, outputWriter, errorWriter io.Writer
 
 		userBytes, err := json.Marshal(user)
 		if err != nil {
-			common.WriteErrorWithExitCode(errorWriter, err, 1)
+			errorWriter.Error(err)
 			return err
 		}
 
 		var obj map[string]any
-		if err := json.Unmarshal(userBytes, &obj); err != nil {
-			_, _ = errorWriter.Write([]byte(err.Error()))
-		}
+		err = json.Unmarshal(userBytes, &obj)
+		errorWriter.ErrorNoExitCode(err)
 
 		obj["Attributes"] = attributes
 
 		if f.groups {
 			groups, err := f.cognitoClient.GetGroupsForUser(*user.Username)
 			if err != nil {
-				_, _ = errorWriter.Write([]byte(err.Error()))
+				errorWriter.ErrorNoExitCode(err)
 				continue
 			}
 
 			groupBytes, err := json.Marshal(groups.Groups)
 			if err != nil {
-				_, _ = errorWriter.Write([]byte(err.Error()))
+				errorWriter.ErrorNoExitCode(err)
 				return err
 			}
 
 			var grps []map[string]string
-			if err := json.Unmarshal(groupBytes, &grps); err != nil {
-				_, _ = errorWriter.Write([]byte(err.Error()))
-			}
+			err = json.Unmarshal(groupBytes, &grps)
+			errorWriter.ErrorNoExitCode(err)
 
 			obj["Groups"] = grps
 		}
 
-		if err := writer.Write(obj); err != nil {
-			_, _ = errorWriter.Write([]byte(err.Error()))
-		}
+		err = writer.Write(obj)
+		errorWriter.ErrorNoExitCode(err)
 	}
 
 	return nil

plugins/fusionauth/pkg/app/fetch.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/aserto-dev/ds-load/plugins/fusionauth/pkg/fetch"
 	"github.com/aserto-dev/ds-load/plugins/fusionauth/pkg/fusionauthclient"
+	"github.com/aserto-dev/ds-load/sdk/common"
 	"github.com/aserto-dev/ds-load/sdk/common/cc"
 )
 
@@ -27,5 +28,5 @@ func (cmd *FetchCmd) Run(ctx *cc.CommonCtx) error {
 
 	fetcher = fetcher.WithGroups(cmd.Groups).WithHost(cmd.HostURL)
 
-	return fetcher.Fetch(ctx.Context, os.Stdout, os.Stderr)
+	return fetcher.Fetch(ctx.Context, os.Stdout, common.ErrorWriter{Writer: os.Stderr})
 }

plugins/fusionauth/pkg/fetch/fetch.go

@@ -7,6 +7,7 @@ import (
 	"io"
 
 	"github.com/aserto-dev/ds-load/plugins/fusionauth/pkg/fusionauthclient"
+	"github.com/aserto-dev/ds-load/sdk/common"
 	"github.com/aserto-dev/ds-load/sdk/common/js"
 )
 
@@ -32,50 +33,44 @@ func (f *Fetcher) WithHost(host string) *Fetcher {
 	return f
 }
 
-func (f *Fetcher) Fetch(ctx context.Context, outputWriter, errorWriter io.Writer) error {
+func (f *Fetcher) Fetch(ctx context.Context, outputWriter io.Writer, errorWriter common.ErrorWriter) error {
 	writer := js.NewJSONArrayWriter(outputWriter)
 	defer writer.Close()
 
 	users, err := f.fusionauthClient.ListUsers(ctx)
-	if err != nil {
-		_, _ = errorWriter.Write([]byte(err.Error()))
-	}
+	errorWriter.ErrorNoExitCode(err)
 
 	for i := range users {
 		user := &users[i]
 
 		userBytes, err := json.Marshal(user)
 		if err != nil {
-			_, _ = errorWriter.Write([]byte(err.Error()))
+			errorWriter.ErrorNoExitCode(err)
 			return err
 		}
 
 		var obj map[string]any
 		if err := json.Unmarshal(userBytes, &obj); err != nil {
-			_, _ = errorWriter.Write([]byte(err.Error()))
+			errorWriter.ErrorNoExitCode(err)
 			return err
 		}
 
 		if user.ImageUrl != "" {
 			obj["picture"] = fmt.Sprintf("%s%s", f.host, user.ImageUrl)
 		}
 
-		if err := writer.Write(obj); err != nil {
-			_, _ = errorWriter.Write([]byte(err.Error()))
-		}
+		err = writer.Write(obj)
+		errorWriter.ErrorNoExitCode(err)
 	}
 
 	if f.groups {
 		groups, err := f.fusionauthClient.ListGroups(ctx)
-		if err != nil {
-			_, _ = errorWriter.Write([]byte(err.Error()))
-		}
+		errorWriter.ErrorNoExitCode(err)
 
 		for i := range groups {
 			group := &groups[i]
-			if err := writer.Write(group); err != nil {
-				_, _ = errorWriter.Write([]byte(err.Error()))
-			}
+			err := writer.Write(group)
+			errorWriter.ErrorNoExitCode(err)
 		}
 	}
 

plugins/google/pkg/app/fetch.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/aserto-dev/ds-load/plugins/google/pkg/fetch"
 	"github.com/aserto-dev/ds-load/plugins/google/pkg/googleclient"
+	"github.com/aserto-dev/ds-load/sdk/common"
 	"github.com/aserto-dev/ds-load/sdk/common/cc"
 )
 
@@ -29,5 +30,5 @@ func (cmd *FetchCmd) Run(ctx *cc.CommonCtx) error {
 
 	fetcher = fetcher.WithGroups(cmd.Groups)
 
-	return fetcher.Fetch(ctx.Context, os.Stdout, os.Stderr)
+	return fetcher.Fetch(ctx.Context, os.Stdout, common.ErrorWriter{Writer: os.Stderr})
 }