Merge branch 'master' into gofumpt

Author: remyleone

.golangci.yml

@@ -42,6 +42,7 @@ linters:
     - noctx # noctx finds sending http request without context.Context [fast: false, auto-fix: false]
     - nolintlint # Reports ill-formed or insufficient nolint directives [fast: true, auto-fix: false]
     - nosprintfhostport # Checks for misuse of Sprintf to construct a host with port in a URL. [fast: true, auto-fix: false]
+    - predeclared # find code that shadows one of Go's predeclared identifiers [fast: true, auto-fix: false]
     - promlinter # Check Prometheus metrics naming via promlint [fast: true, auto-fix: false]
     - revive # Fast, configurable, extensible, flexible, and beautiful linter for Go. Drop-in replacement of golint. [fast: false, auto-fix: false]
     - rowserrcheck # checks whether Err of rows is checked successfully [fast: false, auto-fix: false]
@@ -83,7 +84,6 @@ linters:
     - nonamedreturns # Reports all named returns [fast: true, auto-fix: false]
     - paralleltest # paralleltest detects missing usage of t.Parallel() method in your Go test [fast: true, auto-fix: false]
     - prealloc # Finds slice declarations that could potentially be preallocated [fast: true, auto-fix: false]
-    - predeclared # find code that shadows one of Go's predeclared identifiers [fast: true, auto-fix: false]
     - staticcheck #(megacheck): Staticcheck is a go vet on steroids, applying a ton of static analysis checks [fast: false, auto-fix: false]
     - unparam # Reports unused function parameters [fast: false, auto-fix: false]
     - unused #(megacheck): Checks Go code for unused constants, variables, functions and types [fast: false, auto-fix: false]

scaleway/helpers.go

@@ -541,30 +541,30 @@ func flattenMap(m map[string]string) interface{} {
 	return flattenedMap
 }
 
-func diffSuppressFuncDuration(k, old, new string, d *schema.ResourceData) bool {
-	if old == new {
+func diffSuppressFuncDuration(k, oldValue, newValue string, d *schema.ResourceData) bool {
+	if oldValue == newValue {
 		return true
 	}
-	d1, err1 := time.ParseDuration(old)
-	d2, err2 := time.ParseDuration(new)
+	d1, err1 := time.ParseDuration(oldValue)
+	d2, err2 := time.ParseDuration(newValue)
 	if err1 != nil || err2 != nil {
 		return false
 	}
 	return d1 == d2
 }
 
-func diffSuppressFuncIgnoreCase(k, old, new string, d *schema.ResourceData) bool {
-	return strings.EqualFold(old, new)
+func diffSuppressFuncIgnoreCase(k, oldValue, newValue string, d *schema.ResourceData) bool {
+	return strings.EqualFold(oldValue, newValue)
 }
 
-func diffSuppressFuncIgnoreCaseAndHyphen(k, old, new string, d *schema.ResourceData) bool {
-	return strings.Replace(strings.ToLower(old), "-", "_", -1) == strings.Replace(strings.ToLower(new), "-", "_", -1)
+func diffSuppressFuncIgnoreCaseAndHyphen(k, oldValue, newValue string, d *schema.ResourceData) bool {
+	return strings.Replace(strings.ToLower(oldValue), "-", "_", -1) == strings.Replace(strings.ToLower(newValue), "-", "_", -1)
 }
 
 // diffSuppressFuncLocality is a SuppressDiffFunc to remove the locality from an ID when checking diff.
 // e.g. 2c1a1716-5570-4668-a50a-860c90beabf6 == fr-par-1/2c1a1716-5570-4668-a50a-860c90beabf6
-func diffSuppressFuncLocality(k, old, new string, d *schema.ResourceData) bool {
-	return expandID(old) == expandID(new)
+func diffSuppressFuncLocality(k, oldValue, newValue string, d *schema.ResourceData) bool {
+	return expandID(oldValue) == expandID(newValue)
 }
 
 // TimedOut returns true if the error represents a "wait timed out" condition.

scaleway/resource_account_ssh_key.go

@@ -34,8 +34,8 @@ func resourceScalewayAccountSSKKey() *schema.Resource {
 				ForceNew:    true,
 				Description: "The public SSH key",
 				// We don't consider trailing \n as diff
-				DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
-					return strings.Trim(old, "\n") == strings.Trim(new, "\n")
+				DiffSuppressFunc: func(k, oldValue, newValue string, d *schema.ResourceData) bool {
+					return strings.Trim(oldValue, "\n") == strings.Trim(newValue, "\n")
 				},
 			},
 			"organization_id": organizationIDSchema(),