Add insecure flag support and update endpoint handling (#1218)

Author: CodeSpaceiiii

cli/context.go

@@ -45,6 +45,16 @@ type Context struct {
 	stdout          io.Writer
 	stderr          io.Writer
 	inConfigureMode bool
+	// use http instead of https
+	insecure bool
+}
+
+func (ctx *Context) Insecure() bool {
+	return ctx.insecure
+}
+
+func (ctx *Context) SetInsecure(insecure bool) {
+	ctx.insecure = insecure
 }
 
 func (ctx *Context) InConfigureMode() bool {

main/main.go

@@ -64,6 +64,9 @@ func Main(args []string) {
 	ctx.EnterCommand(rootCmd)
 	ctx.SetCompletion(cli.ParseCompletionForShell())
 	ctx.SetInConfigureMode(openapi.DetectInConfigureMode(ctx.Flags()))
+	// use http force, current use in oss bridge
+	insecure, _ := ParseInSecure(args)
+	ctx.SetInsecure(insecure)
 
 	rootCmd.AddSubCommand(config.NewConfigureCommand())
 	rootCmd.AddSubCommand(lib.NewOssCommand())
@@ -76,6 +79,16 @@ func Main(args []string) {
 	}
 }
 
+func ParseInSecure(args []string) (bool, interface{}) {
+	// check has insecure flag
+	for _, arg := range args {
+		if arg == "--insecure" {
+			return true, nil
+		}
+	}
+	return false, nil
+}
+
 func main() {
 	Main(os.Args[1:])
 }

main/main_test.go

@@ -1,7 +1,47 @@
 package main
 
-import "testing"
+import (
+	"testing"
+)
 
 func TestMain(m *testing.M) {
 	Main([]string{})
 }
+
+func TestParseInSecure(t *testing.T) {
+	tests := []struct {
+		name     string
+		args     []string
+		expected bool
+	}{
+		{
+			name:     "Insecure flag present",
+			args:     []string{"--insecure"},
+			expected: true,
+		},
+		{
+			name:     "Insecure flag with value",
+			args:     []string{"--insecure", "true"},
+			expected: true,
+		},
+		{
+			name:     "Insecure flag absent",
+			args:     []string{"--secure"},
+			expected: false,
+		},
+		{
+			name:     "Empty args",
+			args:     []string{},
+			expected: false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result, _ := ParseInSecure(tt.args)
+			if result != tt.expected {
+				t.Errorf("ParseInSecure(%v) = %v; want %v", tt.args, result, tt.expected)
+			}
+		})
+	}
+}

oss/lib/cli_bridge.go

@@ -3,6 +3,7 @@ package lib
 import (
 	"fmt"
 	"os"
+	"strings"
 
 	"github.com/alibabacloud-go/tea/tea"
 	"github.com/aliyun/aliyun-cli/cli"
@@ -149,7 +150,10 @@ func ParseAndGetEndpoint(ctx *cli.Context, args []string) (string, error) {
 func ParseAndRunCommandFromCli(ctx *cli.Context, args []string) error {
 	// 利用 parser 解析 flags，否则下文读不到
 	parser := cli.NewParser(args, ctx)
-	parser.ReadAll()
+	_, err := parser.ReadAll()
+	if err != nil {
+		return err
+	}
 
 	profile, err := config.LoadProfileWithContext(ctx)
 	if err != nil {
@@ -188,6 +192,15 @@ func ParseAndRunCommandFromCli(ctx *cli.Context, args []string) error {
 	if err != nil {
 		return fmt.Errorf("parse endpoint failed: %s", err)
 	}
+	// check use http force
+	forceUseHttp := ctx.Insecure()
+	if endpoint != "" && !strings.HasPrefix(endpoint, "http://") && !strings.HasPrefix(endpoint, "https://") {
+		if forceUseHttp {
+			endpoint = "http://" + endpoint
+		} else {
+			endpoint = "https://" + endpoint
+		}
+	}
 	configs["endpoint"] = endpoint
 
 	a2 := []string{"aliyun", "oss"}