Merge pull request #261 from wasuradananjith/remove-tenant-flag

Remove tenant flag from "apictl export-apis" command
wso2 · Apr 3, 2020 · 640521e · 640521e
2 parents bb1b683 + 4c3fcf4
commit 640521e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 15 deletions.
diff --git a/import-export-cli/cmd/exportAPIs.go b/import-export-cli/cmd/exportAPIs.go
@@ -35,7 +35,7 @@ const exportAPIsCmdShortDesc = "Export APIs for migration"
 
 const exportAPIsCmdLongDesc = "Export all the APIs of a tenant from one environment, to be imported " +
 "into another environment"
-const exportAPIsCmdExamples = utils.ProjectName + ` ` + exportAPIsCmdLiteral + ` -e production -t wso2.org --force
+const exportAPIsCmdExamples = utils.ProjectName + ` ` + exportAPIsCmdLiteral + ` -e production --force
 ` + utils.ProjectName + ` ` + exportAPIsCmdLiteral + ` -e production
 NOTE: The flag (--environment (-e)) is mandatory`
 
@@ -55,7 +55,7 @@ var credential credentials.Credential
 
 var ExportAPIsCmd = &cobra.Command{
 	Use: exportAPIsCmdLiteral + " (--environment " +
-		"<environment-from-which-artifacts-should-be-exported> -t <Tenant-domain-of-the-resources-to-be-exported> --force)",
+		"<environment-from-which-artifacts-should-be-exported> --format <export-format> --preserveStatus --force)",
 	Short:   exportAPIsCmdShortDesc,
 	Long:    exportAPIsCmdLongDesc,
 	Example: exportAPIsCmdExamples,
@@ -280,9 +280,7 @@ func getAPIList() (count int32, apis []utils.API) {
 func init() {
 	RootCmd.AddCommand(ExportAPIsCmd)
 	ExportAPIsCmd.Flags().StringVarP(&cmdExportEnvironment, "environment", "e",
-		"", "Environment to which the API should be exported")
-	ExportAPIsCmd.Flags().StringVarP(&cmdResourceTenantDomain, "tenant", "t", "",
-		"Tenant domain of the resources to be exported")
+		"", "Environment from which the APIs should be exported")
 	ExportAPIsCmd.PersistentFlags().BoolVarP(&cmdForceStartFromBegin, "force", "", false,
 		"Clean all the previously exported APIs of the given target tenant, in the given environment if "+
 			"any, and to export APIs from beginning")

diff --git a/import-export-cli/docs/apictl_export-apis.md b/import-export-cli/docs/apictl_export-apis.md
@@ -7,26 +7,25 @@ Export APIs for migration
 Export all the APIs of a tenant from one environment, to be imported into another environment
 
 ```
-apictl export-apis (--environment <environment-from-which-artifacts-should-be-exported> -t <Tenant-domain-of-the-resources-to-be-exported> --force) [flags]
+apictl export-apis (--environment <environment-from-which-artifacts-should-be-exported> --format <export-format> --preserveStatus --force) [flags]
 ```
 
 ### Examples
 
 ```
-apictl export-apis -e production -t wso2.org --force
+apictl export-apis -e production --force
 apictl export-apis -e production
 NOTE: The flag (--environment (-e)) is mandatory
 ```
 
 ### Options
 
 ```
-  -e, --environment string   Environment to which the API should be exported
+  -e, --environment string   Environment from which the APIs should be exported
       --force                Clean all the previously exported APIs of the given target tenant, in the given environment if any, and to export APIs from beginning
       --format string        File format of exported archives(json or yaml)
   -h, --help                 help for export-apis
       --preserveStatus       Preserve API status when exporting. Otherwise API will be exported in CREATED status (default true)
-  -t, --tenant string        Tenant domain of the resources to be exported
 ```
 
 ### Options inherited from parent commands

diff --git a/import-export-cli/shell-completions/apictl_bash_completions.sh b/import-export-cli/shell-completions/apictl_bash_completions.sh
@@ -501,9 +501,6 @@ _apictl_export-apis()
     local_nonpersistent_flags+=("--help")
     flags+=("--preserveStatus")
     local_nonpersistent_flags+=("--preserveStatus")
-    flags+=("--tenant=")
-    two_word_flags+=("-t")
-    local_nonpersistent_flags+=("--tenant=")
     flags+=("--insecure")
     flags+=("-k")
     flags+=("--verbose")

diff --git a/import-export-cli/shell-completions/apictl_zsh_completions.sh b/import-export-cli/shell-completions/apictl_zsh_completions.sh
@@ -17,6 +17,9 @@ case $state in
   ;;
   level2)
     case $words[2] in
+      add)
+        _arguments '2: :(api help)'
+      ;;
       change)
         _arguments '2: :(help registry)'
       ;;
@@ -32,9 +35,6 @@ case $state in
       update)
         _arguments '2: :(api help)'
       ;;
-      add)
-        _arguments '2: :(api help)'
-      ;;
       *)
         _arguments '*: :_files'
       ;;