Skip to content

Commit 9c32048

Browse files
chore(deps): update module github.com/bombsimon/wsl/v4 to v5 (#479)
* chore(deps): update module github.com/bombsimon/wsl/v4 to v5 * fix(deps): update module github.com/bombsimon/wsl to v5 * fix: remove strict-append option from wsl tool in Makefile * style: add newlines --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Kim Oliver Drechsel <[email protected]>
1 parent d9538ca commit 9c32048

File tree

6 files changed

+11
-5
lines changed

6 files changed

+11
-5
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ fmt:
3737
go fmt ./...
3838
-go tool gofumpt -l -w .
3939
-go tool goimports -l -w .
40-
-go tool wsl -strict-append -test=true -fix ./...
40+
-go tool wsl -test=true -fix ./...
4141
-go tool perfsprint -fix ./...
4242

4343
update:

cmd/doco-cd/http_handler.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,12 +237,14 @@ func HandleEvent(ctx context.Context, jobLog *slog.Logger, w http.ResponseWriter
237237
if !managed {
238238
onError(w, subJobLog, fmt.Errorf("%w: %s: aborting destruction", ErrNotManagedByDocoCD, deployConfig.Name).Error(),
239239
"", jobID, http.StatusInternalServerError)
240+
240241
return
241242
}
242243

243244
if !correctRepo {
244245
onError(w, subJobLog, fmt.Errorf("%w: %s: aborting destruction", ErrDeploymentConflict, deployConfig.Name).Error(),
245246
map[string]string{"stack": deployConfig.Name}, jobID, http.StatusInternalServerError)
247+
246248
return
247249
}
248250

@@ -310,6 +312,7 @@ func HandleEvent(ctx context.Context, jobLog *slog.Logger, w http.ResponseWriter
310312
if !correctRepo {
311313
onError(w, subJobLog, fmt.Errorf("%w: %s: skipping deployment", ErrDeploymentConflict, deployConfig.Name).Error(),
312314
map[string]string{"stack": deployConfig.Name}, jobID, http.StatusInternalServerError)
315+
313316
return
314317
}
315318

@@ -318,6 +321,7 @@ func HandleEvent(ctx context.Context, jobLog *slog.Logger, w http.ResponseWriter
318321
if err != nil {
319322
onError(w, subJobLog, fmt.Errorf("failed to compare commits in subdirectory: %w", err).Error(),
320323
map[string]string{"stack": deployConfig.Name}, jobID, http.StatusInternalServerError)
324+
321325
return
322326
}
323327

cmd/doco-cd/poll_handler.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ func StartPoll(h *handlerData, pollConfig config.PollConfig, wg *sync.WaitGroup)
4949

5050
go func() {
5151
defer wg.Done()
52+
5253
h.PollHandler(pollJob)
5354
h.log.Debug("PollJob handler stopped", "config", pollConfig)
5455
}()

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ require (
7070
github.com/aws/smithy-go v1.22.3 // indirect
7171
github.com/beorn7/perks v1.0.1 // indirect
7272
github.com/blang/semver v3.5.1+incompatible // indirect
73-
github.com/bombsimon/wsl/v4 v4.7.0 // indirect
73+
github.com/bombsimon/wsl/v5 v5.1.0 // indirect
7474
github.com/buger/goterm v1.0.4 // indirect
7575
github.com/catenacyber/perfsprint v0.9.1 // indirect
7676
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
@@ -292,7 +292,7 @@ require (
292292
)
293293

294294
tool (
295-
github.com/bombsimon/wsl/v4/cmd/wsl
295+
github.com/bombsimon/wsl/v5/cmd/wsl
296296
github.com/catenacyber/perfsprint
297297
golang.org/x/tools/cmd/goimports
298298
mvdan.cc/gofumpt

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,8 @@ github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngE
141141
github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ=
142142
github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
143143
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=
144-
github.com/bombsimon/wsl/v4 v4.7.0 h1:1Ilm9JBPRczjyUs6hvOPKvd7VL1Q++PL8M0SXBDf+jQ=
145-
github.com/bombsimon/wsl/v4 v4.7.0/go.mod h1:uV/+6BkffuzSAVYD+yGyld1AChO7/EuLrCF/8xTiapg=
144+
github.com/bombsimon/wsl/v5 v5.1.0 h1:pLmVRBMxSL1D3/rCe65s/iCSFqU37Cz5/8dVEB4UNBw=
145+
github.com/bombsimon/wsl/v5 v5.1.0/go.mod h1:Gp8lD04z27wm3FANIUPZycXp+8huVsn0oxc+n4qfV9I=
146146
github.com/buger/goterm v1.0.4 h1:Z9YvGmOih81P0FbVtEYTFF6YsSgxSUKEhf/f9bTMXbY=
147147
github.com/buger/goterm v1.0.4/go.mod h1:HiFWV3xnkolgrBV3mY8m0X0Pumt4zg4QhbdOzQtB8tE=
148148
github.com/bugsnag/bugsnag-go v1.0.5-0.20150529004307-13fd6b8acda0 h1:s7+5BfS4WFJoVF9pnB8kBk03S7pZXRdKamnV0FOl5Sc=

internal/logger/logger.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ const (
2727
// ParseLevel parses a string into a log level
2828
func ParseLevel(s string) (slog.Level, error) {
2929
var level slog.Level
30+
3031
err := level.UnmarshalText([]byte(s))
3132

3233
return level, err

0 commit comments

Comments
 (0)