From df9746b80b8ed424f0ff7a2a03c6f0cb96ab797c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oscar=20S=C3=B6derlund?= Date: Mon, 1 Apr 2024 12:25:19 +0200 Subject: [PATCH] ci: bump Sage --- .sage/go.mod | 2 +- .sage/go.sum | 4 +- .sage/{sagefile.go => main.go} | 15 ++-- Makefile | 12 ++-- .../test/multipattern/pattern_test.go | 54 +++++++++++--- .../originallysinglepattern/pattern_test.go | 72 +++++++++++++++---- .../testdata/test/single/pattern_test.go | 18 ++++- 7 files changed, 141 insertions(+), 36 deletions(-) rename .sage/{sagefile.go => main.go} (87%) diff --git a/.sage/go.mod b/.sage/go.mod index 757526c8f0..b6864cc9aa 100644 --- a/.sage/go.mod +++ b/.sage/go.mod @@ -2,4 +2,4 @@ module sage go 1.19 -require go.einride.tech/sage v0.272.0 +require go.einride.tech/sage v0.278.0 diff --git a/.sage/go.sum b/.sage/go.sum index 767564babb..c60919c4a0 100644 --- a/.sage/go.sum +++ b/.sage/go.sum @@ -1,2 +1,2 @@ -go.einride.tech/sage v0.272.0 h1:NxK2zVtsYJn9Wwp//Tz5gmQsiVwT0uXLkau5WJnnXR8= -go.einride.tech/sage v0.272.0/go.mod h1:EzV5uciFX7/2ho8EKB5K9JghOfXIxlzs694b+Tkl5GQ= +go.einride.tech/sage v0.278.0 h1:I3J2eM/5dIo6YYuozGE2hTNEjJpIaM/jESOY7tlfwZo= +go.einride.tech/sage v0.278.0/go.mod h1:EzV5uciFX7/2ho8EKB5K9JghOfXIxlzs694b+Tkl5GQ= diff --git a/.sage/sagefile.go b/.sage/main.go similarity index 87% rename from .sage/sagefile.go rename to .sage/main.go index 38dec93055..e8b64422e9 100644 --- a/.sage/sagefile.go +++ b/.sage/main.go @@ -9,7 +9,7 @@ import ( "go.einride.tech/sage/tools/sggit" "go.einride.tech/sage/tools/sggo" "go.einride.tech/sage/tools/sggolangcilint" - "go.einride.tech/sage/tools/sggoreview" + "go.einride.tech/sage/tools/sggolines" "go.einride.tech/sage/tools/sgmdformat" "go.einride.tech/sage/tools/sgyamlfmt" ) @@ -30,7 +30,7 @@ func main() { func All(ctx context.Context) error { sg.Deps(ctx, ConvcoCheck, FormatMarkdown, FormatYAML, GoGenerate, Proto.All) - sg.Deps(ctx, GoLint, GoReview, GoTest) + sg.Deps(ctx, GoLint, GoTest) sg.SerialDeps(ctx, GoModTidy, GitVerifyNoDiff) return nil } @@ -55,9 +55,14 @@ func GoLint(ctx context.Context) error { return sggolangcilint.Run(ctx) } -func GoReview(ctx context.Context) error { - sg.Logger(ctx).Println("reviewing Go files...") - return sggoreview.Command(ctx, "-c", "1", "./...").Run() +func GoLintFix(ctx context.Context) error { + sg.Logger(ctx).Println("fixing Go files...") + return sggolangcilint.Fix(ctx) +} + +func GoLines(ctx context.Context) error { + sg.Logger(ctx).Println("wrapping Go lines...") + return sggolines.Run(ctx) } func GoModTidy(ctx context.Context) error { diff --git a/Makefile b/Makefile index 96b4e47a20..54fe9081da 100644 --- a/Makefile +++ b/Makefile @@ -67,18 +67,22 @@ git-verify-no-diff: $(sagefile) go-generate: $(sagefile) @$(sagefile) GoGenerate +.PHONY: go-lines +go-lines: $(sagefile) + @$(sagefile) GoLines + .PHONY: go-lint go-lint: $(sagefile) @$(sagefile) GoLint +.PHONY: go-lint-fix +go-lint-fix: $(sagefile) + @$(sagefile) GoLintFix + .PHONY: go-mod-tidy go-mod-tidy: $(sagefile) @$(sagefile) GoModTidy -.PHONY: go-review -go-review: $(sagefile) - @$(sagefile) GoReview - .PHONY: go-test go-test: $(sagefile) @$(sagefile) GoTest diff --git a/cmd/protoc-gen-go-aip/internal/genaip/testdata/test/multipattern/pattern_test.go b/cmd/protoc-gen-go-aip/internal/genaip/testdata/test/multipattern/pattern_test.go index 8293cd7792..7abe963c98 100644 --- a/cmd/protoc-gen-go-aip/internal/genaip/testdata/test/multipattern/pattern_test.go +++ b/cmd/protoc-gen-go-aip/internal/genaip/testdata/test/multipattern/pattern_test.go @@ -56,13 +56,21 @@ func TestShelvesBookResourceName(t *testing.T) { t.Run("bad top-level", func(t *testing.T) { var name ShelvesBookResourceName err := name.UnmarshalString("books/book") - assert.Error(t, err, "parse resource name 'books/book' with pattern 'shelves/{shelf}/books/{book}': segment shelves: got books") + assert.Error( + t, + err, + "parse resource name 'books/book' with pattern 'shelves/{shelf}/books/{book}': segment shelves: got books", + ) }) t.Run("bad wrong parent", func(t *testing.T) { var name ShelvesBookResourceName err := name.UnmarshalString("others/other/books/book") - assert.Error(t, err, "parse resource name 'others/other/books/book' with pattern 'shelves/{shelf}/books/{book}': segment shelves: got others") + assert.Error( + t, + err, + "parse resource name 'others/other/books/book' with pattern 'shelves/{shelf}/books/{book}': segment shelves: got others", + ) }) } @@ -87,13 +95,21 @@ func TestPublishersBookResourceName(t *testing.T) { t.Run("bad top-level", func(t *testing.T) { var name PublishersBookResourceName err := name.UnmarshalString("books/book") - assert.Error(t, err, "parse resource name 'books/book' with pattern 'publishers/{publisher}/books/{book}': segment publishers: got books") + assert.Error( + t, + err, + "parse resource name 'books/book' with pattern 'publishers/{publisher}/books/{book}': segment publishers: got books", + ) }) t.Run("bad wrong parent", func(t *testing.T) { var name PublishersBookResourceName err := name.UnmarshalString("others/other/books/book") - assert.Error(t, err, "parse resource name 'others/other/books/book' with pattern 'publishers/{publisher}/books/{book}': segment publishers: got others") + assert.Error( + t, + err, + "parse resource name 'others/other/books/book' with pattern 'publishers/{publisher}/books/{book}': segment publishers: got others", + ) }) } @@ -148,7 +164,11 @@ func TestShelfResourceName(t *testing.T) { t.Run("bad wrong parent", func(t *testing.T) { var name ShelfResourceName err := name.UnmarshalString("others/other/shelves/shelf") - assert.Error(t, err, "parse resource name 'others/other/shelves/shelf' with pattern 'shelves/{shelf}': segment shelves: got others") + assert.Error( + t, + err, + "parse resource name 'others/other/shelves/shelf' with pattern 'shelves/{shelf}': segment shelves: got others", + ) }) } @@ -173,13 +193,21 @@ func TestLibrariesShelfResourceName(t *testing.T) { t.Run("bad top-level", func(t *testing.T) { var name LibrariesShelfResourceName err := name.UnmarshalString("books/book") - assert.Error(t, err, "parse resource name 'books/book' with pattern 'libraries/{library}/shelves/{shelf}': segment libraries: got books") + assert.Error( + t, + err, + "parse resource name 'books/book' with pattern 'libraries/{library}/shelves/{shelf}': segment libraries: got books", + ) }) t.Run("bad wrong parent", func(t *testing.T) { var name LibrariesShelfResourceName err := name.UnmarshalString("others/other/shelves/shelf") - assert.Error(t, err, "parse resource name 'others/other/shelves/shelf' with pattern 'libraries/{library}/shelves/{shelf}': segment libraries: got others") + assert.Error( + t, + err, + "parse resource name 'others/other/shelves/shelf' with pattern 'libraries/{library}/shelves/{shelf}': segment libraries: got others", + ) }) } @@ -204,12 +232,20 @@ func TestRoomsShelfResourceName(t *testing.T) { t.Run("bad top-level", func(t *testing.T) { var name RoomsShelfResourceName err := name.UnmarshalString("books/book") - assert.Error(t, err, "parse resource name 'books/book' with pattern 'rooms/{room}/shelves/{shelf}': segment rooms: got books") + assert.Error( + t, + err, + "parse resource name 'books/book' with pattern 'rooms/{room}/shelves/{shelf}': segment rooms: got books", + ) }) t.Run("bad wrong parent", func(t *testing.T) { var name RoomsShelfResourceName err := name.UnmarshalString("others/other/shelves/shelf") - assert.Error(t, err, "parse resource name 'others/other/shelves/shelf' with pattern 'rooms/{room}/shelves/{shelf}': segment rooms: got others") + assert.Error( + t, + err, + "parse resource name 'others/other/shelves/shelf' with pattern 'rooms/{room}/shelves/{shelf}': segment rooms: got others", + ) }) } diff --git a/cmd/protoc-gen-go-aip/internal/genaip/testdata/test/originallysinglepattern/pattern_test.go b/cmd/protoc-gen-go-aip/internal/genaip/testdata/test/originallysinglepattern/pattern_test.go index 378b03967d..517d12bdc3 100644 --- a/cmd/protoc-gen-go-aip/internal/genaip/testdata/test/originallysinglepattern/pattern_test.go +++ b/cmd/protoc-gen-go-aip/internal/genaip/testdata/test/originallysinglepattern/pattern_test.go @@ -56,19 +56,31 @@ func TestBookResourceName(t *testing.T) { t.Run("bad top-level", func(t *testing.T) { var name BookResourceName err := name.UnmarshalString("books/book") - assert.Error(t, err, "parse resource name 'books/book' with pattern 'shelves/{shelf}/books/{book}': segment shelves: got books") + assert.Error( + t, + err, + "parse resource name 'books/book' with pattern 'shelves/{shelf}/books/{book}': segment shelves: got books", + ) }) t.Run("bad wrong parent", func(t *testing.T) { var name BookResourceName err := name.UnmarshalString("others/other/books/book") - assert.Error(t, err, "parse resource name 'others/other/books/book' with pattern 'shelves/{shelf}/books/{book}': segment shelves: got others") + assert.Error( + t, + err, + "parse resource name 'others/other/books/book' with pattern 'shelves/{shelf}/books/{book}': segment shelves: got others", + ) }) t.Run("bad newer parent", func(t *testing.T) { var name BookResourceName err := name.UnmarshalString("publishers/publisher/books/book") - assert.Error(t, err, "parse resource name 'publishers/publisher/books/book' with pattern 'shelves/{shelf}/books/{book}': segment shelves: got publishers") + assert.Error( + t, + err, + "parse resource name 'publishers/publisher/books/book' with pattern 'shelves/{shelf}/books/{book}': segment shelves: got publishers", + ) }) } @@ -93,13 +105,21 @@ func TestShelvesBookResourceName(t *testing.T) { t.Run("bad top-level", func(t *testing.T) { var name ShelvesBookResourceName err := name.UnmarshalString("books/book") - assert.Error(t, err, "parse resource name 'books/book' with pattern 'shelves/{shelf}/books/{book}': segment shelves: got books") + assert.Error( + t, + err, + "parse resource name 'books/book' with pattern 'shelves/{shelf}/books/{book}': segment shelves: got books", + ) }) t.Run("bad wrong parent", func(t *testing.T) { var name ShelvesBookResourceName err := name.UnmarshalString("others/other/books/book") - assert.Error(t, err, "parse resource name 'others/other/books/book' with pattern 'shelves/{shelf}/books/{book}': segment shelves: got others") + assert.Error( + t, + err, + "parse resource name 'others/other/books/book' with pattern 'shelves/{shelf}/books/{book}': segment shelves: got others", + ) }) } @@ -124,13 +144,21 @@ func TestPublishersBookResourceName(t *testing.T) { t.Run("bad top-level", func(t *testing.T) { var name PublishersBookResourceName err := name.UnmarshalString("books/book") - assert.Error(t, err, "parse resource name 'books/book' with pattern 'publishers/{publisher}/books/{book}': segment publishers: got books") + assert.Error( + t, + err, + "parse resource name 'books/book' with pattern 'publishers/{publisher}/books/{book}': segment publishers: got books", + ) }) t.Run("bad wrong parent", func(t *testing.T) { var name PublishersBookResourceName err := name.UnmarshalString("others/other/books/book") - assert.Error(t, err, "parse resource name 'others/other/books/book' with pattern 'publishers/{publisher}/books/{book}': segment publishers: got others") + assert.Error( + t, + err, + "parse resource name 'others/other/books/book' with pattern 'publishers/{publisher}/books/{book}': segment publishers: got others", + ) }) } @@ -157,7 +185,11 @@ func TestShelfResourceName(t *testing.T) { t.Run("bad wrong parent", func(t *testing.T) { var name ShelfResourceName err := name.UnmarshalString("others/other/shelves/shelf") - assert.Error(t, err, "parse resource name 'others/other/shelves/shelf' with pattern 'shelves/{shelf}': segment shelves: got others") + assert.Error( + t, + err, + "parse resource name 'others/other/shelves/shelf' with pattern 'shelves/{shelf}': segment shelves: got others", + ) }) } @@ -182,13 +214,21 @@ func TestLibrariesShelfResourceName(t *testing.T) { t.Run("bad top-level", func(t *testing.T) { var name LibrariesShelfResourceName err := name.UnmarshalString("books/book") - assert.Error(t, err, "parse resource name 'books/book' with pattern 'libraries/{library}/shelves/{shelf}': segment libraries: got books") + assert.Error( + t, + err, + "parse resource name 'books/book' with pattern 'libraries/{library}/shelves/{shelf}': segment libraries: got books", + ) }) t.Run("bad wrong parent", func(t *testing.T) { var name LibrariesShelfResourceName err := name.UnmarshalString("others/other/shelves/shelf") - assert.Error(t, err, "parse resource name 'others/other/shelves/shelf' with pattern 'libraries/{library}/shelves/{shelf}': segment libraries: got others") + assert.Error( + t, + err, + "parse resource name 'others/other/shelves/shelf' with pattern 'libraries/{library}/shelves/{shelf}': segment libraries: got others", + ) }) } @@ -213,12 +253,20 @@ func TestRoomsShelfResourceName(t *testing.T) { t.Run("bad top-level", func(t *testing.T) { var name RoomsShelfResourceName err := name.UnmarshalString("books/book") - assert.Error(t, err, "parse resource name 'books/book' with pattern 'rooms/{room}/shelves/{shelf}': segment rooms: got books") + assert.Error( + t, + err, + "parse resource name 'books/book' with pattern 'rooms/{room}/shelves/{shelf}': segment rooms: got books", + ) }) t.Run("bad wrong parent", func(t *testing.T) { var name RoomsShelfResourceName err := name.UnmarshalString("others/other/shelves/shelf") - assert.Error(t, err, "parse resource name 'others/other/shelves/shelf' with pattern 'rooms/{room}/shelves/{shelf}': segment rooms: got others") + assert.Error( + t, + err, + "parse resource name 'others/other/shelves/shelf' with pattern 'rooms/{room}/shelves/{shelf}': segment rooms: got others", + ) }) } diff --git a/cmd/protoc-gen-go-aip/internal/genaip/testdata/test/single/pattern_test.go b/cmd/protoc-gen-go-aip/internal/genaip/testdata/test/single/pattern_test.go index b027c6f169..bf4bfdd5c3 100644 --- a/cmd/protoc-gen-go-aip/internal/genaip/testdata/test/single/pattern_test.go +++ b/cmd/protoc-gen-go-aip/internal/genaip/testdata/test/single/pattern_test.go @@ -28,13 +28,21 @@ func TestBookResourceName(t *testing.T) { t.Run("bad top-level", func(t *testing.T) { var name BookResourceName err := name.UnmarshalString("books/book") - assert.Error(t, err, "parse resource name 'books/book' with pattern 'shelves/{shelf}/books/{book}': segment shelves: got books") + assert.Error( + t, + err, + "parse resource name 'books/book' with pattern 'shelves/{shelf}/books/{book}': segment shelves: got books", + ) }) t.Run("bad wrong parent", func(t *testing.T) { var name BookResourceName err := name.UnmarshalString("others/other/books/book") - assert.Error(t, err, "parse resource name 'others/other/books/book' with pattern 'shelves/{shelf}/books/{book}': segment shelves: got others") + assert.Error( + t, + err, + "parse resource name 'others/other/books/book' with pattern 'shelves/{shelf}/books/{book}': segment shelves: got others", + ) }) } @@ -61,6 +69,10 @@ func TestShelfResourceName(t *testing.T) { t.Run("bad wrong parent", func(t *testing.T) { var name ShelfResourceName err := name.UnmarshalString("others/other/shelves/shelf") - assert.Error(t, err, "parse resource name 'others/other/shelves/shelf' with pattern 'shelves/{shelf}': segment shelves: got others") + assert.Error( + t, + err, + "parse resource name 'others/other/shelves/shelf' with pattern 'shelves/{shelf}': segment shelves: got others", + ) }) }