From d3e7719a368f714a1bb37f2fff40b629b787298b Mon Sep 17 00:00:00 2001 From: Andreas Fritzler Date: Fri, 19 Apr 2024 16:10:16 +0200 Subject: [PATCH] Replace `deadline` in favor of `timeout` in `golangci-lint` configuration As of 1.57 version, golangci-lint deprecated the `deadline` linter setting (https://github.com/golangci/golangci-lint/releases/tag/v1.57.0). This PR changes `deadline` to `timeout` in the `.golangci.yml` configuration both for the project setup and for the `.golangci.yml` scaffolding. --- .golangci.yml | 2 +- .../component-config-tutorial/testdata/project/.golangci.yml | 2 +- docs/book/src/cronjob-tutorial/testdata/project/.golangci.yml | 2 +- docs/book/src/getting-started/testdata/project/.golangci.yml | 2 +- .../src/multiversion-tutorial/testdata/project/.golangci.yml | 2 +- pkg/plugins/golang/v4/scaffolds/internal/templates/golangci.go | 2 +- testdata/project-v4-multigroup-with-deploy-image/.golangci.yml | 2 +- testdata/project-v4-multigroup/.golangci.yml | 2 +- testdata/project-v4-with-deploy-image/.golangci.yml | 2 +- testdata/project-v4-with-grafana/.golangci.yml | 2 +- testdata/project-v4/.golangci.yml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index dba9e9f4d6..b11f9d38ca 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,5 +1,5 @@ run: - deadline: 5m + timeout: 5m allow-parallel-runners: true issues: diff --git a/docs/book/src/component-config-tutorial/testdata/project/.golangci.yml b/docs/book/src/component-config-tutorial/testdata/project/.golangci.yml index aed8644d11..ca69a11f6f 100644 --- a/docs/book/src/component-config-tutorial/testdata/project/.golangci.yml +++ b/docs/book/src/component-config-tutorial/testdata/project/.golangci.yml @@ -1,5 +1,5 @@ run: - deadline: 5m + timeout: 5m allow-parallel-runners: true issues: diff --git a/docs/book/src/cronjob-tutorial/testdata/project/.golangci.yml b/docs/book/src/cronjob-tutorial/testdata/project/.golangci.yml index aed8644d11..ca69a11f6f 100644 --- a/docs/book/src/cronjob-tutorial/testdata/project/.golangci.yml +++ b/docs/book/src/cronjob-tutorial/testdata/project/.golangci.yml @@ -1,5 +1,5 @@ run: - deadline: 5m + timeout: 5m allow-parallel-runners: true issues: diff --git a/docs/book/src/getting-started/testdata/project/.golangci.yml b/docs/book/src/getting-started/testdata/project/.golangci.yml index aed8644d11..ca69a11f6f 100644 --- a/docs/book/src/getting-started/testdata/project/.golangci.yml +++ b/docs/book/src/getting-started/testdata/project/.golangci.yml @@ -1,5 +1,5 @@ run: - deadline: 5m + timeout: 5m allow-parallel-runners: true issues: diff --git a/docs/book/src/multiversion-tutorial/testdata/project/.golangci.yml b/docs/book/src/multiversion-tutorial/testdata/project/.golangci.yml index aed8644d11..ca69a11f6f 100644 --- a/docs/book/src/multiversion-tutorial/testdata/project/.golangci.yml +++ b/docs/book/src/multiversion-tutorial/testdata/project/.golangci.yml @@ -1,5 +1,5 @@ run: - deadline: 5m + timeout: 5m allow-parallel-runners: true issues: diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/golangci.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/golangci.go index f6b263dc67..7696421806 100644 --- a/pkg/plugins/golang/v4/scaffolds/internal/templates/golangci.go +++ b/pkg/plugins/golang/v4/scaffolds/internal/templates/golangci.go @@ -43,7 +43,7 @@ func (f *Golangci) SetTemplateDefaults() error { //nolint:lll const golangciTemplate = `run: - deadline: 5m + timeout: 5m allow-parallel-runners: true issues: diff --git a/testdata/project-v4-multigroup-with-deploy-image/.golangci.yml b/testdata/project-v4-multigroup-with-deploy-image/.golangci.yml index aed8644d11..ca69a11f6f 100644 --- a/testdata/project-v4-multigroup-with-deploy-image/.golangci.yml +++ b/testdata/project-v4-multigroup-with-deploy-image/.golangci.yml @@ -1,5 +1,5 @@ run: - deadline: 5m + timeout: 5m allow-parallel-runners: true issues: diff --git a/testdata/project-v4-multigroup/.golangci.yml b/testdata/project-v4-multigroup/.golangci.yml index aed8644d11..ca69a11f6f 100644 --- a/testdata/project-v4-multigroup/.golangci.yml +++ b/testdata/project-v4-multigroup/.golangci.yml @@ -1,5 +1,5 @@ run: - deadline: 5m + timeout: 5m allow-parallel-runners: true issues: diff --git a/testdata/project-v4-with-deploy-image/.golangci.yml b/testdata/project-v4-with-deploy-image/.golangci.yml index aed8644d11..ca69a11f6f 100644 --- a/testdata/project-v4-with-deploy-image/.golangci.yml +++ b/testdata/project-v4-with-deploy-image/.golangci.yml @@ -1,5 +1,5 @@ run: - deadline: 5m + timeout: 5m allow-parallel-runners: true issues: diff --git a/testdata/project-v4-with-grafana/.golangci.yml b/testdata/project-v4-with-grafana/.golangci.yml index aed8644d11..ca69a11f6f 100644 --- a/testdata/project-v4-with-grafana/.golangci.yml +++ b/testdata/project-v4-with-grafana/.golangci.yml @@ -1,5 +1,5 @@ run: - deadline: 5m + timeout: 5m allow-parallel-runners: true issues: diff --git a/testdata/project-v4/.golangci.yml b/testdata/project-v4/.golangci.yml index aed8644d11..ca69a11f6f 100644 --- a/testdata/project-v4/.golangci.yml +++ b/testdata/project-v4/.golangci.yml @@ -1,5 +1,5 @@ run: - deadline: 5m + timeout: 5m allow-parallel-runners: true issues: