Remove fhir package and clean up warnings

Author: loafoe

audit/client.go

@@ -1,4 +1,4 @@
-// Package audit provides support for HSDP Audit service
+// Package audit provides support for interacting with the HSDP Audit service
 package audit
 
 import (
@@ -33,10 +33,6 @@ type OptionFunc func(*http.Request) error
 type Config struct {
 	Region      string
 	Environment string
-	// ProductKey is provided as part of Auditing onboarding
-	ProductKey string
-	// Tenant value is used to support multi tenancy with a single ProductKey
-	Tenant string
 	// AuditBaseURL is provided as part of Auditing onboarding
 	AuditBaseURL string
 	// SharedKey is the IAM API signing key
@@ -98,7 +94,7 @@ func newClient(httpClient *http.Client, config *Config) (*Client, error) {
 		return nil, fmt.Errorf("cdr.NewClient create FHIR STU3 unmarshaller (timezone=[%s]): %w", config.TimeZone, err)
 	}
 	c.um = um
-	c.setAuditBaseURL(c.config.AuditBaseURL)
+	_ = c.setAuditBaseURL(c.config.AuditBaseURL)
 
 	return c, nil
 }
@@ -207,7 +203,7 @@ func (c *Client) do(req *http.Request, v interface{}) (*Response, error) {
 
 	response := newResponse(resp)
 
-	doErr := CheckResponse(resp)
+	doErr := checkResponse(resp)
 
 	if v != nil {
 		defer resp.Body.Close() // Only close if we plan to read it
@@ -224,8 +220,8 @@ func (c *Client) do(req *http.Request, v interface{}) (*Response, error) {
 	return response, doErr
 }
 
-// CheckResponse checks the API response for errors, and returns them if present.
-func CheckResponse(r *http.Response) error {
+// checkResponse checks the API response for errors, and returns them if present.
+func checkResponse(r *http.Response) error {
 	switch r.StatusCode {
 	case 200, 201, 202, 204, 304:
 		return nil

credentials/client.go

@@ -11,13 +11,13 @@ import (
 	"net/http/httputil"
 	"net/url"
 	"os"
+	"sort"
 	"strings"
 
 	autoconf "github.com/philips-software/go-hsdp-api/config"
 
 	"github.com/go-playground/validator/v10"
 	"github.com/google/go-querystring/query"
-	"github.com/philips-software/go-hsdp-api/fhir"
 	"github.com/philips-software/go-hsdp-api/iam"
 )
 
@@ -219,7 +219,7 @@ func (c *Client) Do(req *http.Request, v interface{}) (*Response, error) {
 
 	response := newResponse(resp)
 
-	err = fhir.CheckResponse(resp)
+	err = checkResponse(resp)
 	if err != nil {
 		// even though there was an error, we still return the response
 		// in case the caller wants to inspect it further
@@ -236,3 +236,65 @@ func (c *Client) Do(req *http.Request, v interface{}) (*Response, error) {
 
 	return response, err
 }
+
+// ErrorResponse represents an IAM errors response
+// containing a code and a human readable message
+type ErrorResponse struct {
+	Response *http.Response `json:"-"`
+	Code     string         `json:"responseCode"`
+	Message  string         `json:"responseMessage"`
+}
+
+func (e *ErrorResponse) Error() string {
+	path, _ := url.QueryUnescape(e.Response.Request.URL.Opaque)
+	u := fmt.Sprintf("%s://%s%s", e.Response.Request.URL.Scheme, e.Response.Request.URL.Host, path)
+	return fmt.Sprintf("%s %s: %d %s", e.Response.Request.Method, u, e.Response.StatusCode, e.Message)
+}
+
+func checkResponse(r *http.Response) error {
+	switch r.StatusCode {
+	case 200, 201, 202, 204, 304:
+		return nil
+	}
+
+	errorResponse := &ErrorResponse{Response: r}
+	data, err := ioutil.ReadAll(r.Body)
+	if err == nil && data != nil {
+		var raw interface{}
+		if err := json.Unmarshal(data, &raw); err != nil {
+			errorResponse.Message = "failed to parse unknown error format"
+		}
+
+		errorResponse.Message = parseError(raw)
+	}
+
+	return errorResponse
+}
+
+func parseError(raw interface{}) string {
+	switch raw := raw.(type) {
+	case string:
+		return raw
+
+	case []interface{}:
+		var errs []string
+		for _, v := range raw {
+			errs = append(errs, parseError(v))
+		}
+		return fmt.Sprintf("[%s]", strings.Join(errs, ", "))
+
+	case map[string]interface{}:
+		var errs []string
+		for k, v := range raw {
+			errs = append(errs, fmt.Sprintf("{%s: %s}", k, parseError(v)))
+		}
+		sort.Strings(errs)
+		return strings.Join(errs, ", ")
+	case float64:
+		return fmt.Sprintf("%d", int64(raw))
+	case int64:
+		return fmt.Sprintf("%d", raw)
+	default:
+		return fmt.Sprintf("failed to parse unexpected error type: %T", raw)
+	}
+}

fhir/backbone_element.go

@@ -44,7 +44,7 @@ func main() {
 		Count:        1,
 		ClusterTag:   "andytest",
 		EBS: has.EBS{
-                        DeleteOnTermination: true,
+			DeleteOnTermination: true,
 			VolumeSize: 50,
 			VolumeType: "standard",
 		},