Skip to content

Commit c4f5b0e

Browse files
zhanluxianshenMandssS
zhanluxianshen
authored andcommitted
Delete redundant package import.
Signed-off-by: zhanluxianshen <irelandabby883@gmail.com>
1 parent a6edf88 commit c4f5b0e

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

cli/cmd/exp.go

+20-20
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@ package cmd
1919
import (
2020
"context"
2121
"fmt"
22+
"path"
23+
2224
"github.com/chaosblade-io/chaosblade-exec-cri/exec"
2325
"github.com/chaosblade-io/chaosblade-operator/exec/model"
2426
"github.com/chaosblade-io/chaosblade-spec-go/log"
25-
"github.com/chaosblade-io/chaosblade/exec/middleware"
2627
"github.com/chaosblade-io/chaosblade/exec/cloud"
27-
"path"
28+
"github.com/chaosblade-io/chaosblade/exec/middleware"
2829

2930
"github.com/chaosblade-io/chaosblade-spec-go/channel"
3031
"github.com/chaosblade-io/chaosblade-spec-go/spec"
31-
"github.com/chaosblade-io/chaosblade-spec-go/util"
3232
specutil "github.com/chaosblade-io/chaosblade-spec-go/util"
3333
"github.com/spf13/cobra"
3434
"github.com/spf13/pflag"
@@ -137,7 +137,7 @@ func (ec *baseExpCommandService) registerSubCommands() {
137137

138138
// registerOsExpCommands
139139
func (ec *baseExpCommandService) registerOsExpCommands() []*modelCommand {
140-
file := path.Join(util.GetYamlHome(), fmt.Sprintf("chaosblade-os-spec-%s.yaml", version.Ver))
140+
file := path.Join(specutil.GetYamlHome(), fmt.Sprintf("chaosblade-os-spec-%s.yaml", version.Ver))
141141
models, err := specutil.ParseSpecsToModel(file, os.NewExecutor())
142142
if err != nil {
143143
return nil
@@ -151,10 +151,9 @@ func (ec *baseExpCommandService) registerOsExpCommands() []*modelCommand {
151151
return osCommands
152152
}
153153

154-
155154
// registerMiddlewareExpCommands
156155
func (ec *baseExpCommandService) registerMiddlewareExpCommands() []*modelCommand {
157-
file := path.Join(util.GetYamlHome(), fmt.Sprintf("chaosblade-middleware-spec-%s.yaml", version.Ver))
156+
file := path.Join(specutil.GetYamlHome(), fmt.Sprintf("chaosblade-middleware-spec-%s.yaml", version.Ver))
158157
models, err := specutil.ParseSpecsToModel(file, middleware.NewExecutor())
159158
if err != nil {
160159
return nil
@@ -167,9 +166,10 @@ func (ec *baseExpCommandService) registerMiddlewareExpCommands() []*modelCommand
167166
}
168167
return middlewareCommands
169168
}
169+
170170
// registerCloudExpCommands
171171
func (ec *baseExpCommandService) registerCloudExpCommands() []*modelCommand {
172-
file := path.Join(util.GetYamlHome(), fmt.Sprintf("chaosblade-cloud-spec-%s.yaml", version.Ver))
172+
file := path.Join(specutil.GetYamlHome(), fmt.Sprintf("chaosblade-cloud-spec-%s.yaml", version.Ver))
173173
models, err := specutil.ParseSpecsToModel(file, cloud.NewExecutor())
174174
if err != nil {
175175
return nil
@@ -186,8 +186,8 @@ func (ec *baseExpCommandService) registerCloudExpCommands() []*modelCommand {
186186

187187
// registerJvmExpCommands
188188
func (ec *baseExpCommandService) registerJvmExpCommands() []*modelCommand {
189-
file := path.Join(util.GetYamlHome(), fmt.Sprintf("chaosblade-jvm-spec-%s.yaml", version.Ver))
190-
models, err := util.ParseSpecsToModel(file, jvm.NewExecutor())
189+
file := path.Join(specutil.GetYamlHome(), fmt.Sprintf("chaosblade-jvm-spec-%s.yaml", version.Ver))
190+
models, err := specutil.ParseSpecsToModel(file, jvm.NewExecutor())
191191
if err != nil {
192192
return nil
193193
}
@@ -202,8 +202,8 @@ func (ec *baseExpCommandService) registerJvmExpCommands() []*modelCommand {
202202

203203
// registerCplusExpCommands
204204
func (ec *baseExpCommandService) registerCplusExpCommands() []*modelCommand {
205-
file := path.Join(util.GetYamlHome(), "chaosblade-cplus-spec.yaml")
206-
models, err := util.ParseSpecsToModel(file, cplus.NewExecutor())
205+
file := path.Join(specutil.GetYamlHome(), "chaosblade-cplus-spec.yaml")
206+
models, err := specutil.ParseSpecsToModel(file, cplus.NewExecutor())
207207
if err != nil {
208208
return nil
209209
}
@@ -218,7 +218,7 @@ func (ec *baseExpCommandService) registerCplusExpCommands() []*modelCommand {
218218

219219
// registerDockerExpCommands
220220
func (ec *baseExpCommandService) registerDockerExpCommands() []*modelCommand {
221-
file := path.Join(util.GetYamlHome(), fmt.Sprintf("chaosblade-docker-spec-%s.yaml", version.Ver))
221+
file := path.Join(specutil.GetYamlHome(), fmt.Sprintf("chaosblade-docker-spec-%s.yaml", version.Ver))
222222
models, err := specutil.ParseSpecsToModel(file, docker.NewExecutor())
223223
if err != nil {
224224
return nil
@@ -231,8 +231,8 @@ func (ec *baseExpCommandService) registerDockerExpCommands() []*modelCommand {
231231
modelCommands = append(modelCommands, command)
232232
}
233233

234-
file = path.Join(util.GetYamlHome(), fmt.Sprintf("chaosblade-jvm-spec-%s.yaml", version.Ver))
235-
models, err = util.ParseSpecsToModel(file, docker.NewExecutor())
234+
file = path.Join(specutil.GetYamlHome(), fmt.Sprintf("chaosblade-jvm-spec-%s.yaml", version.Ver))
235+
models, err = specutil.ParseSpecsToModel(file, docker.NewExecutor())
236236
if err != nil {
237237
return nil
238238
}
@@ -262,7 +262,7 @@ func GetResourceFlags() []spec.ExpFlagSpec {
262262

263263
func (ec *baseExpCommandService) registerK8sExpCommands() []*modelCommand {
264264
// 读取 k8s 下的场景并注册
265-
file := path.Join(util.GetYamlHome(), fmt.Sprintf("chaosblade-k8s-spec-%s.yaml", version.Ver))
265+
file := path.Join(specutil.GetYamlHome(), fmt.Sprintf("chaosblade-k8s-spec-%s.yaml", version.Ver))
266266
models, err := specutil.ParseSpecsToModel(file, kubernetes.NewComposeExecutor())
267267
if err != nil {
268268
return nil
@@ -275,8 +275,8 @@ func (ec *baseExpCommandService) registerK8sExpCommands() []*modelCommand {
275275
modelCommands = append(modelCommands, command)
276276
}
277277

278-
file = path.Join(util.GetYamlHome(), fmt.Sprintf("chaosblade-jvm-spec-%s.yaml", version.Ver))
279-
models, err = util.ParseSpecsToModel(file, kubernetes.NewExecutor())
278+
file = path.Join(specutil.GetYamlHome(), fmt.Sprintf("chaosblade-jvm-spec-%s.yaml", version.Ver))
279+
models, err = specutil.ParseSpecsToModel(file, kubernetes.NewExecutor())
280280
if err != nil {
281281
return nil
282282
}
@@ -299,7 +299,7 @@ func (ec *baseExpCommandService) registerK8sExpCommands() []*modelCommand {
299299

300300
// registerCriExpCommands
301301
func (ec *baseExpCommandService) registerCriExpCommands() []*modelCommand {
302-
file := path.Join(util.GetYamlHome(), fmt.Sprintf("chaosblade-cri-spec-%s.yaml", version.Ver))
302+
file := path.Join(specutil.GetYamlHome(), fmt.Sprintf("chaosblade-cri-spec-%s.yaml", version.Ver))
303303
models, err := specutil.ParseSpecsToModel(file, cri.NewExecutor())
304304
if err != nil {
305305
return nil
@@ -312,8 +312,8 @@ func (ec *baseExpCommandService) registerCriExpCommands() []*modelCommand {
312312
modelCommands = append(modelCommands, command)
313313
}
314314

315-
file = path.Join(util.GetYamlHome(), fmt.Sprintf("chaosblade-jvm-spec-%s.yaml", version.Ver))
316-
models, err = util.ParseSpecsToModel(file, cri.NewExecutor())
315+
file = path.Join(specutil.GetYamlHome(), fmt.Sprintf("chaosblade-jvm-spec-%s.yaml", version.Ver))
316+
models, err = specutil.ParseSpecsToModel(file, cri.NewExecutor())
317317
if err != nil {
318318
return nil
319319
}

0 commit comments

Comments
 (0)