From 96928230e1828360448118a8fa35de5bcb4febda Mon Sep 17 00:00:00 2001
From: Daniel Bradley <daniel@pulumi.com>
Date: Thu, 29 Aug 2024 10:53:44 +0100
Subject: [PATCH] Fix golangci-lint warnings (#1064)

- Upgrade golangci-lint to v1.60 (#1062) surfaced new warnings about
deprecations.
- The configuration option `run.skip-files` is deprecated, please use
`issues.exclude-files`.
- The linter named "megacheck" is deprecated. It has been split into:
gosimple, staticcheck, unused.
---
 provider-ci/internal/pkg/templates/provider/.golangci.yml | 8 +++++---
 provider-ci/test-providers/aws/.golangci.yml              | 8 +++++---
 provider-ci/test-providers/cloudflare/.golangci.yml       | 8 +++++---
 provider-ci/test-providers/docker/.golangci.yml           | 8 +++++---
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/provider-ci/internal/pkg/templates/provider/.golangci.yml b/provider-ci/internal/pkg/templates/provider/.golangci.yml
index ee0e12faeb..a9c21b11af 100644
--- a/provider-ci/internal/pkg/templates/provider/.golangci.yml
+++ b/provider-ci/internal/pkg/templates/provider/.golangci.yml
@@ -10,17 +10,19 @@ linters:
   - govet
   - ineffassign
   - lll
-  - megacheck
+  - gosimple
+  - staticcheck
   - misspell
   - nakedret
   - revive
   - unconvert
   - unused
   enable-all: false
-run:
-  skip-files:
+issues:
+  exclude-files:
   - schema.go
   - pulumiManifest.go
+run:
   timeout: 20m
 linters-settings:
   gci:
diff --git a/provider-ci/test-providers/aws/.golangci.yml b/provider-ci/test-providers/aws/.golangci.yml
index 6ec4773fbb..bca44903db 100644
--- a/provider-ci/test-providers/aws/.golangci.yml
+++ b/provider-ci/test-providers/aws/.golangci.yml
@@ -10,17 +10,19 @@ linters:
   - govet
   - ineffassign
   - lll
-  - megacheck
+  - gosimple
+  - staticcheck
   - misspell
   - nakedret
   - revive
   - unconvert
   - unused
   enable-all: false
-run:
-  skip-files:
+issues:
+  exclude-files:
   - schema.go
   - pulumiManifest.go
+run:
   timeout: 20m
 linters-settings:
   gci:
diff --git a/provider-ci/test-providers/cloudflare/.golangci.yml b/provider-ci/test-providers/cloudflare/.golangci.yml
index 4fc67eb91a..48f2517c9a 100644
--- a/provider-ci/test-providers/cloudflare/.golangci.yml
+++ b/provider-ci/test-providers/cloudflare/.golangci.yml
@@ -10,17 +10,19 @@ linters:
   - govet
   - ineffassign
   - lll
-  - megacheck
+  - gosimple
+  - staticcheck
   - misspell
   - nakedret
   - revive
   - unconvert
   - unused
   enable-all: false
-run:
-  skip-files:
+issues:
+  exclude-files:
   - schema.go
   - pulumiManifest.go
+run:
   timeout: 20m
 linters-settings:
   gci:
diff --git a/provider-ci/test-providers/docker/.golangci.yml b/provider-ci/test-providers/docker/.golangci.yml
index 1b236e157c..2dc511d182 100644
--- a/provider-ci/test-providers/docker/.golangci.yml
+++ b/provider-ci/test-providers/docker/.golangci.yml
@@ -10,17 +10,19 @@ linters:
   - govet
   - ineffassign
   - lll
-  - megacheck
+  - gosimple
+  - staticcheck
   - misspell
   - nakedret
   - revive
   - unconvert
   - unused
   enable-all: false
-run:
-  skip-files:
+issues:
+  exclude-files:
   - schema.go
   - pulumiManifest.go
+run:
   timeout: 20m
 linters-settings:
   gci: