fix: clarifies message error regards service account (openshift#174)

* fix: clarifies message error regards service account

* apply suggestions

Upstream-repository: api
Upstream-commit: f579141ce61d8bb7c4dc7c06169bc436ac4b9703

Author: camilamacedo86

staging/api/pkg/validation/internal/bundle.go

@@ -52,7 +52,11 @@ func validateServiceAccounts(bundle *manifests.Bundle) []errors.Error {
 		sa := v1.ServiceAccount{}
 		if err := runtime.DefaultUnstructuredConverter.FromUnstructured(obj.Object, &sa); err == nil {
 			if _, ok := saNamesFromCSV[sa.Name]; ok {
-				errs = append(errs, errors.ErrInvalidBundle("invalid service account found in bundle. sa name cannot match service account defined for deployment spec in CSV", sa.Name))
+				errs = append(errs, errors.ErrInvalidBundle(fmt.Sprintf("invalid service account found in bundle. " +
+					"This service account %s in your bundle is not valid, because a service account with the same name " +
+					"was already specified in your CSV. If this was unintentional, please remove the service account " +
+					"manifest from your bundle. If it was intentional to specify a separate service account, " +
+					"please rename the SA in either the bundle manifest or the CSV.",sa.Name), sa.Name))
 			}
 		}
 	}

staging/api/pkg/validation/internal/bundle_test.go

@@ -49,7 +49,7 @@ func TestValidateBundle(t *testing.T) {
 			description: "invalid bundle service account can't match sa in csv",
 			directory:   "./testdata/invalid_bundle_sa",
 			hasError:    true,
-			errString:   `invalid service account found in bundle. sa name cannot match service account defined for deployment spec in CSV`,
+			errString:   `invalid service account found in bundle. This service account etcd-operator in your bundle is not valid, because a service account with the same name was already specified in your CSV. If this was unintentional, please remove the service account manifest from your bundle. If it was intentional to specify a separate service account, please rename the SA in either the bundle manifest or the CSV.`,
 		},
 	}
 
@@ -141,7 +141,7 @@ func TestValidateServiceAccount(t *testing.T) {
 				},
 			},
 			hasError:  true,
-			errString: `invalid service account found in bundle. sa name cannot match service account defined for deployment spec in CSV`,
+			errString: `invalid service account found in bundle. This service account foo in your bundle is not valid, because a service account with the same name was already specified in your CSV. If this was unintentional, please remove the service account manifest from your bundle. If it was intentional to specify a separate service account, please rename the SA in either the bundle manifest or the CSV.`,
 		},
 	}