diff --git a/cli/hrp/cmd/scaffold.go b/cli/hrp/cmd/scaffold.go index 4f3a1c81..fba1f8ba 100644 --- a/cli/hrp/cmd/scaffold.go +++ b/cli/hrp/cmd/scaffold.go @@ -35,6 +35,7 @@ var scaffoldCmd = &cobra.Command{ log.Error().Err(err).Msg("create scaffold project failed") os.Exit(1) } + log.Info().Str("projectName", args[0]).Msg("create scaffold success") return nil }, } diff --git a/cli/scripts/install.sh b/cli/scripts/install.sh index 632e403a..284f1571 100644 --- a/cli/scripts/install.sh +++ b/cli/scripts/install.sh @@ -2,7 +2,7 @@ # install hrp with one shell command # bash -c "$(curl -ksSL https://httprunner.oss-cn-beijing.aliyuncs.com/install.sh)" -LATEST_VERSION="v0.7.0" +LATEST_VERSION="v0.8.0-beta" set -e diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 57bc44b9..06dad9c5 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,8 +1,9 @@ # Release History -## v0.8.0 (2022-03-18) +## v0.8.0 (2022-03-21) -- feat: create scaffold with python plugin +- feat: support hashicorp python plugin over gRPC +- feat: create scaffold with plugin option, `--py`(default), `--go`, `--ignore-plugin` - feat: print statistics summary after load testing finished - fix: update prometheus state to stopped on quit @@ -16,7 +17,7 @@ ## v0.6.4 (2022-03-10) -- feat: both support gPRC(default) and net/rpc mode in hashicorp plugin, switch with environment `HRP_PLUGIN_TYPE` +- feat: both support gRPC(default) and net/rpc mode in hashicorp plugin, switch with environment `HRP_PLUGIN_TYPE` - refactor: move submodule `plugin` to separate repo `github.com/httprunner/funplugin` - refactor: replace builtin json library with `json-iterator/go` to improve performance diff --git a/docs/cmd/hrp.md b/docs/cmd/hrp.md index e2f73a2a..03d3b782 100644 --- a/docs/cmd/hrp.md +++ b/docs/cmd/hrp.md @@ -33,4 +33,4 @@ Copyright 2021 debugtalk * [hrp run](hrp_run.md) - run API test * [hrp startproject](hrp_startproject.md) - create a scaffold project -###### Auto generated by spf13/cobra on 17-Mar-2022 +###### Auto generated by spf13/cobra on 21-Mar-2022 diff --git a/docs/cmd/hrp_boom.md b/docs/cmd/hrp_boom.md index aeae7f46..d7a97193 100644 --- a/docs/cmd/hrp_boom.md +++ b/docs/cmd/hrp_boom.md @@ -41,4 +41,4 @@ hrp boom [flags] * [hrp](hrp.md) - One-stop solution for HTTP(S) testing. -###### Auto generated by spf13/cobra on 17-Mar-2022 +###### Auto generated by spf13/cobra on 21-Mar-2022 diff --git a/docs/cmd/hrp_har2case.md b/docs/cmd/hrp_har2case.md index 34ff04ee..59396b67 100644 --- a/docs/cmd/hrp_har2case.md +++ b/docs/cmd/hrp_har2case.md @@ -23,4 +23,4 @@ hrp har2case $har_path... [flags] * [hrp](hrp.md) - One-stop solution for HTTP(S) testing. -###### Auto generated by spf13/cobra on 17-Mar-2022 +###### Auto generated by spf13/cobra on 21-Mar-2022 diff --git a/docs/cmd/hrp_run.md b/docs/cmd/hrp_run.md index f827c16e..3482790f 100644 --- a/docs/cmd/hrp_run.md +++ b/docs/cmd/hrp_run.md @@ -34,4 +34,4 @@ hrp run $path... [flags] * [hrp](hrp.md) - One-stop solution for HTTP(S) testing. -###### Auto generated by spf13/cobra on 17-Mar-2022 +###### Auto generated by spf13/cobra on 21-Mar-2022 diff --git a/docs/cmd/hrp_startproject.md b/docs/cmd/hrp_startproject.md index 3c538379..713f3850 100644 --- a/docs/cmd/hrp_startproject.md +++ b/docs/cmd/hrp_startproject.md @@ -9,11 +9,14 @@ hrp startproject $project_name [flags] ### Options ``` - -h, --help help for startproject + --go generate hashicorp go plugin + -h, --help help for startproject + --ignore-plugin ignore function plugin + --py generate hashicorp python plugin (default true) ``` ### SEE ALSO * [hrp](hrp.md) - One-stop solution for HTTP(S) testing. -###### Auto generated by spf13/cobra on 17-Mar-2022 +###### Auto generated by spf13/cobra on 21-Mar-2022 diff --git a/go.mod b/go.mod index 6c8a1798..dee9ae12 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/andybalholm/brotli v1.0.4 github.com/denisbrodbeck/machineid v1.0.1 github.com/google/uuid v1.3.0 - github.com/httprunner/funplugin v0.3.2-0.20220319011341-76c4084b52ae + github.com/httprunner/funplugin v0.4.0 github.com/jinzhu/copier v0.3.2 github.com/jmespath/go-jmespath v0.4.0 github.com/json-iterator/go v1.1.12 diff --git a/go.sum b/go.sum index 1b17bc9e..9daae201 100644 --- a/go.sum +++ b/go.sum @@ -198,8 +198,8 @@ github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2p github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb h1:b5rjCoWHc7eqmAS4/qyk21ZsHyb6Mxv/jykxvNTkU4M= github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= -github.com/httprunner/funplugin v0.3.2-0.20220319011341-76c4084b52ae h1:phue9WjORQnb5UM4a8Um2fl3pDNaSOUCAMo4TlgVTB4= -github.com/httprunner/funplugin v0.3.2-0.20220319011341-76c4084b52ae/go.mod h1:vPyeJIfbpGe0epZZtAV0wCn16gLY9+imSw/zfxq0Lcc= +github.com/httprunner/funplugin v0.4.0 h1:jSptZ6Ki0Dh3uvpLDbmxE6kSqVv0FHaQnHs0Qt+6SS8= +github.com/httprunner/funplugin v0.4.0/go.mod h1:vPyeJIfbpGe0epZZtAV0wCn16gLY9+imSw/zfxq0Lcc= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= diff --git a/internal/scaffold/main.go b/internal/scaffold/main.go index 549ab5c6..17a4a4a5 100644 --- a/internal/scaffold/main.go +++ b/internal/scaffold/main.go @@ -15,12 +15,12 @@ import ( "github.com/httprunner/hrp/internal/ga" ) -type PluginType uint +type PluginType string const ( - Ignore PluginType = iota - Py - Go + Ignore PluginType = "ignore" + Py PluginType = "py" + Go PluginType = "go" ) func CreateScaffold(projectName string, pluginType PluginType) error { @@ -37,7 +37,10 @@ func CreateScaffold(projectName string, pluginType PluginType) error { return fmt.Errorf("project name already exists") } - log.Info().Str("projectName", projectName).Msg("create new scaffold project") + log.Info(). + Str("projectName", projectName). + Str("pluginType", string(pluginType)). + Msg("create new scaffold project") // create project folders if err := builtin.CreateFolder(projectName); err != nil { diff --git a/internal/version/init.go b/internal/version/init.go index 4546a264..432a66a1 100644 --- a/internal/version/init.go +++ b/internal/version/init.go @@ -1,3 +1,3 @@ package version -const VERSION = "v0.7.0" +const VERSION = "v0.8.0-beta" diff --git a/runner_test.go b/runner_test.go index b69ef090..032c3f64 100644 --- a/runner_test.go +++ b/runner_test.go @@ -74,6 +74,7 @@ func assertRunTestCases(t *testing.T) { testcase4 := &demoRefTestCaseJSONPath r := NewRunner(t) + r.SetPluginLogOn() err := r.Run(testcase1, testcase2, testcase3, testcase4) if err != nil { t.Fatalf("run testcase error: %v", err)