allow-taking-sidecar-route-from-ui

uber · Jan 4, 2018 · e495c02 · e495c02
1 parent 6767b18
commit e495c02
Show file tree

Hide file tree

Showing 4 changed files with 99 additions and 5 deletions.
diff --git a/backend/repository/client_update.go b/backend/repository/client_update.go
@@ -44,6 +44,7 @@ type configField struct {
 	ThriftFile     string            `json:"thriftFile"`
 	ThriftFileSha  string            `json:"thriftFileSha"`
 	ExposedMethods map[string]string `json:"exposedMethods,omitempty"`
+	SidecarRouter  string            `json:"sidecarRouter,omitempty"`
 }
 
 func correctMethodNaming(key string) string {
@@ -64,6 +65,7 @@ func NewClientConfigJSON(cfg *ClientConfig) *ClientJSONConfig {
 		Config: &configField{
 			ThriftFile:     cfg.ThriftFile,
 			ExposedMethods: cfg.ExposedMethods,
+			SidecarRouter:  cfg.SidecarRouter,
 		},
 	}
 	return cfgJSON
@@ -95,7 +97,6 @@ func (r *Repository) UpdateClientConfigs(req *ClientConfig, clientCfgDir, thrift
 		updatedExposedMethod[k] = val
 	}
 	cfgJSON.Config.ExposedMethods = updatedExposedMethod
-
 	cfgJSON.Config.ThriftFileSha = thriftFileSha
 	clientPath := filepath.Join(r.absPath(clientCfgDir), cfgJSON.Name)
 	if err := os.MkdirAll(clientPath, os.ModePerm); err != nil {
@@ -138,11 +139,11 @@ func validateClientUpdateRequest(req *ClientConfig) error {
 		return reqerr.NewRequestError(
 			reqerr.ClientsServiceName, errors.New("invalid request: muttley name is required for tchannel client"))
 	}
-	if req.IP == "" || req.Port == 0 {
+	if len(req.SidecarRouter) < 1 && req.IP == "" {
 		return reqerr.NewRequestError(
 			reqerr.ClientsIP, errors.New("invalid request: ip is required"))
 	}
-	if req.Port == 0 {
+	if len(req.SidecarRouter) < 1 && req.Port == 0 {
 		return reqerr.NewRequestError(
 			reqerr.ClientsPort, errors.New("invalid request: port is required"))
 	}
@@ -195,8 +196,10 @@ func UpdateProductionConfigJSON(req *ClientConfig, productionCfgJSONPath string)
 			content[prefix+"routingKey"] = req.RoutingKey
 		}
 	}
-	content[prefix+"port"] = req.Port
-	content[prefix+"ip"] = req.IP
+	if len(req.SidecarRouter) < 1 {
+		content[prefix+"port"] = req.Port
+		content[prefix+"ip"] = req.IP
+	}
 	return writeToJSONFile(productionCfgJSONPath, content)
 }
 

diff --git a/backend/repository/client_update_test.go b/backend/repository/client_update_test.go
@@ -54,6 +54,23 @@ func TestUpdateHTTPClientWithoutExposedMethods(t *testing.T) {
 	testUpdateClientConfig(t, req, "contacts")
 }
 
+func TestUpdateTchannelClientWithSidecarRouter(t *testing.T) {
+	req := &ClientConfig{
+		Name:        "corge",
+		Type:        "tchannel",
+		ThriftFile:  "clients/corge/corge.thrift",
+		ServiceName: "Corge",
+		ExposedMethods: map[string]string{
+			"EchoString": "Corge::echoString",
+		},
+		SidecarRouter:     "default",
+		IP:                "127.0.0.1",
+		Timeout:           10000,
+		TimeoutPerAttempt: 2000,
+	}
+	testUpdateClientConfig(t, req, "corge")
+}
+
 func TestUpdateTchannelClient(t *testing.T) {
 	req := &ClientConfig{}
 	err := readJSONFile(tchannelClientUpdateRequestFile, req)

diff --git a/backend/repository/config.go b/backend/repository/config.go
@@ -89,6 +89,7 @@ type ClientConfig struct {
 	Timeout           int64             `json:"clientTimeout,omitempty"`
 	TimeoutPerAttempt int64             `json:"clientTimeoutPerAttempt,omitempty"`
 	RoutingKey        string            `json:"routingKey"`
+	SidecarRouter     string            `json:"sidecarRouter,omitempty"`
 }
 
 // EndpointMiddlewareConfig is the configuration for a middleware instance for a endpoint

diff --git a/backend/repository/data/handler/test_cases.json b/backend/repository/data/handler/test_cases.json
@@ -2321,6 +2321,79 @@
 			}
 		}
 	},
+	{
+		"name": "create-diff-sidecar",
+		"request": {
+			"method": "POST",
+			"url": "/create-diff",
+			"header": {
+				"gateway-id": "example-gateway"
+			},
+			"body": {
+				"client_updates": [
+					{
+						"clientTimeout": 10000,
+						"clientTimeoutPerAttempt": 2000,
+						"exposedMethods": {
+							"Call": "SimpleService::call",
+							"Compare": "SimpleService::compare",
+							"DeliberateDiffNoop": "SimpleService::sillyNoop",
+							"EchoBinary": "SecondService::echoBinary",
+							"EchoBool": "SecondService::echoBool",
+							"EchoDouble": "SecondService::echoDouble",
+							"EchoEnum": "SecondService::echoEnum",
+							"EchoI16": "SecondService::echoI16",
+							"EchoI32": "SecondService::echoI32",
+							"EchoI64": "SecondService::echoI64",
+							"EchoI8": "SecondService::echoI8",
+							"EchoString": "SecondService::echoString",
+							"EchoStringList": "SecondService::echoStringList",
+							"EchoStringMap": "SecondService::echoStringMap",
+							"EchoStringSet": "SecondService::echoStringSet",
+							"EchoStructList": "SecondService::echoStructList",
+							"EchoStructMap": "SecondService::echoStructMap",
+							"EchoStructSet": "SecondService::echoStructSet",
+							"EchoTypedef": "SecondService::echoTypedef",
+							"Ping": "SimpleService::ping",
+							"Trans": "SimpleService::trans"
+						},
+						"ip": "127.0.0.1",
+						"name": "baz",
+						"sidecarRouter": "default",
+						"serviceName": "Qux",
+						"thriftFile": "clients/baz/baz.thrift",
+						"type": "tchannel"
+					}
+				],
+				"endpoint_updates": [
+					{
+						"clientId": "baz",
+						"clientMethod": "Compare",
+						"endpointId": "baz",
+						"endpointType": "http",
+						"handleId": "compare",
+						"middlewares": [],
+						"reqHeaderMap": {},
+						"resHeaderMap": {},
+						"testFixtures": {},
+						"thriftFile": "endpoints/baz/baz.thrift",
+						"thriftFileSha": "{{placeholder}}",
+						"thriftMethodName": "SimpleService::compare",
+						"workflowType": "tchannelClient"
+					}
+				],
+				"thrift_files": [
+					"clients/baz/baz.thrift"
+				]
+			}
+		},
+		"response": {
+			"code": 200,
+			"body": {
+				"diff_uri": "http://diff-for-example-gateway"
+			}
+		}
+	},
 	{
 		"name": "create-diff-managed-thrift",
 		"request": {