fixed some inconcistencies due to merge conflicts

Signed-off-by: RayyanSeliya <rayyanseliya786@gmail.com>

Author: RayyanSeliya

cmd/deploy.go

@@ -309,9 +309,6 @@ Valid examples:
   func deploy --namespace myapp
   func deploy --namespace my-app-123
 
-For more options, run 'func deploy --help'`, err)
-		}
-
 For more options, run 'func deploy --help'`, err)
 		}
 		if errors.Is(err, fn.ErrConflictingImageAndRegistry) {
@@ -786,8 +783,6 @@ func (c deployConfig) Validate(cmd *cobra.Command) (err error) {
 			return fn.ErrInvalidNamespace
 		}
 	}
-		}
-
 
 	// Check Image Digest was included
 	var digest bool

pkg/functions/errors.go

@@ -37,7 +37,7 @@ var (
 
 	// ErrInvalidDomain is returned when a domain name doesn't meet DNS subdomain requirements
 	ErrInvalidDomain = errors.New("invalid domain")
-	
+
 	// ErrInvalidNamespace is returned when a namespace name doesn't meet Kubernetes naming requirements
 	ErrInvalidNamespace = errors.New("invalid namespace")
 )

pkg/utils/names.go

@@ -25,6 +25,7 @@ type ErrInvalidLabel error
 
 // ErrInvalidDomain indicates the domain name did not pass DNS subdomain validation.
 type ErrInvalidDomain error
+
 // ErrInvalidNamespace indicates the namespace name did not pass Kubernetes namespace validation.
 type ErrInvalidNamespace error
 
@@ -125,6 +126,9 @@ func ValidateDomain(domain string) error {
 		return ErrInvalidDomain(errors.New(errMsg))
 	}
 
+	return nil
+}
+
 // ValidateNamespace validates that the input name is a valid Kubernetes namespace name, ie. valid DNS-1123 label.
 // It must consist of lower case alphanumeric characters or '-',
 // start with an alphabetic character, and end with an alphanumeric character

pkg/utils/names_test.go

@@ -212,8 +212,6 @@ func TestValidateLabelValue(t *testing.T) {
 
 // TestValidateDomain tests that only correct DNS subdomain names are accepted
 func TestValidateDomain(t *testing.T) {
-// TestValidateNamespace tests that only correct Kubernetes namespace names are accepted
-func TestValidateNamespace(t *testing.T) {
 	cases := []struct {
 		In    string
 		Valid bool
@@ -233,6 +231,7 @@ func TestValidateNamespace(t *testing.T) {
 		{"example-app.com", true},                // hyphen in domain
 		{"a.co", true},                           // short domain
 		{"123app.example.com", true},             // label starting with number
+
 		// Invalid domains
 		{"Example.Com", false},        // uppercase not allowed
 		{"MY-APP.COM", false},         // uppercase not allowed
@@ -264,6 +263,45 @@ func TestValidateNamespace(t *testing.T) {
 		}
 		if err == nil && !c.Valid {
 			t.Fatalf("Expected error for invalid domain: '%v'", c.In)
+		}
+	}
+}
+
+func TestValidateDomainErrMsg(t *testing.T) {
+	invalidDomain := "my@app.com"
+	errMsgPrefix := fmt.Sprintf("Domain '%v'", invalidDomain)
+
+	err := ValidateDomain(invalidDomain)
+	if err != nil {
+		if !strings.HasPrefix(err.Error(), errMsgPrefix) {
+			t.Fatalf("Unexpected error message: %v, the message should start with '%v' string", err.Error(), errMsgPrefix)
+		}
+	} else {
+		t.Fatalf("Expected error for invalid domain: %v", invalidDomain)
+	}
+}
+
+// TestValidateDomainEmptyString ensures empty string is handled specially
+func TestValidateDomainEmptyString(t *testing.T) {
+	// Empty string should be valid (means use cluster default)
+	err := ValidateDomain("")
+	if err != nil {
+		t.Fatalf("Empty string should be valid (means use default): %v", err)
+	}
+
+	// String with only whitespace should error
+	err = ValidateDomain("   ")
+	if err == nil {
+		t.Fatal("String with only whitespace should be invalid")
+	}
+}
+
+// TestValidateNamespace tests that only correct Kubernetes namespace names are accepted
+func TestValidateNamespace(t *testing.T) {
+	cases := []struct {
+		In    string
+		Valid bool
+	}{
 		// Valid namespaces
 		{"default", true},
 		{"kube-system", true},
@@ -309,11 +347,6 @@ func TestValidateNamespace(t *testing.T) {
 	}
 }
 
-func TestValidateDomainErrMsg(t *testing.T) {
-	invalidDomain := "my@app.com"
-	errMsgPrefix := fmt.Sprintf("Domain '%v'", invalidDomain)
-
-	err := ValidateDomain(invalidDomain)
 func TestValidateNamespaceErrMsg(t *testing.T) {
 	invalidNamespace := "my@app"
 	errMsgPrefix := fmt.Sprintf("Namespace '%v'", invalidNamespace)
@@ -324,24 +357,6 @@ func TestValidateNamespaceErrMsg(t *testing.T) {
 			t.Fatalf("Unexpected error message: %v, the message should start with '%v' string", err.Error(), errMsgPrefix)
 		}
 	} else {
-		t.Fatalf("Expected error for invalid domain: %v", invalidDomain)
-	}
-}
-
-// TestValidateDomainEmptyString ensures empty string is handled specially
-func TestValidateDomainEmptyString(t *testing.T) {
-	// Empty string should be valid (means use cluster default)
-	err := ValidateDomain("")
-	if err != nil {
-		t.Fatalf("Empty string should be valid (means use default): %v", err)
-	}
-
-	// String with only whitespace should error
-	err = ValidateDomain("   ")
-	if err == nil {
-		t.Fatal("String with only whitespace should be invalid")
-	}
-}
 		t.Fatalf("Expected error for invalid namespace: %v", invalidNamespace)
 	}
 }