use cli blob

Author: AllyW

main/main.go

@@ -29,7 +29,7 @@ import (
 	"github.com/aliyun/aliyun-cli/v3/openapi"
 	"github.com/aliyun/aliyun-cli/v3/oss/lib"
 	"github.com/aliyun/aliyun-cli/v3/ossutil"
-	"github.com/aliyun/aliyun-cli/v3/ots"
+	"github.com/aliyun/aliyun-cli/v3/otsutil"
 )
 
 func Main(args []string) {
@@ -81,7 +81,7 @@ func Main(args []string) {
 	// new oss command
 	rootCmd.AddSubCommand(ossutil.NewOssutilCommand())
 	// tablestore command
-	rootCmd.AddSubCommand(ots.NewOtsCommand())
+	rootCmd.AddSubCommand(otsutil.NewOtsutilCommand())
 	if os.Getenv("GENERATE_METADATA") == "YES" {
 		generateMetadata(rootCmd)
 	} else {

ots/main.go

@@ -0,0 +1,42 @@
+package otsutil
+
+import (
+	"github.com/aliyun/aliyun-cli/v3/cli"
+	"github.com/aliyun/aliyun-cli/v3/i18n"
+)
+
+func NewOtsutilCommand() *cli.Command {
+	return &cli.Command{
+		Name:   "otsutil",
+		Short:  i18n.T("Alibaba Cloud Tablestore Utility", "阿里云表格存储工具"),
+		Usage:  "aliyun otsutil <command> [args...]",
+		Hidden: false,
+		Run: func(ctx *cli.Context, args []string) error {
+			if ctx.IsHelp() {
+				hasHelp := false
+				for i, arg := range args {
+					if arg == "help" {
+						hasHelp = true
+						break
+					} else if arg == "--help" {
+						// 将 --help 替换为 help
+						args[i] = "help"
+						hasHelp = true
+						break
+					}
+				}
+				// 如果没有找到 help 相关参数，说明是被过滤掉的 "help" 参数
+				if !hasHelp {
+					args = append(args, "help")
+				}
+			}
+			// fmt.Println("otsutil args", args)
+			options := NewContext(ctx)
+			return options.Run(args)
+		},
+		// allow unknown args
+		EnableUnknownFlag: true,
+		KeepArgs:          true,
+		SkipDefaultHelp:   true, // DO NOT use default help and version
+	}
+}

otsutil/main.go

@@ -1,4 +1,4 @@
-package ots
+package otsutil
 
 import (
 	"bytes"
@@ -10,24 +10,24 @@ import (
 )
 
 func TestNewOtsCommand(t *testing.T) {
-	cmd := NewOtsCommand()
+	cmd := NewOtsutilCommand()
 	if cmd == nil {
-		t.Fatalf("NewOtsCommand returned nil")
+		t.Fatalf("NewOtsutilCommand returned nil")
 	}
-	if cmd.Name != "ots" {
-		t.Errorf("Name expected 'ots', got %s", cmd.Name)
+	if cmd.Name != "otsutil" {
+		t.Errorf("Name expected 'otsutil', got %s", cmd.Name)
 	}
 	if cmd.Short == nil {
 		t.Fatalf("Short i18n text nil")
 	}
-	if en := cmd.Short.Get("en"); en != "Alibaba Cloud Tablestore CLI" {
-		t.Errorf("Short en expected 'Alibaba Cloud Tablestore CLI', got %s", en)
+	if en := cmd.Short.Get("en"); en != "Alibaba Cloud Tablestore Utility" {
+		t.Errorf("Short en expected 'Alibaba Cloud Tablestore Utility', got %s", en)
 	}
-	if zh := cmd.Short.Get("zh"); zh != "阿里云表格存储CLI工具" {
-		t.Errorf("Short zh expected '阿里云表格存储CLI工具', got %s", zh)
+	if zh := cmd.Short.Get("zh"); zh != "阿里云表格存储工具" {
+		t.Errorf("Short zh expected '阿里云表格存储工具', got %s", zh)
 	}
-	if cmd.Usage != "aliyun ots <command> --region cn-hangzhou" {
-		t.Errorf("Usage expected 'aliyun ots <command> --region cn-hangzhou', got %s", cmd.Usage)
+	if cmd.Usage != "aliyun otsutil <command> [args...]" {
+		t.Errorf("Usage expected 'aliyun otsutil <command> [args...]', got %s", cmd.Usage)
 	}
 	if cmd.Hidden {
 		t.Errorf("Hidden expected false")
@@ -47,26 +47,26 @@ func TestNewOtsCommand(t *testing.T) {
 }
 
 func TestNewOtsCommandMetadata(t *testing.T) {
-	cmd := NewOtsCommand()
+	cmd := NewOtsutilCommand()
 	metaMap := map[string]*cli.Metadata{}
 	cmd.GetMetadata(metaMap)
 	m, ok := metaMap[cmd.Name]
 	if !ok {
 		t.Fatalf("metadata for %s not found", cmd.Name)
 	}
-	if m.Name != "ots" {
-		t.Errorf("metadata name expected ots, got %s", m.Name)
+	if m.Name != "otsutil" {
+		t.Errorf("metadata name expected otsutil, got %s", m.Name)
 	}
 	if m.Usage != cmd.Usage {
 		t.Errorf("metadata usage mismatch")
 	}
 	if m.Hidden != cmd.Hidden {
 		t.Errorf("metadata hidden mismatch")
 	}
-	if se := m.Short["en"]; se != "Alibaba Cloud Tablestore CLI" {
+	if se := m.Short["en"]; se != "Alibaba Cloud Tablestore Utility" {
 		t.Errorf("metadata short en mismatch: %s", se)
 	}
-	if sz := m.Short["zh"]; sz != "阿里云表格存储CLI工具" {
+	if sz := m.Short["zh"]; sz != "阿里云表格存储工具" {
 		t.Errorf("metadata short zh mismatch: %s", sz)
 	}
 }
@@ -83,12 +83,12 @@ func TestOtsCommandRunInstalledSkipNetwork(t *testing.T) {
 	if err := os.WriteFile(execPath, []byte("#!/bin/sh\necho dummy\n"), 0755); err != nil {
 		t.Fatalf("write fake exec: %v", err)
 	}
-	
+
 	// 设置忽略profile，避免真实配置依赖
 	os.Setenv("ALIBABA_CLOUD_IGNORE_PROFILE", "TRUE")
 	defer os.Unsetenv("ALIBABA_CLOUD_IGNORE_PROFILE")
 
-	cmd := NewOtsCommand()
+	cmd := NewOtsutilCommand()
 	stdout := &bytes.Buffer{}
 	stderr := &bytes.Buffer{}
 	ctx := cli.NewCommandContext(stdout, stderr)
@@ -104,4 +104,3 @@ func TestOtsCommandRunInstalledSkipNetwork(t *testing.T) {
 		t.Errorf("unexpected error: %v", err)
 	}
 }
-