From 36ef8f96408f94efb04c358d4766b886d69c96b6 Mon Sep 17 00:00:00 2001 From: Haris Osmanagic Date: Thu, 16 Mar 2023 10:53:16 +0100 Subject: [PATCH 1/2] Upgrade to Go 1.20, remove abandoned linters --- .github/workflows/build.yml | 2 +- .github/workflows/lint.yml | 5 +++-- .github/workflows/release.yml | 2 +- .golangci.yml | 3 --- go.mod | 2 +- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 709dbdc1..b0d469e6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,7 +14,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: "1.20" - name: Test run: make test GOTEST_FLAGS="-v -count=1" diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index dc8943f0..f20cb926 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -12,8 +12,9 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: "1.20" - name: golangci-lint uses: golangci/golangci-lint-action@v3.4.0 with: - version: v1.50.1 + version: v1.51.2 + args: --timeout=2m diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index aa2047f4..b02ded1a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,7 +21,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: "1.20" - name: Run GoReleaser uses: goreleaser/goreleaser-action@v4 diff --git a/.golangci.yml b/.golangci.yml index 8fae7642..12cfe23b 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -23,7 +23,6 @@ linters: disable-all: true enable: - bodyclose - - deadcode # - depguard - dogsled - durationcheck @@ -70,7 +69,6 @@ linters: - predeclared - rowserrcheck - staticcheck - - structcheck - stylecheck - sqlclosecheck # - tagliatelle @@ -81,7 +79,6 @@ linters: - unconvert # - unparam - unused - - varcheck - wastedassign - whitespace # - wrapcheck diff --git a/go.mod b/go.mod index f99c2d77..3e44035c 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/conduitio/conduit-connector-postgres -go 1.18 +go 1.20 require ( github.com/Masterminds/squirrel v1.5.3 From 12c127e0b7726fd821df4508617180d8fd970e36 Mon Sep 17 00:00:00 2001 From: Haris Osmanagic Date: Tue, 11 Apr 2023 13:33:54 +0200 Subject: [PATCH 2/2] Bump SDK version to v0.6.0 --- go.mod | 6 +++--- go.sum | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 43278088..88f8cdb3 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.20 require ( github.com/Masterminds/squirrel v1.5.4 - github.com/conduitio/conduit-connector-sdk v0.5.2 + github.com/conduitio/conduit-connector-sdk v0.6.0 github.com/jackc/pgconn v1.14.0 github.com/jackc/pglogrepl v0.0.0-20220305000529-420b8467887a github.com/jackc/pgproto3/v2 v2.3.2 @@ -17,7 +17,7 @@ require ( github.com/Masterminds/goutils v1.1.1 // indirect github.com/Masterminds/semver/v3 v3.2.0 // indirect github.com/Masterminds/sprig/v3 v3.2.3 // indirect - github.com/conduitio/conduit-connector-protocol v0.4.1 // indirect + github.com/conduitio/conduit-connector-protocol v0.5.0 // indirect github.com/fatih/color v1.13.0 // indirect github.com/gofrs/uuid v4.2.0+incompatible // indirect github.com/golang/protobuf v1.5.2 // indirect @@ -48,7 +48,7 @@ require ( github.com/shopspring/decimal v1.2.0 // indirect github.com/spf13/cast v1.3.1 // indirect go.uber.org/goleak v1.2.1 // indirect - go.uber.org/multierr v1.10.0 // indirect + go.uber.org/multierr v1.11.0 // indirect golang.org/x/crypto v0.6.0 // indirect golang.org/x/exp v0.0.0-20221114191408-850992195362 // indirect golang.org/x/net v0.7.0 // indirect diff --git a/go.sum b/go.sum index 559cf722..2b588c19 100644 --- a/go.sum +++ b/go.sum @@ -13,10 +13,10 @@ github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I= github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ= -github.com/conduitio/conduit-connector-protocol v0.4.1 h1:QIqvkpfVVSxsBHltMKRpy4l5u1M3psAF0SePxhv+CTU= -github.com/conduitio/conduit-connector-protocol v0.4.1/go.mod h1:UIhHWxq52hvwwbkvQDaRgZRHfbpDDmU7tZaw0mwLdd4= -github.com/conduitio/conduit-connector-sdk v0.5.2 h1:YOPWaG/+NrAzJNkuFbvN6pPk3SdQDErRtipiSH3XT2c= -github.com/conduitio/conduit-connector-sdk v0.5.2/go.mod h1:Ih8mHJWX2+TvFj429hcrj361vJNULw7FWk4iz1W5l9s= +github.com/conduitio/conduit-connector-protocol v0.5.0 h1:Rr2SsDAvWDryQArvonwPoXBELQA2wRXr49xBLrAtBaM= +github.com/conduitio/conduit-connector-protocol v0.5.0/go.mod h1:UIhHWxq52hvwwbkvQDaRgZRHfbpDDmU7tZaw0mwLdd4= +github.com/conduitio/conduit-connector-sdk v0.6.0 h1:WK9Pts2j3Y6xInTAz7WccEwwt2eGQWweTxJoITTURTY= +github.com/conduitio/conduit-connector-sdk v0.6.0/go.mod h1:wcaEzbC2uz43wRF/XV3bMWWbOyfYkoQ7znJHSIdnYH0= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= @@ -220,8 +220,8 @@ go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= -go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ= -go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= +go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= +go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=