Rename webhooks errors exported funcs (#925)

* pkg webhooks: update new error functions names to IsAdmission prefix; NOT API breaking

* pkg webhooks: update IsInvalidReplicationFactor exported func name with IsAdmission prefix; API breaking change

Author: mihaialexandrescu

pkg/resources/cruisecontrol/topicManager.go

@@ -99,7 +99,7 @@ func generateCCTopic(cluster *v1beta1.KafkaCluster, client client.Client, log lo
 					return errorfactory.New(errorfactory.ResourceNotReady{}, err, "topic admission failed to connect to kafka cluster")
 				}
 				// If less than the required brokers are available - return not ready
-				if webhooks.IsInvalidReplicationFactor(err) {
+				if webhooks.IsAdmissionInvalidReplicationFactor(err) {
 					return errorfactory.New(errorfactory.ResourceNotReady{}, err, fmt.Sprintf("not enough brokers available (at least %d needed) for CC topic", topic.Spec.ReplicationFactor))
 				}
 				return errorfactory.New(errorfactory.APIFailure{}, err, "could not create cruise control topic")

pkg/webhooks/errors.go

@@ -36,26 +36,26 @@ func IsAdmissionCantConnect(err error) bool {
 	return apierrors.IsInternalError(err) && strings.Contains(err.Error(), cantConnectErrorMsg)
 }
 
-func IsCantConnectAPIServer(err error) bool {
+func IsAdmissionCantConnectAPIServer(err error) bool {
 	return apierrors.IsInternalError(err) && strings.Contains(err.Error(), cantConnectAPIServerMsg)
 }
 
-func IsInvalidReplicationFactor(err error) bool {
+func IsAdmissionInvalidReplicationFactor(err error) bool {
 	return apierrors.IsInvalid(err) && strings.Contains(err.Error(), invalidReplicationFactorErrMsg)
 }
 
-func IsOutOfRangeReplicationFactor(err error) bool {
+func IsAdmissionOutOfRangeReplicationFactor(err error) bool {
 	return apierrors.IsInvalid(err) && strings.Contains(err.Error(), outOfRangeReplicationFactorErrMsg)
 }
 
-func IsOutOfRangePartitions(err error) bool {
+func IsAdmissionOutOfRangePartitions(err error) bool {
 	return apierrors.IsInvalid(err) && strings.Contains(err.Error(), outOfRangePartitionsErrMsg)
 }
 
-func IsInvalidRemovingStorage(err error) bool {
+func IsAdmissionInvalidRemovingStorage(err error) bool {
 	return apierrors.IsInvalid(err) && strings.Contains(err.Error(), unsupportedRemovingStorageMsg)
 }
 
-func IsErrorDuringValidation(err error) bool {
+func IsAdmissionErrorDuringValidation(err error) bool {
 	return apierrors.IsInternalError(err) && strings.Contains(err.Error(), errorDuringValidationMsg)
 }

pkg/webhooks/errors_test.go

@@ -55,22 +55,22 @@ func TestIsInvalidReplicationFactor(t *testing.T) {
 		kafkaTopic.GetObjectKind().GroupVersionKind().GroupKind(),
 		kafkaTopic.Name, fieldErrs)
 
-	if !IsInvalidReplicationFactor(err) {
+	if !IsAdmissionInvalidReplicationFactor(err) {
 		t.Error("Expected is invalid replication error to be true, got false")
 	}
 
 	err = apierrors.NewServiceUnavailable("some other reason")
-	if IsInvalidReplicationFactor(err) {
+	if IsAdmissionInvalidReplicationFactor(err) {
 		t.Error("Expected is invalid replication error to be false, got true")
 	}
 
 	err = apierrors.NewServiceUnavailable(invalidReplicationFactorErrMsg)
-	if IsInvalidReplicationFactor(err) {
+	if IsAdmissionInvalidReplicationFactor(err) {
 		t.Error("Expected is invalid replication error to be false, got true")
 	}
 }
 
-func TestIsCantConnectAPIServer(t *testing.T) {
+func TestIsAdmissionCantConnectAPIServer(t *testing.T) {
 	testCases := []struct {
 		testName string
 		err      error
@@ -90,40 +90,40 @@ func TestIsCantConnectAPIServer(t *testing.T) {
 
 	for _, tc := range testCases {
 		t.Run(tc.testName, func(t *testing.T) {
-			if got := IsCantConnectAPIServer(tc.err); got != tc.want {
+			if got := IsAdmissionCantConnectAPIServer(tc.err); got != tc.want {
 				t.Errorf("Check connection to API Server error message. Expected: %t ; Got: %t", tc.want, got)
 			}
 		})
 	}
 }
 
-func TestIsOutOfRangeReplicationFactor(t *testing.T) {
+func TestIsAdmissionOutOfRangeReplicationFactor(t *testing.T) {
 	kafkaTopic := banzaicloudv1alpha1.KafkaTopic{ObjectMeta: metav1.ObjectMeta{Name: "test-KafkaTopic"}}
 	var fieldErrs field.ErrorList
 	fieldErrs = append(fieldErrs, field.Invalid(field.NewPath("spec").Child("replicationFactor"), "-2", outOfRangeReplicationFactorErrMsg))
 	err := apierrors.NewInvalid(
 		kafkaTopic.GetObjectKind().GroupVersionKind().GroupKind(),
 		kafkaTopic.Name, fieldErrs)
 
-	if ok := IsOutOfRangeReplicationFactor(err); !ok {
+	if ok := IsAdmissionOutOfRangeReplicationFactor(err); !ok {
 		t.Errorf("Check Out of Range ReplicationFactor error message. Expected: %t ; Got: %t", true, ok)
 	}
 }
 
-func TestIsOutOfRangePartitions(t *testing.T) {
+func TestIsAdmissionOutOfRangePartitions(t *testing.T) {
 	kafkaTopic := banzaicloudv1alpha1.KafkaTopic{ObjectMeta: metav1.ObjectMeta{Name: "test-KafkaTopic"}}
 	var fieldErrs field.ErrorList
 	fieldErrs = append(fieldErrs, field.Invalid(field.NewPath("spec").Child("partitions"), "-2", outOfRangePartitionsErrMsg))
 	err := apierrors.NewInvalid(
 		kafkaTopic.GetObjectKind().GroupVersionKind().GroupKind(),
 		kafkaTopic.Name, fieldErrs)
 
-	if ok := IsOutOfRangePartitions(err); !ok {
+	if ok := IsAdmissionOutOfRangePartitions(err); !ok {
 		t.Errorf("Check Out of Range Partitions error message. Expected: %t ; Got: %t", true, ok)
 	}
 }
 
-func TestIsInvalidRemovingStorage(t *testing.T) {
+func TestIsAdmissionInvalidRemovingStorage(t *testing.T) {
 	testCases := []struct {
 		testName  string
 		fieldErrs field.ErrorList
@@ -159,14 +159,14 @@ func TestIsInvalidRemovingStorage(t *testing.T) {
 				kafkaCluster.GetObjectKind().GroupVersionKind().GroupKind(),
 				kafkaCluster.Name, tc.fieldErrs)
 
-			if got := IsInvalidRemovingStorage(err); got != tc.want {
+			if got := IsAdmissionInvalidRemovingStorage(err); got != tc.want {
 				t.Errorf("Check Storage Removal Error message. Expected: %t ; Got: %t", tc.want, got)
 			}
 		})
 	}
 }
 
-func TestIsErrorDuringValidation(t *testing.T) {
+func TestIsAdmissionErrorDuringValidation(t *testing.T) {
 	testCases := []struct {
 		testName string
 		err      error
@@ -186,7 +186,7 @@ func TestIsErrorDuringValidation(t *testing.T) {
 
 	for _, tc := range testCases {
 		t.Run(tc.testName, func(t *testing.T) {
-			if got := IsErrorDuringValidation(tc.err); got != tc.want {
+			if got := IsAdmissionErrorDuringValidation(tc.err); got != tc.want {
 				t.Errorf("Check overall Error During Validation error message. Expected: %t ; Got: %t", tc.want, got)
 			}
 		})