Fix lint issues

Author: BartoszBlizniak

cloudsmith/resource_repository_upstream.go

@@ -264,9 +264,9 @@ func resourceRepositoryUpstreamCreate(d *schema.ResourceData, m interface{}) err
 		req := pc.APIClient.ReposApi.ReposUpstreamDockerCreate(pc.Auth, namespace, repository)
 
 		// Read certificate files for mTLS authentication (Docker only for now)
-		authCert, authCertKey, err := readCertificateFiles(d)
-		if err != nil {
-			return err
+		authCert, authCertKey, certErr := readCertificateFiles(d)
+		if certErr != nil {
+			return certErr
 		}
 
 		req = req.Data(cloudsmith.DockerUpstreamRequest{
@@ -286,7 +286,15 @@ func resourceRepositoryUpstreamCreate(d *schema.ResourceData, m interface{}) err
 			UpstreamUrl:        upstreamUrl,
 			VerifySsl:          verifySsl,
 		})
-		upstream, resp, err = pc.APIClient.ReposApi.ReposUpstreamDockerCreateExecute(req)
+		var execErr error
+		upstream, resp, execErr = pc.APIClient.ReposApi.ReposUpstreamDockerCreateExecute(req)
+		if execErr != nil {
+			if resp != nil && resp.StatusCode == http.StatusInternalServerError {
+				// Until we handle this better in API response we have to assume that this is the issue
+				return fmt.Errorf("this `upstream_url` might be already configured for this repository. %w", execErr)
+			}
+			return execErr
+		}
 	case Helm:
 		req := pc.APIClient.ReposApi.ReposUpstreamHelmCreate(pc.Auth, namespace, repository)
 		req = req.Data(cloudsmith.HelmUpstreamRequest{
@@ -677,9 +685,9 @@ func resourceRepositoryUpstreamUpdate(d *schema.ResourceData, m interface{}) err
 		req := pc.APIClient.ReposApi.ReposUpstreamDockerUpdate(pc.Auth, namespace, repository, slugPerm)
 
 		// Read certificate files for mTLS authentication (Docker only for now)
-		authCert, authCertKey, err := readCertificateFiles(d)
-		if err != nil {
-			return err
+		authCert, authCertKey, certErr := readCertificateFiles(d)
+		if certErr != nil {
+			return certErr
 		}
 
 		req = req.Data(cloudsmith.DockerUpstreamRequest{
@@ -699,7 +707,11 @@ func resourceRepositoryUpstreamUpdate(d *schema.ResourceData, m interface{}) err
 			UpstreamUrl:        upstreamUrl,
 			VerifySsl:          verifySsl,
 		})
-		upstream, _, err = pc.APIClient.ReposApi.ReposUpstreamDockerUpdateExecute(req)
+		var execErr error
+		upstream, _, execErr = pc.APIClient.ReposApi.ReposUpstreamDockerUpdateExecute(req)
+		if execErr != nil {
+			return execErr
+		}
 	case Helm:
 		req := pc.APIClient.ReposApi.ReposUpstreamHelmUpdate(pc.Auth, namespace, repository, slugPerm)
 		req = req.Data(cloudsmith.HelmUpstreamRequest{

cloudsmith/resource_repository_upstream_test.go

@@ -8,7 +8,6 @@ import (
 	"crypto/x509/pkix"
 	"encoding/pem"
 	"fmt"
-	"io"
 	"math/big"
 	"net/http"
 	"os"
@@ -1362,17 +1361,17 @@ func testAccRepositoryUpstreamCheckDestroy(resourceName string) resource.TestChe
 			req := pc.APIClient.ReposApi.ReposUpstreamSwiftRead(pc.Auth, namespace, repository, slugPerm)
 			_, resp, err = pc.APIClient.ReposApi.ReposUpstreamSwiftReadExecute(req)
 		default:
-			err = fmt.Errorf("invalid upstream_type: '%s'", upstreamType)
+			return fmt.Errorf("invalid upstream_type: '%s'", upstreamType)
 		}
 
 		if err != nil && !is404(resp) {
 			return fmt.Errorf("unable to verify upstream deletion: %w", err)
 		} else if is200(resp) {
 			return fmt.Errorf("unable to verify upstream deletion: still exists: %s", resourceName)
 		}
-		defer func(Body io.ReadCloser) {
-			_ = Body.Close()
-		}(resp.Body)
+		if resp != nil && resp.Body != nil {
+			defer resp.Body.Close()
+		}
 
 		return nil
 	}