diff --git a/CHANGELOG.md b/CHANGELOG.md index f18dbec44..ae15aa1d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## [Unreleased] ### Breaking: +- breaking(vcl): moved the `vcl` command under the `service` command ([#1616](https://github.com/fastly/cli/pull/1616)) ### Enhancements: - feat(rust): Allow testing with prerelease Rust versions ([#1604](https://github.com/fastly/cli/pull/1604)) diff --git a/pkg/app/run_test.go b/pkg/app/run_test.go index e951b37bc..f85226701 100644 --- a/pkg/app/run_test.go +++ b/pkg/app/run_test.go @@ -102,7 +102,6 @@ tls-subscription tools update user -vcl version whoami `, diff --git a/pkg/commands/commands.go b/pkg/commands/commands.go index 5dd59bd40..d4f4f98d1 100644 --- a/pkg/commands/commands.go +++ b/pkg/commands/commands.go @@ -95,6 +95,10 @@ import ( "github.com/fastly/cli/pkg/commands/secretstoreentry" "github.com/fastly/cli/pkg/commands/service" servicepurge "github.com/fastly/cli/pkg/commands/service/purge" + servicevcl "github.com/fastly/cli/pkg/commands/service/vcl" + servicevclcondition "github.com/fastly/cli/pkg/commands/service/vcl/condition" + servicevclcustom "github.com/fastly/cli/pkg/commands/service/vcl/custom" + servicevclsnippet "github.com/fastly/cli/pkg/commands/service/vcl/snippet" "github.com/fastly/cli/pkg/commands/serviceauth" "github.com/fastly/cli/pkg/commands/serviceversion" "github.com/fastly/cli/pkg/commands/shellcomplete" @@ -112,10 +116,6 @@ import ( domainTools "github.com/fastly/cli/pkg/commands/tools/domain" "github.com/fastly/cli/pkg/commands/update" "github.com/fastly/cli/pkg/commands/user" - "github.com/fastly/cli/pkg/commands/vcl" - "github.com/fastly/cli/pkg/commands/vcl/condition" - "github.com/fastly/cli/pkg/commands/vcl/custom" - "github.com/fastly/cli/pkg/commands/vcl/snippet" "github.com/fastly/cli/pkg/commands/version" "github.com/fastly/cli/pkg/commands/whoami" "github.com/fastly/cli/pkg/global" @@ -630,6 +630,26 @@ func Define( // nolint:revive // function-length serviceauthDescribe := serviceauth.NewDescribeCommand(serviceauthCmdRoot.CmdClause, data) serviceauthList := serviceauth.NewListCommand(serviceauthCmdRoot.CmdClause, data) serviceauthUpdate := serviceauth.NewUpdateCommand(serviceauthCmdRoot.CmdClause, data) + servicevclCmdRoot := servicevcl.NewRootCommand(serviceCmdRoot.CmdClause, data) + servicevclDescribe := servicevcl.NewDescribeCommand(servicevclCmdRoot.CmdClause, data) + servicevclConditionCmdRoot := servicevclcondition.NewRootCommand(servicevclCmdRoot.CmdClause, data) + servicevclConditionCreate := servicevclcondition.NewCreateCommand(servicevclConditionCmdRoot.CmdClause, data) + servicevclConditionDelete := servicevclcondition.NewDeleteCommand(servicevclConditionCmdRoot.CmdClause, data) + servicevclConditionDescribe := servicevclcondition.NewDescribeCommand(servicevclConditionCmdRoot.CmdClause, data) + servicevclConditionList := servicevclcondition.NewListCommand(servicevclConditionCmdRoot.CmdClause, data) + servicevclConditionUpdate := servicevclcondition.NewUpdateCommand(servicevclConditionCmdRoot.CmdClause, data) + servicevclCustomCmdRoot := servicevclcustom.NewRootCommand(servicevclCmdRoot.CmdClause, data) + servicevclCustomCreate := servicevclcustom.NewCreateCommand(servicevclCustomCmdRoot.CmdClause, data) + servicevclCustomDelete := servicevclcustom.NewDeleteCommand(servicevclCustomCmdRoot.CmdClause, data) + servicevclCustomDescribe := servicevclcustom.NewDescribeCommand(servicevclCustomCmdRoot.CmdClause, data) + servicevclCustomList := servicevclcustom.NewListCommand(servicevclCustomCmdRoot.CmdClause, data) + servicevclCustomUpdate := servicevclcustom.NewUpdateCommand(servicevclCustomCmdRoot.CmdClause, data) + servicevclSnippetCmdRoot := servicevclsnippet.NewRootCommand(servicevclCmdRoot.CmdClause, data) + servicevclSnippetCreate := servicevclsnippet.NewCreateCommand(servicevclSnippetCmdRoot.CmdClause, data) + servicevclSnippetDelete := servicevclsnippet.NewDeleteCommand(servicevclSnippetCmdRoot.CmdClause, data) + servicevclSnippetDescribe := servicevclsnippet.NewDescribeCommand(servicevclSnippetCmdRoot.CmdClause, data) + servicevclSnippetList := servicevclsnippet.NewListCommand(servicevclSnippetCmdRoot.CmdClause, data) + servicevclSnippetUpdate := servicevclsnippet.NewUpdateCommand(servicevclSnippetCmdRoot.CmdClause, data) serviceVersionCmdRoot := serviceversion.NewRootCommand(app, data) serviceVersionActivate := serviceversion.NewActivateCommand(serviceVersionCmdRoot.CmdClause, data) serviceVersionClone := serviceversion.NewCloneCommand(serviceVersionCmdRoot.CmdClause, data) @@ -690,26 +710,6 @@ func Define( // nolint:revive // function-length userDescribe := user.NewDescribeCommand(userCmdRoot.CmdClause, data) userList := user.NewListCommand(userCmdRoot.CmdClause, data) userUpdate := user.NewUpdateCommand(userCmdRoot.CmdClause, data) - vclCmdRoot := vcl.NewRootCommand(app, data) - vclDescribe := vcl.NewDescribeCommand(vclCmdRoot.CmdClause, data) - vclConditionCmdRoot := condition.NewRootCommand(vclCmdRoot.CmdClause, data) - vclConditionCreate := condition.NewCreateCommand(vclConditionCmdRoot.CmdClause, data) - vclConditionDelete := condition.NewDeleteCommand(vclConditionCmdRoot.CmdClause, data) - vclConditionDescribe := condition.NewDescribeCommand(vclConditionCmdRoot.CmdClause, data) - vclConditionList := condition.NewListCommand(vclConditionCmdRoot.CmdClause, data) - vclConditionUpdate := condition.NewUpdateCommand(vclConditionCmdRoot.CmdClause, data) - vclCustomCmdRoot := custom.NewRootCommand(vclCmdRoot.CmdClause, data) - vclCustomCreate := custom.NewCreateCommand(vclCustomCmdRoot.CmdClause, data) - vclCustomDelete := custom.NewDeleteCommand(vclCustomCmdRoot.CmdClause, data) - vclCustomDescribe := custom.NewDescribeCommand(vclCustomCmdRoot.CmdClause, data) - vclCustomList := custom.NewListCommand(vclCustomCmdRoot.CmdClause, data) - vclCustomUpdate := custom.NewUpdateCommand(vclCustomCmdRoot.CmdClause, data) - vclSnippetCmdRoot := snippet.NewRootCommand(vclCmdRoot.CmdClause, data) - vclSnippetCreate := snippet.NewCreateCommand(vclSnippetCmdRoot.CmdClause, data) - vclSnippetDelete := snippet.NewDeleteCommand(vclSnippetCmdRoot.CmdClause, data) - vclSnippetDescribe := snippet.NewDescribeCommand(vclSnippetCmdRoot.CmdClause, data) - vclSnippetList := snippet.NewListCommand(vclSnippetCmdRoot.CmdClause, data) - vclSnippetUpdate := snippet.NewUpdateCommand(vclSnippetCmdRoot.CmdClause, data) versionCmdRoot := version.NewRootCommand(app, data) whoamiCmdRoot := whoami.NewRootCommand(app, data) @@ -1205,6 +1205,26 @@ func Define( // nolint:revive // function-length serviceauthDescribe, serviceauthList, serviceauthUpdate, + servicevclCmdRoot, + servicevclDescribe, + servicevclConditionCmdRoot, + servicevclConditionCreate, + servicevclConditionDelete, + servicevclConditionDescribe, + servicevclConditionList, + servicevclConditionUpdate, + servicevclCustomCmdRoot, + servicevclCustomCreate, + servicevclCustomDelete, + servicevclCustomDescribe, + servicevclCustomList, + servicevclCustomUpdate, + servicevclSnippetCmdRoot, + servicevclSnippetCreate, + servicevclSnippetDelete, + servicevclSnippetDescribe, + servicevclSnippetList, + servicevclSnippetUpdate, serviceVersionActivate, serviceVersionClone, serviceVersionCmdRoot, @@ -1266,26 +1286,6 @@ func Define( // nolint:revive // function-length userDescribe, userList, userUpdate, - vclCmdRoot, - vclDescribe, - vclConditionCmdRoot, - vclConditionCreate, - vclConditionDelete, - vclConditionDescribe, - vclConditionList, - vclConditionUpdate, - vclCustomCmdRoot, - vclCustomCreate, - vclCustomDelete, - vclCustomDescribe, - vclCustomList, - vclCustomUpdate, - vclSnippetCmdRoot, - vclSnippetCreate, - vclSnippetDelete, - vclSnippetDescribe, - vclSnippetList, - vclSnippetUpdate, versionCmdRoot, whoamiCmdRoot, aliasPurge, diff --git a/pkg/commands/vcl/condition/condition_test.go b/pkg/commands/service/vcl/condition/condition_test.go similarity index 92% rename from pkg/commands/vcl/condition/condition_test.go rename to pkg/commands/service/vcl/condition/condition_test.go index f6dffe231..ec226b50d 100644 --- a/pkg/commands/vcl/condition/condition_test.go +++ b/pkg/commands/service/vcl/condition/condition_test.go @@ -8,8 +8,9 @@ import ( "github.com/fastly/go-fastly/v12/fastly" - root "github.com/fastly/cli/pkg/commands/vcl" - sub "github.com/fastly/cli/pkg/commands/vcl/condition" + top "github.com/fastly/cli/pkg/commands/service" + root "github.com/fastly/cli/pkg/commands/service/vcl" + sub "github.com/fastly/cli/pkg/commands/service/vcl/condition" "github.com/fastly/cli/pkg/mock" "github.com/fastly/cli/pkg/testutil" ) @@ -40,7 +41,7 @@ func TestConditionCreate(t *testing.T) { }, } - testutil.RunCLIScenarios(t, []string{root.CommandName, sub.CommandName, "create"}, scenarios) + testutil.RunCLIScenarios(t, []string{top.CommandName, root.CommandName, sub.CommandName, "create"}, scenarios) } func TestConditionDelete(t *testing.T) { @@ -69,7 +70,7 @@ func TestConditionDelete(t *testing.T) { }, } - testutil.RunCLIScenarios(t, []string{root.CommandName, sub.CommandName, "delete"}, scenarios) + testutil.RunCLIScenarios(t, []string{top.CommandName, root.CommandName, sub.CommandName, "delete"}, scenarios) } func TestConditionUpdate(t *testing.T) { @@ -107,7 +108,7 @@ func TestConditionUpdate(t *testing.T) { }, } - testutil.RunCLIScenarios(t, []string{root.CommandName, sub.CommandName, "update"}, scenarios) + testutil.RunCLIScenarios(t, []string{top.CommandName, root.CommandName, sub.CommandName, "update"}, scenarios) } func TestConditionDescribe(t *testing.T) { @@ -134,7 +135,7 @@ func TestConditionDescribe(t *testing.T) { }, } - testutil.RunCLIScenarios(t, []string{root.CommandName, sub.CommandName, "describe"}, scenarios) + testutil.RunCLIScenarios(t, []string{top.CommandName, root.CommandName, sub.CommandName, "describe"}, scenarios) } func TestConditionList(t *testing.T) { @@ -189,7 +190,7 @@ func TestConditionList(t *testing.T) { }, } - testutil.RunCLIScenarios(t, []string{root.CommandName, sub.CommandName, "list"}, scenarios) + testutil.RunCLIScenarios(t, []string{top.CommandName, root.CommandName, sub.CommandName, "list"}, scenarios) } var describeConditionOutput = "\n" + strings.TrimSpace(` diff --git a/pkg/commands/vcl/condition/create.go b/pkg/commands/service/vcl/condition/create.go similarity index 100% rename from pkg/commands/vcl/condition/create.go rename to pkg/commands/service/vcl/condition/create.go diff --git a/pkg/commands/vcl/condition/delete.go b/pkg/commands/service/vcl/condition/delete.go similarity index 100% rename from pkg/commands/vcl/condition/delete.go rename to pkg/commands/service/vcl/condition/delete.go diff --git a/pkg/commands/vcl/condition/describe.go b/pkg/commands/service/vcl/condition/describe.go similarity index 100% rename from pkg/commands/vcl/condition/describe.go rename to pkg/commands/service/vcl/condition/describe.go diff --git a/pkg/commands/vcl/condition/doc.go b/pkg/commands/service/vcl/condition/doc.go similarity index 100% rename from pkg/commands/vcl/condition/doc.go rename to pkg/commands/service/vcl/condition/doc.go diff --git a/pkg/commands/vcl/condition/list.go b/pkg/commands/service/vcl/condition/list.go similarity index 100% rename from pkg/commands/vcl/condition/list.go rename to pkg/commands/service/vcl/condition/list.go diff --git a/pkg/commands/vcl/condition/root.go b/pkg/commands/service/vcl/condition/root.go similarity index 100% rename from pkg/commands/vcl/condition/root.go rename to pkg/commands/service/vcl/condition/root.go diff --git a/pkg/commands/vcl/condition/update.go b/pkg/commands/service/vcl/condition/update.go similarity index 100% rename from pkg/commands/vcl/condition/update.go rename to pkg/commands/service/vcl/condition/update.go diff --git a/pkg/commands/vcl/custom/create.go b/pkg/commands/service/vcl/custom/create.go similarity index 100% rename from pkg/commands/vcl/custom/create.go rename to pkg/commands/service/vcl/custom/create.go diff --git a/pkg/commands/vcl/custom/custom_test.go b/pkg/commands/service/vcl/custom/custom_test.go similarity index 95% rename from pkg/commands/vcl/custom/custom_test.go rename to pkg/commands/service/vcl/custom/custom_test.go index a6d84d977..bdeb29c33 100644 --- a/pkg/commands/vcl/custom/custom_test.go +++ b/pkg/commands/service/vcl/custom/custom_test.go @@ -6,8 +6,9 @@ import ( "github.com/fastly/go-fastly/v12/fastly" - root "github.com/fastly/cli/pkg/commands/vcl" - sub "github.com/fastly/cli/pkg/commands/vcl/custom" + top "github.com/fastly/cli/pkg/commands/service" + root "github.com/fastly/cli/pkg/commands/service/vcl" + sub "github.com/fastly/cli/pkg/commands/service/vcl/custom" "github.com/fastly/cli/pkg/mock" "github.com/fastly/cli/pkg/testutil" ) @@ -166,7 +167,7 @@ func TestVCLCustomCreate(t *testing.T) { }, } - testutil.RunCLIScenarios(t, []string{root.CommandName, sub.CommandName, "create"}, scenarios) + testutil.RunCLIScenarios(t, []string{top.CommandName, root.CommandName, sub.CommandName, "create"}, scenarios) } func TestVCLCustomDelete(t *testing.T) { @@ -238,7 +239,7 @@ func TestVCLCustomDelete(t *testing.T) { }, } - testutil.RunCLIScenarios(t, []string{root.CommandName, sub.CommandName, "delete"}, scenarios) + testutil.RunCLIScenarios(t, []string{top.CommandName, root.CommandName, sub.CommandName, "delete"}, scenarios) } func TestVCLCustomDescribe(t *testing.T) { @@ -289,7 +290,7 @@ func TestVCLCustomDescribe(t *testing.T) { }, } - testutil.RunCLIScenarios(t, []string{root.CommandName, sub.CommandName, "describe"}, scenarios) + testutil.RunCLIScenarios(t, []string{top.CommandName, root.CommandName, sub.CommandName, "describe"}, scenarios) } func TestVCLCustomList(t *testing.T) { @@ -343,7 +344,7 @@ func TestVCLCustomList(t *testing.T) { }, } - testutil.RunCLIScenarios(t, []string{root.CommandName, sub.CommandName, "list"}, scenarios) + testutil.RunCLIScenarios(t, []string{top.CommandName, root.CommandName, sub.CommandName, "list"}, scenarios) } func TestVCLCustomUpdate(t *testing.T) { @@ -453,7 +454,7 @@ func TestVCLCustomUpdate(t *testing.T) { }, } - testutil.RunCLIScenarios(t, []string{root.CommandName, sub.CommandName, "update"}, scenarios) + testutil.RunCLIScenarios(t, []string{top.CommandName, root.CommandName, sub.CommandName, "update"}, scenarios) } func getVCL(_ context.Context, i *fastly.GetVCLInput) (*fastly.VCL, error) { diff --git a/pkg/commands/vcl/custom/delete.go b/pkg/commands/service/vcl/custom/delete.go similarity index 100% rename from pkg/commands/vcl/custom/delete.go rename to pkg/commands/service/vcl/custom/delete.go diff --git a/pkg/commands/vcl/custom/describe.go b/pkg/commands/service/vcl/custom/describe.go similarity index 100% rename from pkg/commands/vcl/custom/describe.go rename to pkg/commands/service/vcl/custom/describe.go diff --git a/pkg/commands/vcl/custom/doc.go b/pkg/commands/service/vcl/custom/doc.go similarity index 100% rename from pkg/commands/vcl/custom/doc.go rename to pkg/commands/service/vcl/custom/doc.go diff --git a/pkg/commands/vcl/custom/list.go b/pkg/commands/service/vcl/custom/list.go similarity index 100% rename from pkg/commands/vcl/custom/list.go rename to pkg/commands/service/vcl/custom/list.go diff --git a/pkg/commands/vcl/custom/root.go b/pkg/commands/service/vcl/custom/root.go similarity index 100% rename from pkg/commands/vcl/custom/root.go rename to pkg/commands/service/vcl/custom/root.go diff --git a/pkg/commands/vcl/custom/testdata/example.vcl b/pkg/commands/service/vcl/custom/testdata/example.vcl similarity index 100% rename from pkg/commands/vcl/custom/testdata/example.vcl rename to pkg/commands/service/vcl/custom/testdata/example.vcl diff --git a/pkg/commands/vcl/custom/update.go b/pkg/commands/service/vcl/custom/update.go similarity index 100% rename from pkg/commands/vcl/custom/update.go rename to pkg/commands/service/vcl/custom/update.go diff --git a/pkg/commands/vcl/describe.go b/pkg/commands/service/vcl/describe.go similarity index 100% rename from pkg/commands/vcl/describe.go rename to pkg/commands/service/vcl/describe.go diff --git a/pkg/commands/vcl/doc.go b/pkg/commands/service/vcl/doc.go similarity index 100% rename from pkg/commands/vcl/doc.go rename to pkg/commands/service/vcl/doc.go diff --git a/pkg/commands/vcl/root.go b/pkg/commands/service/vcl/root.go similarity index 100% rename from pkg/commands/vcl/root.go rename to pkg/commands/service/vcl/root.go diff --git a/pkg/commands/vcl/snippet/create.go b/pkg/commands/service/vcl/snippet/create.go similarity index 100% rename from pkg/commands/vcl/snippet/create.go rename to pkg/commands/service/vcl/snippet/create.go diff --git a/pkg/commands/vcl/snippet/delete.go b/pkg/commands/service/vcl/snippet/delete.go similarity index 100% rename from pkg/commands/vcl/snippet/delete.go rename to pkg/commands/service/vcl/snippet/delete.go diff --git a/pkg/commands/vcl/snippet/describe.go b/pkg/commands/service/vcl/snippet/describe.go similarity index 100% rename from pkg/commands/vcl/snippet/describe.go rename to pkg/commands/service/vcl/snippet/describe.go diff --git a/pkg/commands/vcl/snippet/doc.go b/pkg/commands/service/vcl/snippet/doc.go similarity index 100% rename from pkg/commands/vcl/snippet/doc.go rename to pkg/commands/service/vcl/snippet/doc.go diff --git a/pkg/commands/vcl/snippet/list.go b/pkg/commands/service/vcl/snippet/list.go similarity index 100% rename from pkg/commands/vcl/snippet/list.go rename to pkg/commands/service/vcl/snippet/list.go diff --git a/pkg/commands/vcl/snippet/root.go b/pkg/commands/service/vcl/snippet/root.go similarity index 100% rename from pkg/commands/vcl/snippet/root.go rename to pkg/commands/service/vcl/snippet/root.go diff --git a/pkg/commands/vcl/snippet/snippet_test.go b/pkg/commands/service/vcl/snippet/snippet_test.go similarity index 96% rename from pkg/commands/vcl/snippet/snippet_test.go rename to pkg/commands/service/vcl/snippet/snippet_test.go index 2184efde7..9e355ee4e 100644 --- a/pkg/commands/vcl/snippet/snippet_test.go +++ b/pkg/commands/service/vcl/snippet/snippet_test.go @@ -6,8 +6,9 @@ import ( "github.com/fastly/go-fastly/v12/fastly" - root "github.com/fastly/cli/pkg/commands/vcl" - sub "github.com/fastly/cli/pkg/commands/vcl/snippet" + top "github.com/fastly/cli/pkg/commands/service" + root "github.com/fastly/cli/pkg/commands/service/vcl" + sub "github.com/fastly/cli/pkg/commands/service/vcl/snippet" "github.com/fastly/cli/pkg/mock" "github.com/fastly/cli/pkg/testutil" ) @@ -220,7 +221,7 @@ func TestVCLSnippetCreate(t *testing.T) { }, } - testutil.RunCLIScenarios(t, []string{root.CommandName, sub.CommandName, "create"}, scenarios) + testutil.RunCLIScenarios(t, []string{top.CommandName, root.CommandName, sub.CommandName, "create"}, scenarios) } func TestVCLSnippetDelete(t *testing.T) { @@ -292,7 +293,7 @@ func TestVCLSnippetDelete(t *testing.T) { }, } - testutil.RunCLIScenarios(t, []string{root.CommandName, sub.CommandName, "delete"}, scenarios) + testutil.RunCLIScenarios(t, []string{top.CommandName, root.CommandName, sub.CommandName, "delete"}, scenarios) } func TestVCLSnippetDescribe(t *testing.T) { @@ -362,7 +363,7 @@ func TestVCLSnippetDescribe(t *testing.T) { }, } - testutil.RunCLIScenarios(t, []string{root.CommandName, sub.CommandName, "describe"}, scenarios) + testutil.RunCLIScenarios(t, []string{top.CommandName, root.CommandName, sub.CommandName, "describe"}, scenarios) } func TestVCLSnippetList(t *testing.T) { @@ -416,7 +417,7 @@ func TestVCLSnippetList(t *testing.T) { }, } - testutil.RunCLIScenarios(t, []string{root.CommandName, sub.CommandName, "list"}, scenarios) + testutil.RunCLIScenarios(t, []string{top.CommandName, root.CommandName, sub.CommandName, "list"}, scenarios) } func TestVCLSnippetUpdate(t *testing.T) { @@ -556,7 +557,7 @@ func TestVCLSnippetUpdate(t *testing.T) { }, } - testutil.RunCLIScenarios(t, []string{root.CommandName, sub.CommandName, "update"}, scenarios) + testutil.RunCLIScenarios(t, []string{top.CommandName, root.CommandName, sub.CommandName, "update"}, scenarios) } func getSnippet(_ context.Context, i *fastly.GetSnippetInput) (*fastly.Snippet, error) { diff --git a/pkg/commands/vcl/snippet/testdata/snippet.vcl b/pkg/commands/service/vcl/snippet/testdata/snippet.vcl similarity index 100% rename from pkg/commands/vcl/snippet/testdata/snippet.vcl rename to pkg/commands/service/vcl/snippet/testdata/snippet.vcl diff --git a/pkg/commands/vcl/snippet/update.go b/pkg/commands/service/vcl/snippet/update.go similarity index 100% rename from pkg/commands/vcl/snippet/update.go rename to pkg/commands/service/vcl/snippet/update.go diff --git a/pkg/commands/vcl/vcl_test.go b/pkg/commands/service/vcl/vcl_test.go similarity index 91% rename from pkg/commands/vcl/vcl_test.go rename to pkg/commands/service/vcl/vcl_test.go index 9ea9e5ec6..ac8577927 100644 --- a/pkg/commands/vcl/vcl_test.go +++ b/pkg/commands/service/vcl/vcl_test.go @@ -6,7 +6,8 @@ import ( "github.com/fastly/go-fastly/v12/fastly" - root "github.com/fastly/cli/pkg/commands/vcl" + root "github.com/fastly/cli/pkg/commands/service" + sub "github.com/fastly/cli/pkg/commands/service/vcl" "github.com/fastly/cli/pkg/mock" "github.com/fastly/cli/pkg/testutil" ) @@ -53,7 +54,7 @@ func TestVCLDescribe(t *testing.T) { }, } - testutil.RunCLIScenarios(t, []string{root.CommandName, "describe"}, scenarios) + testutil.RunCLIScenarios(t, []string{root.CommandName, sub.CommandName, "describe"}, scenarios) } func getVCL(_ context.Context, i *fastly.GetGeneratedVCLInput) (*fastly.VCL, error) {