feat: add brace expansion support

Author: LinuxSuRen

README.md

@@ -39,11 +39,13 @@ Usage:
 
 Available Commands:
   completion  Generate the autocompletion script for the specified shell
+  func        Print all the supported functions
   help        Help about any command
   json        Print the JSON schema of the test suites struct
   run         Run the test suite
   sample      Generate a sample test case YAML file
   server      Run as a server mode
+  service     Install atest as a Linux service
 
 Flags:
   -h, --help      help for atest

cmd/run.go

@@ -16,6 +16,7 @@ import (
 	"github.com/linuxsuren/api-testing/pkg/render"
 	"github.com/linuxsuren/api-testing/pkg/runner"
 	"github.com/linuxsuren/api-testing/pkg/testing"
+	"github.com/linuxsuren/api-testing/pkg/util"
 	"github.com/spf13/cobra"
 	"golang.org/x/sync/semaphore"
 )
@@ -71,7 +72,7 @@ See also https://github.com/LinuxSuRen/api-testing/tree/master/sample`,
 	// set flags
 	flags := cmd.Flags()
 	flags.StringVarP(&opt.pattern, "pattern", "p", "test-suite-*.yaml",
-		"The file pattern which try to execute the test cases")
+		"The file pattern which try to execute the test cases. Brace expansion is supported, such as: test-suite-{1,2}.yaml")
 	flags.StringVarP(&opt.level, "level", "l", "info", "Set the output log level")
 	flags.DurationVarP(&opt.duration, "duration", "", 0, "Running duration")
 	flags.DurationVarP(&opt.requestTimeout, "request-timeout", "", time.Minute, "Timeout for per request")
@@ -125,7 +126,6 @@ func (o *runOption) preRunE(cmd *cobra.Command, args []string) (err error) {
 }
 
 func (o *runOption) runE(cmd *cobra.Command, args []string) (err error) {
-	var files []string
 	o.startTime = time.Now()
 	o.context = cmd.Context()
 	o.limiter = limit.NewDefaultRateLimiter(o.qps, o.burst)
@@ -134,12 +134,20 @@ func (o *runOption) runE(cmd *cobra.Command, args []string) (err error) {
 		o.limiter.Stop()
 	}()
 
-	if files, err = filepath.Glob(o.pattern); err == nil {
-		for i := range files {
-			item := files[i]
-			if err = o.runSuiteWithDuration(item); err != nil {
-				break
-			}
+	var suites []string
+	for _, pattern := range util.Expand(o.pattern) {
+		var files []string
+		if files, err = filepath.Glob(pattern); err == nil {
+			suites = append(suites, files...)
+		}
+	}
+
+	cmd.Println("found suites:", len(suites))
+	for i := range suites {
+		item := suites[i]
+		cmd.Println("run suite:", item)
+		if err = o.runSuiteWithDuration(item); err != nil {
+			break
 		}
 	}
 

pkg/util/expand.go

@@ -0,0 +1,25 @@
+package util
+
+import (
+	"regexp"
+	"strings"
+)
+
+// Expand the text with brace syntax.
+// Such as: /home/{good,bad} -> [/home/good, /home/bad]
+func Expand(text string) (result []string) {
+	reg := regexp.MustCompile(`\{.*\}`)
+	if reg.MatchString(text) {
+		brace := reg.FindString(text)
+		braceItem := strings.TrimPrefix(brace, "{")
+		braceItem = strings.TrimSuffix(braceItem, "}")
+		items := strings.Split(braceItem, ",")
+
+		for _, item := range items {
+			result = append(result, strings.ReplaceAll(text, brace, item))
+		}
+	} else {
+		result = []string{text}
+	}
+	return
+}

pkg/util/expand_test.go

@@ -0,0 +1,34 @@
+package util_test
+
+import (
+	"testing"
+
+	"github.com/linuxsuren/api-testing/pkg/util"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestExpand(t *testing.T) {
+	tests := []struct {
+		name   string
+		input  string
+		expect []string
+	}{{
+		name:   "without brace",
+		input:  "/home",
+		expect: []string{"/home"},
+	}, {
+		name:   "with brace",
+		input:  "/home/{good,bad}",
+		expect: []string{"/home/good", "/home/bad"},
+	}, {
+		name:   "with brace, have suffix",
+		input:  "/home/{good,bad}.yaml",
+		expect: []string{"/home/good.yaml", "/home/bad.yaml"},
+	}}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got := util.Expand(tt.input)
+			assert.Equal(t, tt.expect, got, got)
+		})
+	}
+}