From 7499d471751aa8b741fdde19c53b154955b001a3 Mon Sep 17 00:00:00 2001 From: Alec Thomas Date: Sat, 23 Sep 2023 18:58:27 +1000 Subject: [PATCH] chore: upgrade all out of date tools (#417) --- .golangci.yml | 21 +++++++++++-------- bin/{.act-0.2.45.pkg => .bit-0.3.1.pkg} | 0 bin/{.bit-0.3.0.pkg => .buf-1.26.1.pkg} | 0 bin/{.buf-1.15.0.pkg => .dbmate-2.6.0.pkg} | 0 bin/{.caddy-2.6.4.pkg => .go-1.21.1.pkg} | 0 ...te-2.5.0.pkg => .golangci-lint-1.54.2.pkg} | 0 bin/{.go-1.21.0.pkg => .grpcurl-1.8.8.pkg} | 0 ...angci-lint-1.51.2.pkg => .helm-3.12.3.pkg} | 0 bin/{.grpcurl-1.8.7.pkg => .k3d-5.6.0.pkg} | 0 bin/{.helm-3.12.2.pkg => .kotlin-1.9.10.pkg} | 0 bin/{.k3d-5.5.1.pkg => .kubectl-1.28.1.pkg} | 0 bin/{.kotlin-1.8.10.pkg => .node-20.7.0.pkg} | 0 ...bectl-1.24.0.pkg => .pre-commit-3.4.0.pkg} | 0 ...e-20.5.0.pkg => .protoc-gen-go-1.31.0.pkg} | 0 bin/.sqlc-1.20.0.pkg | 1 - ....pre-commit-3.3.3.pkg => .sqlc-1.21.0.pkg} | 0 bin/.watchexec-1.22.3.pkg | 1 - ...en-go-1.28.1.pkg => .watchexec-1.23.0.pkg} | 0 bin/act | 1 - bin/bit | 2 +- bin/buf | 2 +- bin/caddy | 1 - bin/corepack | 2 +- bin/dbmate | 2 +- bin/go | 2 +- bin/gofmt | 2 +- bin/golangci-lint | 2 +- bin/grpcurl | 2 +- bin/helm | 2 +- bin/k3d | 2 +- bin/kapt | 2 +- bin/kotlin | 2 +- bin/kotlin-dce-js | 2 +- bin/kotlinc-js | 2 +- bin/kotlinc-jvm | 2 +- bin/kubectl | 2 +- bin/node | 2 +- bin/npm | 2 +- bin/npx | 2 +- bin/pre-commit | 2 +- bin/protoc-gen-buf-breaking | 2 +- bin/protoc-gen-buf-lint | 2 +- bin/protoc-gen-go | 2 +- bin/sqlc | 2 +- bin/watchexec | 2 +- go-runtime/compile/schema_test.go | 7 +++++-- protos/xyz/block/ftl/v1/console/console.pb.go | 4 +++- protos/xyz/block/ftl/v1/ftl.pb.go | 3 ++- protos/xyz/block/ftl/v1/schema/runtime.pb.go | 2 +- protos/xyz/block/ftl/v1/schema/schema.pb.go | 5 ++++- 50 files changed, 52 insertions(+), 44 deletions(-) rename bin/{.act-0.2.45.pkg => .bit-0.3.1.pkg} (100%) rename bin/{.bit-0.3.0.pkg => .buf-1.26.1.pkg} (100%) rename bin/{.buf-1.15.0.pkg => .dbmate-2.6.0.pkg} (100%) rename bin/{.caddy-2.6.4.pkg => .go-1.21.1.pkg} (100%) rename bin/{.dbmate-2.5.0.pkg => .golangci-lint-1.54.2.pkg} (100%) rename bin/{.go-1.21.0.pkg => .grpcurl-1.8.8.pkg} (100%) rename bin/{.golangci-lint-1.51.2.pkg => .helm-3.12.3.pkg} (100%) rename bin/{.grpcurl-1.8.7.pkg => .k3d-5.6.0.pkg} (100%) rename bin/{.helm-3.12.2.pkg => .kotlin-1.9.10.pkg} (100%) rename bin/{.k3d-5.5.1.pkg => .kubectl-1.28.1.pkg} (100%) rename bin/{.kotlin-1.8.10.pkg => .node-20.7.0.pkg} (100%) rename bin/{.kubectl-1.24.0.pkg => .pre-commit-3.4.0.pkg} (100%) rename bin/{.node-20.5.0.pkg => .protoc-gen-go-1.31.0.pkg} (100%) delete mode 120000 bin/.sqlc-1.20.0.pkg rename bin/{.pre-commit-3.3.3.pkg => .sqlc-1.21.0.pkg} (100%) delete mode 120000 bin/.watchexec-1.22.3.pkg rename bin/{.protoc-gen-go-1.28.1.pkg => .watchexec-1.23.0.pkg} (100%) delete mode 120000 bin/act delete mode 120000 bin/caddy diff --git a/.golangci.yml b/.golangci.yml index d86af17131..8624387cc5 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -69,6 +69,8 @@ linters: - musttag - gofmt # autofmt - interfacebloat + - tagalign + - nolintlint linters-settings: exhaustive: @@ -87,15 +89,15 @@ linters-settings: disabled-checks: - ifElseChain depguard: - list-type: blacklist - include-go-root: true - packages-with-error-message: - - errors: "use github.com/alecthomas/errors" - - github.com/pkg/errors: "use github.com/alecthomas/errors" - - github.com/stretchr/testify: "use alecthomas/assert" - forbidigo: - forbid: - - 'fmt\.Errorf' + rules: + main: + deny: + - pkg: errors + desc: "use github.com/alecthomas/errors" + - pkg: github.com/pkg/errors + desc: "use github.com/alecthomas/errors" + - pkg: github.com/stretchr/testify + desc: "use alecthomas/assert" wrapcheck: ignorePackageGlobs: - github.com/TBD54566975/ftl/* @@ -124,3 +126,4 @@ issues: - "blank-imports" - 'should have comment \(or a comment on this block\) or be unexported' - caseOrder + - unused-parameter diff --git a/bin/.act-0.2.45.pkg b/bin/.bit-0.3.1.pkg similarity index 100% rename from bin/.act-0.2.45.pkg rename to bin/.bit-0.3.1.pkg diff --git a/bin/.bit-0.3.0.pkg b/bin/.buf-1.26.1.pkg similarity index 100% rename from bin/.bit-0.3.0.pkg rename to bin/.buf-1.26.1.pkg diff --git a/bin/.buf-1.15.0.pkg b/bin/.dbmate-2.6.0.pkg similarity index 100% rename from bin/.buf-1.15.0.pkg rename to bin/.dbmate-2.6.0.pkg diff --git a/bin/.caddy-2.6.4.pkg b/bin/.go-1.21.1.pkg similarity index 100% rename from bin/.caddy-2.6.4.pkg rename to bin/.go-1.21.1.pkg diff --git a/bin/.dbmate-2.5.0.pkg b/bin/.golangci-lint-1.54.2.pkg similarity index 100% rename from bin/.dbmate-2.5.0.pkg rename to bin/.golangci-lint-1.54.2.pkg diff --git a/bin/.go-1.21.0.pkg b/bin/.grpcurl-1.8.8.pkg similarity index 100% rename from bin/.go-1.21.0.pkg rename to bin/.grpcurl-1.8.8.pkg diff --git a/bin/.golangci-lint-1.51.2.pkg b/bin/.helm-3.12.3.pkg similarity index 100% rename from bin/.golangci-lint-1.51.2.pkg rename to bin/.helm-3.12.3.pkg diff --git a/bin/.grpcurl-1.8.7.pkg b/bin/.k3d-5.6.0.pkg similarity index 100% rename from bin/.grpcurl-1.8.7.pkg rename to bin/.k3d-5.6.0.pkg diff --git a/bin/.helm-3.12.2.pkg b/bin/.kotlin-1.9.10.pkg similarity index 100% rename from bin/.helm-3.12.2.pkg rename to bin/.kotlin-1.9.10.pkg diff --git a/bin/.k3d-5.5.1.pkg b/bin/.kubectl-1.28.1.pkg similarity index 100% rename from bin/.k3d-5.5.1.pkg rename to bin/.kubectl-1.28.1.pkg diff --git a/bin/.kotlin-1.8.10.pkg b/bin/.node-20.7.0.pkg similarity index 100% rename from bin/.kotlin-1.8.10.pkg rename to bin/.node-20.7.0.pkg diff --git a/bin/.kubectl-1.24.0.pkg b/bin/.pre-commit-3.4.0.pkg similarity index 100% rename from bin/.kubectl-1.24.0.pkg rename to bin/.pre-commit-3.4.0.pkg diff --git a/bin/.node-20.5.0.pkg b/bin/.protoc-gen-go-1.31.0.pkg similarity index 100% rename from bin/.node-20.5.0.pkg rename to bin/.protoc-gen-go-1.31.0.pkg diff --git a/bin/.sqlc-1.20.0.pkg b/bin/.sqlc-1.20.0.pkg deleted file mode 120000 index 383f4511d4..0000000000 --- a/bin/.sqlc-1.20.0.pkg +++ /dev/null @@ -1 +0,0 @@ -hermit \ No newline at end of file diff --git a/bin/.pre-commit-3.3.3.pkg b/bin/.sqlc-1.21.0.pkg similarity index 100% rename from bin/.pre-commit-3.3.3.pkg rename to bin/.sqlc-1.21.0.pkg diff --git a/bin/.watchexec-1.22.3.pkg b/bin/.watchexec-1.22.3.pkg deleted file mode 120000 index 383f4511d4..0000000000 --- a/bin/.watchexec-1.22.3.pkg +++ /dev/null @@ -1 +0,0 @@ -hermit \ No newline at end of file diff --git a/bin/.protoc-gen-go-1.28.1.pkg b/bin/.watchexec-1.23.0.pkg similarity index 100% rename from bin/.protoc-gen-go-1.28.1.pkg rename to bin/.watchexec-1.23.0.pkg diff --git a/bin/act b/bin/act deleted file mode 120000 index 9c335974e6..0000000000 --- a/bin/act +++ /dev/null @@ -1 +0,0 @@ -.act-0.2.45.pkg \ No newline at end of file diff --git a/bin/bit b/bin/bit index 6e568dab01..4cbfb25017 120000 --- a/bin/bit +++ b/bin/bit @@ -1 +1 @@ -.bit-0.3.0.pkg \ No newline at end of file +.bit-0.3.1.pkg \ No newline at end of file diff --git a/bin/buf b/bin/buf index 565ec553fa..a53b857e83 120000 --- a/bin/buf +++ b/bin/buf @@ -1 +1 @@ -.buf-1.15.0.pkg \ No newline at end of file +.buf-1.26.1.pkg \ No newline at end of file diff --git a/bin/caddy b/bin/caddy deleted file mode 120000 index 97bd8f92f4..0000000000 --- a/bin/caddy +++ /dev/null @@ -1 +0,0 @@ -.caddy-2.6.4.pkg \ No newline at end of file diff --git a/bin/corepack b/bin/corepack index fc4228d5a3..58016e770f 120000 --- a/bin/corepack +++ b/bin/corepack @@ -1 +1 @@ -.node-20.5.0.pkg \ No newline at end of file +.node-20.7.0.pkg \ No newline at end of file diff --git a/bin/dbmate b/bin/dbmate index 7813a7b380..ea08120607 120000 --- a/bin/dbmate +++ b/bin/dbmate @@ -1 +1 @@ -.dbmate-2.5.0.pkg \ No newline at end of file +.dbmate-2.6.0.pkg \ No newline at end of file diff --git a/bin/go b/bin/go index 66116ff062..0eb62e274f 120000 --- a/bin/go +++ b/bin/go @@ -1 +1 @@ -.go-1.21.0.pkg \ No newline at end of file +.go-1.21.1.pkg \ No newline at end of file diff --git a/bin/gofmt b/bin/gofmt index 66116ff062..0eb62e274f 120000 --- a/bin/gofmt +++ b/bin/gofmt @@ -1 +1 @@ -.go-1.21.0.pkg \ No newline at end of file +.go-1.21.1.pkg \ No newline at end of file diff --git a/bin/golangci-lint b/bin/golangci-lint index 7d8886c71d..268cdee0f1 120000 --- a/bin/golangci-lint +++ b/bin/golangci-lint @@ -1 +1 @@ -.golangci-lint-1.51.2.pkg \ No newline at end of file +.golangci-lint-1.54.2.pkg \ No newline at end of file diff --git a/bin/grpcurl b/bin/grpcurl index ec73950650..942b1dd827 120000 --- a/bin/grpcurl +++ b/bin/grpcurl @@ -1 +1 @@ -.grpcurl-1.8.7.pkg \ No newline at end of file +.grpcurl-1.8.8.pkg \ No newline at end of file diff --git a/bin/helm b/bin/helm index 2b80eb34b5..37747daac6 120000 --- a/bin/helm +++ b/bin/helm @@ -1 +1 @@ -.helm-3.12.2.pkg \ No newline at end of file +.helm-3.12.3.pkg \ No newline at end of file diff --git a/bin/k3d b/bin/k3d index 6d3450b905..9316ea24fb 120000 --- a/bin/k3d +++ b/bin/k3d @@ -1 +1 @@ -.k3d-5.5.1.pkg \ No newline at end of file +.k3d-5.6.0.pkg \ No newline at end of file diff --git a/bin/kapt b/bin/kapt index 2173588a8c..b953f65451 120000 --- a/bin/kapt +++ b/bin/kapt @@ -1 +1 @@ -.kotlin-1.8.10.pkg \ No newline at end of file +.kotlin-1.9.10.pkg \ No newline at end of file diff --git a/bin/kotlin b/bin/kotlin index 2173588a8c..b953f65451 120000 --- a/bin/kotlin +++ b/bin/kotlin @@ -1 +1 @@ -.kotlin-1.8.10.pkg \ No newline at end of file +.kotlin-1.9.10.pkg \ No newline at end of file diff --git a/bin/kotlin-dce-js b/bin/kotlin-dce-js index 2173588a8c..b953f65451 120000 --- a/bin/kotlin-dce-js +++ b/bin/kotlin-dce-js @@ -1 +1 @@ -.kotlin-1.8.10.pkg \ No newline at end of file +.kotlin-1.9.10.pkg \ No newline at end of file diff --git a/bin/kotlinc-js b/bin/kotlinc-js index 2173588a8c..b953f65451 120000 --- a/bin/kotlinc-js +++ b/bin/kotlinc-js @@ -1 +1 @@ -.kotlin-1.8.10.pkg \ No newline at end of file +.kotlin-1.9.10.pkg \ No newline at end of file diff --git a/bin/kotlinc-jvm b/bin/kotlinc-jvm index 2173588a8c..b953f65451 120000 --- a/bin/kotlinc-jvm +++ b/bin/kotlinc-jvm @@ -1 +1 @@ -.kotlin-1.8.10.pkg \ No newline at end of file +.kotlin-1.9.10.pkg \ No newline at end of file diff --git a/bin/kubectl b/bin/kubectl index 5afd2cfd7c..fcb70bd954 120000 --- a/bin/kubectl +++ b/bin/kubectl @@ -1 +1 @@ -.kubectl-1.24.0.pkg \ No newline at end of file +.kubectl-1.28.1.pkg \ No newline at end of file diff --git a/bin/node b/bin/node index fc4228d5a3..58016e770f 120000 --- a/bin/node +++ b/bin/node @@ -1 +1 @@ -.node-20.5.0.pkg \ No newline at end of file +.node-20.7.0.pkg \ No newline at end of file diff --git a/bin/npm b/bin/npm index fc4228d5a3..58016e770f 120000 --- a/bin/npm +++ b/bin/npm @@ -1 +1 @@ -.node-20.5.0.pkg \ No newline at end of file +.node-20.7.0.pkg \ No newline at end of file diff --git a/bin/npx b/bin/npx index fc4228d5a3..58016e770f 120000 --- a/bin/npx +++ b/bin/npx @@ -1 +1 @@ -.node-20.5.0.pkg \ No newline at end of file +.node-20.7.0.pkg \ No newline at end of file diff --git a/bin/pre-commit b/bin/pre-commit index ae2fb8567a..83cd854c6f 120000 --- a/bin/pre-commit +++ b/bin/pre-commit @@ -1 +1 @@ -.pre-commit-3.3.3.pkg \ No newline at end of file +.pre-commit-3.4.0.pkg \ No newline at end of file diff --git a/bin/protoc-gen-buf-breaking b/bin/protoc-gen-buf-breaking index 565ec553fa..a53b857e83 120000 --- a/bin/protoc-gen-buf-breaking +++ b/bin/protoc-gen-buf-breaking @@ -1 +1 @@ -.buf-1.15.0.pkg \ No newline at end of file +.buf-1.26.1.pkg \ No newline at end of file diff --git a/bin/protoc-gen-buf-lint b/bin/protoc-gen-buf-lint index 565ec553fa..a53b857e83 120000 --- a/bin/protoc-gen-buf-lint +++ b/bin/protoc-gen-buf-lint @@ -1 +1 @@ -.buf-1.15.0.pkg \ No newline at end of file +.buf-1.26.1.pkg \ No newline at end of file diff --git a/bin/protoc-gen-go b/bin/protoc-gen-go index 1d8f14ea35..2fc78c45f3 120000 --- a/bin/protoc-gen-go +++ b/bin/protoc-gen-go @@ -1 +1 @@ -.protoc-gen-go-1.28.1.pkg \ No newline at end of file +.protoc-gen-go-1.31.0.pkg \ No newline at end of file diff --git a/bin/sqlc b/bin/sqlc index c712ff53d2..c762c7e1b4 120000 --- a/bin/sqlc +++ b/bin/sqlc @@ -1 +1 @@ -.sqlc-1.20.0.pkg \ No newline at end of file +.sqlc-1.21.0.pkg \ No newline at end of file diff --git a/bin/watchexec b/bin/watchexec index 1ebd06f7cd..ac8ef2e57e 120000 --- a/bin/watchexec +++ b/bin/watchexec @@ -1 +1 @@ -.watchexec-1.22.3.pkg \ No newline at end of file +.watchexec-1.23.0.pkg \ No newline at end of file diff --git a/go-runtime/compile/schema_test.go b/go-runtime/compile/schema_test.go index cede36b064..5015cfeca3 100644 --- a/go-runtime/compile/schema_test.go +++ b/go-runtime/compile/schema_test.go @@ -1,11 +1,13 @@ package compile import ( - "github.com/TBD54566975/ftl/backend/schema" - "github.com/alecthomas/assert/v2" "go/ast" "go/types" "testing" + + "github.com/alecthomas/assert/v2" + + "github.com/TBD54566975/ftl/backend/schema" ) func TestParseDirectives(t *testing.T) { @@ -33,6 +35,7 @@ func TestParseDirectives(t *testing.T) { }, } for _, tt := range tests { + tt := tt t.Run(tt.name, func(t *testing.T) { got, err := directiveParser.ParseString("", tt.input) assert.NoError(t, err) diff --git a/protos/xyz/block/ftl/v1/console/console.pb.go b/protos/xyz/block/ftl/v1/console/console.pb.go index 9cfd45cde0..807d6303bf 100644 --- a/protos/xyz/block/ftl/v1/console/console.pb.go +++ b/protos/xyz/block/ftl/v1/console/console.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 +// protoc-gen-go v1.31.0 // protoc (unknown) // source: xyz/block/ftl/v1/console/console.proto @@ -1006,6 +1006,7 @@ type Event struct { // Unique ID for event. Id int64 `protobuf:"varint,2,opt,name=id,proto3" json:"id,omitempty"` // Types that are assignable to Entry: + // // *Event_Log // *Event_Call // *Event_DeploymentCreated @@ -1606,6 +1607,7 @@ type EventsQuery_Filter struct { // These map 1:1 with filters in backend/controller/internal/dal/events.go // // Types that are assignable to Filter: + // // *EventsQuery_Filter_Limit // *EventsQuery_Filter_LogLevel // *EventsQuery_Filter_Deployments diff --git a/protos/xyz/block/ftl/v1/ftl.pb.go b/protos/xyz/block/ftl/v1/ftl.pb.go index 11dfcdd65d..97b31b0549 100644 --- a/protos/xyz/block/ftl/v1/ftl.pb.go +++ b/protos/xyz/block/ftl/v1/ftl.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 +// protoc-gen-go v1.31.0 // protoc (unknown) // source: xyz/block/ftl/v1/ftl.proto @@ -377,6 +377,7 @@ type CallResponse struct { unknownFields protoimpl.UnknownFields // Types that are assignable to Response: + // // *CallResponse_Body // *CallResponse_Error_ Response isCallResponse_Response `protobuf_oneof:"response"` diff --git a/protos/xyz/block/ftl/v1/schema/runtime.pb.go b/protos/xyz/block/ftl/v1/schema/runtime.pb.go index e663c02d7e..329526ba25 100644 --- a/protos/xyz/block/ftl/v1/schema/runtime.pb.go +++ b/protos/xyz/block/ftl/v1/schema/runtime.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 +// protoc-gen-go v1.31.0 // protoc (unknown) // source: xyz/block/ftl/v1/schema/runtime.proto diff --git a/protos/xyz/block/ftl/v1/schema/schema.pb.go b/protos/xyz/block/ftl/v1/schema/schema.pb.go index 73a25ddbd6..2b1e71b3bb 100644 --- a/protos/xyz/block/ftl/v1/schema/schema.pb.go +++ b/protos/xyz/block/ftl/v1/schema/schema.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 +// protoc-gen-go v1.31.0 // protoc (unknown) // source: xyz/block/ftl/v1/schema/schema.proto @@ -255,6 +255,7 @@ type Decl struct { unknownFields protoimpl.UnknownFields // Types that are assignable to Value: + // // *Decl_Data // *Decl_Verb Value isDecl_Value `protobuf_oneof:"value"` @@ -537,6 +538,7 @@ type Metadata struct { unknownFields protoimpl.UnknownFields // Types that are assignable to Value: + // // *Metadata_Calls // *Metadata_Ingress Value isMetadata_Value `protobuf_oneof:"value"` @@ -1008,6 +1010,7 @@ type Type struct { unknownFields protoimpl.UnknownFields // Types that are assignable to Value: + // // *Type_Int // *Type_Float // *Type_String_