fix: label key can be saved without value if saved without propagation (#3190)

* fix: length of key increased in global tag

* fix: not validating label value required tag as tags can be supplied without value if saved without propagation

* sql file renamed

Author: manish-agrawal-ai

api/appbean/AppDetail.go

@@ -33,7 +33,7 @@ type AppMetadata struct {
 
 type AppLabel struct {
 	Key       string `json:"key,notnull" validate:"required"`
-	Value     string `json:"value,notnull" validate:"required"`
+	Value     string `json:"value,notnull"` // intentionally not added required tag as tag can be added without value
 	Propagate bool   `json:"propagate"`
 }
 

pkg/bean/app.go

@@ -649,7 +649,7 @@ type AppLabelDto struct {
 
 type Label struct {
 	Key       string `json:"key" validate:"required"`
-	Value     string `json:"value" validate:"required"`
+	Value     string `json:"value"` // intentionally not added required tag as tag can be added without value
 	Propagate bool   `json:"propagate"`
 }
 

scripts/sql/125_global_tags_fix.down.sql

@@ -0,0 +1 @@
+ALTER TABLE "public"."global_tag" ALTER COLUMN "key" SET DATA TYPE varchar(100);

scripts/sql/125_global_tags_fix.up.sql

@@ -0,0 +1 @@
+ALTER TABLE "public"."global_tag" ALTER COLUMN "key" SET DATA TYPE varchar(317);

util/K8sUtil.go

@@ -4,16 +4,20 @@ import (
 	"errors"
 	"fmt"
 	"k8s.io/apimachinery/pkg/util/validation"
+	"strings"
 )
 
 func CheckIfValidLabel(labelKey string, labelValue string) error {
+	labelKey = strings.TrimSpace(labelKey)
+	labelValue = strings.TrimSpace(labelValue)
+
 	errs := validation.IsQualifiedName(labelKey)
-	if len(errs) > 0 {
+	if len(labelKey) == 0 || len(errs) > 0 {
 		return errors.New(fmt.Sprintf("Validation error - label key - %s is not satisfying the label key criteria", labelKey))
 	}
 
 	errs = validation.IsValidLabelValue(labelValue)
-	if len(errs) > 0 {
+	if len(labelValue) == 0 || len(errs) > 0 {
 		return errors.New(fmt.Sprintf("Validation error - label value - %s is not satisfying the label value criteria for label key - %s", labelValue, labelKey))
 	}
 	return nil