Proper Api error (#34)

* Added functions to get Api error when possible instead of http error code
* Added original error

cmd/backup.go

@@ -35,7 +35,7 @@ var getBackupCmd = &cobra.Command{
 		}
 		resp, r, err := listBackupRequest.Execute()
 		if err != nil {
-			logrus.Errorf("Error when calling `BackupApi.ListBackups`: %v", err)
+			logrus.Errorf("Error when calling `BackupApi.ListBackups`: %s", ybmAuthClient.GetApiErrorDetails(err))
 			logrus.Debugf("Full HTTP response: %v", r)
 			return
 		}
@@ -74,7 +74,7 @@ var restoreBackupCmd = &cobra.Command{
 
 		_, r, err := authApi.RestoreBackup().RestoreSpec(*restoreSpec).Execute()
 		if err != nil {
-			logrus.Errorf("Error when calling `BackupApi.RestoreBackup``: %v", err)
+			logrus.Errorf("Error when calling `BackupApi.RestoreBackup`: %s", ybmAuthClient.GetApiErrorDetails(err))
 			logrus.Debugf("Full HTTP response: %v", r)
 			return
 		}
@@ -119,7 +119,7 @@ var createBackupCmd = &cobra.Command{
 		backupResp, response, err := authApi.CreateBackup().BackupSpec(createBackupSpec).Execute()
 
 		if err != nil {
-			logrus.Errorf("Error when calling `BackupApi.CreateBackup``: %v", err)
+			logrus.Errorf("Error when calling `BackupApi.CreateBackup`: %s", ybmAuthClient.GetApiErrorDetails(err))
 			logrus.Debugf("Full HTTP response: %v", response)
 			return
 		}
@@ -151,7 +151,7 @@ var deleteBackupCmd = &cobra.Command{
 		response, err := authApi.DeleteBackup(backupID).Execute()
 
 		if err != nil {
-			logrus.Errorf("Error when calling `BackupApi.DeleteBackup``: %v", err)
+			logrus.Errorf("Error when calling `BackupApi.DeleteBackup`: %s", ybmAuthClient.GetApiErrorDetails(err))
 			logrus.Debugf("Full HTTP response: %v", response)
 			return
 		}

cmd/cdc_sink.go

@@ -34,7 +34,7 @@ var getCdcSinkCmd = &cobra.Command{
 
 		resp, r, err := authApi.GetCdcSink(cdcSinkID).Execute()
 		if err != nil {
-			logrus.Errorf("Error when calling `CdcApi.GetCdcSink`: %v", err)
+			logrus.Errorf("Error when calling `CdcApi.GetCdcSink`: %s", ybmAuthClient.GetApiErrorDetails(err))
 			logrus.Debugf("Full HTTP response: %v", r)
 			return
 		}
@@ -80,7 +80,7 @@ var createCdcSinkCmd = &cobra.Command{
 
 		resp, r, err := authApi.CreateCdcSink().CreateCdcSinkRequest(*createSinkRequest).Execute()
 		if err != nil {
-			logrus.Errorf("Error when calling `CdcApi.CreateeCdcSink`: %v", err)
+			logrus.Errorf("Error when calling `CdcApi.CreateCdcSink`: %s", ybmAuthClient.GetApiErrorDetails(err))
 			logrus.Debugf("Full HTTP response: %v", r)
 			return
 		}
@@ -133,7 +133,7 @@ var editCdcSinkCmd = &cobra.Command{
 
 		resp, r, err := authApi.EditCdcSink(cdcSinkID).EditCdcSinkRequest(*editCdcSinkRequest).Execute()
 		if err != nil {
-			logrus.Errorf("Error when calling `CdcApi.EditCdcSink`: %v", err)
+			logrus.Errorf("Error when calling `CdcApi.EditCdcSink`: %s", ybmAuthClient.GetApiErrorDetails(err))
 			logrus.Debugf("Full HTTP response: %v", r)
 			return
 		}
@@ -164,7 +164,7 @@ var deleteCdcSinkCmd = &cobra.Command{
 
 		resp, err := authApi.DeleteCdcSink(cdcSinkID).Execute()
 		if err != nil {
-			logrus.Errorf("Error when calling `CdcApi.DeleteeCdcSink`: %v", err)
+			logrus.Errorf("Error when calling `CdcApi.DeleteCdcSink`: %s", ybmAuthClient.GetApiErrorDetails(err))
 			logrus.Debugf("Full HTTP response: %v", resp)
 			return
 		}

cmd/cdc_stream.go

@@ -39,7 +39,7 @@ var getCdcStreamCmd = &cobra.Command{
 
 		resp, r, err := authApi.GetCdcStream(clusterID, cdcStreamID).Execute()
 		if err != nil {
-			logrus.Errorf("Error when calling `CdcApi.GetCdcStream`: %v", err)
+			logrus.Errorf("Error when calling `CdcApi.GetCdcStream`: %s", ybmAuthClient.GetApiErrorDetails(err))
 			logrus.Debugf("Full HTTP response: %v", r)
 			return
 		}
@@ -85,7 +85,7 @@ var createCdcStreamCmd = &cobra.Command{
 
 		resp, r, err := authApi.CreateCdcStream(clusterID).CdcStreamSpec(cdcStreamSpec).Execute()
 		if err != nil {
-			logrus.Errorf("Error when calling `CdcApi.CreateCdcStream`: %v", err)
+			logrus.Errorf("Error when calling `CdcApi.CreateCdcStream`: %s", ybmAuthClient.GetApiErrorDetails(err))
 			logrus.Debugf("Full HTTP response: %v", r)
 			return
 		}
@@ -132,7 +132,7 @@ var editCdcStreamCmd = &cobra.Command{
 
 		resp, r, err := authApi.EditCdcStream(clusterID, cdcStreamID).EditCdcStreamRequest(*editCdcStreamRequest).Execute()
 		if err != nil {
-			logrus.Errorf("Error when calling `CdcApi.EditCdcStream`: %v", err)
+			logrus.Errorf("Error when calling `CdcApi.EditCdcStream`: %s", ybmAuthClient.GetApiErrorDetails(err))
 			logrus.Debugf("Full HTTP response: %v", r)
 			return
 		}
@@ -167,7 +167,7 @@ var deleteCdcStreamCmd = &cobra.Command{
 		}
 		resp, err := authApi.DeleteCdcStream(clusterID, cdcStreamID).Execute()
 		if err != nil {
-			logrus.Errorf("Error when calling `CdcApi.DeleteCdcStream`: %v", err)
+			logrus.Errorf("Error when calling `CdcApi.DeleteCdcStream`: %s", ybmAuthClient.GetApiErrorDetails(err))
 			logrus.Debugf("Full HTTP response: %v", resp)
 			return
 		}

cmd/cloud_regions.go

@@ -28,7 +28,7 @@ var getCloudRegionsCmd = &cobra.Command{
 		cloudProvider, _ := cmd.Flags().GetString("cloud-provider")
 		cloudRegionsResp, resp, err := authApi.GetSupportedCloudRegions().Cloud(cloudProvider).Execute()
 		if err != nil {
-			logrus.Errorf("Error when calling `ClusterApi.GetSupportedCloudRegions`: %v", err)
+			logrus.Errorf("Error when calling `ClusterApi.GetSupportedCloudRegions`: %s", ybmAuthClient.GetApiErrorDetails(err))
 			logrus.Debugf("Full HTTP response: %v", resp)
 			return
 		}

cmd/create_cluster.go

@@ -69,7 +69,7 @@ var createClusterCmd = &cobra.Command{
 
 		resp, r, err := authApi.CreateCluster().CreateClusterRequest(*createClusterRequest).Execute()
 		if err != nil {
-			fmt.Fprintf(os.Stderr, "Error when calling `ClusterApi.CreateCluster``: %v", err)
+			fmt.Fprintf(os.Stderr, "Error when calling `ClusterApi.CreateCluster`: %s", ybmAuthClient.GetApiErrorDetails(err))
 			fmt.Fprintf(os.Stderr, "Full HTTP response: %v", r)
 			return
 		}

cmd/delete_cluster.go

@@ -34,7 +34,7 @@ var deleteClusterCmd = &cobra.Command{
 
 		r, err := authApi.DeleteCluster(clusterID).Execute()
 		if err != nil {
-			logrus.Errorf("Error when calling `ClusterApi.DeleteCluster`: %v", err)
+			logrus.Errorf("Error when calling `ClusterApi.DeleteCluster`: %s", ybmAuthClient.GetApiErrorDetails(err))
 			logrus.Debugf("Full HTTP response: %v", r)
 			return
 		}

cmd/get_cluster.go

@@ -36,7 +36,7 @@ var getClusterCmd = &cobra.Command{
 		resp, r, err := clusterListRequest.Execute()
 
 		if err != nil {
-			logrus.Errorf("Error when calling `ClusterApi.ListClusters`: %v", err)
+			logrus.Errorf("Error when calling `ClusterApi.ListClusters`: %s", ybmAuthClient.GetApiErrorDetails(err))
 			logrus.Debugf("Full HTTP response: %v", r)
 			return
 		}

cmd/instance_types.go

@@ -31,7 +31,7 @@ var getInstanceTypesCmd = &cobra.Command{
 		showDisabled, _ := cmd.Flags().GetBool("show-disabled")
 		instanceTypesResp, resp, err := authApi.GetSupportedInstanceTypes(cloudProvider, tier, cloudRegion).ShowDisabled(showDisabled).Execute()
 		if err != nil {
-			logrus.Errorf("Error when calling `ClusterApi.GetSupportedInstanceTypes`: %v", err)
+			logrus.Errorf("Error when calling `ClusterApi.GetSupportedInstanceTypes`: %s", ybmAuthClient.GetApiErrorDetails(err))
 			logrus.Debugf("Full HTTP response: %v", resp)
 			return
 		}

cmd/network_allow_list.go

@@ -45,7 +45,7 @@ var getNetworkAllowListCmd = &cobra.Command{
 		// No option to filter by name :(
 		resp, r, err := authApi.ListNetworkAllowLists().Execute()
 		if err != nil {
-			logrus.Errorf("Error when calling `NetworkApi.ListNetworkAllowLists`: %v", err)
+			logrus.Errorf("Error when calling `NetworkApi.ListNetworkAllowLists`: %s", ybmAuthClient.GetApiErrorDetails(err))
 			logrus.Debugf("Full HTTP response: %v", r)
 			return
 		}
@@ -90,7 +90,7 @@ var createNetworkAllowListCmd = &cobra.Command{
 
 		resp, r, err := authApi.CreateNetworkAllowList().NetworkAllowListSpec(nalSpec).Execute()
 		if err != nil {
-			logrus.Errorf("Error when calling `NetworkApi.ListNetworkAllowLists`: %v", err)
+			logrus.Errorf("Error when calling `NetworkApi.ListNetworkAllowLists`: %s", ybmAuthClient.GetApiErrorDetails(err))
 			logrus.Debugf("Full HTTP response: %v", r)
 			return
 		}
@@ -121,7 +121,7 @@ var deleteNetworkAllowListCmd = &cobra.Command{
 
 		resp, r, err := authApi.ListNetworkAllowLists().Execute()
 		if err != nil {
-			logrus.Errorf("Error when calling `NetworkApi.ListNetworkAllowLists`: %v", err)
+			logrus.Errorf("Error when calling `NetworkApi.ListNetworkAllowLists`: %s", ybmAuthClient.GetApiErrorDetails(err))
 			logrus.Debugf("Full HTTP response: %v", r)
 			return
 		}
@@ -134,7 +134,7 @@ var deleteNetworkAllowListCmd = &cobra.Command{
 
 		r, err = authApi.DeleteNetworkAllowList(allowList.Info.Id).Execute()
 		if err != nil {
-			logrus.Errorf("Error when calling `NetworkApi.DeleteNetworkAllowList`: %v", err)
+			logrus.Errorf("Error when calling `NetworkApi.DeleteNetworkAllowList`: %s", ybmAuthClient.GetApiErrorDetails(err))
 			logrus.Debugf("Full HTTP response: %v", r)
 			return
 		}

cmd/pause_cluster.go

@@ -35,7 +35,7 @@ var pauseClusterCmd = &cobra.Command{
 		}
 		resp, r, err := authApi.PauseCluster(clusterID).Execute()
 		if err != nil {
-			logrus.Errorf("Error when calling `ClusterApi.PauseCluster`: %v", err)
+			logrus.Errorf("Error when calling `ClusterApi.PauseCluster`: %s", ybmAuthClient.GetApiErrorDetails(err))
 			logrus.Debugf("Full HTTP response: %v", r)
 			return
 		}

cmd/read_replica.go

@@ -115,7 +115,7 @@ var getReadReplicaCmd = &cobra.Command{
 		}
 		resp, r, err := authApi.ListReadReplicas(clusterID).Execute()
 		if err != nil {
-			logrus.Errorf("Error when calling `ReadReplicaApi.ListReadReplicas`: %v", err)
+			logrus.Errorf("Error when calling `ReadReplicaApi.ListReadReplicas`: %s", ybmAuthClient.GetApiErrorDetails(err))
 			logrus.Debugf("Full HTTP response: %v", r)
 			return
 		}
@@ -147,7 +147,7 @@ var createReadReplicaCmd = &cobra.Command{
 
 		resp, r, err := authApi.CreateReadReplica(clusterID).ReadReplicaSpec(readReplicaSpecs).Execute()
 		if err != nil {
-			logrus.Errorf("Error when calling `ReadReplicaApi.CreateReadReplica`: %v", err)
+			logrus.Errorf("Error when calling `ReadReplicaApi.CreateReadReplica`: %s", ybmAuthClient.GetApiErrorDetails(err))
 			logrus.Debugf("Full HTTP response: %v", r)
 			return
 		}
@@ -180,7 +180,7 @@ var updateReadReplicaCmd = &cobra.Command{
 
 		resp, r, err := authApi.EditReadReplicas(clusterID).ReadReplicaSpec(readReplicaSpecs).Execute()
 		if err != nil {
-			logrus.Errorf("Error when calling `ReadReplicaApi.EditReadReplicas`: %v", err)
+			logrus.Errorf("Error when calling `ReadReplicaApi.EditReadReplicas`: %s", ybmAuthClient.GetApiErrorDetails(err))
 			logrus.Debugf("Full HTTP response: %v", r)
 			return
 		}
@@ -207,7 +207,7 @@ var deleteReadReplicaCmd = &cobra.Command{
 		}
 		r, err := authApi.DeleteReadReplica(clusterID).Execute()
 		if err != nil {
-			logrus.Errorf("Error when calling `ReadReplicaApi.DeleteReadReplica`: %v", err)
+			logrus.Errorf("Error when calling `ReadReplicaApi.DeleteReadReplica`: %s", ybmAuthClient.GetApiErrorDetails(err))
 			logrus.Debugf("Full HTTP response: %v", r)
 			return
 		}

cmd/resume_cluster.go

@@ -35,7 +35,7 @@ var resumeClusterCmd = &cobra.Command{
 		}
 		resp, r, err := authApi.ResumeCluster(clusterID).Execute()
 		if err != nil {
-			logrus.Errorf("Error when calling `ClusterApi.ResumeCluster`: %v", err)
+			logrus.Errorf("Error when calling `ClusterApi.ResumeCluster`: %s", ybmAuthClient.GetApiErrorDetails(err))
 			logrus.Debugf("Full HTTP response: %v", r)
 			return
 		}

cmd/update_cluster.go

@@ -36,7 +36,7 @@ var updateClusterCmd = &cobra.Command{
 		}
 		resp, r, err := authApi.GetCluster(clusterID).Execute()
 		if err != nil {
-			logrus.Errorf("Error when calling `ClusterApi.GetCluster`: %v", err)
+			logrus.Errorf("Error when calling `ClusterApi.GetCluster`: %s", ybmAuthClient.GetApiErrorDetails(err))
 			logrus.Debugf("Full HTTP response: %v", r)
 			return
 		}
@@ -45,14 +45,14 @@ var updateClusterCmd = &cobra.Command{
 		trackID := originalSpec.SoftwareInfo.GetTrackId()
 		trackName, err := authApi.GetTrackNameById(trackID)
 		if err != nil {
-			logrus.Errorf("Error when calling `getTrackName`: %v", err)
+			logrus.Errorf("Error when calling `getTrackName`: %s", ybmAuthClient.GetApiErrorDetails(err))
 			return
 		}
 		vpcName := ""
 		if vpcID, ok := originalSpec.ClusterRegionInfo[0].PlacementInfo.GetVpcIdOk(); ok {
 			vpcName, err = authApi.GetVpcNameById(*vpcID)
 			if err != nil {
-				logrus.Errorf("Error when calling `getVpcName`: %v", err)
+				logrus.Errorf("Error when calling `getVpcName`: %s", ybmAuthClient.GetApiErrorDetails(err))
 				return
 			}
 		}
@@ -93,7 +93,7 @@ var updateClusterCmd = &cobra.Command{
 
 		resp, r, err = authApi.EditCluster(clusterID).ClusterSpec(*clusterSpec).Execute()
 		if err != nil {
-			logrus.Errorf("Error when calling `ClusterApi.UpdateCluster`: %v", err)
+			logrus.Errorf("Error when calling `ClusterApi.UpdateCluster`: %s", ybmAuthClient.GetApiErrorDetails(err))
 			logrus.Debugf("Full HTTP response: %v", r)
 			return
 		}

cmd/vpc.go

@@ -33,7 +33,7 @@ var getVpcCmd = &cobra.Command{
 		resp, r, err := vpcListRequest.Execute()
 
 		if err != nil {
-			logrus.Errorf("Error when calling `NetworkApi.ListSingleTenantVpcs`: %v", err)
+			logrus.Errorf("Error when calling `NetworkApi.ListSingleTenantVpcs`: %s", ybmAuthClient.GetApiErrorDetails(err))
 			logrus.Debugf("Full HTTP response: %v", r)
 			return
 		}
@@ -108,7 +108,7 @@ var createVpcCmd = &cobra.Command{
 		authApi.GetInfo("", "")
 		resp, r, err := authApi.CreateVpc().SingleTenantVpcRequest(vpcRequest).Execute()
 		if err != nil {
-			logrus.Errorf("Error when calling `NetworkApi.CreateVpc`: %v", err)
+			logrus.Errorf("Error when calling `NetworkApi.CreateVpc`: %s", ybmAuthClient.GetApiErrorDetails(err))
 			logrus.Debugf("Full HTTP response: %v", r)
 			return
 		}
@@ -147,7 +147,7 @@ var deleteVpcCmd = &cobra.Command{
 		}
 		r, err := authApi.DeleteVpc(vpcId).Execute()
 		if err != nil {
-			logrus.Errorf("Error when calling `NetworkApi.DeleteVpc``: %v", err)
+			logrus.Errorf("Error when calling `NetworkApi.DeleteVpc`: %s", ybmAuthClient.GetApiErrorDetails(err))
 			logrus.Debugf("Full HTTP response: %v", r)
 			return
 		}

cmd/vpc_peering.go

@@ -39,7 +39,7 @@ var getVpcPeeringCmd = &cobra.Command{
 		resp, r, err := authApi.ListVpcPeerings().Execute()
 
 		if err != nil {
-			logrus.Errorf("Error when calling `NetworkApi.ListVpcPeerings``: %v", err)
+			logrus.Errorf("Error when calling `NetworkApi.ListVpcPeerings`: %s", ybmAuthClient.GetApiErrorDetails(err))
 			logrus.Errorf("Full HTTP response: %v", r)
 			return
 		}
@@ -144,7 +144,7 @@ var createVpcPeeringCmd = &cobra.Command{
 		vpcPeeringSpec := *ybmclient.NewVpcPeeringSpec(ybVpcId, vpcPeeringName, *applicationVPCSpec)
 		vpcPeeringResp, response, err := authApi.CreateVpcPeering().VpcPeeringSpec(vpcPeeringSpec).Execute()
 		if err != nil {
-			logrus.Errorf("Error when calling `NetworkApi.CreateVpcPeering``: %v", err)
+			logrus.Errorf("Error when calling `NetworkApi.CreateVpcPeering`: %s", ybmAuthClient.GetApiErrorDetails(err))
 			logrus.Errorf("Full HTTP response: %v", response)
 			return
 		}
@@ -176,7 +176,7 @@ var deleteVpcPeeringCmd = &cobra.Command{
 		resp, r, err := authApi.ListVpcPeerings().Execute()
 
 		if err != nil {
-			logrus.Errorf("Error when calling `NetworkApi.ListVpcPeerings``: %v", err)
+			logrus.Errorf("Error when calling `NetworkApi.ListVpcPeerings`: %s", ybmAuthClient.GetApiErrorDetails(err))
 			logrus.Errorf("Full HTTP response: %v", r)
 			return
 		}
@@ -191,7 +191,7 @@ var deleteVpcPeeringCmd = &cobra.Command{
 
 		response, err := authApi.DeleteVpcPeering(vpcPeeringId).Execute()
 		if err != nil {
-			logrus.Errorf("Error when calling `NetworkApi.ListVpcPeerings``: %v", err)
+			logrus.Errorf("Error when calling `NetworkApi.ListVpcPeerings`: %s", ybmAuthClient.GetApiErrorDetails(err))
 			logrus.Errorf("Full HTTP response: %v", response)
 			return
 		}

internal/client/client.go

@@ -2,6 +2,7 @@ package client
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 	"net/http"
 	"net/http/httputil"
@@ -574,6 +575,32 @@ func getFromNodeConfig(resource string, numCores int32, nodeConfigList []ybmclie
 	return 0, fmt.Errorf("node with the given number of CPU cores doesn't exist in the given region")
 }
 
+// Utils functions
+
+// GetApiErrorDetails will return the api Error message if present
+// If not present will return the original err.Error()
+func GetApiErrorDetails(err error) string {
+	switch castedError := err.(type) {
+	case ybmclient.GenericOpenAPIError:
+		if v := getAPIError(castedError.Body()); v != nil {
+			if d, ok := v.GetErrorOk(); ok {
+				return fmt.Sprintf("%s-%s", err.Error(), d.GetDetail())
+			}
+		}
+	}
+	return err.Error()
+
+}
+
+func getAPIError(b []byte) *ybmclient.ApiError {
+	apiError := ybmclient.NewApiErrorWithDefaults()
+	err := json.Unmarshal(b, &apiError)
+	if err != nil {
+		return nil
+	}
+	return apiError
+}
+
 func parseURL(host string) (*url.URL, error) {
 	endpoint, err := url.Parse(host)
 	if err != nil {