Check for duplicate endpoints in a single cortex.yaml file

Author: deliahu

pkg/operator/operator/errors.go

@@ -34,6 +34,8 @@ const (
 	ErrMalformedConfig
 	ErrNoAPIs
 	ErrDuplicateName
+	ErrDuplicateEndpointInOneDeploy
+	ErrDuplicateEndpoint
 	ErrSpecifyAllOrNone
 	ErrOneOfPrerequisitesNotDefined
 	ErrMinReplicasGreaterThanMax
@@ -50,7 +52,6 @@ const (
 	ErrFieldNotSupportedByPredictorType
 	ErrNoAvailableNodeComputeLimit
 	ErrAPINotDeployed
-	ErrDuplicateEndpoint
 )
 
 var _errorKinds = []string{
@@ -60,6 +61,8 @@ var _errorKinds = []string{
 	"err_malformed_config",
 	"err_no_apis",
 	"err_duplicate_name",
+	"err_duplicate_endpoint_in_one_deploy",
+	"err_duplicate_endpoint",
 	"err_specify_all_or_none",
 	"err_one_of_prerequisites_not_defined",
 	"err_min_replicas_greater_than_max",
@@ -76,10 +79,9 @@ var _errorKinds = []string{
 	"err_field_not_supported_by_predictor_type",
 	"err_no_available_node_compute_limit",
 	"err_api_not_deployed",
-	"err_duplicate_endpoint",
 }
 
-var _ = [1]int{}[int(ErrDuplicateEndpoint)-(len(_errorKinds)-1)] // Ensure list length matches
+var _ = [1]int{}[int(ErrAPINotDeployed)-(len(_errorKinds)-1)] // Ensure list length matches
 
 func (t ErrorKind) String() string {
 	return _errorKinds[t]
@@ -164,6 +166,25 @@ func ErrorDuplicateName(apis []userconfig.API) error {
 	})
 }
 
+func ErrorDuplicateEndpointInOneDeploy(apis []userconfig.API) error {
+	names := make([]string, len(apis))
+	for i, api := range apis {
+		names[i] = api.Name
+	}
+
+	return errors.WithStack(Error{
+		Kind:    ErrDuplicateEndpointInOneDeploy,
+		message: fmt.Sprintf("endpoint %s must be unique across apis (defined in %s)", s.UserStr(*apis[0].Endpoint), s.StrsAnd(names)),
+	})
+}
+
+func ErrorDuplicateEndpoint(apiName string) error {
+	return errors.WithStack(Error{
+		Kind:    ErrDuplicateEndpoint,
+		message: fmt.Sprintf("endpoint is already being used by the %s api", apiName),
+	})
+}
+
 func ErrorSpecifyAllOrNone(val string, vals ...string) error {
 	allVals := append(vals, val)
 	message := fmt.Sprintf("please specify all or none of %s", s.UserStrsAnd(allVals))
@@ -299,10 +320,3 @@ func ErrorAPINotDeployed(apiName string) error {
 		message: fmt.Sprintf("%s api is not deployed", apiName), // note: if modifying this string, search the codebase for it and change all occurrences
 	})
 }
-
-func ErrorDuplicateEndpoint(apiName string) error {
-	return errors.WithStack(Error{
-		Kind:    ErrDuplicateEndpoint,
-		message: fmt.Sprintf("endpoint is already being used by the %s api", apiName),
-	})
-}

pkg/operator/operator/validations.go

@@ -278,11 +278,6 @@ func validateAPIs(apis []userconfig.API, projectFileMap map[string][]byte) error
 		return ErrorNoAPIs()
 	}
 
-	dups := findDuplicateNames(apis)
-	if len(dups) > 0 {
-		return ErrorDuplicateName(dups)
-	}
-
 	virtualServices, maxMem, err := getValidationK8sResources()
 	if err != nil {
 		return err
@@ -293,6 +288,17 @@ func validateAPIs(apis []userconfig.API, projectFileMap map[string][]byte) error
 			return err
 		}
 	}
+
+	dups := findDuplicateNames(apis)
+	if len(dups) > 0 {
+		return ErrorDuplicateName(dups)
+	}
+
+	dups = findDuplicateEndpoints(apis)
+	if len(dups) > 0 {
+		return ErrorDuplicateEndpointInOneDeploy(dups)
+	}
+
 	return nil
 }
 
@@ -585,6 +591,22 @@ func findDuplicateNames(apis []userconfig.API) []userconfig.API {
 	return nil
 }
 
+func findDuplicateEndpoints(apis []userconfig.API) []userconfig.API {
+	endpoints := make(map[string][]userconfig.API)
+
+	for _, api := range apis {
+		endpoints[*api.Endpoint] = append(endpoints[*api.Endpoint], api)
+	}
+
+	for endpoint := range endpoints {
+		if len(endpoints[endpoint]) > 1 {
+			return endpoints[endpoint]
+		}
+	}
+
+	return nil
+}
+
 func getValidationK8sResources() ([]kunstructured.Unstructured, *kresource.Quantity, error) {
 	var virtualServices []kunstructured.Unstructured
 	var maxMem *kresource.Quantity