Update CLI and Python Client (#2189)

Author: deliahu

cli/cluster/patch.go

@@ -19,7 +19,6 @@ package cmd
 import (
 	"fmt"
 	"os"
-	"path"
 	"path/filepath"
 	"regexp"
 	"strings"
@@ -675,9 +674,9 @@ var _clusterDownCmd = &cobra.Command{
 }
 
 var _clusterExportCmd = &cobra.Command{
-	Use:   "export [API_NAME] [API_ID]",
-	Short: "download the code and configuration for APIs",
-	Args:  cobra.RangeArgs(0, 2),
+	Use:   "export",
+	Short: "download the configurations for all APIs",
+	Args:  cobra.NoArgs,
 	Run: func(cmd *cobra.Command, args []string) {
 		telemetry.Event("cli.cluster.export")
 
@@ -715,25 +714,13 @@ var _clusterExportCmd = &cobra.Command{
 		}
 
 		var apisResponse []schema.APIResponse
-		if len(args) == 0 {
-			apisResponse, err = cluster.GetAPIs(operatorConfig)
-			if err != nil {
-				exit.Error(err)
-			}
-			if len(apisResponse) == 0 {
-				fmt.Println(fmt.Sprintf("no apis found in your cluster named %s in %s", accessConfig.ClusterName, accessConfig.Region))
-				exit.Ok()
-			}
-		} else if len(args) == 1 {
-			apisResponse, err = cluster.GetAPI(operatorConfig, args[0])
-			if err != nil {
-				exit.Error(err)
-			}
-		} else if len(args) == 2 {
-			apisResponse, err = cluster.GetAPIByID(operatorConfig, args[0], args[1])
-			if err != nil {
-				exit.Error(err)
-			}
+		apisResponse, err = cluster.GetAPIs(operatorConfig)
+		if err != nil {
+			exit.Error(err)
+		}
+		if len(apisResponse) == 0 {
+			fmt.Println(fmt.Sprintf("no apis found in your cluster named %s in %s", accessConfig.ClusterName, accessConfig.Region))
+			exit.Ok()
 		}
 
 		exportPath := fmt.Sprintf("export-%s-%s", accessConfig.Region, accessConfig.ClusterName)
@@ -744,21 +731,16 @@ var _clusterExportCmd = &cobra.Command{
 		}
 
 		for _, apiResponse := range apisResponse {
-			baseDir := filepath.Join(exportPath, apiResponse.Spec.Name, apiResponse.Spec.ID)
+			specFilePath := filepath.Join(exportPath, apiResponse.Spec.Name+".yaml")
 
-			fmt.Println(fmt.Sprintf("exporting %s to %s", apiResponse.Spec.Name, baseDir))
-
-			err = files.CreateDir(baseDir)
-			if err != nil {
-				exit.Error(err)
-			}
+			fmt.Println(fmt.Sprintf("exporting %s to %s", apiResponse.Spec.Name, specFilePath))
 
 			yamlBytes, err := yaml.Marshal(apiResponse.Spec.API.SubmittedAPISpec)
 			if err != nil {
 				exit.Error(err)
 			}
 
-			err = files.WriteFile(yamlBytes, path.Join(baseDir, apiResponse.Spec.FileName))
+			err = files.WriteFile(yamlBytes, specFilePath)
 			if err != nil {
 				exit.Error(err)
 			}

cli/cmd/cluster.go

@@ -116,7 +116,6 @@ func init() {
 	envInit()
 	getInit()
 	logsInit()
-	patchInit()
 	refreshInit()
 	versionInit()
 }
@@ -155,7 +154,6 @@ func Execute() {
 
 	_rootCmd.AddCommand(_deployCmd)
 	_rootCmd.AddCommand(_getCmd)
-	_rootCmd.AddCommand(_patchCmd)
 	_rootCmd.AddCommand(_logsCmd)
 	_rootCmd.AddCommand(_refreshCmd)
 	_rootCmd.AddCommand(_deleteCmd)

cli/cmd/patch.go

@@ -117,7 +117,6 @@ func main() {
 
 	routerWithAuth.HandleFunc("/info", endpoints.Info).Methods("GET")
 	routerWithAuth.HandleFunc("/deploy", endpoints.Deploy).Methods("POST")
-	routerWithAuth.HandleFunc("/patch", endpoints.Patch).Methods("POST")
 	routerWithAuth.HandleFunc("/refresh/{apiName}", endpoints.Refresh).Methods("POST")
 	routerWithAuth.HandleFunc("/delete/{apiName}", endpoints.Delete).Methods("DELETE")
 	routerWithAuth.HandleFunc("/get", endpoints.GetAPIs).Methods("GET")

cli/cmd/root.go

@@ -34,10 +34,8 @@ commands=(
   "deploy"
   "get"
   "logs"
-  "patch"
   "refresh"
   "delete"
-  "prepare-debug"
   "cluster up"
   "cluster info"
   "cluster scale"

cmd/operator/main.go

@@ -65,11 +65,7 @@ truncate -s -1 $docs_path
 
 # Cortex version comment
 sed -i "s/^## deploy$/## deploy\n\n<!-- CORTEX_VERSION_MINOR -->/g" $docs_path
-sed -i "s/^## deploy\\\_realtime\\\_api$/## deploy\\\_realtime\\\_api\n\n<!-- CORTEX_VERSION_MINOR -->/g" $docs_path
-sed -i "s/^## deploy\\\_async\\\_api$/## deploy\\\_async\\\_api\n\n<!-- CORTEX_VERSION_MINOR -->/g" $docs_path
-sed -i "s/^## deploy\\\_batch\\\_api$/## deploy\\\_batch\\\_api\n\n<!-- CORTEX_VERSION_MINOR -->/g" $docs_path
-sed -i "s/^## deploy\\\_task\\\_api$/## deploy\\\_task\\\_api\n\n<!-- CORTEX_VERSION_MINOR -->/g" $docs_path
-sed -i "s/^## deploy\\\_traffic\\\_splitter$/## deploy\\\_traffic\\\_splitter\n\n<!-- CORTEX_VERSION_MINOR -->/g" $docs_path
+sed -i "s/^## deploy\\\_from\\\_file$/## deploy\\\_from\\\_file\n\n<!-- CORTEX_VERSION_MINOR -->/g" $docs_path
 
 pip3 uninstall -y cortex
 rm -rf $ROOT/python/client/cortex.egg-info

dev/generate_cli_md.sh

@@ -46,21 +46,6 @@ Flags:
   -h, --help         help for logs
 ```
 
-## patch
-
-```text
-update API configuration for a deployed API
-
-Usage:
-  cortex patch [CONFIG_FILE] [flags]
-
-Flags:
-  -e, --env string      environment to use
-  -f, --force           override the in-progress api update
-  -o, --output string   output format: one of pretty|json (default "pretty")
-  -h, --help            help for patch
-```
-
 ## refresh
 
 ```text
@@ -92,18 +77,6 @@ Flags:
   -h, --help            help for delete
 ```
 
-## prepare-debug
-
-```text
-prepare artifacts to debug containers
-
-Usage:
-  cortex prepare-debug CONFIG_FILE [API_NAME] [flags]
-
-Flags:
-  -h, --help   help for prepare-debug
-```
-
 ## cluster up
 
 ```text
@@ -175,10 +148,10 @@ Flags:
 ## cluster export
 
 ```text
-download the code and configuration for APIs
+download the configurations for all APIs
 
 Usage:
-  cortex cluster export [API_NAME] [API_ID] [flags]
+  cortex cluster export [flags]
 
 Flags:
   -c, --config string   path to a cluster configuration file