Remove experiment mappings as a required field and update regex for r…

…oute name path
caraml-dev · Sep 15, 2022 · c4668b8 · c4668b8
1 parent edca1ca
commit c4668b8
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 15 deletions.
diff --git a/api/api/openapi.bundle.yaml b/api/api/openapi.bundle.yaml
@@ -2352,11 +2352,8 @@ components:
             $ref: '#/components/schemas/EnsemblerStandardConfig_experiment_mappings'
           type: array
         route_name_path:
-          pattern: ^\w*(?:\.\w+)*$
+          pattern: ^[\w\-]*(?:\.[\w\-]+)*$
           type: string
-      required:
-      - experiment_mappings
-      - route_name_path
       type: object
     EnsemblerDockerConfig:
       description: ensembler config when ensembler type is docker

diff --git a/api/api/specs/routers.yaml b/api/api/specs/routers.yaml
@@ -794,9 +794,6 @@ components:
       description: "ensembler config when ensembler type is standard"
       type: "object"
       nullable: true
-      required:
-        - "experiment_mappings"
-        - "route_name_path"
       properties:
         experiment_mappings:
           type: "array"
@@ -821,7 +818,7 @@ components:
                 example: "route-1"
         route_name_path:
           type: "string"
-          pattern: '^\w*(?:\.\w+)*$'
+          pattern: '^[\w\-]*(?:\.[\w\-]+)*$'
 
     EnsemblerDockerConfig:
       description: "ensembler config when ensembler type is docker"

diff --git a/api/turing/models/ensembler.go b/api/turing/models/ensembler.go
@@ -32,7 +32,7 @@ const (
 )
 
 type EnsemblerStandardConfig struct {
-	ExperimentMappings []ExperimentMapping `json:"experiment_mappings" validate:"required,dive"`
+	ExperimentMappings []ExperimentMapping `json:"experiment_mappings" validate:"dive"`
 	RouteNamePath      string              `json:"route_name_path"`
 }
 

diff --git a/...ring/testdata/cluster/servicebuilder/router_configmap_std_ensembler_with_exp_mappings.yml b/...ring/testdata/cluster/servicebuilder/router_configmap_std_ensembler_with_exp_mappings.yml
@@ -28,6 +28,5 @@ strategy:
     - experiment: exp_exp_test_experiment_2
       route: route-2
       treatment: treatment
-    route_name_path: ""
   type: fiber.DefaultTuringRoutingStrategy
 type: EAGER_ROUTER
diff --git a/...g/testdata/cluster/servicebuilder/router_configmap_std_ensembler_with_route_name_path.yml b/...g/testdata/cluster/servicebuilder/router_configmap_std_ensembler_with_route_name_path.yml
@@ -29,7 +29,6 @@ strategy:
         app_version:
           field: appVer
           field_source: header
-    experiment_mappings: []
     route_name_path: policy.route_name
   type: fiber.DefaultTuringRoutingStrategy
 type: EAGER_ROUTER
diff --git a/api/turing/testdata/cluster/servicebuilder/router_configmap_traffic_splitting.yml b/api/turing/testdata/cluster/servicebuilder/router_configmap_traffic_splitting.yml
@@ -26,7 +26,6 @@ routes:
       - experiment: exp_exp_test_experiment_2
         route: route-2
         treatment: treatment
-      route_name_path: ""
     type: fiber.DefaultTuringRoutingStrategy
   type: EAGER_ROUTER
 - id: traffic-split-0
@@ -59,7 +58,6 @@ routes:
       - experiment: exp_exp_test_experiment_2
         route: route-2
         treatment: treatment
-      route_name_path: ""
     type: fiber.DefaultTuringRoutingStrategy
   type: EAGER_ROUTER
 - id: traffic-split-1
@@ -92,7 +90,6 @@ routes:
       - experiment: exp_exp_test_experiment_2
         route: route-2
         treatment: treatment
-      route_name_path: ""
     type: fiber.DefaultTuringRoutingStrategy
   type: EAGER_ROUTER
 - id: traffic-split-2
@@ -125,7 +122,6 @@ routes:
       - experiment: exp_exp_test_experiment_2
         route: route-2
         treatment: treatment
-      route_name_path: ""
     type: fiber.DefaultTuringRoutingStrategy
   type: EAGER_ROUTER
 strategy: