chore: fix nilerr linter (#1284)

Author: remyleone

.golangci.yml

@@ -35,6 +35,7 @@ linters:
     - makezero # Finds slice declarations with non-zero initial length [fast: false, auto-fix: false]
     - misspell # Finds commonly misspelled English words in comments [fast: true, auto-fix: true]
     - nakedret # Finds naked returns in functions greater than a specified function length [fast: true, auto-fix: false]
+    - nilerr # Finds the code that returns nil even if it checks that the error is not nil. [fast: false, auto-fix: false]
     - 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]
@@ -80,7 +81,6 @@ linters:
     - maintidx # maintidx measures the maintainability index of each function. [fast: true, auto-fix: false]
     - maligned #[deprecated]: Tool to detect Go structs that would take less memory if their fields were sorted [fast: false, auto-fix: false]
     - nestif # Reports deeply nested if statements [fast: true, auto-fix: false]
-    - nilerr # Finds the code that returns nil even if it checks that the error is not nil. [fast: false, auto-fix: false]
     - nilnil # Checks that there is no simultaneous return of `nil` error and an invalid value. [fast: false, auto-fix: false]
     - nlreturn # nlreturn checks for a new line before return and branch statements to increase code clarity [fast: true, auto-fix: false]
     - nonamedreturns # Reports all named returns [fast: true, auto-fix: false]

scaleway/data_source_registry_image_test.go

@@ -65,7 +65,7 @@ func testAccCheckScalewayRegistryImageExists(tt *TestTools, n string) resource.T
 
 		api, region, id, err := registryAPIWithRegionAndID(tt.Meta, rs.Primary.ID)
 		if err != nil {
-			return nil
+			return err
 		}
 
 		_, err = api.GetImage(&registry.GetImageRequest{

scaleway/resource_container_namespace_test.go

@@ -156,7 +156,7 @@ func testAccCheckScalewayContainerNamespaceExists(tt *TestTools, n string) resou
 
 		api, region, id, err := containerAPIWithRegionAndID(tt.Meta, rs.Primary.ID)
 		if err != nil {
-			return nil
+			return err
 		}
 
 		_, err = api.GetNamespace(&container.GetNamespaceRequest{

scaleway/resource_container_test.go

@@ -187,7 +187,7 @@ func testAccCheckScalewayContainerExists(tt *TestTools, n string) resource.TestC
 
 		api, region, id, err := containerAPIWithRegionAndID(tt.Meta, rs.Primary.ID)
 		if err != nil {
-			return nil
+			return err
 		}
 
 		_, err = api.GetContainer(&container.GetContainerRequest{
@@ -241,7 +241,7 @@ func testConfigContainerNamespace(tt *TestTools, n string) resource.TestCheckFun
 		}
 		api, region, id, err := containerAPIWithRegionAndID(tt.Meta, rs.Primary.ID)
 		if err != nil {
-			return nil
+			return err
 		}
 
 		ns, err := api.WaitForNamespace(&container.WaitForNamespaceRequest{

scaleway/resource_function_namespace_test.go

@@ -179,7 +179,7 @@ func testAccCheckScalewayFunctionNamespaceExists(tt *TestTools, n string) resour
 
 		api, region, id, err := functionAPIWithRegionAndID(tt.Meta, rs.Primary.ID)
 		if err != nil {
-			return nil
+			return err
 		}
 
 		_, err = api.GetNamespace(&function.GetNamespaceRequest{

scaleway/resource_registry_namespace_test.go

@@ -92,7 +92,7 @@ func testAccCheckScalewayRegistryNamespaceExists(tt *TestTools, n string) resour
 
 		api, region, id, err := registryAPIWithRegionAndID(tt.Meta, rs.Primary.ID)
 		if err != nil {
-			return nil
+			return err
 		}
 
 		_, err = api.GetNamespace(&registry.GetNamespaceRequest{