Condense CatchV2ErrorDetailWithResponse and CatchV2ErrorMessageWithResponse into one

internal/cmd/api-key/command_create.go

@@ -225,5 +225,5 @@ func (c *command) catchServiceAccountNotValidError(err error, r *http.Response,
 		return err
 	}
 
-	return errors.CatchV2ErrorDetailWithResponse(err, r)
+	return errors.CatchCCloudV2Error(err, r)
 }

internal/cmd/connect/command_create.go

@@ -58,7 +58,7 @@ func (c *command) create(cmd *cobra.Command, _ []string) error {
 
 	connectorInfo, httpResp, err := c.V2Client.CreateConnector(c.EnvironmentId(), kafkaCluster.ID, connectConfig)
 	if err != nil {
-		return errors.CatchV2ErrorMessageWithResponse(err, httpResp)
+		return errors.CatchCCloudV2Error(err, httpResp)
 	}
 
 	connectorExpansion, err := c.V2Client.GetConnectorExpansionByName(connectorInfo.GetName(), c.EnvironmentId(), kafkaCluster.ID)

internal/cmd/connect/command_update.go

@@ -45,7 +45,7 @@ func (c *command) update(cmd *cobra.Command, args []string) error {
 	}
 
 	if _, httpResp, err := c.V2Client.CreateOrUpdateConnectorConfig(connectorExpansion.Info.GetName(), c.EnvironmentId(), kafkaCluster.ID, *userConfigs); err != nil {
-		return errors.CatchV2ErrorMessageWithResponse(err, httpResp)
+		return errors.CatchCCloudV2Error(err, httpResp)
 	}
 
 	utils.Printf(cmd, errors.UpdatedResourceMsg, resource.Connector, args[0])

internal/cmd/iam/command_pool_create.go

@@ -69,7 +69,7 @@ func (c *identityPoolCommand) create(cmd *cobra.Command, args []string) error {
 	}
 	resp, httpResp, err := c.V2Client.CreateIdentityPool(createIdentityPool, provider)
 	if err != nil {
-		return errors.CatchV2ErrorMessageWithResponse(err, httpResp)
+		return errors.CatchCCloudV2Error(err, httpResp)
 	}
 
 	identityPool := &identityPool{

internal/cmd/iam/command_pool_delete.go

@@ -38,7 +38,7 @@ func (c *identityPoolCommand) delete(cmd *cobra.Command, args []string) error {
 	}
 
 	if httpResp, err := c.V2Client.DeleteIdentityPool(args[0], provider); err != nil {
-		return errors.CatchV2ErrorMessageWithResponse(err, httpResp)
+		return errors.CatchCCloudV2Error(err, httpResp)
 	}
 
 	utils.ErrPrintf(cmd, errors.DeletedResourceMsg, resource.IdentityPool, args[0])

internal/cmd/iam/command_pool_describe.go

@@ -47,7 +47,7 @@ func (c identityPoolCommand) describe(cmd *cobra.Command, args []string) error {
 
 	identityPoolProfile, httpResp, err := c.V2Client.GetIdentityPool(args[0], provider)
 	if err != nil {
-		return errors.CatchV2ErrorMessageWithResponse(err, httpResp)
+		return errors.CatchCCloudV2Error(err, httpResp)
 	}
 
 	describeIdentityPool := &identityPool{

internal/cmd/iam/command_pool_update.go

@@ -85,7 +85,7 @@ func (c *identityPoolCommand) update(cmd *cobra.Command, args []string) error {
 
 	resp, httpResp, err := c.V2Client.UpdateIdentityPool(updateIdentityPool, provider)
 	if err != nil {
-		return errors.CatchV2ErrorMessageWithResponse(err, httpResp)
+		return errors.CatchCCloudV2Error(err, httpResp)
 	}
 
 	describeIdentityPool := &identityPool{

internal/cmd/iam/command_provider_create.go

@@ -62,7 +62,7 @@ func (c *identityProviderCommand) create(cmd *cobra.Command, args []string) erro
 	}
 	resp, httpResp, err := c.V2Client.CreateIdentityProvider(newIdentityProvider)
 	if err != nil {
-		return errors.CatchV2ErrorMessageWithResponse(err, httpResp)
+		return errors.CatchCCloudV2Error(err, httpResp)
 	}
 
 	identityProvider := &identityProvider{

internal/cmd/iam/command_provider_delete.go

@@ -28,7 +28,7 @@ func (c *identityProviderCommand) newDeleteCommand() *cobra.Command {
 
 func (c *identityProviderCommand) delete(cmd *cobra.Command, args []string) error {
 	if httpResp, err := c.V2Client.DeleteIdentityProvider(args[0]); err != nil {
-		return errors.CatchV2ErrorMessageWithResponse(err, httpResp)
+		return errors.CatchCCloudV2Error(err, httpResp)
 	}
 
 	utils.ErrPrintf(cmd, errors.DeletedResourceMsg, resource.IdentityProvider, args[0])

internal/cmd/iam/command_provider_describe.go

@@ -39,7 +39,7 @@ func (c identityProviderCommand) newDescribeCommand() *cobra.Command {
 func (c identityProviderCommand) describe(cmd *cobra.Command, args []string) error {
 	identityProviderProfile, httpResp, err := c.V2Client.GetIdentityProvider(args[0])
 	if err != nil {
-		return errors.CatchV2ErrorMessageWithResponse(err, httpResp)
+		return errors.CatchCCloudV2Error(err, httpResp)
 	}
 
 	describeIdentityProvider := &identityProvider{

internal/cmd/iam/command_provider_update.go

@@ -59,7 +59,7 @@ func (c *identityProviderCommand) update(cmd *cobra.Command, args []string) erro
 
 	resp, httpResp, err := c.V2Client.UpdateIdentityProvider(update)
 	if err != nil {
-		return errors.CatchV2ErrorMessageWithResponse(err, httpResp)
+		return errors.CatchCCloudV2Error(err, httpResp)
 	}
 
 	describeIdentityProvider := &identityProvider{

internal/cmd/iam/command_service_account_delete.go

@@ -33,7 +33,7 @@ func (c *serviceAccountCommand) delete(cmd *cobra.Command, args []string) error
 
 	httpResp, err := c.V2Client.DeleteIamServiceAccount(args[0])
 	if err != nil {
-		return errors.Errorf(`failed to delete service account "%s": %v`, args[0], errors.CatchV2ErrorDetailWithResponse(err, httpResp))
+		return errors.Errorf(errors.DeleteResourceErrorMsg, resource.ServiceAccount, args[0], errors.CatchCCloudV2Error(err, httpResp))
 	}
 
 	utils.ErrPrintf(cmd, errors.DeletedResourceMsg, resource.ServiceAccount, args[0])

internal/cmd/iam/command_user_delete.go

@@ -27,7 +27,7 @@ func (c userCommand) delete(cmd *cobra.Command, args []string) error {
 
 	httpResp, err := c.V2Client.DeleteIamUser(resourceId)
 	if err != nil {
-		return errors.Errorf(`failed to delete user "%s": %v`, resourceId, errors.CatchV2ErrorDetailWithResponse(err, httpResp))
+		return errors.Errorf(errors.DeleteResourceErrorMsg, resource.User, resourceId, errors.CatchCCloudV2Error(err, httpResp))
 	}
 
 	utils.Printf(cmd, errors.DeletedResourceMsg, resource.User, resourceId)

internal/cmd/iam/command_user_update.go

@@ -39,7 +39,7 @@ func (c *userCommand) update(cmd *cobra.Command, args []string) error {
 
 	_, httpResp, err := c.V2Client.UpdateIamUser(resourceId, update)
 	if err != nil {
-		return errors.Errorf(`failed to update user "%s": %v`, resourceId, errors.CatchV2ErrorDetailWithResponse(err, httpResp))
+		return errors.Errorf(errors.UpdateResourceErrorMsg, resource.User, resourceId, errors.CatchCCloudV2Error(err, httpResp))
 	}
 
 	utils.ErrPrintf(cmd, errors.UpdateSuccessMsg, "full name", "user", resourceId, fullName)

internal/cmd/kafka/command_cluster_update.go

@@ -89,7 +89,7 @@ func (c *clusterCommand) update(cmd *cobra.Command, args []string, prompt form.P
 
 	updatedCluster, httpResp, err := c.V2Client.UpdateKafkaCluster(clusterID, update)
 	if err != nil {
-		return errors.NewWrapErrorWithSuggestions(errors.CatchV2ErrorDetailWithResponse(err, httpResp), "failed to update Kafka cluster", errors.KafkaClusterUpdateFailedSuggestions)
+		return errors.NewWrapErrorWithSuggestions(errors.CatchCCloudV2Error(err, httpResp), "failed to update Kafka cluster", errors.KafkaClusterUpdateFailedSuggestions)
 	}
 
 	return c.outputKafkaClusterDescription(cmd, &updatedCluster)

internal/cmd/stream-share/command_consumer_redeem.go

@@ -74,7 +74,7 @@ func (c *command) redeemShare(cmd *cobra.Command, args []string) error {
 
 	redeemResponse, httpResp, err := c.V2Client.RedeemSharedToken(token, awsAccountId, azureSubscriptionId)
 	if err != nil {
-		return errors.CatchV2ErrorDetailWithResponse(err, httpResp)
+		return errors.CatchCCloudV2Error(err, httpResp)
 	}
 
 	var resources []string

internal/cmd/stream-share/command_consumer_share_delete.go

@@ -30,7 +30,7 @@ func (c *command) deleteConsumerShare(cmd *cobra.Command, args []string) error {
 	shareId := args[0]
 
 	if httpResp, err := c.V2Client.DeleteConsumerShare(shareId); err != nil {
-		return errors.CatchV2ErrorDetailWithResponse(err, httpResp)
+		return errors.CatchCCloudV2Error(err, httpResp)
 	}
 
 	utils.Printf(cmd, errors.DeletedResourceMsg, resource.ConsumerShare, shareId)

internal/cmd/stream-share/command_consumer_share_describe.go

@@ -34,7 +34,7 @@ func (c *command) describeConsumerShare(cmd *cobra.Command, args []string) error
 
 	consumerShare, httpResp, err := c.V2Client.DescribeConsumerShare(shareId)
 	if err != nil {
-		return errors.CatchV2ErrorDetailWithResponse(err, httpResp)
+		return errors.CatchCCloudV2Error(err, httpResp)
 	}
 
 	return output.DescribeObject(cmd, c.buildConsumerShare(consumerShare), consumerShareListFields, consumerHumanLabelMap, consumerStructuredLabelMap)

internal/cmd/stream-share/command_provider_invite_create.go

@@ -60,7 +60,7 @@ func (c *command) createEmailInvite(cmd *cobra.Command, _ []string) error {
 
 	invite, httpResp, err := c.V2Client.CreateInvite(environment, kafkaCluster, topic, email)
 	if err != nil {
-		return errors.CatchV2ErrorDetailWithResponse(err, httpResp)
+		return errors.CatchCCloudV2Error(err, httpResp)
 	}
 
 	return output.DescribeObject(cmd, c.buildProviderShare(invite), providerShareListFields, providerHumanLabelMap, providerStructuredLabelMap)

internal/cmd/stream-share/command_provider_invite_resend.go

@@ -32,7 +32,7 @@ func (c *command) resendEmailInvite(cmd *cobra.Command, args []string) error {
 	shareId := args[0]
 
 	if httpResp, err := c.V2Client.ResendInvite(shareId); err != nil {
-		return errors.CatchV2ErrorDetailWithResponse(err, httpResp)
+		return errors.CatchCCloudV2Error(err, httpResp)
 	}
 
 	utils.Printf(cmd, errors.ResendInviteMsg, shareId)

internal/cmd/stream-share/command_provider_share_delete.go

@@ -30,7 +30,7 @@ func (c *command) deleteProviderShare(cmd *cobra.Command, args []string) error {
 	shareId := args[0]
 
 	if httpResp, err := c.V2Client.DeleteProviderShare(shareId); err != nil {
-		return errors.CatchV2ErrorDetailWithResponse(err, httpResp)
+		return errors.CatchCCloudV2Error(err, httpResp)
 	}
 
 	utils.Printf(cmd, errors.DeletedResourceMsg, resource.ProviderShare, shareId)

internal/cmd/stream-share/command_provider_share_describe.go

@@ -34,7 +34,7 @@ func (c *command) describeProviderShare(cmd *cobra.Command, args []string) error
 
 	provideShare, httpResp, err := c.V2Client.DescribeProviderShare(shareId)
 	if err != nil {
-		return errors.CatchV2ErrorDetailWithResponse(err, httpResp)
+		return errors.CatchCCloudV2Error(err, httpResp)
 	}
 
 	return output.DescribeObject(cmd, c.buildProviderShare(provideShare), providerShareListFields, providerHumanLabelMap, providerStructuredLabelMap)

internal/pkg/auth/sso/auth_state.go

@@ -196,11 +196,11 @@ func (s *authState) getOAuthTokenResponse(payload *strings.Reader) (map[string]i
 		return nil, errors.Wrap(err, "failed to get oauth token")
 	}
 	defer res.Body.Close()
-	responseBody, _ := ioutil.ReadAll(res.Body)
+	errorResponseBody, _ := ioutil.ReadAll(res.Body)
 	var data map[string]interface{}
-	err = json.Unmarshal(responseBody, &data)
+	err = json.Unmarshal(errorResponseBody, &data)
 	if err != nil {
-		log.CliLogger.Debugf("Failed oauth token response body: %s", responseBody)
+		log.CliLogger.Debugf("Failed oauth token response body: %s", errorResponseBody)
 		return nil, errors.Wrap(err, errors.UnmarshalOAuthTokenErrorMsg)
 	}
 	return data, nil

internal/pkg/ccloudv2/cdx.go

@@ -75,7 +75,7 @@ func (c *Client) ListProviderShares(sharedResource string) ([]cdxv1.CdxV1Provide
 	for !done {
 		page, r, err := c.executeListProviderShares(sharedResource, pageToken)
 		if err != nil {
-			return nil, errors.CatchV2ErrorDetailWithResponse(err, r)
+			return nil, errors.CatchCCloudV2Error(err, r)
 		}
 		list = append(list, page.GetData()...)
 
@@ -96,7 +96,7 @@ func (c *Client) ListConsumerShares(sharedResource string) ([]cdxv1.CdxV1Consume
 	for !done {
 		page, r, err := c.executeListConsumerShares(sharedResource, pageToken)
 		if err != nil {
-			return nil, errors.CatchV2ErrorDetailWithResponse(err, r)
+			return nil, errors.CatchCCloudV2Error(err, r)
 		}
 		list = append(list, page.GetData()...)
 

internal/pkg/dynamic-config/client.go

@@ -21,7 +21,7 @@ func (d *DynamicContext) FetchCluster(clusterId string) (*v1.KafkaClusterConfig,
 
 	cluster, httpResp, err := d.V2Client.DescribeKafkaCluster(clusterId, environmentId)
 	if err != nil {
-		return nil, errors.CatchV2ErrorDetailWithResponse(err, httpResp)
+		return nil, errors.CatchCCloudV2Error(err, httpResp)
 	}
 
 	apiEndpoint, err := getKafkaApiEndpoint(d.Client, clusterId, environmentId)
@@ -60,7 +60,7 @@ func (d *DynamicContext) FetchAPIKeyError(apiKey string, clusterID string) error
 	// check if this is API key exists server-side
 	key, httpResp, err := d.V2Client.GetApiKey(apiKey)
 	if err != nil {
-		return errors.CatchV2ErrorDetailWithResponse(err, httpResp)
+		return errors.CatchCCloudV2Error(err, httpResp)
 	}
 	// check if the key is for the right cluster
 	ok := key.Spec.Resource.Id == clusterID

internal/pkg/errors/catcher.go

@@ -24,7 +24,7 @@ import (
 
 const quotaExceededRegex = ".* is currently limited to .*"
 
-type responseBody struct {
+type errorResponseBody struct {
 	Error   []errorDetail `json:"errors"`
 	Message string        `json:"message"`
 }
@@ -141,26 +141,30 @@ func catchCCloudBackendUnmarshallingError(err error) error {
 	CCLOUD-SDK-GO CLIENT ERROR CATCHING
 */
 
-func CatchV2ErrorDetailWithResponse(err error, r *http.Response) error {
+func CatchCCloudV2Error(err error, r *http.Response) error {
+	if err == nil {
+		return nil
+	}
+
 	if r == nil {
 		return err
 	}
 
 	body, _ := io.ReadAll(r.Body)
-	return CatchV2ErrorDetailWithResponseBody(err, body)
-}
-
-func CatchV2ErrorDetailWithResponseBody(err error, body []byte) error {
-	var resBody responseBody
+	var resBody errorResponseBody
 	_ = json.Unmarshal(body, &resBody)
 	if len(resBody.Error) > 0 {
 		detail := resBody.Error[0].Detail
 		if ok, _ := regexp.MatchString(quotaExceededRegex, detail); ok {
 			return NewWrapErrorWithSuggestions(err, detail, QuotaExceededSuggestions)
 		} else if detail != "" {
-			return Wrap(err, strings.TrimSuffix(resBody.Error[0].Detail, "\n"))
+			return Wrap(err, strings.TrimSuffix(detail, "\n"))
 		}
 	}
+	if resBody.Message != "" {
+		return Wrap(err, strings.TrimRight(resBody.Message, "\n"))
+	}
+
 	return err
 }
 
@@ -184,10 +188,10 @@ func CatchEnvironmentNotFoundError(err error, r *http.Response) error {
 	}
 
 	if r != nil && r.StatusCode == http.StatusForbidden {
-		return NewWrapErrorWithSuggestions(CatchV2ErrorDetailWithResponse(err, r), "environment not found or access forbidden", EnvNotFoundSuggestions)
+		return NewWrapErrorWithSuggestions(CatchCCloudV2Error(err, r), "environment not found or access forbidden", EnvNotFoundSuggestions)
 	}
 
-	return CatchV2ErrorDetailWithResponse(err, r)
+	return CatchCCloudV2Error(err, r)
 }
 
 func CatchKafkaNotFoundError(err error, clusterId string, r *http.Response) error {
@@ -203,10 +207,10 @@ func CatchKafkaNotFoundError(err error, clusterId string, r *http.Response) erro
 		if r.Request.Method == http.MethodDelete {
 			suggestions = KafkaClusterDeletingSuggestions
 		}
-		return NewWrapErrorWithSuggestions(CatchV2ErrorDetailWithResponse(err, r), "Kafka cluster not found or access forbidden", suggestions)
+		return NewWrapErrorWithSuggestions(CatchCCloudV2Error(err, r), "Kafka cluster not found or access forbidden", suggestions)
 	}
 
-	return CatchV2ErrorDetailWithResponse(err, r)
+	return CatchCCloudV2Error(err, r)
 }
 
 func CatchClusterConfigurationNotValidError(err error, r *http.Response) error {
@@ -218,19 +222,19 @@ func CatchClusterConfigurationNotValidError(err error, r *http.Response) error {
 		return err
 	}
 
-	body, _ := io.ReadAll(r.Body)
-	if strings.Contains(string(body), "CKU must be greater") {
+	err = CatchCCloudV2Error(err, r)
+	if strings.Contains(err.Error(), "CKU must be greater") {
 		return New(InvalidCkuErrorMsg)
 	}
 
-	return CatchV2ErrorDetailWithResponseBody(err, body)
+	return err
 }
 
 func CatchApiKeyForbiddenAccessError(err error, operation string, r *http.Response) error {
 	if r != nil && r.StatusCode == http.StatusForbidden || strings.Contains(err.Error(), "Unknown API key") {
-		return NewWrapErrorWithSuggestions(CatchV2ErrorDetailWithResponse(err, r), fmt.Sprintf("error %s API key", operation), APIKeyNotFoundSuggestions)
+		return NewWrapErrorWithSuggestions(CatchCCloudV2Error(err, r), fmt.Sprintf("error %s API key", operation), APIKeyNotFoundSuggestions)
 	}
-	return CatchV2ErrorDetailWithResponse(err, r)
+	return CatchCCloudV2Error(err, r)
 }
 
 func CatchKSQLNotFoundError(err error, clusterId string) error {
@@ -253,13 +257,13 @@ func CatchServiceNameInUseError(err error, r *http.Response, serviceName string)
 		return err
 	}
 
-	body, _ := io.ReadAll(r.Body)
-	if strings.Contains(string(body), "Service name is already in use") {
+	err = CatchCCloudV2Error(err, r)
+	if strings.Contains(err.Error(), "Service name is already in use") {
 		errorMsg := fmt.Sprintf(ServiceNameInUseErrorMsg, serviceName)
 		return NewErrorWithSuggestions(errorMsg, ServiceNameInUseSuggestions)
 	}
 
-	return CatchV2ErrorDetailWithResponseBody(err, body)
+	return err
 }
 
 func CatchServiceAccountNotFoundError(err error, r *http.Response, serviceAccountId string) error {
@@ -273,31 +277,11 @@ func CatchServiceAccountNotFoundError(err error, r *http.Response, serviceAccoun
 			errorMsg := fmt.Sprintf(ServiceAccountNotFoundErrorMsg, serviceAccountId)
 			return NewErrorWithSuggestions(errorMsg, ServiceAccountNotFoundSuggestions)
 		case http.StatusForbidden:
-			return NewWrapErrorWithSuggestions(CatchV2ErrorDetailWithResponse(err, r), "service account not found or access forbidden", ServiceAccountNotFoundSuggestions)
+			return NewWrapErrorWithSuggestions(CatchCCloudV2Error(err, r), "service account not found or access forbidden", ServiceAccountNotFoundSuggestions)
 		}
 	}
 
-	return CatchV2ErrorDetailWithResponse(err, r)
-}
-
-func CatchV2ErrorMessageWithResponse(err error, r *http.Response) error {
-	if err == nil {
-		return nil
-	}
-
-	if r == nil {
-		return err
-	}
-	body, _ := io.ReadAll(r.Body)
-	var resBody responseBody
-	_ = json.Unmarshal(body, &resBody)
-	if resBody.Message != "" {
-		// {"error_code":400,"message":"Connector configuration is invalid and contains 1 validation error(s).
-		// Errors: quickstart: Value \"CLICKM\" is not a valid \"Select a template\" type\n"}
-		return Wrap(err, strings.TrimSuffix(resBody.Message, "\n"))
-	}
-
-	return err
+	return CatchCCloudV2Error(err, r)
 }
 
 func isResourceNotFoundError(err error) bool {