Remove special error code handling in response middleware

CHANGELOG.md

@@ -1,3 +1,12 @@
+## 1.22.2 (Apr 4, 2024)
+
+BUG FIXES:
+
+* Remove special error code handling in response middleware
+* Fix error handling in check license and version func
+
+PR: [#56](https://github.com/jfrog/terraform-provider-shared/pull/56)
+
 ## 1.22.1 (Mar 20, 2024)
 
 IMPROVEMENTS:

client/client.go

@@ -4,9 +4,7 @@ import (
 	"fmt"
 	"net/http"
 	"net/url"
-	"os"
 	"regexp"
-	"slices"
 	"strings"
 
 	"github.com/go-resty/resty/v2"
@@ -36,10 +34,6 @@ func Build(URL, productId string) (*resty.Client, error) {
 				return nil
 			}
 
-			tfLogLevel := strings.ToLower(os.Getenv("TF_LOG"))
-			if response.StatusCode() >= http.StatusBadRequest && slices.Contains([]string{"debug", "trace"}, tfLogLevel) {
-				return fmt.Errorf("\n%d %s %s\n%s", response.StatusCode(), response.Request.Method, response.Request.URL, string(response.Body()[:]))
-			}
 			return nil
 		}).
 		SetHeader("content-type", "application/json").

util/fw/fw.go

@@ -92,7 +92,7 @@ func CheckArtifactoryLicense(client *resty.Client, licenseTypesToCheck ...string
 	}
 
 	licensesWrapper := LicensesWrapper{}
-	_, err := client.R().
+	resp, err := client.R().
 		SetResult(&licensesWrapper).
 		Get("/artifactory/api/system/license")
 
@@ -101,6 +101,11 @@ func CheckArtifactoryLicense(client *resty.Client, licenseTypesToCheck ...string
 		return
 	}
 
+	if resp.IsError() {
+		ds.AddError("Failed to check for license. If your usage doesn't require admin permission, you can set `check_license` attribute to `false` to skip this check.", resp.String())
+		return
+	}
+
 	var licenseType string
 	if len(licensesWrapper.Licenses) > 0 {
 		licenseType = licensesWrapper.Licenses[0].Type

util/sdk/sdk.go

@@ -237,14 +237,18 @@ func CheckArtifactoryLicense(client *resty.Client, licenseTypesToCheck ...string
 	}
 
 	licensesWrapper := LicensesWrapper{}
-	_, err := client.R().
+	resp, err := client.R().
 		SetResult(&licensesWrapper).
 		Get("/artifactory/api/system/license")
 
 	if err != nil {
 		return diag.Errorf("Failed to check for license. If your usage doesn't require admin permission, you can set `check_license` attribute to `false` to skip this check. %s", err)
 	}
 
+	if resp.IsError() {
+		return diag.Errorf("Failed to check for license. If your usage doesn't require admin permission, you can set `check_license` attribute to `false` to skip this check. %s", resp.String())
+	}
+
 	var licenseType string
 	if len(licensesWrapper.Licenses) > 0 {
 		licenseType = licensesWrapper.Licenses[0].Type

util/util.go

@@ -58,13 +58,17 @@ func SendUsage(ctx context.Context, client *resty.Client, productId string, feat
 
 	usage := UsageStruct{productId, features}
 
-	_, err := client.R().
+	resp, err := client.R().
 		SetBody(usage).
 		Post("artifactory/api/system/usage")
 
 	if err != nil {
 		tflog.Info(ctx, fmt.Sprintf("failed to send usage: %v", err))
 	}
+
+	if resp.IsError() {
+		tflog.Info(ctx, fmt.Sprintf("failed to send usage: %v", resp.String()))
+	}
 }
 
 func CheckVersion(versionToCheck string, supportedVersion string) (bool, error) {
@@ -87,14 +91,18 @@ func GetArtifactoryVersion(client *resty.Client) (string, error) {
 	}
 
 	artifactoryVersion := ArtifactoryVersion{}
-	_, err := client.R().
+	resp, err := client.R().
 		SetResult(&artifactoryVersion).
 		Get("/artifactory/api/system/version")
 
 	if err != nil {
 		return "", fmt.Errorf("failed to get Artifactory version. %s", err)
 	}
 
+	if resp.IsError() {
+		return "", fmt.Errorf("failed to get Artifactory version. %s", resp.String())
+	}
+
 	return artifactoryVersion.Version, nil
 }
 
@@ -104,14 +112,18 @@ func GetXrayVersion(client *resty.Client) (string, error) {
 	}
 
 	xrayVersion := XrayVersion{}
-	_, err := client.R().
+	resp, err := client.R().
 		SetResult(&xrayVersion).
 		Get("/xray/api/v1/system/version")
 
 	if err != nil {
 		return "", fmt.Errorf("failed to get Xray version. %s", err)
 	}
 
+	if resp.IsError() {
+		return "", fmt.Errorf("failed to get Xray version. %s", resp.String())
+	}
+
 	return xrayVersion.Version, nil
 }