Move endpoint and local_port to networking API config (#1151)

deliahu · web-flow · commit 4771cbb0e790 · 2020-06-23T10:15:02.000-07:00
diff --git a/cli/cmd/get.go b/cli/cmd/get.go
@@ -319,7 +319,7 @@ func getAPI(env cliconfig.Environment, apiName string) (string, error) {
 
 	apiEndpoint := apiRes.BaseURL
 	if env.Provider == types.AWSProviderType {
-		apiEndpoint = urls.Join(apiRes.BaseURL, *api.Endpoint)
+		apiEndpoint = urls.Join(apiRes.BaseURL, *api.Networking.Endpoint)
 		if api.Networking.APIGateway == userconfig.NoneAPIGatewayType {
 			apiEndpoint = strings.Replace(apiEndpoint, "https://", "http://", 1)
 		}
diff --git a/cli/cmd/predict.go b/cli/cmd/predict.go
@@ -70,7 +70,7 @@ var _predictCmd = &cobra.Command{
 			if err != nil {
 				exit.Error(err)
 			}
-			apiEndpoint = urls.Join(apiRes.BaseURL, *apiRes.API.Endpoint)
+			apiEndpoint = urls.Join(apiRes.BaseURL, *apiRes.API.Networking.Endpoint)
 
 		} else {
 			apiRes, err = local.GetAPI(apiName)
diff --git a/cli/local/docker_spec.go b/cli/local/docker_spec.go
@@ -111,8 +111,8 @@ func getAPIEnv(api *spec.API, awsClient *aws.Client) []string {
 
 func deployPythonContainer(api *spec.API, awsClient *aws.Client) error {
 	portBinding := nat.PortBinding{}
-	if api.LocalPort != nil {
-		portBinding.HostPort = s.Int(*api.LocalPort)
+	if api.Networking.LocalPort != nil {
+		portBinding.HostPort = s.Int(*api.Networking.LocalPort)
 	}
 
 	runtime := ""
@@ -180,8 +180,8 @@ func deployPythonContainer(api *spec.API, awsClient *aws.Client) error {
 
 func deployONNXContainer(api *spec.API, awsClient *aws.Client) error {
 	portBinding := nat.PortBinding{}
-	if api.LocalPort != nil {
-		portBinding.HostPort = s.Int(*api.LocalPort)
+	if api.Networking.LocalPort != nil {
+		portBinding.HostPort = s.Int(*api.Networking.LocalPort)
 	}
 
 	runtime := ""
@@ -330,8 +330,8 @@ func deployTensorFlowContainers(api *spec.API, awsClient *aws.Client) error {
 	tfContainerHost := containerInfo.NetworkSettings.Networks["bridge"].IPAddress
 
 	portBinding := nat.PortBinding{}
-	if api.LocalPort != nil {
-		portBinding.HostPort = fmt.Sprintf("%d", *api.LocalPort)
+	if api.Networking.LocalPort != nil {
+		portBinding.HostPort = fmt.Sprintf("%d", *api.Networking.LocalPort)
 	}
 	apiHostConfig := &container.HostConfig{
 		PortBindings: nat.PortMap{
diff --git a/cli/local/validations.go b/cli/local/validations.go
@@ -199,57 +199,57 @@ func ValidateLocalAPIs(apis []userconfig.API, projectFiles ProjectFiles, awsClie
 	for i := range apis {
 		api := &apis[i]
 
-		updatingAPIToPortMap[api.Name] = api.LocalPort
-		if api.LocalPort != nil {
-			if collidingAPIName, ok := portToUpdatingAPIMap[*api.LocalPort]; ok {
-				return errors.Wrap(ErrorDuplicateLocalPort(collidingAPIName), api.Identify(), userconfig.LocalPortKey, s.Int(*api.LocalPort))
+		updatingAPIToPortMap[api.Name] = api.Networking.LocalPort
+		if api.Networking.LocalPort != nil {
+			if collidingAPIName, ok := portToUpdatingAPIMap[*api.Networking.LocalPort]; ok {
+				return errors.Wrap(ErrorDuplicateLocalPort(collidingAPIName), api.Identify(), userconfig.LocalPortKey, s.Int(*api.Networking.LocalPort))
 			}
-			usedPorts = append(usedPorts, *api.LocalPort)
-			portToUpdatingAPIMap[*api.LocalPort] = api.Name
+			usedPorts = append(usedPorts, *api.Networking.LocalPort)
+			portToUpdatingAPIMap[*api.Networking.LocalPort] = api.Name
 		}
 	}
 
 	for i := range apis {
 		api := &apis[i]
-		if api.LocalPort != nil {
+		if api.Networking.LocalPort != nil {
 			// same port as previous deployment of this API
-			if *api.LocalPort == runningAPIsToPortMap[api.Name] {
+			if *api.Networking.LocalPort == runningAPIsToPortMap[api.Name] {
 				continue
 			}
 
 			// port is being used by another API
-			if apiName, ok := portToRunningAPIsMap[*api.LocalPort]; ok {
-				return errors.Wrap(ErrorDuplicateLocalPort(apiName), api.Identify(), userconfig.LocalPortKey, s.Int(*api.LocalPort))
+			if apiName, ok := portToRunningAPIsMap[*api.Networking.LocalPort]; ok {
+				return errors.Wrap(ErrorDuplicateLocalPort(apiName), api.Identify(), userconfig.LocalPortKey, s.Int(*api.Networking.LocalPort))
 			}
-			isPortAvailable, err := checkPortAvailability(*api.LocalPort)
+			isPortAvailable, err := checkPortAvailability(*api.Networking.LocalPort)
 			if err != nil {
 				return err
 			}
 
 			if !isPortAvailable {
-				return errors.Wrap(ErrorPortAlreadyInUse(*api.LocalPort), api.Identify(), userconfig.LocalPortKey)
+				return errors.Wrap(ErrorPortAlreadyInUse(*api.Networking.LocalPort), api.Identify(), userconfig.LocalPortKey)
 			}
 		} else {
 			// get previous api deployment port
 			if port, ok := runningAPIsToPortMap[api.Name]; ok {
 
 				// check that the previous api deployment port has not been claimed in new deployment
 				if _, ok := portToUpdatingAPIMap[port]; !ok {
-					api.LocalPort = pointer.Int(port)
+					api.Networking.LocalPort = pointer.Int(port)
 				}
 			}
 		}
 	}
 
 	for i := range apis {
 		api := &apis[i]
-		if api.LocalPort == nil {
+		if api.Networking.LocalPort == nil {
 			availablePort, err := findTheNextAvailablePort(usedPorts)
 			if err != nil {
 				errors.Wrap(err, api.Identify())
 			}
 
-			api.LocalPort = pointer.Int(availablePort)
+			api.Networking.LocalPort = pointer.Int(availablePort)
 		}
 	}
 
diff --git a/docs/deployments/api-configuration.md b/docs/deployments/api-configuration.md
@@ -10,25 +10,25 @@ Reference the section below which corresponds to your Predictor type: [Python](#
 
 ```yaml
 - name: <string>  # API name (required)
-  endpoint: <string>  # the endpoint for the API (aws only) (default: <api_name>)
-  local_port: <int>  # specify the port for API (local only) (default: 8888)
   predictor:
     type: python
     path: <string>  # path to a python file with a PythonPredictor class definition, relative to the Cortex root (required)
     config: <string: value>  # arbitrary dictionary passed to the constructor of the Predictor (optional)
     python_path: <string>  # path to the root of your Python folder that will be appended to PYTHONPATH (default: folder containing cortex.yaml)
     image: <string> # docker image to use for the Predictor (default: cortexlabs/python-predictor-cpu or cortexlabs/python-predictor-gpu based on compute)
     env: <string: string>  # dictionary of environment variables
-  monitoring:  # (aws only)
-    model_type: <string>  # must be "classification" or "regression", so responses can be interpreted correctly (i.e. categorical vs continuous) (required)
-    key: <string>  # the JSON key in the response payload of the value to monitor (required if the response payload is a JSON object)
+  networking:
+    endpoint: <string>  # the endpoint for the API (aws only) (default: <api_name>)
+    local_port: <int>  # specify the port for API (local only) (default: 8888)
+    api_gateway: public | none  # whether to create a public API Gateway endpoint for this API (if not, the load balancer will be accessed directly) (default: public)
   compute:
     cpu: <string | int | float>  # CPU request per replica, e.g. 200m or 1 (200m is equivalent to 0.2) (default: 200m)
     gpu: <int>  # GPU request per replica (default: 0)
     inf: <int> # Inferentia ASIC request per replica (default: 0)
     mem: <string>  # memory request per replica, e.g. 200Mi or 1Gi (default: Null)
-  networking:
-    api_gateway: public | none  # whether to create a public API Gateway endpoint for this API (if not, the load balancer will be accessed directly) (default: public)
+  monitoring:  # (aws only)
+    model_type: <string>  # must be "classification" or "regression", so responses can be interpreted correctly (i.e. categorical vs continuous) (required)
+    key: <string>  # the JSON key in the response payload of the value to monitor (required if the response payload is a JSON object)
   autoscaling:  # (aws only)
     min_replicas: <int>  # minimum number of replicas (default: 1)
     max_replicas: <int>  # maximum number of replicas (default: 100)
@@ -55,8 +55,6 @@ See additional documentation for [autoscaling](autoscaling.md), [compute](comput
 
 ```yaml
 - name: <string>  # API name (required)
-  endpoint: <string>  # the endpoint for the API (aws only) (default: <api_name>)
-  local_port: <int>  # specify the port for API (local only) (default: 8888)
   predictor:
     type: tensorflow
     path: <string>  # path to a python file with a TensorFlowPredictor class definition, relative to the Cortex root (required)
@@ -72,16 +70,18 @@ See additional documentation for [autoscaling](autoscaling.md), [compute](comput
     image: <string> # docker image to use for the Predictor (default: cortexlabs/tensorflow-predictor)
     tensorflow_serving_image: <string> # docker image to use for the TensorFlow Serving container (default: cortexlabs/tensorflow-serving-gpu or cortexlabs/tensorflow-serving-cpu based on compute)
     env: <string: string>  # dictionary of environment variables
-  monitoring:  # (aws only)
-    model_type: <string>  # must be "classification" or "regression", so responses can be interpreted correctly (i.e. categorical vs continuous) (required)
-    key: <string>  # the JSON key in the response payload of the value to monitor (required if the response payload is a JSON object)
+  networking:
+    endpoint: <string>  # the endpoint for the API (aws only) (default: <api_name>)
+    local_port: <int>  # specify the port for API (local only) (default: 8888)
+    api_gateway: public | none  # whether to create a public API Gateway endpoint for this API (if not, the load balancer will be accessed directly) (default: public)
   compute:
     cpu: <string | int | float>  # CPU request per replica, e.g. 200m or 1 (200m is equivalent to 0.2) (default: 200m)
     gpu: <int>  # GPU request per replica (default: 0)
     inf: <int> # Inferentia ASIC request per replica (default: 0)
     mem: <string>  # memory request per replica, e.g. 200Mi or 1Gi (default: Null)
-  networking:
-    api_gateway: public | none  # whether to create a public API Gateway endpoint for this API (if not, the load balancer will be accessed directly) (default: public)
+  monitoring:  # (aws only)
+    model_type: <string>  # must be "classification" or "regression", so responses can be interpreted correctly (i.e. categorical vs continuous) (required)
+    key: <string>  # the JSON key in the response payload of the value to monitor (required if the response payload is a JSON object)
   autoscaling:  # (aws only)
     min_replicas: <int>  # minimum number of replicas (default: 1)
     max_replicas: <int>  # maximum number of replicas (default: 100)
@@ -108,8 +108,6 @@ See additional documentation for [autoscaling](autoscaling.md), [compute](comput
 
 ```yaml
 - name: <string>  # API name (required)
-  endpoint: <string>  # the endpoint for the API (aws only) (default: <api_name>)
-  local_port: <int>  # specify the port for API (local only) (default: 8888)
   predictor:
     type: onnx
     path: <string>  # path to a python file with an ONNXPredictor class definition, relative to the Cortex root (required)
@@ -123,15 +121,17 @@ See additional documentation for [autoscaling](autoscaling.md), [compute](comput
     python_path: <string>  # path to the root of your Python folder that will be appended to PYTHONPATH (default: folder containing cortex.yaml)
     image: <string> # docker image to use for the Predictor (default: cortexlabs/onnx-predictor-gpu or cortexlabs/onnx-predictor-cpu based on compute)
     env: <string: string>  # dictionary of environment variables
-  monitoring:  # (aws only)
-    model_type: <string>  # must be "classification" or "regression", so responses can be interpreted correctly (i.e. categorical vs continuous) (required)
-    key: <string>  # the JSON key in the response payload of the value to monitor (required if the response payload is a JSON object)
+  networking:
+    endpoint: <string>  # the endpoint for the API (aws only) (default: <api_name>)
+    local_port: <int>  # specify the port for API (local only) (default: 8888)
+    api_gateway: public | none  # whether to create a public API Gateway endpoint for this API (if not, the load balancer will be accessed directly) (default: public)
   compute:
     cpu: <string | int | float>  # CPU request per replica, e.g. 200m or 1 (200m is equivalent to 0.2) (default: 200m)
     gpu: <int>  # GPU request per replica (default: 0)
     mem: <string>  # memory request per replica, e.g. 200Mi or 1Gi (default: Null)
-  networking:
-    api_gateway: public | none  # whether to create a public API Gateway endpoint for this API (if not, the load balancer will be accessed directly) (default: public)
+  monitoring:  # (aws only)
+    model_type: <string>  # must be "classification" or "regression", so responses can be interpreted correctly (i.e. categorical vs continuous) (required)
+    key: <string>  # the JSON key in the response payload of the value to monitor (required if the response payload is a JSON object)
   autoscaling:  # (aws only)
     min_replicas: <int>  # minimum number of replicas (default: 1)
     max_replicas: <int>  # maximum number of replicas (default: 100)
diff --git a/pkg/operator/operator/api.go b/pkg/operator/operator/api.go
@@ -58,7 +58,7 @@ func UpdateAPI(apiConfig *userconfig.API, projectID string, force bool) (*spec.A
 			go deleteK8sResources(api.Name)
 			return nil, "", err
 		}
-		err = addAPIToAPIGateway(*api.Endpoint, api.Networking.APIGateway)
+		err = addAPIToAPIGateway(*api.Networking.Endpoint, api.Networking.APIGateway)
 		if err != nil {
 			go deleteK8sResources(api.Name)
 			return nil, "", err
diff --git a/pkg/operator/operator/gateway.go b/pkg/operator/operator/gateway.go
@@ -158,5 +158,5 @@ func updateAPIGatewayK8s(prevVirtualService *istioclientnetworking.VirtualServic
 		return err
 	}
 
-	return updateAPIGateway(prevEndpoint, prevAPIGatewayType, *newAPI.Endpoint, newAPI.Networking.APIGateway)
+	return updateAPIGateway(prevEndpoint, prevAPIGatewayType, *newAPI.Networking.Endpoint, newAPI.Networking.APIGateway)
 }
diff --git a/pkg/operator/operator/k8s_specs.go b/pkg/operator/operator/k8s_specs.go
@@ -562,7 +562,7 @@ func virtualServiceSpec(api *spec.API) *istioclientnetworking.VirtualService {
 		Gateways:    []string{"apis-gateway"},
 		ServiceName: k8sName(api.Name),
 		ServicePort: _defaultPortInt32,
-		Path:        *api.Endpoint,
+		Path:        *api.Networking.Endpoint,
 		Rewrite:     pointer.String("predict"),
 		Annotations: api.ToK8sAnnotations(),
 		Labels: map[string]string{
diff --git a/pkg/operator/operator/validations.go b/pkg/operator/operator/validations.go
@@ -83,7 +83,7 @@ func ValidateClusterAPIs(apis []userconfig.API, projectFiles spec.ProjectFiles)
 			return err
 		}
 
-		if !didPrintWarning && api.LocalPort != nil {
+		if !didPrintWarning && api.Networking.LocalPort != nil {
 			fmt.Println(fmt.Sprintf("warning: %s will be ignored because it is not supported in an environment using aws provider\n", userconfig.LocalPortKey))
 			didPrintWarning = true
 		}
@@ -158,7 +158,7 @@ func validateEndpointCollisions(api *userconfig.API, virtualServices []istioclie
 
 		endpoints := k8s.ExtractVirtualServiceEndpoints(&virtualService)
 		for endpoint := range endpoints {
-			if s.EnsureSuffix(endpoint, "/") == s.EnsureSuffix(*api.Endpoint, "/") && virtualService.GetLabels()["apiName"] != api.Name {
+			if s.EnsureSuffix(endpoint, "/") == s.EnsureSuffix(*api.Networking.Endpoint, "/") && virtualService.GetLabels()["apiName"] != api.Name {
 				return errors.Wrap(spec.ErrorDuplicateEndpoint(virtualService.GetLabels()["apiName"]), api.Identify(), userconfig.EndpointKey, endpoint)
 			}
 		}
@@ -171,7 +171,7 @@ 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)
+		endpoints[*api.Networking.Endpoint] = append(endpoints[*api.Networking.Endpoint], api)
 	}
 
 	for endpoint := range endpoints {
diff --git a/pkg/types/spec/api.go b/pkg/types/spec/api.go
@@ -50,11 +50,11 @@ type LocalModelCache struct {
 func GetAPISpec(apiConfig *userconfig.API, projectID string, deploymentID string) *API {
 	var buf bytes.Buffer
 	buf.WriteString(apiConfig.Name)
-	if apiConfig.Endpoint != nil {
-		buf.WriteString(*apiConfig.Endpoint)
+	if apiConfig.Networking.Endpoint != nil {
+		buf.WriteString(*apiConfig.Networking.Endpoint)
 	}
-	if apiConfig.LocalPort != nil {
-		buf.WriteString(s.Obj(*apiConfig.LocalPort))
+	if apiConfig.Networking.LocalPort != nil {
+		buf.WriteString(s.Obj(*apiConfig.Networking.LocalPort))
 	}
 	buf.WriteString(s.Obj(apiConfig.Predictor))
 	buf.WriteString(s.Obj(apiConfig.Monitoring))
diff --git a/pkg/types/spec/errors.go b/pkg/types/spec/errors.go
@@ -99,7 +99,7 @@ func ErrorDuplicateEndpointInOneDeploy(apis []userconfig.API) error {
 
 	return errors.WithStack(&errors.Error{
 		Kind:    ErrDuplicateEndpointInOneDeploy,
-		Message: fmt.Sprintf("endpoint %s must be unique across apis (defined in %s)", s.UserStr(*apis[0].Endpoint), s.StrsAnd(names)),
+		Message: fmt.Sprintf("endpoint %s must be unique across apis (defined in %s)", s.UserStr(*apis[0].Networking.Endpoint), s.StrsAnd(names)),
 	})
 }
 
diff --git a/pkg/types/spec/validations.go b/pkg/types/spec/validations.go
@@ -58,20 +58,6 @@ func apiValidation(provider types.ProviderType) *cr.StructValidation {
 					MaxLength: 42, // k8s adds 21 characters to the pod name, and 63 is the max before it starts to truncate
 				},
 			},
-			{
-				StructField: "Endpoint",
-				StringPtrValidation: &cr.StringPtrValidation{
-					Validator: urls.ValidateEndpoint,
-					MaxLength: 1000, // no particular reason other than it works
-				},
-			},
-			{
-				StructField: "LocalPort",
-				IntPtrValidation: &cr.IntPtrValidation{
-					GreaterThan:       pointer.Int(0),
-					LessThanOrEqualTo: pointer.Int(math.MaxUint16),
-				},
-			},
 			predictorValidation(),
 			monitoringValidation(),
 			networkingValidation(),
@@ -192,6 +178,20 @@ func networkingValidation() *cr.StructFieldValidation {
 		StructField: "Networking",
 		StructValidation: &cr.StructValidation{
 			StructFieldValidations: []*cr.StructFieldValidation{
+				{
+					StructField: "Endpoint",
+					StringPtrValidation: &cr.StringPtrValidation{
+						Validator: urls.ValidateEndpoint,
+						MaxLength: 1000, // no particular reason other than it works
+					},
+				},
+				{
+					StructField: "LocalPort",
+					IntPtrValidation: &cr.IntPtrValidation{
+						GreaterThan:       pointer.Int(0),
+						LessThanOrEqualTo: pointer.Int(math.MaxUint16),
+					},
+				},
 				{
 					StructField: "APIGateway",
 					StringValidation: &cr.StringValidation{
@@ -505,8 +505,8 @@ func ValidateAPI(
 	providerType types.ProviderType,
 	awsClient *aws.Client,
 ) error {
-	if providerType == types.AWSProviderType && api.Endpoint == nil {
-		api.Endpoint = pointer.String("/" + api.Name)
+	if providerType == types.AWSProviderType && api.Networking.Endpoint == nil {
+		api.Networking.Endpoint = pointer.String("/" + api.Name)
 	}
 
 	if err := validatePredictor(api, projectFiles, providerType, awsClient); err != nil {
diff --git a/pkg/types/userconfig/api.go b/pkg/types/userconfig/api.go
diff --git a/pkg/types/userconfig/config_key.go b/pkg/types/userconfig/config_key.go
diff --git a/pkg/workloads/cortex/lib/type/api.py b/pkg/workloads/cortex/lib/type/api.py

Original file line number	Diff line number	Diff line change
`@@ -319,7 +319,7 @@ func getAPI(env cliconfig.Environment, apiName string) (string, error) {`
`319`	`319`
`320`	`320`	`apiEndpoint := apiRes.BaseURL`
`321`	`321`	`if env.Provider == types.AWSProviderType {`
`322`		`- apiEndpoint = urls.Join(apiRes.BaseURL, *api.Endpoint)`
	`322`	`+ apiEndpoint = urls.Join(apiRes.BaseURL, *api.Networking.Endpoint)`
`323`	`323`	`if api.Networking.APIGateway == userconfig.NoneAPIGatewayType {`
`324`	`324`	`apiEndpoint = strings.Replace(apiEndpoint, "https://", "http://", 1)`
`325`	`325`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ var _predictCmd = &cobra.Command{`
`70`	`70`	`if err != nil {`
`71`	`71`	`exit.Error(err)`
`72`	`72`	`}`
`73`		`- apiEndpoint = urls.Join(apiRes.BaseURL, *apiRes.API.Endpoint)`
	`73`	`+ apiEndpoint = urls.Join(apiRes.BaseURL, *apiRes.API.Networking.Endpoint)`
`74`	`74`
`75`	`75`	`} else {`
`76`	`76`	`apiRes, err = local.GetAPI(apiName)`
Original file line number	Diff line number	Diff line change
`@@ -199,57 +199,57 @@ func ValidateLocalAPIs(apis []userconfig.API, projectFiles ProjectFiles, awsClie`
`199`	`199`	`for i := range apis {`
`200`	`200`	`api := &apis[i]`
`201`	`201`
`202`		`- updatingAPIToPortMap[api.Name] = api.LocalPort`
`203`		`- if api.LocalPort != nil {`
`204`		`- if collidingAPIName, ok := portToUpdatingAPIMap[*api.LocalPort]; ok {`
`205`		`- return errors.Wrap(ErrorDuplicateLocalPort(collidingAPIName), api.Identify(), userconfig.LocalPortKey, s.Int(*api.LocalPort))`
	`202`	`+ updatingAPIToPortMap[api.Name] = api.Networking.LocalPort`
	`203`	`+ if api.Networking.LocalPort != nil {`
	`204`	`+ if collidingAPIName, ok := portToUpdatingAPIMap[*api.Networking.LocalPort]; ok {`
	`205`	`+ return errors.Wrap(ErrorDuplicateLocalPort(collidingAPIName), api.Identify(), userconfig.LocalPortKey, s.Int(*api.Networking.LocalPort))`
`206`	`206`	`}`
`207`		`- usedPorts = append(usedPorts, *api.LocalPort)`
`208`		`- portToUpdatingAPIMap[*api.LocalPort] = api.Name`
	`207`	`+ usedPorts = append(usedPorts, *api.Networking.LocalPort)`
	`208`	`+ portToUpdatingAPIMap[*api.Networking.LocalPort] = api.Name`
`209`	`209`	`}`
`210`	`210`	`}`
`211`	`211`
`212`	`212`	`for i := range apis {`
`213`	`213`	`api := &apis[i]`
`214`		`- if api.LocalPort != nil {`
	`214`	`+ if api.Networking.LocalPort != nil {`
`215`	`215`	`// same port as previous deployment of this API`
`216`		`- if *api.LocalPort == runningAPIsToPortMap[api.Name] {`
	`216`	`+ if *api.Networking.LocalPort == runningAPIsToPortMap[api.Name] {`
`217`	`217`	`continue`
`218`	`218`	`}`
`219`	`219`
`220`	`220`	`// port is being used by another API`
`221`		`- if apiName, ok := portToRunningAPIsMap[*api.LocalPort]; ok {`
`222`		`- return errors.Wrap(ErrorDuplicateLocalPort(apiName), api.Identify(), userconfig.LocalPortKey, s.Int(*api.LocalPort))`
	`221`	`+ if apiName, ok := portToRunningAPIsMap[*api.Networking.LocalPort]; ok {`
	`222`	`+ return errors.Wrap(ErrorDuplicateLocalPort(apiName), api.Identify(), userconfig.LocalPortKey, s.Int(*api.Networking.LocalPort))`
`223`	`223`	`}`
`224`		`- isPortAvailable, err := checkPortAvailability(*api.LocalPort)`
	`224`	`+ isPortAvailable, err := checkPortAvailability(*api.Networking.LocalPort)`
`225`	`225`	`if err != nil {`
`226`	`226`	`return err`
`227`	`227`	`}`
`228`	`228`
`229`	`229`	`if !isPortAvailable {`
`230`		`- return errors.Wrap(ErrorPortAlreadyInUse(*api.LocalPort), api.Identify(), userconfig.LocalPortKey)`
	`230`	`+ return errors.Wrap(ErrorPortAlreadyInUse(*api.Networking.LocalPort), api.Identify(), userconfig.LocalPortKey)`
`231`	`231`	`}`
`232`	`232`	`} else {`
`233`	`233`	`// get previous api deployment port`
`234`	`234`	`if port, ok := runningAPIsToPortMap[api.Name]; ok {`
`235`	`235`
`236`	`236`	`// check that the previous api deployment port has not been claimed in new deployment`
`237`	`237`	`if _, ok := portToUpdatingAPIMap[port]; !ok {`
`238`		`- api.LocalPort = pointer.Int(port)`
	`238`	`+ api.Networking.LocalPort = pointer.Int(port)`
`239`	`239`	`}`
`240`	`240`	`}`
`241`	`241`	`}`
`242`	`242`	`}`
`243`	`243`
`244`	`244`	`for i := range apis {`
`245`	`245`	`api := &apis[i]`
`246`		`- if api.LocalPort == nil {`
	`246`	`+ if api.Networking.LocalPort == nil {`
`247`	`247`	`availablePort, err := findTheNextAvailablePort(usedPorts)`
`248`	`248`	`if err != nil {`
`249`	`249`	`errors.Wrap(err, api.Identify())`
`250`	`250`	`}`
`251`	`251`
`252`		`- api.LocalPort = pointer.Int(availablePort)`
	`252`	`+ api.Networking.LocalPort = pointer.Int(availablePort)`
`253`	`253`	`}`
`254`	`254`	`}`
`255`	`255`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ func UpdateAPI(apiConfig userconfig.API, projectID string, force bool) (spec.A`
`58`	`58`	`go deleteK8sResources(api.Name)`
`59`	`59`	`return nil, "", err`
`60`	`60`	`}`
`61`		`- err = addAPIToAPIGateway(*api.Endpoint, api.Networking.APIGateway)`
	`61`	`+ err = addAPIToAPIGateway(*api.Networking.Endpoint, api.Networking.APIGateway)`
`62`	`62`	`if err != nil {`
`63`	`63`	`go deleteK8sResources(api.Name)`
`64`	`64`	`return nil, "", err`
Original file line number	Diff line number	Diff line change
`@@ -158,5 +158,5 @@ func updateAPIGatewayK8s(prevVirtualService *istioclientnetworking.VirtualServic`
`158`	`158`	`return err`
`159`	`159`	`}`
`160`	`160`
`161`		`- return updateAPIGateway(prevEndpoint, prevAPIGatewayType, *newAPI.Endpoint, newAPI.Networking.APIGateway)`
	`161`	`+ return updateAPIGateway(prevEndpoint, prevAPIGatewayType, *newAPI.Networking.Endpoint, newAPI.Networking.APIGateway)`
`162`	`162`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ func ValidateClusterAPIs(apis []userconfig.API, projectFiles spec.ProjectFiles)`
`83`	`83`	`return err`
`84`	`84`	`}`
`85`	`85`
`86`		`- if !didPrintWarning && api.LocalPort != nil {`
	`86`	`+ if !didPrintWarning && api.Networking.LocalPort != nil {`
`87`	`87`	`fmt.Println(fmt.Sprintf("warning: %s will be ignored because it is not supported in an environment using aws provider\n", userconfig.LocalPortKey))`
`88`	`88`	`didPrintWarning = true`
`89`	`89`	`}`
`@@ -158,7 +158,7 @@ func validateEndpointCollisions(api *userconfig.API, virtualServices []istioclie`
`158`	`158`
`159`	`159`	`endpoints := k8s.ExtractVirtualServiceEndpoints(&virtualService)`
`160`	`160`	`for endpoint := range endpoints {`
`161`		`- if s.EnsureSuffix(endpoint, "/") == s.EnsureSuffix(*api.Endpoint, "/") && virtualService.GetLabels()["apiName"] != api.Name {`
	`161`	`+ if s.EnsureSuffix(endpoint, "/") == s.EnsureSuffix(*api.Networking.Endpoint, "/") && virtualService.GetLabels()["apiName"] != api.Name {`
`162`	`162`	`return errors.Wrap(spec.ErrorDuplicateEndpoint(virtualService.GetLabels()["apiName"]), api.Identify(), userconfig.EndpointKey, endpoint)`
`163`	`163`	`}`
`164`	`164`	`}`
`@@ -171,7 +171,7 @@ func findDuplicateEndpoints(apis []userconfig.API) []userconfig.API {`
`171`	`171`	`endpoints := make(map[string][]userconfig.API)`
`172`	`172`
`173`	`173`	`for _, api := range apis {`
`174`		`- endpoints[api.Endpoint] = append(endpoints[api.Endpoint], api)`
	`174`	`+ endpoints[api.Networking.Endpoint] = append(endpoints[api.Networking.Endpoint], api)`
`175`	`175`	`}`
`176`	`176`
`177`	`177`	`for endpoint := range endpoints {`