Skip to content

Commit

Permalink
Merge pull request #3905 from saschagrunert/multierr
Browse files Browse the repository at this point in the history
Replace go-multierror
  • Loading branch information
k8s-ci-robot authored Feb 4, 2025
2 parents b0764d9 + 38169f0 commit eaa5df5
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ require (
github.com/google/go-github/v60 v60.0.0
github.com/google/safetext v0.0.0-20230106111101-7156a760e523
github.com/google/uuid v1.6.0
github.com/hashicorp/go-multierror v1.1.1
github.com/in-toto/in-toto-golang v0.9.0
github.com/mattn/go-isatty v0.0.20
github.com/maxbrunsfeld/counterfeiter/v6 v6.11.2
Expand Down Expand Up @@ -175,6 +174,7 @@ require (
github.com/gorilla/mux v1.8.1 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
github.com/hashicorp/hcl v1.0.1-vault-5 // indirect
github.com/imdario/mergo v0.3.16 // indirect
Expand Down
4 changes: 1 addition & 3 deletions pkg/testgrid/testgrid-scraper.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ import (
"net/http"
"regexp"
"strings"

"github.com/hashicorp/go-multierror"
)

// SummaryLookup this type is used if multiple testgrid summaries are getting requested concurrently.
Expand Down Expand Up @@ -72,7 +70,7 @@ func ReqTestgridDashboardSummaries(ctx context.Context, dashboardNames []Dashboa
// Collect data from buffered channel
for lookups := range requestData(done, dashboardNames...) {
if lookups.Error != nil {
err = multierror.Append(err, fmt.Errorf("error requesting summary for dashboard %s: %w", lookups.Dashboard, lookups.Error))
err = errors.Join(err, fmt.Errorf("error requesting summary for dashboard %s: %w", lookups.Dashboard, lookups.Error))
} else {
dashboardData[lookups.Dashboard] = lookups.Summary
}
Expand Down

0 comments on commit eaa5df5

Please sign in to comment.