Remove "api" from response messages

Author: deliahu

build/test-examples.sh

@@ -54,8 +54,8 @@ for example in $ROOT/examples/*/cortex.yaml; do
         echo "$result"
         if [ $prediction_exit_code -ne 0 ]; then
           # accommodate transient error `error: failed to connect to operator...`
-          # handle `error: api ... is updating` error caused when the API status is set to `ready` but it actually isn't
-          if [[ $result =~ ^error\:\ failed\ to\ connect\ to\ the\ operator.* ]] || [[ $result =~ ^error\:\ api.*is\ updating$ ]]; then
+          # handle `error: api is updating` error caused when the API status is set to `ready` but it actually isn't
+          if [[ $result =~ ^error\:\ failed\ to\ connect\ to\ the\ operator.* ]] || [[ $result =~ ^error\:\ .*is\ updating$ ]]; then
               echo "retrying prediction..."
               $retry="true"
               break # skip request predictions from the remaining APIs and try again

cli/cmd/delete.go

@@ -54,7 +54,7 @@ func delete(apiName string, keepCache bool) {
 	if !_flagDeleteForce {
 		readyReplicas := getReadyReplicasOrNil(apiName)
 		if readyReplicas != nil && *readyReplicas > 2 {
-			prompt.YesOrExit(fmt.Sprintf("are you sure you want to delete the %s api (which has %d live replicas)?", apiName, *readyReplicas), "", "")
+			prompt.YesOrExit(fmt.Sprintf("are you sure you want to delete %s (which has %d live replicas)?", apiName, *readyReplicas), "", "")
 		}
 	}
 

cli/cmd/errors.go

@@ -100,7 +100,7 @@ func (e Error) Error() string {
 func ErrorAPINotReady(apiName string, status string) error {
 	return errors.WithStack(Error{
 		Kind:    ErrAPINotReady,
-		message: fmt.Sprintf("%s api is %s", s.UserStr(apiName), status),
+		message: fmt.Sprintf("%s is %s", s.UserStr(apiName), status),
 	})
 }
 

examples/sklearn/iris-classifier/README.md

@@ -124,7 +124,7 @@ Create a `cortex.yaml` file and add the configuration below. An `api` provides a
 ```bash
 $ cortex deploy
 
-creating iris-classifier api
+creating iris-classifier
 ```
 
 Track the status of your api using `cortex get`:
@@ -185,7 +185,7 @@ Run `cortex deploy` again to perform a rolling update to your API with the new c
 ```bash
 $ cortex deploy
 
-updating iris-classifier api
+updating iris-classifier
 ```
 
 After making more predictions, your `cortex get` command will show information about your API's past predictions:
@@ -228,7 +228,7 @@ You could also configure GPU compute here if your cluster supports it. Adding co
 ```bash
 $ cortex deploy
 
-updating iris-classifier api
+updating iris-classifier
 ```
 
 Run `cortex get` again:
@@ -284,8 +284,8 @@ Run `cortex deploy` to create the new API:
 ```bash
 $ cortex deploy
 
-iris-classifier api is up to date
-creating another-iris-classifier api
+iris-classifier is up to date
+creating another-iris-classifier
 ```
 
 `cortex deploy` is declarative so the `iris-classifier` API is unchanged while `another-iris-classifier` is created:
@@ -378,7 +378,7 @@ Run `cortex deploy` to create your batch API:
 ```bash
 $ cortex deploy
 
-creating batch-iris-classifier api
+creating batch-iris-classifier
 ```
 
 `cortex get` should show all 3 APIs now:
@@ -432,15 +432,15 @@ Run `cortex delete` to delete each API:
 ```bash
 $ cortex delete iris-classifier
 
-deleting iris-classifier api
+deleting iris-classifier
 
 $ cortex delete another-iris-classifier
 
-deleting another-iris-classifier api
+deleting another-iris-classifier
 
 $ cortex delete batch-iris-classifier
 
-deleting batch-iris-classifier api
+deleting batch-iris-classifier
 ```
 
 Running `cortex delete` will free up cluster resources and allow Cortex to scale down to the minimum number of instances you specified during cluster installation. It will not spin down your cluster.

pkg/operator/endpoints/delete.go

@@ -56,7 +56,7 @@ func Delete(w http.ResponseWriter, r *http.Request) {
 	}
 
 	response := schema.DeleteResponse{
-		Message: fmt.Sprintf("deleting %s api", apiName),
+		Message: fmt.Sprintf("deleting %s", apiName),
 	}
 	respond(w, response)
 }

pkg/operator/operator/api.go

@@ -56,7 +56,7 @@ func UpdateAPI(apiConfig *userconfig.API, projectID string, force bool) (*spec.A
 			go deleteK8sResources(api.Name)
 			return nil, "", err
 		}
-		return api, fmt.Sprintf("creating %s api", api.Name), nil
+		return api, fmt.Sprintf("creating %s", api.Name), nil
 	}
 
 	if !areAPIsEqual(prevDeployment, deploymentSpec(api, prevDeployment)) {
@@ -65,15 +65,15 @@ func UpdateAPI(apiConfig *userconfig.API, projectID string, force bool) (*spec.A
 			return nil, "", err
 		}
 		if isUpdating && !force {
-			return nil, "", errors.New(fmt.Sprintf("%s api is updating (override with --force)", api.Name))
+			return nil, "", errors.New(fmt.Sprintf("%s is updating (override with --force)", api.Name))
 		}
 		if err := config.AWS.UploadMsgpackToS3(api, *config.Cluster.Bucket, api.Key); err != nil {
 			return nil, "", errors.Wrap(err, "upload api spec")
 		}
 		if err := applyK8sResources(api, prevDeployment, prevService, prevVirtualService); err != nil {
 			return nil, "", err
 		}
-		return api, fmt.Sprintf("updating %s api", api.Name), nil
+		return api, fmt.Sprintf("updating %s", api.Name), nil
 	}
 
 	// deployment didn't change
@@ -82,9 +82,9 @@ func UpdateAPI(apiConfig *userconfig.API, projectID string, force bool) (*spec.A
 		return nil, "", err
 	}
 	if isUpdating {
-		return api, fmt.Sprintf("%s api is already updating", api.Name), nil
+		return api, fmt.Sprintf("%s is already updating", api.Name), nil
 	}
-	return api, fmt.Sprintf("%s api is up to date", api.Name), nil
+	return api, fmt.Sprintf("%s is up to date", api.Name), nil
 }
 
 func RefreshAPI(apiName string, force bool) (string, error) {
@@ -101,7 +101,7 @@ func RefreshAPI(apiName string, force bool) (string, error) {
 	}
 
 	if isUpdating && !force {
-		return "", errors.New(fmt.Sprintf("%s api is updating (override with --force)", apiName))
+		return "", errors.New(fmt.Sprintf("%s is updating (override with --force)", apiName))
 	}
 
 	apiID := prevDeployment.Labels["apiID"]
@@ -124,7 +124,7 @@ func RefreshAPI(apiName string, force bool) (string, error) {
 		return "", err
 	}
 
-	return fmt.Sprintf("updating %s api", api.Name), nil
+	return fmt.Sprintf("updating %s", api.Name), nil
 }
 
 func DeleteAPI(apiName string, keepCache bool) error {

pkg/operator/operator/errors.go

@@ -181,7 +181,7 @@ func ErrorDuplicateEndpointInOneDeploy(apis []userconfig.API) error {
 func ErrorDuplicateEndpoint(apiName string) error {
 	return errors.WithStack(Error{
 		Kind:    ErrDuplicateEndpoint,
-		message: fmt.Sprintf("endpoint is already being used by the %s api", apiName),
+		message: fmt.Sprintf("endpoint is already being used by %s", apiName),
 	})
 }
 
@@ -317,6 +317,6 @@ func ErrorNoAvailableNodeComputeLimit(resource string, reqStr string, maxStr str
 func ErrorAPINotDeployed(apiName string) error {
 	return errors.WithStack(Error{
 		Kind:    ErrAPINotDeployed,
-		message: fmt.Sprintf("%s api is not deployed", apiName), // note: if modifying this string, search the codebase for it and change all occurrences
+		message: fmt.Sprintf("%s is not deployed", apiName), // note: if modifying this string, search the codebase for it and change all occurrences
 	})
 }

pkg/operator/operator/logs.go

@@ -128,7 +128,7 @@ func streamFromCloudWatch(apiName string, podCheckCancel chan struct{}, socket *
 			}
 
 			if deployment == nil {
-				writeAndCloseSocket(socket, "\n"+apiName+" api not found")
+				writeAndCloseSocket(socket, "\n"+apiName+" not found")
 				continue
 			}
 

pkg/types/userconfig/api.go

@@ -75,7 +75,7 @@ func IdentifyAPI(filePath string, name string, index int) string {
 	}
 
 	if name != "" {
-		return str + "api: " + name
+		return str + name
 	} else if index >= 0 {
 		return str + "api at " + s.Index(index)
 	}