Update error writer

carabasdaniel · carabasdaniel · commit 4aa5d3aabddf · 2025-04-29T11:35:35.000+03:00
diff --git a/plugins/auth0/pkg/app/fetch.go b/plugins/auth0/pkg/app/fetch.go
@@ -46,5 +46,5 @@ func (f *FetchCmd) Run(ctx *cc.CommonCtx) error {
 		WithSAML(f.SAML).
 		WithConnectionName(f.ConnectionName)
 
-	return fetcher.Fetch(ctx.Context, os.Stdout, common.ErrorWriter{Writer: os.Stderr})
+	return fetcher.Fetch(ctx.Context, os.Stdout, common.NewErrorWriter(os.Stderr))
 }
diff --git a/plugins/azuread/pkg/app/fetch.go b/plugins/azuread/pkg/app/fetch.go
@@ -30,5 +30,5 @@ func (cmd *FetchCmd) Run(ctx *cc.CommonCtx) error {
 		return err
 	}
 
-	return fetcher.WithGroups(cmd.Groups).Fetch(ctx.Context, os.Stdout, common.ErrorWriter{Writer: os.Stderr})
+	return fetcher.WithGroups(cmd.Groups).Fetch(ctx.Context, os.Stdout, common.NewErrorWriter(os.Stderr))
 }
diff --git a/plugins/azuread/pkg/fetch/fetch.go b/plugins/azuread/pkg/fetch/fetch.go
@@ -42,15 +42,15 @@ func (f *Fetcher) Fetch(ctx context.Context, outputWriter io.Writer, errorWriter
 			errorWriter.Error(err)
 
 			err := jsonWriter.Write(obj)
-			errorWriter.ErrorNoExitCode(err)
+			errorWriter.Error(err, common.NoExitCode)
 		}
 	}
 
 	for user, err := range f.fetchUsers(ctx) {
 		errorWriter.Error(err)
 
 		err := jsonWriter.Write(user)
-		errorWriter.ErrorNoExitCode(err)
+		errorWriter.Error(err, common.NoExitCode)
 	}
 
 	return nil
diff --git a/plugins/azureadb2c/pkg/app/fetch.go b/plugins/azureadb2c/pkg/app/fetch.go
@@ -30,5 +30,5 @@ func (cmd *FetchCmd) Run(ctx *cc.CommonCtx) error {
 		return err
 	}
 
-	return fetcher.WithGroups(cmd.Groups).Fetch(ctx.Context, os.Stdout, common.ErrorWriter{Writer: os.Stderr})
+	return fetcher.WithGroups(cmd.Groups).Fetch(ctx.Context, os.Stdout, common.NewErrorWriter(os.Stderr))
 }
diff --git a/plugins/azureadb2c/pkg/fetch/fetch.go b/plugins/azureadb2c/pkg/fetch/fetch.go
@@ -42,15 +42,15 @@ func (f *Fetcher) Fetch(ctx context.Context, outputWriter io.Writer, errorWriter
 			errorWriter.Error(err)
 
 			err := jsonWriter.Write(obj)
-			errorWriter.ErrorNoExitCode(err)
+			errorWriter.Error(err, common.NoExitCode)
 		}
 	}
 
 	for user, err := range f.fetchUsers(ctx) {
 		errorWriter.Error(err)
 
 		err := jsonWriter.Write(user)
-		errorWriter.ErrorNoExitCode(err)
+		errorWriter.Error(err, common.NoExitCode)
 	}
 
 	return nil
diff --git a/plugins/cognito/pkg/app/fetch.go b/plugins/cognito/pkg/app/fetch.go
@@ -30,5 +30,5 @@ func (cmd *FetchCmd) Run(ctx *cc.CommonCtx) error {
 
 	fetcher = fetcher.WithGroups(cmd.Groups)
 
-	return fetcher.Fetch(ctx.Context, os.Stdout, common.ErrorWriter{Writer: os.Stderr})
+	return fetcher.Fetch(ctx.Context, os.Stdout, common.NewErrorWriter(os.Stderr))
 }
diff --git a/plugins/cognito/pkg/fetch/fetch.go b/plugins/cognito/pkg/fetch/fetch.go
@@ -38,12 +38,12 @@ func (f *Fetcher) Fetch(ctx context.Context, outputWriter io.Writer, errorWriter
 			errorWriter.Error(err)
 
 			err := writer.Write(obj)
-			errorWriter.ErrorNoExitCode(err)
+			errorWriter.Error(err, common.NoExitCode)
 		}
 	}
 
 	users, err := f.cognitoClient.ListUsers(ctx)
-	errorWriter.ErrorNoExitCode(err)
+	errorWriter.Error(err, common.NoExitCode)
 
 	for _, user := range users {
 		attributes := make(map[string]string)
@@ -59,32 +59,32 @@ func (f *Fetcher) Fetch(ctx context.Context, outputWriter io.Writer, errorWriter
 
 		var obj map[string]any
 		err = json.Unmarshal(userBytes, &obj)
-		errorWriter.ErrorNoExitCode(err)
+		errorWriter.Error(err, common.NoExitCode)
 
 		obj["Attributes"] = attributes
 
 		if f.groups {
 			groups, err := f.cognitoClient.GetGroupsForUser(*user.Username)
 			if err != nil {
-				errorWriter.ErrorNoExitCode(err)
+				errorWriter.Error(err, common.NoExitCode)
 				continue
 			}
 
 			groupBytes, err := json.Marshal(groups.Groups)
 			if err != nil {
-				errorWriter.ErrorNoExitCode(err)
+				errorWriter.Error(err, common.NoExitCode)
 				return err
 			}
 
 			var grps []map[string]string
 			err = json.Unmarshal(groupBytes, &grps)
-			errorWriter.ErrorNoExitCode(err)
+			errorWriter.Error(err, common.NoExitCode)
 
 			obj["Groups"] = grps
 		}
 
 		err = writer.Write(obj)
-		errorWriter.ErrorNoExitCode(err)
+		errorWriter.Error(err, common.NoExitCode)
 	}
 
 	return nil
diff --git a/plugins/fusionauth/pkg/app/fetch.go b/plugins/fusionauth/pkg/app/fetch.go
@@ -28,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, common.ErrorWriter{Writer: os.Stderr})
+	return fetcher.Fetch(ctx.Context, os.Stdout, common.NewErrorWriter(os.Stderr))
 }
diff --git a/plugins/fusionauth/pkg/fetch/fetch.go b/plugins/fusionauth/pkg/fetch/fetch.go
@@ -38,20 +38,20 @@ func (f *Fetcher) Fetch(ctx context.Context, outputWriter io.Writer, errorWriter
 	defer writer.Close()
 
 	users, err := f.fusionauthClient.ListUsers(ctx)
-	errorWriter.ErrorNoExitCode(err)
+	errorWriter.Error(err, common.NoExitCode)
 
 	for i := range users {
 		user := &users[i]
 
 		userBytes, err := json.Marshal(user)
 		if err != nil {
-			errorWriter.ErrorNoExitCode(err)
+			errorWriter.Error(err, common.NoExitCode)
 			return err
 		}
 
 		var obj map[string]any
 		if err := json.Unmarshal(userBytes, &obj); err != nil {
-			errorWriter.ErrorNoExitCode(err)
+			errorWriter.Error(err, common.NoExitCode)
 			return err
 		}
 
@@ -60,17 +60,17 @@ func (f *Fetcher) Fetch(ctx context.Context, outputWriter io.Writer, errorWriter
 		}
 
 		err = writer.Write(obj)
-		errorWriter.ErrorNoExitCode(err)
+		errorWriter.Error(err, common.NoExitCode)
 	}
 
 	if f.groups {
 		groups, err := f.fusionauthClient.ListGroups(ctx)
-		errorWriter.ErrorNoExitCode(err)
+		errorWriter.Error(err, common.NoExitCode)
 
 		for i := range groups {
 			group := &groups[i]
 			err := writer.Write(group)
-			errorWriter.ErrorNoExitCode(err)
+			errorWriter.Error(err, common.NoExitCode)
 		}
 	}
 
diff --git a/plugins/google/pkg/app/fetch.go b/plugins/google/pkg/app/fetch.go
@@ -30,5 +30,5 @@ func (cmd *FetchCmd) Run(ctx *cc.CommonCtx) error {
 
 	fetcher = fetcher.WithGroups(cmd.Groups)
 
-	return fetcher.Fetch(ctx.Context, os.Stdout, common.ErrorWriter{Writer: os.Stderr})
+	return fetcher.Fetch(ctx.Context, os.Stdout, common.NewErrorWriter(os.Stderr))
 }
diff --git a/plugins/google/pkg/fetch/fetch.go b/plugins/google/pkg/fetch/fetch.go
@@ -41,7 +41,7 @@ func (f *Fetcher) Fetch(ctx context.Context, outputWriter io.Writer, errorWriter
 		}
 
 		err := writer.Write(user)
-		errorWriter.ErrorNoExitCode(err)
+		errorWriter.Error(err, common.NoExitCode)
 	}
 
 	if f.Groups {
@@ -52,7 +52,7 @@ func (f *Fetcher) Fetch(ctx context.Context, outputWriter io.Writer, errorWriter
 			}
 
 			err := writer.Write(group)
-			errorWriter.ErrorNoExitCode(err)
+			errorWriter.Error(err, common.NoExitCode)
 		}
 	}
 
diff --git a/plugins/jumpcloud/pkg/app/fetch.go b/plugins/jumpcloud/pkg/app/fetch.go
@@ -27,5 +27,5 @@ func (cmd *FetchCmd) Run(ctx *cc.CommonCtx) error {
 
 	fetcher = fetcher.WithGroups(cmd.Groups)
 
-	return fetcher.Fetch(ctx.Context, os.Stdout, common.ErrorWriter{Writer: os.Stderr})
+	return fetcher.Fetch(ctx.Context, os.Stdout, common.NewErrorWriter(os.Stderr))
 }
diff --git a/plugins/jumpcloud/pkg/fetch/fetch.go b/plugins/jumpcloud/pkg/fetch/fetch.go
@@ -53,7 +53,9 @@ func (f *Fetcher) Fetch(ctx context.Context, outputWriter io.Writer, errorWriter
 		}
 
 		err = writer.Write(obj)
-		errorWriter.ErrorNoExitCode(err)
+		errorWriter.Error(err, func(eo *common.ErrorOptions) {
+			eo.SetExitCode = false
+		})
 
 		idLookup[user.ID] = &user.BaseUser
 	}
diff --git a/plugins/ldap/pkg/app/fetch.go b/plugins/ldap/pkg/app/fetch.go
@@ -43,5 +43,5 @@ func (cmd *FetchCmd) Run(ctx *cc.CommonCtx) error {
 
 	fetcher := fetch.New(ldapClient, cmd.IDField)
 
-	return fetcher.Fetch(ctx.Context, os.Stdout, common.ErrorWriter{Writer: os.Stderr})
+	return fetcher.Fetch(ctx.Context, os.Stdout, common.NewErrorWriter(os.Stderr))
 }
diff --git a/plugins/okta/pkg/app/fetch.go b/plugins/okta/pkg/app/fetch.go
@@ -28,5 +28,5 @@ func (f *FetchCmd) Run(ctx *cc.CommonCtx) error {
 		return err
 	}
 
-	return fetcher.WithGroups(f.Groups).WithRoles(f.Roles).Fetch(ctx.Context, os.Stdout, common.ErrorWriter{Writer: os.Stderr})
+	return fetcher.WithGroups(f.Groups).WithRoles(f.Roles).Fetch(ctx.Context, os.Stdout, common.NewErrorWriter(os.Stderr))
 }
diff --git a/plugins/okta/pkg/fetch/fetch.go b/plugins/okta/pkg/fetch/fetch.go
@@ -57,16 +57,16 @@ func (fetcher *Fetcher) fetchUsers(ctx context.Context, writer *js.JSONArrayWrit
 	}
 
 	for {
-		logIfRateLimitExceeded(response, errorWriter.Writer)
+		logIfRateLimitExceeded(response, errorWriter)
 
 		for i := range users {
 			user := &users[i]
 
-			userResult, err := fetcher.processUser(ctx, user, errorWriter.Writer)
+			userResult, err := fetcher.processUser(ctx, user, errorWriter)
 			errorWriter.Error(err)
 
 			err = writer.Write(userResult)
-			errorWriter.ErrorNoExitCode(err)
+			errorWriter.Error(err, common.NoExitCode)
 		}
 
 		if response != nil && response.HasNextPage() {
@@ -88,14 +88,14 @@ func (fetcher *Fetcher) fetchGroups(ctx context.Context, writer *js.JSONArrayWri
 	}
 
 	for {
-		logIfRateLimitExceeded(response, errorWriter.Writer)
+		logIfRateLimitExceeded(response, errorWriter)
 
 		for _, group := range groups {
-			groupResult, err := fetcher.processGroup(ctx, &group, errorWriter.Writer)
+			groupResult, err := fetcher.processGroup(ctx, &group, errorWriter)
 			errorWriter.Error(err)
 
 			err = writer.Write(groupResult)
-			errorWriter.ErrorNoExitCode(err)
+			errorWriter.Error(err, common.NoExitCode)
 		}
 
 		if response != nil && response.HasNextPage() {
@@ -109,7 +109,7 @@ func (fetcher *Fetcher) fetchGroups(ctx context.Context, writer *js.JSONArrayWri
 	return nil
 }
 
-func (fetcher *Fetcher) processUser(ctx context.Context, user *okta.User, errorWriter io.Writer) (map[string]any, error) {
+func (fetcher *Fetcher) processUser(ctx context.Context, user *okta.User, errorWriter common.ErrorWriter) (map[string]any, error) {
 	userBytes, err := json.Marshal(user)
 	if err != nil {
 		common.SetExitCode(1)
@@ -148,7 +148,7 @@ func (fetcher *Fetcher) processUser(ctx context.Context, user *okta.User, errorW
 	return userResult, nil
 }
 
-func (fetcher *Fetcher) processGroup(ctx context.Context, group *okta.Group, errorWriter io.Writer) (map[string]any, error) {
+func (fetcher *Fetcher) processGroup(ctx context.Context, group *okta.Group, errorWriter common.ErrorWriter) (map[string]any, error) {
 	userBytes, err := json.Marshal(group)
 	if err != nil {
 		common.SetExitCode(1)
@@ -176,7 +176,7 @@ func (fetcher *Fetcher) processGroup(ctx context.Context, group *okta.Group, err
 	return groupResult, nil
 }
 
-func (fetcher *Fetcher) getGroups(ctx context.Context, userID string, errorWriter io.Writer) ([]map[string]any, error) {
+func (fetcher *Fetcher) getGroups(ctx context.Context, userID string, errorWriter common.ErrorWriter) ([]map[string]any, error) {
 	var (
 		response *okta.APIResponse
 		result   []map[string]any
@@ -219,7 +219,7 @@ func (fetcher *Fetcher) getGroups(ctx context.Context, userID string, errorWrite
 	return result, nil
 }
 
-func (fetcher *Fetcher) getUserRoles(ctx context.Context, userID string, errorWriter io.Writer) ([]map[string]any, error) {
+func (fetcher *Fetcher) getUserRoles(ctx context.Context, userID string, errorWriter common.ErrorWriter) ([]map[string]any, error) {
 	var (
 		response *okta.APIResponse
 		result   []map[string]any
@@ -263,7 +263,7 @@ func (fetcher *Fetcher) getUserRoles(ctx context.Context, userID string, errorWr
 	return result, nil
 }
 
-func (fetcher *Fetcher) getGroupRoles(ctx context.Context, groupID string, errorWriter io.Writer) ([]map[string]any, error) {
+func (fetcher *Fetcher) getGroupRoles(ctx context.Context, groupID string, errorWriter common.ErrorWriter) ([]map[string]any, error) {
 	var (
 		response *okta.APIResponse
 		result   []map[string]any
@@ -306,7 +306,7 @@ func (fetcher *Fetcher) getGroupRoles(ctx context.Context, groupID string, error
 	return result, nil
 }
 
-func logIfRateLimitExceeded(resp *okta.APIResponse, errorWriter io.Writer) {
+func logIfRateLimitExceeded(resp *okta.APIResponse, errorWriter common.ErrorWriter) {
 	if resp.Response != nil && resp.StatusCode == http.StatusTooManyRequests {
 		_, _ = errorWriter.Write([]byte("Rate limit exceeded"))
 	}
diff --git a/plugins/openapi/pkg/app/fetch.go b/plugins/openapi/pkg/app/fetch.go
@@ -29,5 +29,5 @@ func (cmd *FetchCmd) Run(ctx *cc.CommonCtx) error {
 
 	fetcher = fetcher.WithDirectory(cmd.Directory).WithURL(cmd.URL).WithIDFormat(cmd.IDFormat).WithServiceName(cmd.ServiceName)
 
-	return fetcher.Fetch(ctx.Context, os.Stdout, common.ErrorWriter{Writer: os.Stderr})
+	return fetcher.Fetch(ctx.Context, os.Stdout, common.NewErrorWriter(os.Stderr))
 }
diff --git a/plugins/openapi/pkg/fetch/fetch.go b/plugins/openapi/pkg/fetch/fetch.go
@@ -48,19 +48,19 @@ func (f *Fetcher) Fetch(ctx context.Context, outputWriter io.Writer, errorWriter
 	defer writer.Close()
 
 	services, err := f.client.ListServices()
-	errorWriter.ErrorNoExitCode(err)
+	errorWriter.Error(err, common.NoExitCode)
 
 	for _, service := range services {
 		err := writer.Write(service)
-		errorWriter.ErrorNoExitCode(err)
+		errorWriter.Error(err, common.NoExitCode)
 	}
 
 	apis, err := f.client.ListAPIs()
 	errorWriter.Error(err)
 
 	for _, api := range apis {
 		err := writer.Write(api)
-		errorWriter.ErrorNoExitCode(err)
+		errorWriter.Error(err, common.NoExitCode)
 	}
 
 	return nil
diff --git a/sdk/common/error_writer.go b/sdk/common/error_writer.go
diff --git a/sdk/exec/exec.go b/sdk/exec/exec.go

Original file line number	Diff line number	Diff line change
`@@ -46,5 +46,5 @@ func (f FetchCmd) Run(ctx cc.CommonCtx) error {`
`46`	`46`	`WithSAML(f.SAML).`
`47`	`47`	`WithConnectionName(f.ConnectionName)`
`48`	`48`
`49`		`- return fetcher.Fetch(ctx.Context, os.Stdout, common.ErrorWriter{Writer: os.Stderr})`
	`49`	`+ return fetcher.Fetch(ctx.Context, os.Stdout, common.NewErrorWriter(os.Stderr))`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,5 +30,5 @@ func (cmd FetchCmd) Run(ctx cc.CommonCtx) error {`
`30`	`30`	`return err`
`31`	`31`	`}`
`32`	`32`
`33`		`- return fetcher.WithGroups(cmd.Groups).Fetch(ctx.Context, os.Stdout, common.ErrorWriter{Writer: os.Stderr})`
	`33`	`+ return fetcher.WithGroups(cmd.Groups).Fetch(ctx.Context, os.Stdout, common.NewErrorWriter(os.Stderr))`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,15 +42,15 @@ func (f *Fetcher) Fetch(ctx context.Context, outputWriter io.Writer, errorWriter`
`42`	`42`	`errorWriter.Error(err)`
`43`	`43`
`44`	`44`	`err := jsonWriter.Write(obj)`
`45`		`- errorWriter.ErrorNoExitCode(err)`
	`45`	`+ errorWriter.Error(err, common.NoExitCode)`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`for user, err := range f.fetchUsers(ctx) {`
`50`	`50`	`errorWriter.Error(err)`
`51`	`51`
`52`	`52`	`err := jsonWriter.Write(user)`
`53`		`- errorWriter.ErrorNoExitCode(err)`
	`53`	`+ errorWriter.Error(err, common.NoExitCode)`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`return nil`
Original file line number	Diff line number	Diff line change
`@@ -28,5 +28,5 @@ func (cmd FetchCmd) Run(ctx cc.CommonCtx) error {`
`28`	`28`
`29`	`29`	`fetcher = fetcher.WithGroups(cmd.Groups).WithHost(cmd.HostURL)`
`30`	`30`
`31`		`- return fetcher.Fetch(ctx.Context, os.Stdout, common.ErrorWriter{Writer: os.Stderr})`
	`31`	`+ return fetcher.Fetch(ctx.Context, os.Stdout, common.NewErrorWriter(os.Stderr))`
`32`	`32`	`}`