refactor(serviceaccount): print custom messages instead of status codes (#413)

Author: rkpattnaik780

cmd/rhoas/pkged.go

@@ -24,6 +24,13 @@ one = 'could not save credentials to file'
 description = 'Error message when service account is not found'
 one = 'service account with ID "{{.ID}}" not found'
 
+[serviceAccount.common.error.internalServerError]
+one = 'internal server error'
+
+[serviceAccount.common.error.forbidden]
+one = 'you are forbidden to {{.Operation}} this service account'
+other = 'you are forbidden to {{.Operation}} these service accounts'
+
 [serviceAccount.common.log.info.credentialsSaved]
 description = 'Credentials file saved message'
 one = 'Credentials saved to {{.FilePath}}'

locales/cmd/serviceaccount/active.en.toml

@@ -135,10 +135,22 @@ func runCreate(opts *Options) error {
 	api := connection.API()
 	a := api.Kafka().CreateServiceAccount(context.Background())
 	a = a.ServiceAccountRequest(*serviceAccountPayload)
-	serviceacct, _, apiErr := a.Execute()
+	serviceacct, httpRes, apiErr := a.Execute()
 
 	if apiErr.Error() != "" {
-		return fmt.Errorf("%v: %v", localizer.MustLocalizeFromID("serviceAccount.create.error.couldNotCreate"), apiErr)
+		switch httpRes.StatusCode {
+		case 403:
+			return fmt.Errorf("%v: %w", localizer.MustLocalize(&localizer.Config{
+				MessageID: "serviceAccount.common.error.forbidden",
+				TemplateData: map[string]interface{}{
+					"Operation": "create",
+				},
+			}), apiErr)
+		case 500:
+			return fmt.Errorf("%v: %w", localizer.MustLocalizeFromID("serviceAccount.common.error.internalServerError"), apiErr)
+		default:
+			return apiErr
+		}
 	}
 
 	logger.Info(localizer.MustLocalize(&localizer.Config{

pkg/cmd/serviceaccount/create/create.go

@@ -123,10 +123,22 @@ func deleteServiceAccount(opts *Options) error {
 	api := connection.API()
 
 	a := api.Kafka().DeleteServiceAccount(context.Background(), opts.id)
-	_, _, apiErr := a.Execute()
+	_, httpRes, apiErr := a.Execute()
 
 	if apiErr.Error() != "" {
-		return fmt.Errorf("%v: %w", localizer.MustLocalizeFromID("serviceAccount.delete.error.unableToDelete"), apiErr)
+		switch httpRes.StatusCode {
+		case 403:
+			return fmt.Errorf("%v: %w", localizer.MustLocalize(&localizer.Config{
+				MessageID: "serviceAccount.common.error.forbidden",
+				TemplateData: map[string]interface{}{
+					"Operation": "delete",
+				},
+			}), apiErr)
+		case 500:
+			return fmt.Errorf("%v: %w", localizer.MustLocalizeFromID("serviceAccount.common.error.internalServerError"), apiErr)
+		default:
+			return apiErr
+		}
 	}
 
 	logger.Info(localizer.MustLocalizeFromID("serviceAccount.delete.log.info.deleteSuccess"))

pkg/cmd/serviceaccount/delete/delete.go

@@ -67,10 +67,29 @@ func runDescribe(opts *Options) error {
 	api := connection.API()
 
 	a := api.Kafka().GetServiceAccountById(context.Background(), opts.id)
-	res, _, apiErr := a.Execute()
+	res, httpRes, apiErr := a.Execute()
 
 	if apiErr.Error() != "" {
-		return fmt.Errorf("%v: %w", localizer.MustLocalizeFromID("serviceAccount.describe.error.unableToDescribe"), apiErr)
+		switch httpRes.StatusCode {
+		case 404:
+			return fmt.Errorf(localizer.MustLocalize(&localizer.Config{
+				MessageID: "serviceAccount.common.error.notFoundError",
+				TemplateData: map[string]interface{}{
+					"ID": opts.id,
+				},
+			}))
+		case 403:
+			return fmt.Errorf("%v: %w", localizer.MustLocalize(&localizer.Config{
+				MessageID: "serviceAccount.common.error.forbidden",
+				TemplateData: map[string]interface{}{
+					"Operation": "view",
+				},
+			}), apiErr)
+		case 500:
+			return fmt.Errorf("%v: %w", localizer.MustLocalizeFromID("serviceAccount.common.error.internalServerError"), apiErr)
+		default:
+			return apiErr
+		}
 	}
 
 	switch opts.outputFormat {

pkg/cmd/serviceaccount/describe/describe.go

@@ -79,10 +79,23 @@ func runList(opts *Options) (err error) {
 	api := connection.API()
 
 	a := api.Kafka().ListServiceAccounts(context.Background())
-	res, _, apiErr := a.Execute()
+	res, httpRes, apiErr := a.Execute()
 
 	if apiErr.Error() != "" {
-		return fmt.Errorf("%v: %w", localizer.MustLocalizeFromID("serviceAccount.list.error.unableToList"), apiErr)
+		switch httpRes.StatusCode {
+		case 403:
+			return fmt.Errorf("%v: %w", localizer.MustLocalize(&localizer.Config{
+				MessageID:   "serviceAccount.common.error.forbidden",
+				PluralCount: 2,
+				TemplateData: map[string]interface{}{
+					"Operation": "list",
+				},
+			}), apiErr)
+		case 500:
+			return fmt.Errorf("%v: %w", localizer.MustLocalizeFromID("serviceAccount.common.error.internalServerError"), apiErr)
+		default:
+			return apiErr
+		}
 	}
 
 	serviceaccounts := res.GetItems()

pkg/cmd/serviceaccount/list/list.go

@@ -212,10 +212,22 @@ func resetCredentials(name string, opts *Options) (*kasclient.ServiceAccount, er
 		},
 	}))
 
-	serviceacct, _, apiErr := api.Kafka().ResetServiceAccountCreds(context.Background(), opts.id).Execute()
+	serviceacct, httpRes, apiErr := api.Kafka().ResetServiceAccountCreds(context.Background(), opts.id).Execute()
 
 	if apiErr.Error() != "" {
-		return nil, apiErr
+		switch httpRes.StatusCode {
+		case 403:
+			return nil, fmt.Errorf("%v: %w", localizer.MustLocalize(&localizer.Config{
+				MessageID: "serviceAccount.common.error.forbidden",
+				TemplateData: map[string]interface{}{
+					"Operation": "update",
+				},
+			}), apiErr)
+		case 500:
+			return nil, fmt.Errorf("%v: %w", localizer.MustLocalizeFromID("serviceAccount.common.error.internalServerError"), apiErr)
+		default:
+			return nil, apiErr
+		}
 	}
 
 	return &serviceacct, nil