From 91744629c35eec86a4e734dab3193d0f489bdafa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 Feb 2023 03:04:55 +0000 Subject: [PATCH 1/5] build(deps): bump golang from 1.19 to 1.20 Bumps golang from 1.19 to 1.20. --- updated-dependencies: - dependency-name: golang dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Dockerfile | 2 +- Dockerfile.mini | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index db7d8dcca..341df5702 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ # builder image ARG ARCH -FROM golang:1.19 as builder +FROM golang:1.20 as builder ARG ARCH WORKDIR /sigs.k8s.io/external-dns diff --git a/Dockerfile.mini b/Dockerfile.mini index 90cba37d9..2428351ae 100644 --- a/Dockerfile.mini +++ b/Dockerfile.mini @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.19 as builder +FROM golang:1.20 as builder WORKDIR /sigs.k8s.io/external-dns From 93e7fcdb64b789ca5e3670dee9f2dfbfc67cc77f Mon Sep 17 00:00:00 2001 From: Michel Loiseleur Date: Fri, 9 Jun 2023 11:13:35 +0200 Subject: [PATCH 2/5] update go 1.20 on go.mod, docs & on ci --- .github/workflows/ci.yml | 4 ++-- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/docs.yml | 2 +- docs/contributing/getting-started.md | 2 +- go.mod | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f3d36d5d5..173721737 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v4 with: - go-version: 1.19 + go-version: 1.20 id: go - name: Check out code into the Go module directory @@ -38,7 +38,7 @@ jobs: apt update apt install -y make gcc libc-dev git if: github.actor == 'nektos/act' - + - name: Test run: make test diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index bf37e27d3..cadcb0488 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -30,7 +30,7 @@ jobs: - name: Install go version uses: actions/setup-go@v3 with: - go-version: '^1.19' + go-version: '^1.20' # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 112048477..aef5af4cc 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -26,7 +26,7 @@ jobs: - uses: actions/setup-go@v4 with: - go-version: ^1.19 + go-version: ^1.20 - run: | pip install -r docs/scripts/requirements.txt diff --git a/docs/contributing/getting-started.md b/docs/contributing/getting-started.md index 82976ee6d..7cf42ca09 100644 --- a/docs/contributing/getting-started.md +++ b/docs/contributing/getting-started.md @@ -1,7 +1,7 @@ # Quick Start - [Git](https://git-scm.com/downloads) -- [Go 1.19+](https://golang.org/dl/) +- [Go 1.20+](https://golang.org/dl/) - [Go modules](https://github.com/golang/go/wiki/Modules) - [golangci-lint](https://github.com/golangci/golangci-lint) - [Docker](https://docs.docker.com/install/) diff --git a/go.mod b/go.mod index 16af9aad9..4d848314c 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/external-dns -go 1.19 +go 1.20 require ( cloud.google.com/go/compute/metadata v0.2.3 From de20b13879a32ba990502ac7fdfb3422370e27f2 Mon Sep 17 00:00:00 2001 From: Michel Loiseleur Date: Fri, 9 Jun 2023 12:04:58 +0200 Subject: [PATCH 3/5] add golangci-lint update --- .github/workflows/lint.yaml | 2 +- .golangci.yml | 1 - provider/coredns/coredns.go | 2 +- provider/rdns/rdns.go | 2 +- provider/tencentcloud/cloudapi/mockapi.go | 2 +- source/fake.go | 2 +- 6 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 41b9880fa..58465ce1f 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -31,5 +31,5 @@ jobs: - name: Lint run: | - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.50.1 + curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.53.2 make lint diff --git a/.golangci.yml b/.golangci.yml index 20c72e8c2..e5a24cf6a 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -19,7 +19,6 @@ linters: # inverted configuration with `enable-all` and `disable` is not scalable during updates of golangci-lint disable-all: true enable: - - depguard - dogsled - gofmt - goimports diff --git a/provider/coredns/coredns.go b/provider/coredns/coredns.go index 356ffee73..0d6255286 100644 --- a/provider/coredns/coredns.go +++ b/provider/coredns/coredns.go @@ -38,7 +38,7 @@ import ( ) func init() { - rand.Seed(time.Now().UnixNano()) + rand.New(rand.NewSource(time.Now().UnixNano())) } const ( diff --git a/provider/rdns/rdns.go b/provider/rdns/rdns.go index e645be0bc..42feadcef 100644 --- a/provider/rdns/rdns.go +++ b/provider/rdns/rdns.go @@ -46,7 +46,7 @@ const ( ) func init() { - rand.Seed(time.Now().UnixNano()) + rand.New(rand.NewSource(time.Now().UnixNano())) } // RDNSClient is an interface to work with Rancher DNS(RDNS) records in etcdv3 backend. diff --git a/provider/tencentcloud/cloudapi/mockapi.go b/provider/tencentcloud/cloudapi/mockapi.go index 424bd6102..bdf6dabb2 100644 --- a/provider/tencentcloud/cloudapi/mockapi.go +++ b/provider/tencentcloud/cloudapi/mockapi.go @@ -34,7 +34,7 @@ type mockAPIService struct { } func NewMockService(privateZones []*privatedns.PrivateZone, privateZoneRecords map[string][]*privatedns.PrivateZoneRecord, dnspodDomains []*dnspod.DomainListItem, dnspodRecords map[string][]*dnspod.RecordListItem) *mockAPIService { - rand.Seed(time.Now().Unix()) + rand.New(rand.NewSource(time.Now().Unix())) return &mockAPIService{ privateZones: privateZones, privateZoneRecords: privateZoneRecords, diff --git a/source/fake.go b/source/fake.go index 9173f4d0a..1e3afadf9 100644 --- a/source/fake.go +++ b/source/fake.go @@ -41,7 +41,7 @@ const ( ) func init() { - rand.Seed(time.Now().UnixNano()) + rand.New(rand.NewSource(time.Now().UnixNano())) } // NewFakeSource creates a new fakeSource with the given config. From e86656771805835b6761b05b1f9e8716147efb39 Mon Sep 17 00:00:00 2001 From: Michel Loiseleur Date: Mon, 12 Jun 2023 08:55:52 +0200 Subject: [PATCH 4/5] fix: yaml parsing of go version --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 173721737..5194ed0dc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v4 with: - go-version: 1.20 + go-version: '1.20' id: go - name: Check out code into the Go module directory From 7fa786733a020e7921840b91053f626e0577604e Mon Sep 17 00:00:00 2001 From: Michel Loiseleur Date: Mon, 12 Jun 2023 12:08:35 +0200 Subject: [PATCH 5/5] review: remove seed and init() func --- .github/workflows/docs.yml | 2 +- provider/coredns/coredns.go | 4 ---- provider/tencentcloud/cloudapi/mockapi.go | 2 -- source/fake.go | 5 ----- 4 files changed, 1 insertion(+), 12 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index aef5af4cc..b5a7decd8 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -26,7 +26,7 @@ jobs: - uses: actions/setup-go@v4 with: - go-version: ^1.20 + go-version: '^1.20' - run: | pip install -r docs/scripts/requirements.txt diff --git a/provider/coredns/coredns.go b/provider/coredns/coredns.go index 0d6255286..c76525e29 100644 --- a/provider/coredns/coredns.go +++ b/provider/coredns/coredns.go @@ -37,10 +37,6 @@ import ( "sigs.k8s.io/external-dns/provider" ) -func init() { - rand.New(rand.NewSource(time.Now().UnixNano())) -} - const ( priority = 10 // default priority when nothing is set etcdTimeout = 5 * time.Second diff --git a/provider/tencentcloud/cloudapi/mockapi.go b/provider/tencentcloud/cloudapi/mockapi.go index bdf6dabb2..707579f00 100644 --- a/provider/tencentcloud/cloudapi/mockapi.go +++ b/provider/tencentcloud/cloudapi/mockapi.go @@ -18,7 +18,6 @@ package cloudapi import ( "math/rand" - "time" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" dnspod "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dnspod/v20210323" @@ -34,7 +33,6 @@ type mockAPIService struct { } func NewMockService(privateZones []*privatedns.PrivateZone, privateZoneRecords map[string][]*privatedns.PrivateZoneRecord, dnspodDomains []*dnspod.DomainListItem, dnspodRecords map[string][]*dnspod.RecordListItem) *mockAPIService { - rand.New(rand.NewSource(time.Now().Unix())) return &mockAPIService{ privateZones: privateZones, privateZoneRecords: privateZoneRecords, diff --git a/source/fake.go b/source/fake.go index 1e3afadf9..2041c116e 100644 --- a/source/fake.go +++ b/source/fake.go @@ -25,7 +25,6 @@ import ( "fmt" "math/rand" "net" - "time" "sigs.k8s.io/external-dns/endpoint" ) @@ -40,10 +39,6 @@ const ( defaultFQDNTemplate = "example.com" ) -func init() { - rand.New(rand.NewSource(time.Now().UnixNano())) -} - // NewFakeSource creates a new fakeSource with the given config. func NewFakeSource(fqdnTemplate string) (Source, error) { if fqdnTemplate == "" {