Update id and name validation

Signed-off-by: Maysun J Faisal <[email protected]>

Author: maysunfaisal

pkg/validation/commands.go

@@ -22,12 +22,6 @@ func ValidateCommands(commands []v1alpha2.Command, components []v1alpha2.Compone
 	}
 
 	for _, command := range commands {
-		// Check if command id is all numeric
-		isIDNumeric := isInt(command.Id)
-		if isIDNumeric {
-			return &InvalidNameOrIdError{id: command.Id, resourceType: "command"}
-		}
-
 		// parentCommands is a map to keep a track of all the parent commands when validating the composite command's subcommands recursively
 		parentCommands := make(map[string]string)
 		err = validateCommand(command, parentCommands, commandMap, components)

pkg/validation/components.go

@@ -34,12 +34,6 @@ func ValidateComponents(components []v1alpha2.Component) error {
 	}
 
 	for _, component := range components {
-		// Check if component name is all numeric
-		isNameNumeric := isInt(component.Name)
-		if isNameNumeric {
-			return &InvalidNameOrIdError{name: component.Name, resourceType: "component"}
-		}
-
 		switch {
 		case component.Container != nil:
 			// Process all the volume mounts in container components to validate them later

pkg/validation/components_test.go

@@ -136,7 +136,6 @@ func TestValidateComponents(t *testing.T) {
 	sameEndpointNameErr := "devfile contains multiple endpoint entries with same name.*"
 	sameTargetPortErr := "devfile contains multiple containers with same TargetPort.*"
 	invalidURIErr := ".*invalid URI for request"
-	nameNumericErr := "name cannot be with all numeric characters"
 
 	tests := []struct {
 		name       string
@@ -231,13 +230,6 @@ func TestValidateComponents(t *testing.T) {
 			},
 			wantErr: &sameEndpointNameErr,
 		},
-		{
-			name: "Invalid component name with all numeric values",
-			components: []v1alpha2.Component{
-				generateDummyVolumeComponent("123", "1Gi"),
-			},
-			wantErr: &nameNumericErr,
-		},
 		{
 			name: "Invalid plugin registry url",
 			components: []v1alpha2.Component{

pkg/validation/endpoints.go

@@ -11,12 +11,6 @@ func validateEndpoints(endpoints []v1alpha2.Endpoint, processedEndPointPort map[
 	currentComponentEndPointPort := make(map[int]bool)
 
 	for _, endPoint := range endpoints {
-		// Check if endpoint name is all numeric
-		isNameNumeric := isInt(endPoint.Name)
-		if isNameNumeric {
-			return &InvalidNameOrIdError{name: endPoint.Name, resourceType: "endpoint"}
-		}
-
 		if _, ok := processedEndPointName[endPoint.Name]; ok {
 			return &InvalidEndpointError{name: endPoint.Name}
 		}

pkg/validation/endpoints_test.go

@@ -9,7 +9,6 @@ import (
 
 func TestValidateEndpoints(t *testing.T) {
 
-	nameNumericErr := "name cannot be with all numeric characters"
 	duplicateNameErr := "multiple endpoint entries with same name"
 	duplicatePortErr := "devfile contains multiple containers with same TargetPort"
 
@@ -62,15 +61,6 @@ func TestValidateEndpoints(t *testing.T) {
 			},
 			wantErr: &duplicatePortErr,
 		},
-		{
-			name: "Numeric endpoint name",
-			endpoints: []v1alpha2.Endpoint{
-				generateDummyEndpoint("123", 8080),
-			},
-			processedEndpointName: map[string]bool{},
-			processedEndpointPort: map[int]bool{},
-			wantErr:               &nameNumericErr,
-		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {

pkg/validation/errors.go

@@ -77,20 +77,3 @@ type InvalidComponentError struct {
 func (e *InvalidComponentError) Error() string {
 	return fmt.Sprintf("the component %q is invalid - %s", e.componentName, e.reason)
 }
-
-// InvalidNameOrIdError returns an error if the name or id is invalid
-type InvalidNameOrIdError struct {
-	name         string
-	id           string
-	resourceType string
-}
-
-func (e *InvalidNameOrIdError) Error() string {
-	var errMsg string
-	if e.name != "" {
-		errMsg = fmt.Sprintf("%s name: %s is invalid, the name cannot be with all numeric characters", e.resourceType, e.name)
-	} else if e.id != "" {
-		errMsg = fmt.Sprintf("%s id: %s is invalid, the id cannot be with all numeric characters", e.resourceType, e.id)
-	}
-	return errMsg
-}

pkg/validation/utils.go

@@ -2,14 +2,11 @@ package validation
 
 import (
 	"net/url"
-	"regexp"
 	"strings"
 
 	"github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
 )
 
-var alphaRegexp = regexp.MustCompile(`^[0-9]+$`)
-
 // getCommandsMap iterates through the commands and returns a map of command
 func getCommandsMap(commands []v1alpha2.Command) map[string]v1alpha2.Command {
 	commandMap := make(map[string]v1alpha2.Command, len(commands))
@@ -22,12 +19,6 @@ func getCommandsMap(commands []v1alpha2.Command) map[string]v1alpha2.Command {
 	return commandMap
 }
 
-// isInt returns true if the string is an integer, false otherwise
-func isInt(str string) bool {
-	match := alphaRegexp.MatchString(str)
-	return match
-}
-
 // ValidateURI checks if the string is with valid uri format, return error if not valid
 func ValidateURI(uri string) error {
 	if strings.HasPrefix(uri, "http") {

pkg/validation/utils_test.go

@@ -4,44 +4,6 @@ import (
 	"testing"
 )
 
-func TestIsInt(t *testing.T) {
-
-	tests := []struct {
-		name       string
-		arg        string
-		wantResult bool
-	}{
-		{
-			name:       "Numeric string",
-			arg:        "1234",
-			wantResult: true,
-		},
-		{
-			name:       "Alphanumeric string",
-			arg:        "pp1234abc-1223",
-			wantResult: false,
-		},
-		{
-			name:       "String with numbers and character",
-			arg:        "12-34",
-			wantResult: false,
-		},
-		{
-			name:       "Hexadecimal string",
-			arg:        "0xff",
-			wantResult: false,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			result := isInt(tt.arg)
-			if result != tt.wantResult {
-				t.Errorf("TestIsInt result: %v, wantResult: %v", result, tt.wantResult)
-			}
-		})
-	}
-}
-
 func TestValidateURI(t *testing.T) {
 
 	tests := []struct {

pkg/validation/validation-rule.md

@@ -10,7 +10,6 @@ The validation will be done as part of schema validation, the rule will be intro
 - no special characters allowed except dash(-)
 - start with an alphanumeric character
 - end with an alphanumeric character
-- must not be with all numbers (not included in schema validation, will have extra validation function)
 
 
 ### Endpoints: