updates testcases

Signed-off-by: rashmi_kh <[email protected]>

Author: rashmi43

internal/authentication/tokengetter.go

@@ -7,6 +7,7 @@ import (
 	"time"
 
 	authenticationv1 "k8s.io/api/authentication/v1"
+	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	corev1 "k8s.io/client-go/kubernetes/typed/core/v1"
@@ -25,7 +26,7 @@ type ServiceAccountNotFoundError struct {
 }
 
 func (e *ServiceAccountNotFoundError) Error() string {
-	return fmt.Sprintf(" Unable to authenticate with Kubernetes cluster using ServiceAccount \"%s\": ServiceAccount \"%s\" not found.", e.ServiceAccountName, e.ServiceAccountName)
+	return fmt.Sprintf("Unable to authenticate with Kubernetes cluster using ServiceAccount \"%s\": ServiceAccount \"%s\" not found.", e.ServiceAccountName, e.ServiceAccountName)
 }
 
 type TokenGetterOption func(*TokenGetter)
@@ -95,8 +96,12 @@ func (t *TokenGetter) getToken(ctx context.Context, key types.NamespacedName) (*
 			Spec: authenticationv1.TokenRequestSpec{ExpirationSeconds: ptr.To(int64(t.expirationDuration / time.Second))},
 		}, metav1.CreateOptions{})
 	if err != nil {
-		saErr := &ServiceAccountNotFoundError{key.Name}
-		return nil, saErr
+		if errors.IsNotFound(err) {
+			saErr := &ServiceAccountNotFoundError{key.Name}
+			return nil, saErr
+		} else {
+			return nil, err
+		}
 	}
 	return &req.Status, nil
 }

internal/authentication/tokengetter_test.go

@@ -71,7 +71,7 @@ func TestTokenGetterGet(t *testing.T) {
 		{"Testing token that expired 10 seconds ago", "test-service-account-3",
 			"test-namespace-3", "test-token-3", "failed to get token"},
 		{"Testing error when getting token from fake client", "test-service-account-4",
-			"test-namespace-4", "error when fetching token", "error when fetching token"},
+			"test-namespace-4", "error when fetching token.", "error when fetching token"},
 	}
 
 	for _, tc := range tests {

internal/controllers/clusterextension_controller_test.go

@@ -744,6 +744,7 @@ func TestClusterExtensionInstallationFailsWithNoServiceAccount(t *testing.T) {
 	require.Equal(t, ocv1.BundleMetadata{Name: "prometheus.v1.0.0", Version: "1.0.0"}, clusterExtension.Status.Install.Bundle)
 
 	t.Log("By checking the expected installed conditions")
+
 	installedCond := apimeta.FindStatusCondition(clusterExtension.Status.Conditions, ocv1.TypeInstalled)
 	t.Log("By checking the installed conditions message", installedCond.Message)
 	require.NotNil(t, installedCond)
@@ -760,8 +761,11 @@ func TestClusterExtensionInstallationFailsWithNoServiceAccount(t *testing.T) {
 	t.Log("Progressing condition reason", progressingCond.Reason)
 	//require.Equal(t, metav1.ConditionTrue, progressingCond.Status)
 	require.Equal(t, ocv1.ReasonFailed, progressingCond.Reason)
+	failedCond := apimeta.FindStatusCondition(clusterExtension.Status.Conditions, ocv1.ReasonFailed)
+	t.Log("By checking the failed conditions message", failedCond.Message)
+	t.Log("By checking the failed conditions status", failedCond.Status, failedCond.Reason)
 
-	//require.NoError(t, cl.DeleteAllOf(ctx, &ocv1.ClusterExtension{}))
+	require.NoError(t, cl.DeleteAllOf(ctx, &ocv1.ClusterExtension{}))
 }
 
 func TestClusterExtensionDeleteFinalizerFails(t *testing.T) {