From f23e085536febfddec941b49ac0033f93e8662cc Mon Sep 17 00:00:00 2001 From: Artur Sawicki Date: Mon, 7 Oct 2024 15:02:51 +0200 Subject: [PATCH] chore: Bump golang-ci lint to 1.61 (#3112) To be able to run successfully with go 1.23.2. --- Makefile | 2 +- main.go | 1 - pkg/sdk/views_gen_test.go | 9 ++++----- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 46d53e635f..99a213fb55 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ export TERRAFORM_PLUGIN_LOCAL_INSTALL=$(TERRAFORM_PLUGINS_DIR)/$(BASE_BINARY_NAM default: help dev-setup: ## setup development dependencies - @which ./bin/golangci-lint || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b ./bin v1.55.2 + @which ./bin/golangci-lint || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b ./bin v1.61.0 cd tools && mkdir -p bin/ cd tools && env GOBIN=$$PWD/bin go install github.com/hashicorp/terraform-plugin-docs/cmd/tfplugindocs cd tools && env GOBIN=$$PWD/bin go install mvdan.cc/gofumpt diff --git a/main.go b/main.go index d0118612ae..4e3937ba73 100644 --- a/main.go +++ b/main.go @@ -56,7 +56,6 @@ func main() { muxServer.ProviderServer, serveOpts..., ) - if err != nil { log.Fatal(err) } diff --git a/pkg/sdk/views_gen_test.go b/pkg/sdk/views_gen_test.go index 919ab84e89..abf27e0cbe 100644 --- a/pkg/sdk/views_gen_test.go +++ b/pkg/sdk/views_gen_test.go @@ -1,7 +1,6 @@ package sdk import ( - "fmt" "testing" ) @@ -530,7 +529,7 @@ func TestViews_Show(t *testing.T) { Database: id, }, } - assertOptsValidAndSQLEquals(t, opts, fmt.Sprintf("SHOW VIEWS IN DATABASE %s", id.FullyQualifiedName())) + assertOptsValidAndSQLEquals(t, opts, "SHOW VIEWS IN DATABASE %s", id.FullyQualifiedName()) }) t.Run("in schema", func(t *testing.T) { @@ -541,7 +540,7 @@ func TestViews_Show(t *testing.T) { Schema: id, }, } - assertOptsValidAndSQLEquals(t, opts, fmt.Sprintf("SHOW VIEWS IN SCHEMA %s", id.FullyQualifiedName())) + assertOptsValidAndSQLEquals(t, opts, "SHOW VIEWS IN SCHEMA %s", id.FullyQualifiedName()) }) t.Run("in application", func(t *testing.T) { @@ -550,7 +549,7 @@ func TestViews_Show(t *testing.T) { opts.In = &ExtendedIn{ Application: id, } - assertOptsValidAndSQLEquals(t, opts, fmt.Sprintf("SHOW VIEWS IN APPLICATION %s", id.FullyQualifiedName())) + assertOptsValidAndSQLEquals(t, opts, "SHOW VIEWS IN APPLICATION %s", id.FullyQualifiedName()) }) t.Run("in application package", func(t *testing.T) { @@ -559,7 +558,7 @@ func TestViews_Show(t *testing.T) { opts.In = &ExtendedIn{ ApplicationPackage: id, } - assertOptsValidAndSQLEquals(t, opts, fmt.Sprintf("SHOW VIEWS IN APPLICATION PACKAGE %s", id.FullyQualifiedName())) + assertOptsValidAndSQLEquals(t, opts, "SHOW VIEWS IN APPLICATION PACKAGE %s", id.FullyQualifiedName()) }) t.Run("all options", func(t *testing.T) {