From a898c4f910304dfeed70b1dd62aae2a5afceb93d Mon Sep 17 00:00:00 2001 From: Richard Carillo Date: Tue, 13 Jan 2026 15:30:35 -0500 Subject: [PATCH 1/8] move vcl commands under service --- pkg/commands/commands.go | 88 +++++++++---------- .../vcl/condition/condition_test.go | 4 +- .../{ => service}/vcl/condition/create.go | 0 .../{ => service}/vcl/condition/delete.go | 0 .../{ => service}/vcl/condition/describe.go | 0 .../{ => service}/vcl/condition/doc.go | 0 .../{ => service}/vcl/condition/list.go | 0 .../{ => service}/vcl/condition/root.go | 0 .../{ => service}/vcl/condition/update.go | 0 .../{ => service}/vcl/custom/create.go | 0 .../{ => service}/vcl/custom/custom_test.go | 4 +- .../{ => service}/vcl/custom/delete.go | 0 .../{ => service}/vcl/custom/describe.go | 0 pkg/commands/{ => service}/vcl/custom/doc.go | 0 pkg/commands/{ => service}/vcl/custom/list.go | 0 pkg/commands/{ => service}/vcl/custom/root.go | 0 .../vcl/custom/testdata/example.vcl | 0 .../{ => service}/vcl/custom/update.go | 0 pkg/commands/{ => service}/vcl/describe.go | 0 pkg/commands/{ => service}/vcl/doc.go | 0 pkg/commands/{ => service}/vcl/root.go | 0 .../{ => service}/vcl/snippet/create.go | 0 .../{ => service}/vcl/snippet/delete.go | 0 .../{ => service}/vcl/snippet/describe.go | 0 pkg/commands/{ => service}/vcl/snippet/doc.go | 0 .../{ => service}/vcl/snippet/list.go | 0 .../{ => service}/vcl/snippet/root.go | 0 .../{ => service}/vcl/snippet/snippet_test.go | 4 +- .../vcl/snippet/testdata/snippet.vcl | 0 .../{ => service}/vcl/snippet/update.go | 0 pkg/commands/{ => service}/vcl/vcl_test.go | 2 +- 31 files changed, 51 insertions(+), 51 deletions(-) rename pkg/commands/{ => service}/vcl/condition/condition_test.go (98%) rename pkg/commands/{ => service}/vcl/condition/create.go (100%) rename pkg/commands/{ => service}/vcl/condition/delete.go (100%) rename pkg/commands/{ => service}/vcl/condition/describe.go (100%) rename pkg/commands/{ => service}/vcl/condition/doc.go (100%) rename pkg/commands/{ => service}/vcl/condition/list.go (100%) rename pkg/commands/{ => service}/vcl/condition/root.go (100%) rename pkg/commands/{ => service}/vcl/condition/update.go (100%) rename pkg/commands/{ => service}/vcl/custom/create.go (100%) rename pkg/commands/{ => service}/vcl/custom/custom_test.go (99%) rename pkg/commands/{ => service}/vcl/custom/delete.go (100%) rename pkg/commands/{ => service}/vcl/custom/describe.go (100%) rename pkg/commands/{ => service}/vcl/custom/doc.go (100%) rename pkg/commands/{ => service}/vcl/custom/list.go (100%) rename pkg/commands/{ => service}/vcl/custom/root.go (100%) rename pkg/commands/{ => service}/vcl/custom/testdata/example.vcl (100%) rename pkg/commands/{ => service}/vcl/custom/update.go (100%) rename pkg/commands/{ => service}/vcl/describe.go (100%) rename pkg/commands/{ => service}/vcl/doc.go (100%) rename pkg/commands/{ => service}/vcl/root.go (100%) rename pkg/commands/{ => service}/vcl/snippet/create.go (100%) rename pkg/commands/{ => service}/vcl/snippet/delete.go (100%) rename pkg/commands/{ => service}/vcl/snippet/describe.go (100%) rename pkg/commands/{ => service}/vcl/snippet/doc.go (100%) rename pkg/commands/{ => service}/vcl/snippet/list.go (100%) rename pkg/commands/{ => service}/vcl/snippet/root.go (100%) rename pkg/commands/{ => service}/vcl/snippet/snippet_test.go (99%) rename pkg/commands/{ => service}/vcl/snippet/testdata/snippet.vcl (100%) rename pkg/commands/{ => service}/vcl/snippet/update.go (100%) rename pkg/commands/{ => service}/vcl/vcl_test.go (97%) 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 98% rename from pkg/commands/vcl/condition/condition_test.go rename to pkg/commands/service/vcl/condition/condition_test.go index f6dffe231..964da1bcc 100644 --- a/pkg/commands/vcl/condition/condition_test.go +++ b/pkg/commands/service/vcl/condition/condition_test.go @@ -8,8 +8,8 @@ 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" + 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" ) 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 99% rename from pkg/commands/vcl/custom/custom_test.go rename to pkg/commands/service/vcl/custom/custom_test.go index a6d84d977..bb4b3c245 100644 --- a/pkg/commands/vcl/custom/custom_test.go +++ b/pkg/commands/service/vcl/custom/custom_test.go @@ -6,8 +6,8 @@ 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" + 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" ) 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 99% rename from pkg/commands/vcl/snippet/snippet_test.go rename to pkg/commands/service/vcl/snippet/snippet_test.go index 2184efde7..2372a2868 100644 --- a/pkg/commands/vcl/snippet/snippet_test.go +++ b/pkg/commands/service/vcl/snippet/snippet_test.go @@ -6,8 +6,8 @@ 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" + 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" ) 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 97% rename from pkg/commands/vcl/vcl_test.go rename to pkg/commands/service/vcl/vcl_test.go index 9ea9e5ec6..22c3aaad7 100644 --- a/pkg/commands/vcl/vcl_test.go +++ b/pkg/commands/service/vcl/vcl_test.go @@ -6,7 +6,7 @@ import ( "github.com/fastly/go-fastly/v12/fastly" - root "github.com/fastly/cli/pkg/commands/vcl" + root "github.com/fastly/cli/pkg/commands/service/vcl" "github.com/fastly/cli/pkg/mock" "github.com/fastly/cli/pkg/testutil" ) From 2f788404c47f383bf7c17cd3c379cc772569837a Mon Sep 17 00:00:00 2001 From: Richard Carillo Date: Tue, 13 Jan 2026 15:59:12 -0500 Subject: [PATCH 2/8] updated tests and run_test files --- pkg/app/run_test.go | 1 - pkg/commands/service/vcl/condition/condition_test.go | 11 ++++++----- pkg/commands/service/vcl/custom/custom_test.go | 11 ++++++----- pkg/commands/service/vcl/snippet/snippet_test.go | 11 ++++++----- pkg/commands/service/vcl/vcl_test.go | 5 +++-- 5 files changed, 21 insertions(+), 18 deletions(-) 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/service/vcl/condition/condition_test.go b/pkg/commands/service/vcl/condition/condition_test.go index 964da1bcc..ec226b50d 100644 --- a/pkg/commands/service/vcl/condition/condition_test.go +++ b/pkg/commands/service/vcl/condition/condition_test.go @@ -8,6 +8,7 @@ import ( "github.com/fastly/go-fastly/v12/fastly" + 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" @@ -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/service/vcl/custom/custom_test.go b/pkg/commands/service/vcl/custom/custom_test.go index bb4b3c245..bdeb29c33 100644 --- a/pkg/commands/service/vcl/custom/custom_test.go +++ b/pkg/commands/service/vcl/custom/custom_test.go @@ -6,6 +6,7 @@ import ( "github.com/fastly/go-fastly/v12/fastly" + 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" @@ -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/service/vcl/snippet/snippet_test.go b/pkg/commands/service/vcl/snippet/snippet_test.go index 2372a2868..9e355ee4e 100644 --- a/pkg/commands/service/vcl/snippet/snippet_test.go +++ b/pkg/commands/service/vcl/snippet/snippet_test.go @@ -6,6 +6,7 @@ import ( "github.com/fastly/go-fastly/v12/fastly" + 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" @@ -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/service/vcl/vcl_test.go b/pkg/commands/service/vcl/vcl_test.go index 22c3aaad7..ac8577927 100644 --- a/pkg/commands/service/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/service/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) { From b7e55db045b00b2c9f3833ce088a6ce9d4ee43a9 Mon Sep 17 00:00:00 2001 From: Richard Carillo Date: Tue, 13 Jan 2026 16:02:02 -0500 Subject: [PATCH 3/8] changelog update --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) 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)) From 7b6b07848833361afedefc8dda8a4bce4a9e995b Mon Sep 17 00:00:00 2001 From: Richard Carillo Date: Thu, 15 Jan 2026 10:08:21 -0500 Subject: [PATCH 4/8] append vcl alias' --- pkg/commands/alias/vcl/condition/create.go | 29 +++++++++++++ pkg/commands/alias/vcl/condition/delete.go | 29 +++++++++++++ pkg/commands/alias/vcl/condition/describe.go | 29 +++++++++++++ pkg/commands/alias/vcl/condition/doc.go | 2 + pkg/commands/alias/vcl/condition/list.go | 31 ++++++++++++++ pkg/commands/alias/vcl/condition/root.go | 31 ++++++++++++++ pkg/commands/alias/vcl/condition/update.go | 29 +++++++++++++ pkg/commands/alias/vcl/custom/create.go | 29 +++++++++++++ pkg/commands/alias/vcl/custom/delete.go | 29 +++++++++++++ pkg/commands/alias/vcl/custom/describe.go | 29 +++++++++++++ pkg/commands/alias/vcl/custom/doc.go | 2 + pkg/commands/alias/vcl/custom/list.go | 31 ++++++++++++++ pkg/commands/alias/vcl/custom/root.go | 31 ++++++++++++++ pkg/commands/alias/vcl/custom/update.go | 29 +++++++++++++ pkg/commands/alias/vcl/describe.go | 29 +++++++++++++ pkg/commands/alias/vcl/doc.go | 2 + pkg/commands/alias/vcl/root.go | 31 ++++++++++++++ pkg/commands/alias/vcl/snippet/create.go | 29 +++++++++++++ pkg/commands/alias/vcl/snippet/delete.go | 29 +++++++++++++ pkg/commands/alias/vcl/snippet/describe.go | 29 +++++++++++++ pkg/commands/alias/vcl/snippet/doc.go | 2 + pkg/commands/alias/vcl/snippet/list.go | 31 ++++++++++++++ pkg/commands/alias/vcl/snippet/root.go | 31 ++++++++++++++ pkg/commands/alias/vcl/snippet/update.go | 29 +++++++++++++ pkg/commands/commands.go | 44 ++++++++++++++++++++ 25 files changed, 646 insertions(+) create mode 100644 pkg/commands/alias/vcl/condition/create.go create mode 100644 pkg/commands/alias/vcl/condition/delete.go create mode 100644 pkg/commands/alias/vcl/condition/describe.go create mode 100644 pkg/commands/alias/vcl/condition/doc.go create mode 100644 pkg/commands/alias/vcl/condition/list.go create mode 100644 pkg/commands/alias/vcl/condition/root.go create mode 100644 pkg/commands/alias/vcl/condition/update.go create mode 100644 pkg/commands/alias/vcl/custom/create.go create mode 100644 pkg/commands/alias/vcl/custom/delete.go create mode 100644 pkg/commands/alias/vcl/custom/describe.go create mode 100644 pkg/commands/alias/vcl/custom/doc.go create mode 100644 pkg/commands/alias/vcl/custom/list.go create mode 100644 pkg/commands/alias/vcl/custom/root.go create mode 100644 pkg/commands/alias/vcl/custom/update.go create mode 100644 pkg/commands/alias/vcl/describe.go create mode 100644 pkg/commands/alias/vcl/doc.go create mode 100644 pkg/commands/alias/vcl/root.go create mode 100644 pkg/commands/alias/vcl/snippet/create.go create mode 100644 pkg/commands/alias/vcl/snippet/delete.go create mode 100644 pkg/commands/alias/vcl/snippet/describe.go create mode 100644 pkg/commands/alias/vcl/snippet/doc.go create mode 100644 pkg/commands/alias/vcl/snippet/list.go create mode 100644 pkg/commands/alias/vcl/snippet/root.go create mode 100644 pkg/commands/alias/vcl/snippet/update.go diff --git a/pkg/commands/alias/vcl/condition/create.go b/pkg/commands/alias/vcl/condition/create.go new file mode 100644 index 000000000..c98be81cb --- /dev/null +++ b/pkg/commands/alias/vcl/condition/create.go @@ -0,0 +1,29 @@ +package condition + +import ( + "io" + + newcmd "github.com/fastly/cli/pkg/commands/service/vcl/condition" + + "github.com/fastly/cli/pkg/argparser" + "github.com/fastly/cli/pkg/global" + "github.com/fastly/cli/pkg/text" +) + +// CreateCommand wraps the CreateCommand from the newcmd package. +type CreateCommand struct { + *newcmd.CreateCommand +} + +// NewCreateCommand returns a usable command registered under the parent. +func NewCreateCommand(parent argparser.Registerer, g *global.Data) *CreateCommand { + c := CreateCommand{newcmd.NewCreateCommand(parent, g)} + c.CmdClause.Hidden() + return &c +} + +// Exec implements the command interface. +func (c *CreateCommand) Exec(in io.Reader, out io.Writer) error { + text.Deprecated(out, "Use the 'service vcl condition create' command instead.") + return c.CreateCommand.Exec(in, out) +} diff --git a/pkg/commands/alias/vcl/condition/delete.go b/pkg/commands/alias/vcl/condition/delete.go new file mode 100644 index 000000000..c5f822888 --- /dev/null +++ b/pkg/commands/alias/vcl/condition/delete.go @@ -0,0 +1,29 @@ +package condition + +import ( + "io" + + newcmd "github.com/fastly/cli/pkg/commands/service/vcl/condition" + + "github.com/fastly/cli/pkg/argparser" + "github.com/fastly/cli/pkg/global" + "github.com/fastly/cli/pkg/text" +) + +// DeleteCommand wraps the DeleteCommand from the newcmd package. +type DeleteCommand struct { + *newcmd.DeleteCommand +} + +// NewDeleteCommand returns a usable command registered under the parent. +func NewDeleteCommand(parent argparser.Registerer, g *global.Data) *DeleteCommand { + c := DeleteCommand{newcmd.NewDeleteCommand(parent, g)} + c.CmdClause.Hidden() + return &c +} + +// Exec implements the command interface. +func (c *DeleteCommand) Exec(in io.Reader, out io.Writer) error { + text.Deprecated(out, "Use the 'service vcl condition delete' command instead.") + return c.DeleteCommand.Exec(in, out) +} diff --git a/pkg/commands/alias/vcl/condition/describe.go b/pkg/commands/alias/vcl/condition/describe.go new file mode 100644 index 000000000..0e8f24efa --- /dev/null +++ b/pkg/commands/alias/vcl/condition/describe.go @@ -0,0 +1,29 @@ +package condition + +import ( + "io" + + newcmd "github.com/fastly/cli/pkg/commands/service/vcl/condition" + + "github.com/fastly/cli/pkg/argparser" + "github.com/fastly/cli/pkg/global" + "github.com/fastly/cli/pkg/text" +) + +// DescribeCommand wraps the DescribeCommand from the newcmd package. +type DescribeCommand struct { + *newcmd.DescribeCommand +} + +// NewDescribeCommand returns a usable command registered under the parent. +func NewDescribeCommand(parent argparser.Registerer, g *global.Data) *DescribeCommand { + c := DescribeCommand{newcmd.NewDescribeCommand(parent, g)} + c.CmdClause.Hidden() + return &c +} + +// Exec implements the command interface. +func (c *DescribeCommand) Exec(in io.Reader, out io.Writer) error { + text.Deprecated(out, "Use the 'service vcl condition describe' command instead.") + return c.DescribeCommand.Exec(in, out) +} diff --git a/pkg/commands/alias/vcl/condition/doc.go b/pkg/commands/alias/vcl/condition/doc.go new file mode 100644 index 000000000..c95858dec --- /dev/null +++ b/pkg/commands/alias/vcl/condition/doc.go @@ -0,0 +1,2 @@ +// Package condition contains deprecated aliases for the service vcl condition commands. +package condition diff --git a/pkg/commands/alias/vcl/condition/list.go b/pkg/commands/alias/vcl/condition/list.go new file mode 100644 index 000000000..8010cb6f3 --- /dev/null +++ b/pkg/commands/alias/vcl/condition/list.go @@ -0,0 +1,31 @@ +package condition + +import ( + "io" + + newcmd "github.com/fastly/cli/pkg/commands/service/vcl/condition" + + "github.com/fastly/cli/pkg/argparser" + "github.com/fastly/cli/pkg/global" + "github.com/fastly/cli/pkg/text" +) + +// ListCommand wraps the ListCommand from the newcmd package. +type ListCommand struct { + *newcmd.ListCommand +} + +// NewListCommand returns a usable command registered under the parent. +func NewListCommand(parent argparser.Registerer, g *global.Data) *ListCommand { + c := ListCommand{newcmd.NewListCommand(parent, g)} + c.CmdClause.Hidden() + return &c +} + +// Exec implements the command interface. +func (c *ListCommand) Exec(in io.Reader, out io.Writer) error { + if !c.JSONOutput.Enabled { + text.Deprecated(out, "Use the 'service vcl condition list' command instead.") + } + return c.ListCommand.Exec(in, out) +} diff --git a/pkg/commands/alias/vcl/condition/root.go b/pkg/commands/alias/vcl/condition/root.go new file mode 100644 index 000000000..e9b3252d7 --- /dev/null +++ b/pkg/commands/alias/vcl/condition/root.go @@ -0,0 +1,31 @@ +package condition + +import ( + "io" + + "github.com/fastly/cli/pkg/argparser" + "github.com/fastly/cli/pkg/global" +) + +// RootCommand is the parent command for all subcommands in this package. +// It should be installed under the primary root command. +type RootCommand struct { + argparser.Base + // no flags +} + +// CommandName is the string to be used to invoke this command. +const CommandName = "condition" + +// NewRootCommand returns a new command registered in the parent. +func NewRootCommand(parent argparser.Registerer, g *global.Data) *RootCommand { + var c RootCommand + c.Globals = g + c.CmdClause = parent.Command(CommandName, "Manipulate Fastly VCL conditions").Hidden() + return &c +} + +// Exec implements the command interface. +func (c *RootCommand) Exec(_ io.Reader, _ io.Writer) error { + panic("unreachable") +} diff --git a/pkg/commands/alias/vcl/condition/update.go b/pkg/commands/alias/vcl/condition/update.go new file mode 100644 index 000000000..8fd450e2f --- /dev/null +++ b/pkg/commands/alias/vcl/condition/update.go @@ -0,0 +1,29 @@ +package condition + +import ( + "io" + + newcmd "github.com/fastly/cli/pkg/commands/service/vcl/condition" + + "github.com/fastly/cli/pkg/argparser" + "github.com/fastly/cli/pkg/global" + "github.com/fastly/cli/pkg/text" +) + +// UpdateCommand wraps the UpdateCommand from the newcmd package. +type UpdateCommand struct { + *newcmd.UpdateCommand +} + +// NewUpdateCommand returns a usable command registered under the parent. +func NewUpdateCommand(parent argparser.Registerer, g *global.Data) *UpdateCommand { + c := UpdateCommand{newcmd.NewUpdateCommand(parent, g)} + c.CmdClause.Hidden() + return &c +} + +// Exec implements the command interface. +func (c *UpdateCommand) Exec(in io.Reader, out io.Writer) error { + text.Deprecated(out, "Use the 'service vcl condition update' command instead.") + return c.UpdateCommand.Exec(in, out) +} diff --git a/pkg/commands/alias/vcl/custom/create.go b/pkg/commands/alias/vcl/custom/create.go new file mode 100644 index 000000000..5a7f8b0a4 --- /dev/null +++ b/pkg/commands/alias/vcl/custom/create.go @@ -0,0 +1,29 @@ +package custom + +import ( + "io" + + newcmd "github.com/fastly/cli/pkg/commands/service/vcl/custom" + + "github.com/fastly/cli/pkg/argparser" + "github.com/fastly/cli/pkg/global" + "github.com/fastly/cli/pkg/text" +) + +// CreateCommand wraps the CreateCommand from the newcmd package. +type CreateCommand struct { + *newcmd.CreateCommand +} + +// NewCreateCommand returns a usable command registered under the parent. +func NewCreateCommand(parent argparser.Registerer, g *global.Data) *CreateCommand { + c := CreateCommand{newcmd.NewCreateCommand(parent, g)} + c.CmdClause.Hidden() + return &c +} + +// Exec implements the command interface. +func (c *CreateCommand) Exec(in io.Reader, out io.Writer) error { + text.Deprecated(out, "Use the 'service vcl custom create' command instead.") + return c.CreateCommand.Exec(in, out) +} diff --git a/pkg/commands/alias/vcl/custom/delete.go b/pkg/commands/alias/vcl/custom/delete.go new file mode 100644 index 000000000..01b077592 --- /dev/null +++ b/pkg/commands/alias/vcl/custom/delete.go @@ -0,0 +1,29 @@ +package custom + +import ( + "io" + + newcmd "github.com/fastly/cli/pkg/commands/service/vcl/custom" + + "github.com/fastly/cli/pkg/argparser" + "github.com/fastly/cli/pkg/global" + "github.com/fastly/cli/pkg/text" +) + +// DeleteCommand wraps the DeleteCommand from the newcmd package. +type DeleteCommand struct { + *newcmd.DeleteCommand +} + +// NewDeleteCommand returns a usable command registered under the parent. +func NewDeleteCommand(parent argparser.Registerer, g *global.Data) *DeleteCommand { + c := DeleteCommand{newcmd.NewDeleteCommand(parent, g)} + c.CmdClause.Hidden() + return &c +} + +// Exec implements the command interface. +func (c *DeleteCommand) Exec(in io.Reader, out io.Writer) error { + text.Deprecated(out, "Use the 'service vcl custom delete' command instead.") + return c.DeleteCommand.Exec(in, out) +} diff --git a/pkg/commands/alias/vcl/custom/describe.go b/pkg/commands/alias/vcl/custom/describe.go new file mode 100644 index 000000000..79c010b73 --- /dev/null +++ b/pkg/commands/alias/vcl/custom/describe.go @@ -0,0 +1,29 @@ +package custom + +import ( + "io" + + newcmd "github.com/fastly/cli/pkg/commands/service/vcl/custom" + + "github.com/fastly/cli/pkg/argparser" + "github.com/fastly/cli/pkg/global" + "github.com/fastly/cli/pkg/text" +) + +// DescribeCommand wraps the DescribeCommand from the newcmd package. +type DescribeCommand struct { + *newcmd.DescribeCommand +} + +// NewDescribeCommand returns a usable command registered under the parent. +func NewDescribeCommand(parent argparser.Registerer, g *global.Data) *DescribeCommand { + c := DescribeCommand{newcmd.NewDescribeCommand(parent, g)} + c.CmdClause.Hidden() + return &c +} + +// Exec implements the command interface. +func (c *DescribeCommand) Exec(in io.Reader, out io.Writer) error { + text.Deprecated(out, "Use the 'service vcl custom describe' command instead.") + return c.DescribeCommand.Exec(in, out) +} diff --git a/pkg/commands/alias/vcl/custom/doc.go b/pkg/commands/alias/vcl/custom/doc.go new file mode 100644 index 000000000..ec2cea37a --- /dev/null +++ b/pkg/commands/alias/vcl/custom/doc.go @@ -0,0 +1,2 @@ +// Package custom contains deprecated aliases for the service vcl custom commands. +package custom diff --git a/pkg/commands/alias/vcl/custom/list.go b/pkg/commands/alias/vcl/custom/list.go new file mode 100644 index 000000000..7868d7a02 --- /dev/null +++ b/pkg/commands/alias/vcl/custom/list.go @@ -0,0 +1,31 @@ +package custom + +import ( + "io" + + newcmd "github.com/fastly/cli/pkg/commands/service/vcl/custom" + + "github.com/fastly/cli/pkg/argparser" + "github.com/fastly/cli/pkg/global" + "github.com/fastly/cli/pkg/text" +) + +// ListCommand wraps the ListCommand from the newcmd package. +type ListCommand struct { + *newcmd.ListCommand +} + +// NewListCommand returns a usable command registered under the parent. +func NewListCommand(parent argparser.Registerer, g *global.Data) *ListCommand { + c := ListCommand{newcmd.NewListCommand(parent, g)} + c.CmdClause.Hidden() + return &c +} + +// Exec implements the command interface. +func (c *ListCommand) Exec(in io.Reader, out io.Writer) error { + if !c.JSONOutput.Enabled { + text.Deprecated(out, "Use the 'service vcl custom list' command instead.") + } + return c.ListCommand.Exec(in, out) +} diff --git a/pkg/commands/alias/vcl/custom/root.go b/pkg/commands/alias/vcl/custom/root.go new file mode 100644 index 000000000..cd01dd8f8 --- /dev/null +++ b/pkg/commands/alias/vcl/custom/root.go @@ -0,0 +1,31 @@ +package custom + +import ( + "io" + + "github.com/fastly/cli/pkg/argparser" + "github.com/fastly/cli/pkg/global" +) + +// RootCommand is the parent command for all subcommands in this package. +// It should be installed under the primary root command. +type RootCommand struct { + argparser.Base + // no flags +} + +// CommandName is the string to be used to invoke this command. +const CommandName = "custom" + +// NewRootCommand returns a new command registered in the parent. +func NewRootCommand(parent argparser.Registerer, g *global.Data) *RootCommand { + var c RootCommand + c.Globals = g + c.CmdClause = parent.Command(CommandName, "Manipulate Fastly custom VCL files").Hidden() + return &c +} + +// Exec implements the command interface. +func (c *RootCommand) Exec(_ io.Reader, _ io.Writer) error { + panic("unreachable") +} diff --git a/pkg/commands/alias/vcl/custom/update.go b/pkg/commands/alias/vcl/custom/update.go new file mode 100644 index 000000000..4745cc0d8 --- /dev/null +++ b/pkg/commands/alias/vcl/custom/update.go @@ -0,0 +1,29 @@ +package custom + +import ( + "io" + + newcmd "github.com/fastly/cli/pkg/commands/service/vcl/custom" + + "github.com/fastly/cli/pkg/argparser" + "github.com/fastly/cli/pkg/global" + "github.com/fastly/cli/pkg/text" +) + +// UpdateCommand wraps the UpdateCommand from the newcmd package. +type UpdateCommand struct { + *newcmd.UpdateCommand +} + +// NewUpdateCommand returns a usable command registered under the parent. +func NewUpdateCommand(parent argparser.Registerer, g *global.Data) *UpdateCommand { + c := UpdateCommand{newcmd.NewUpdateCommand(parent, g)} + c.CmdClause.Hidden() + return &c +} + +// Exec implements the command interface. +func (c *UpdateCommand) Exec(in io.Reader, out io.Writer) error { + text.Deprecated(out, "Use the 'service vcl custom update' command instead.") + return c.UpdateCommand.Exec(in, out) +} diff --git a/pkg/commands/alias/vcl/describe.go b/pkg/commands/alias/vcl/describe.go new file mode 100644 index 000000000..5a570dcd0 --- /dev/null +++ b/pkg/commands/alias/vcl/describe.go @@ -0,0 +1,29 @@ +package vcl + +import ( + "io" + + newcmd "github.com/fastly/cli/pkg/commands/service/vcl" + + "github.com/fastly/cli/pkg/argparser" + "github.com/fastly/cli/pkg/global" + "github.com/fastly/cli/pkg/text" +) + +// DescribeCommand wraps the DescribeCommand from the newcmd package. +type DescribeCommand struct { + *newcmd.DescribeCommand +} + +// NewDescribeCommand returns a usable command registered under the parent. +func NewDescribeCommand(parent argparser.Registerer, g *global.Data) *DescribeCommand { + c := DescribeCommand{newcmd.NewDescribeCommand(parent, g)} + c.CmdClause.Hidden() + return &c +} + +// Exec implements the command interface. +func (c *DescribeCommand) Exec(in io.Reader, out io.Writer) error { + text.Deprecated(out, "Use the 'service vcl describe' command instead.") + return c.DescribeCommand.Exec(in, out) +} diff --git a/pkg/commands/alias/vcl/doc.go b/pkg/commands/alias/vcl/doc.go new file mode 100644 index 000000000..76ab28780 --- /dev/null +++ b/pkg/commands/alias/vcl/doc.go @@ -0,0 +1,2 @@ +// Package vcl contains deprecated aliases for the service vcl commands. +package vcl diff --git a/pkg/commands/alias/vcl/root.go b/pkg/commands/alias/vcl/root.go new file mode 100644 index 000000000..bc4e3d148 --- /dev/null +++ b/pkg/commands/alias/vcl/root.go @@ -0,0 +1,31 @@ +package vcl + +import ( + "io" + + "github.com/fastly/cli/pkg/argparser" + "github.com/fastly/cli/pkg/global" +) + +// RootCommand is the parent command for all subcommands in this package. +// It should be installed under the primary root command. +type RootCommand struct { + argparser.Base + // no flags +} + +// CommandName is the string to be used to invoke this command. +const CommandName = "vcl" + +// NewRootCommand returns a new command registered in the parent. +func NewRootCommand(parent argparser.Registerer, g *global.Data) *RootCommand { + var c RootCommand + c.Globals = g + c.CmdClause = parent.Command(CommandName, "Manipulate Fastly service version VCL").Hidden() + return &c +} + +// Exec implements the command interface. +func (c *RootCommand) Exec(_ io.Reader, _ io.Writer) error { + panic("unreachable") +} diff --git a/pkg/commands/alias/vcl/snippet/create.go b/pkg/commands/alias/vcl/snippet/create.go new file mode 100644 index 000000000..ffe8f9d43 --- /dev/null +++ b/pkg/commands/alias/vcl/snippet/create.go @@ -0,0 +1,29 @@ +package snippet + +import ( + "io" + + newcmd "github.com/fastly/cli/pkg/commands/service/vcl/snippet" + + "github.com/fastly/cli/pkg/argparser" + "github.com/fastly/cli/pkg/global" + "github.com/fastly/cli/pkg/text" +) + +// CreateCommand wraps the CreateCommand from the newcmd package. +type CreateCommand struct { + *newcmd.CreateCommand +} + +// NewCreateCommand returns a usable command registered under the parent. +func NewCreateCommand(parent argparser.Registerer, g *global.Data) *CreateCommand { + c := CreateCommand{newcmd.NewCreateCommand(parent, g)} + c.CmdClause.Hidden() + return &c +} + +// Exec implements the command interface. +func (c *CreateCommand) Exec(in io.Reader, out io.Writer) error { + text.Deprecated(out, "Use the 'service vcl snippet create' command instead.") + return c.CreateCommand.Exec(in, out) +} diff --git a/pkg/commands/alias/vcl/snippet/delete.go b/pkg/commands/alias/vcl/snippet/delete.go new file mode 100644 index 000000000..e1e453e7b --- /dev/null +++ b/pkg/commands/alias/vcl/snippet/delete.go @@ -0,0 +1,29 @@ +package snippet + +import ( + "io" + + newcmd "github.com/fastly/cli/pkg/commands/service/vcl/snippet" + + "github.com/fastly/cli/pkg/argparser" + "github.com/fastly/cli/pkg/global" + "github.com/fastly/cli/pkg/text" +) + +// DeleteCommand wraps the DeleteCommand from the newcmd package. +type DeleteCommand struct { + *newcmd.DeleteCommand +} + +// NewDeleteCommand returns a usable command registered under the parent. +func NewDeleteCommand(parent argparser.Registerer, g *global.Data) *DeleteCommand { + c := DeleteCommand{newcmd.NewDeleteCommand(parent, g)} + c.CmdClause.Hidden() + return &c +} + +// Exec implements the command interface. +func (c *DeleteCommand) Exec(in io.Reader, out io.Writer) error { + text.Deprecated(out, "Use the 'service vcl snippet delete' command instead.") + return c.DeleteCommand.Exec(in, out) +} diff --git a/pkg/commands/alias/vcl/snippet/describe.go b/pkg/commands/alias/vcl/snippet/describe.go new file mode 100644 index 000000000..e82245476 --- /dev/null +++ b/pkg/commands/alias/vcl/snippet/describe.go @@ -0,0 +1,29 @@ +package snippet + +import ( + "io" + + newcmd "github.com/fastly/cli/pkg/commands/service/vcl/snippet" + + "github.com/fastly/cli/pkg/argparser" + "github.com/fastly/cli/pkg/global" + "github.com/fastly/cli/pkg/text" +) + +// DescribeCommand wraps the DescribeCommand from the newcmd package. +type DescribeCommand struct { + *newcmd.DescribeCommand +} + +// NewDescribeCommand returns a usable command registered under the parent. +func NewDescribeCommand(parent argparser.Registerer, g *global.Data) *DescribeCommand { + c := DescribeCommand{newcmd.NewDescribeCommand(parent, g)} + c.CmdClause.Hidden() + return &c +} + +// Exec implements the command interface. +func (c *DescribeCommand) Exec(in io.Reader, out io.Writer) error { + text.Deprecated(out, "Use the 'service vcl snippet describe' command instead.") + return c.DescribeCommand.Exec(in, out) +} diff --git a/pkg/commands/alias/vcl/snippet/doc.go b/pkg/commands/alias/vcl/snippet/doc.go new file mode 100644 index 000000000..544533e9b --- /dev/null +++ b/pkg/commands/alias/vcl/snippet/doc.go @@ -0,0 +1,2 @@ +// Package snippet contains deprecated aliases for the service vcl snippet commands. +package snippet diff --git a/pkg/commands/alias/vcl/snippet/list.go b/pkg/commands/alias/vcl/snippet/list.go new file mode 100644 index 000000000..87ee855ca --- /dev/null +++ b/pkg/commands/alias/vcl/snippet/list.go @@ -0,0 +1,31 @@ +package snippet + +import ( + "io" + + newcmd "github.com/fastly/cli/pkg/commands/service/vcl/snippet" + + "github.com/fastly/cli/pkg/argparser" + "github.com/fastly/cli/pkg/global" + "github.com/fastly/cli/pkg/text" +) + +// ListCommand wraps the ListCommand from the newcmd package. +type ListCommand struct { + *newcmd.ListCommand +} + +// NewListCommand returns a usable command registered under the parent. +func NewListCommand(parent argparser.Registerer, g *global.Data) *ListCommand { + c := ListCommand{newcmd.NewListCommand(parent, g)} + c.CmdClause.Hidden() + return &c +} + +// Exec implements the command interface. +func (c *ListCommand) Exec(in io.Reader, out io.Writer) error { + if !c.JSONOutput.Enabled { + text.Deprecated(out, "Use the 'service vcl snippet list' command instead.") + } + return c.ListCommand.Exec(in, out) +} diff --git a/pkg/commands/alias/vcl/snippet/root.go b/pkg/commands/alias/vcl/snippet/root.go new file mode 100644 index 000000000..478a39d3c --- /dev/null +++ b/pkg/commands/alias/vcl/snippet/root.go @@ -0,0 +1,31 @@ +package snippet + +import ( + "io" + + "github.com/fastly/cli/pkg/argparser" + "github.com/fastly/cli/pkg/global" +) + +// RootCommand is the parent command for all subcommands in this package. +// It should be installed under the primary root command. +type RootCommand struct { + argparser.Base + // no flags +} + +// CommandName is the string to be used to invoke this command. +const CommandName = "snippet" + +// NewRootCommand returns a new command registered in the parent. +func NewRootCommand(parent argparser.Registerer, g *global.Data) *RootCommand { + var c RootCommand + c.Globals = g + c.CmdClause = parent.Command(CommandName, "Manipulate Fastly VCL snippets").Hidden() + return &c +} + +// Exec implements the command interface. +func (c *RootCommand) Exec(_ io.Reader, _ io.Writer) error { + panic("unreachable") +} diff --git a/pkg/commands/alias/vcl/snippet/update.go b/pkg/commands/alias/vcl/snippet/update.go new file mode 100644 index 000000000..f732abace --- /dev/null +++ b/pkg/commands/alias/vcl/snippet/update.go @@ -0,0 +1,29 @@ +package snippet + +import ( + "io" + + newcmd "github.com/fastly/cli/pkg/commands/service/vcl/snippet" + + "github.com/fastly/cli/pkg/argparser" + "github.com/fastly/cli/pkg/global" + "github.com/fastly/cli/pkg/text" +) + +// UpdateCommand wraps the UpdateCommand from the newcmd package. +type UpdateCommand struct { + *newcmd.UpdateCommand +} + +// NewUpdateCommand returns a usable command registered under the parent. +func NewUpdateCommand(parent argparser.Registerer, g *global.Data) *UpdateCommand { + c := UpdateCommand{newcmd.NewUpdateCommand(parent, g)} + c.CmdClause.Hidden() + return &c +} + +// Exec implements the command interface. +func (c *UpdateCommand) Exec(in io.Reader, out io.Writer) error { + text.Deprecated(out, "Use the 'service vcl snippet update' command instead.") + return c.UpdateCommand.Exec(in, out) +} diff --git a/pkg/commands/commands.go b/pkg/commands/commands.go index d4f4f98d1..64536694e 100644 --- a/pkg/commands/commands.go +++ b/pkg/commands/commands.go @@ -8,6 +8,10 @@ import ( "github.com/fastly/cli/pkg/commands/aclentry" "github.com/fastly/cli/pkg/commands/alerts" aliaspurge "github.com/fastly/cli/pkg/commands/alias/purge" + aliasvcl "github.com/fastly/cli/pkg/commands/alias/vcl" + aliasvclcondition "github.com/fastly/cli/pkg/commands/alias/vcl/condition" + aliasvclcustom "github.com/fastly/cli/pkg/commands/alias/vcl/custom" + aliasvclsnippet "github.com/fastly/cli/pkg/commands/alias/vcl/snippet" "github.com/fastly/cli/pkg/commands/authtoken" "github.com/fastly/cli/pkg/commands/backend" "github.com/fastly/cli/pkg/commands/compute" @@ -715,6 +719,26 @@ func Define( // nolint:revive // function-length // Aliases for deprecated commands aliasPurge := aliaspurge.NewCommand(app, data) + aliasVclRoot := aliasvcl.NewRootCommand(app, data) + aliasVclDescribe := aliasvcl.NewDescribeCommand(aliasVclRoot.CmdClause, data) + aliasVclConditionRoot := aliasvclcondition.NewRootCommand(aliasVclRoot.CmdClause, data) + aliasVclConditionCreate := aliasvclcondition.NewCreateCommand(aliasVclConditionRoot.CmdClause, data) + aliasVclConditionDelete := aliasvclcondition.NewDeleteCommand(aliasVclConditionRoot.CmdClause, data) + aliasVclConditionDescribe := aliasvclcondition.NewDescribeCommand(aliasVclConditionRoot.CmdClause, data) + aliasVclConditionList := aliasvclcondition.NewListCommand(aliasVclConditionRoot.CmdClause, data) + aliasVclConditionUpdate := aliasvclcondition.NewUpdateCommand(aliasVclConditionRoot.CmdClause, data) + aliasVclCustomRoot := aliasvclcustom.NewRootCommand(aliasVclRoot.CmdClause, data) + aliasVclCustomCreate := aliasvclcustom.NewCreateCommand(aliasVclCustomRoot.CmdClause, data) + aliasVclCustomDelete := aliasvclcustom.NewDeleteCommand(aliasVclCustomRoot.CmdClause, data) + aliasVclCustomDescribe := aliasvclcustom.NewDescribeCommand(aliasVclCustomRoot.CmdClause, data) + aliasVclCustomList := aliasvclcustom.NewListCommand(aliasVclCustomRoot.CmdClause, data) + aliasVclCustomUpdate := aliasvclcustom.NewUpdateCommand(aliasVclCustomRoot.CmdClause, data) + aliasVclSnippetRoot := aliasvclsnippet.NewRootCommand(aliasVclRoot.CmdClause, data) + aliasVclSnippetCreate := aliasvclsnippet.NewCreateCommand(aliasVclSnippetRoot.CmdClause, data) + aliasVclSnippetDelete := aliasvclsnippet.NewDeleteCommand(aliasVclSnippetRoot.CmdClause, data) + aliasVclSnippetDescribe := aliasvclsnippet.NewDescribeCommand(aliasVclSnippetRoot.CmdClause, data) + aliasVclSnippetList := aliasvclsnippet.NewListCommand(aliasVclSnippetRoot.CmdClause, data) + aliasVclSnippetUpdate := aliasvclsnippet.NewUpdateCommand(aliasVclSnippetRoot.CmdClause, data) return []argparser.Command{ shellcompleteCmdRoot, @@ -1289,5 +1313,25 @@ func Define( // nolint:revive // function-length versionCmdRoot, whoamiCmdRoot, aliasPurge, + aliasVclRoot, + aliasVclDescribe, + aliasVclConditionRoot, + aliasVclConditionCreate, + aliasVclConditionDelete, + aliasVclConditionDescribe, + aliasVclConditionList, + aliasVclConditionUpdate, + aliasVclCustomRoot, + aliasVclCustomCreate, + aliasVclCustomDelete, + aliasVclCustomDescribe, + aliasVclCustomList, + aliasVclCustomUpdate, + aliasVclSnippetRoot, + aliasVclSnippetCreate, + aliasVclSnippetDelete, + aliasVclSnippetDescribe, + aliasVclSnippetList, + aliasVclSnippetUpdate, } } From 4b8357ae62e847f315a1d145285a09ed85cdf08a Mon Sep 17 00:00:00 2001 From: Richard Carillo Date: Thu, 15 Jan 2026 12:01:46 -0500 Subject: [PATCH 5/8] removed duplicate command entry --- pkg/commands/commands.go | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/commands/commands.go b/pkg/commands/commands.go index 31c97eca2..e4691d7d8 100644 --- a/pkg/commands/commands.go +++ b/pkg/commands/commands.go @@ -648,7 +648,6 @@ func Define( // nolint:revive // function-length servicevclSnippetDescribe := servicevclsnippet.NewDescribeCommand(servicevclSnippetCmdRoot.CmdClause, data) servicevclSnippetList := servicevclsnippet.NewListCommand(servicevclSnippetCmdRoot.CmdClause, data) servicevclSnippetUpdate := servicevclsnippet.NewUpdateCommand(servicevclSnippetCmdRoot.CmdClause, data) - serviceVersionCmdRoot := serviceversion.NewRootCommand(app, data) serviceVersionCmdRoot := serviceversion.NewRootCommand(serviceCmdRoot.CmdClause, data) serviceVersionActivate := serviceversion.NewActivateCommand(serviceVersionCmdRoot.CmdClause, data) serviceVersionClone := serviceversion.NewCloneCommand(serviceVersionCmdRoot.CmdClause, data) From 205f49a549a3e3450f6482a43bbf62c58a343cdf Mon Sep 17 00:00:00 2001 From: Richard Carillo Date: Thu, 15 Jan 2026 13:49:20 -0500 Subject: [PATCH 6/8] doc fixes and command tidying --- CHANGELOG.md | 2 +- pkg/commands/alias/vcl/condition/doc.go | 2 +- pkg/commands/alias/vcl/custom/doc.go | 2 +- pkg/commands/alias/vcl/doc.go | 2 +- pkg/commands/alias/vcl/snippet/doc.go | 2 +- pkg/commands/commands.go | 4 ---- 6 files changed, 5 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ba287cd1b..d6a4c0ccc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,6 @@ ## [Unreleased] ### Breaking: -- breaking(vcl): moved the `vcl` command under the `service` command ([#1616](https://github.com/fastly/cli/pull/1616)) - breaking(domain) - service version oriented `domain` commands have been moved under the `service domain` command. Versionless `domainv1` commands have been moved to the `domain` command ([#1615](https://github.com/fastly/cli/pull/1615)) ### Enhancements: @@ -14,6 +13,7 @@ - refactor(argparser/flags.go): add flag conversion utilities for converting string flags to bools and checking ascending and desecnding flags ([#1611](https://github.com/fastly/cli/pull/1611)) - feat(commands/service/purge): Add 'service purge' command as replacement for 'purge', with an unlisted and deprecated alias of 'purge'. ([#1612](https://github.com/fastly/cli/pull/1612)) - feat(commands/service/version): Add 'service version ...' commands as replacements for 'service-version ...', with unlisted and deprecated aliases of 'service-version ...'. ([#1614](https://github.com/fastly/cli/pull/1614)) +- feat(vcl): moved the `vcl` command under the `service` command ([#1616](https://github.com/fastly/cli/pull/1616)) ### Bug fixes: diff --git a/pkg/commands/alias/vcl/condition/doc.go b/pkg/commands/alias/vcl/condition/doc.go index c95858dec..675a2edd8 100644 --- a/pkg/commands/alias/vcl/condition/doc.go +++ b/pkg/commands/alias/vcl/condition/doc.go @@ -1,2 +1,2 @@ -// Package condition contains deprecated aliases for the service vcl condition commands. +// Package condition contains deprecated aliases for the 'service vcl' condition commands. package condition diff --git a/pkg/commands/alias/vcl/custom/doc.go b/pkg/commands/alias/vcl/custom/doc.go index ec2cea37a..503bcd272 100644 --- a/pkg/commands/alias/vcl/custom/doc.go +++ b/pkg/commands/alias/vcl/custom/doc.go @@ -1,2 +1,2 @@ -// Package custom contains deprecated aliases for the service vcl custom commands. +// Package custom contains deprecated aliases for the 'service vcl' custom commands. package custom diff --git a/pkg/commands/alias/vcl/doc.go b/pkg/commands/alias/vcl/doc.go index 76ab28780..628c1bb2e 100644 --- a/pkg/commands/alias/vcl/doc.go +++ b/pkg/commands/alias/vcl/doc.go @@ -1,2 +1,2 @@ -// Package vcl contains deprecated aliases for the service vcl commands. +// Package vcl contains deprecated aliases for the 'service vcl' commands. package vcl diff --git a/pkg/commands/alias/vcl/snippet/doc.go b/pkg/commands/alias/vcl/snippet/doc.go index 544533e9b..1df8057e3 100644 --- a/pkg/commands/alias/vcl/snippet/doc.go +++ b/pkg/commands/alias/vcl/snippet/doc.go @@ -1,2 +1,2 @@ -// Package snippet contains deprecated aliases for the service vcl snippet commands. +// Package snippet contains deprecated aliases for the 'service vcl' snippet commands. package snippet diff --git a/pkg/commands/commands.go b/pkg/commands/commands.go index e4691d7d8..c0fc6ba1c 100644 --- a/pkg/commands/commands.go +++ b/pkg/commands/commands.go @@ -1323,21 +1323,17 @@ func Define( // nolint:revive // function-length versionCmdRoot, whoamiCmdRoot, aliasPurge, - aliasVclRoot, aliasVclDescribe, - aliasVclConditionRoot, aliasVclConditionCreate, aliasVclConditionDelete, aliasVclConditionDescribe, aliasVclConditionList, aliasVclConditionUpdate, - aliasVclCustomRoot, aliasVclCustomCreate, aliasVclCustomDelete, aliasVclCustomDescribe, aliasVclCustomList, aliasVclCustomUpdate, - aliasVclSnippetRoot, aliasVclSnippetCreate, aliasVclSnippetDelete, aliasVclSnippetDescribe, From fc6c43df4aa377fccb3cc2fd6b62475c6128078c Mon Sep 17 00:00:00 2001 From: Richard Carillo Date: Thu, 15 Jan 2026 14:04:41 -0500 Subject: [PATCH 7/8] changelog fix --- CHANGELOG.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 179447f12..9119746d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,8 +11,6 @@ - feat(ngwaf/rules): add support for CRUD operations for NGWAF rules ([#1605](https://github.com/fastly/cli/pull/1605)) - feat(compute/deploy): added the `--no-default-domain` flag to allow for the skipping of automatic domain creation when deploying a Compute service([#1610](https://github.com/fastly/cli/pull/1610)) - refactor(argparser/flags.go): add flag conversion utilities for converting string flags to bools and checking ascending and desecnding flags ([#1611](https://github.com/fastly/cli/pull/1611)) -- feat(commands/service/purge): Add 'service purge' command as replacement for 'purge', with an unlisted and deprecated alias of 'purge'. ([#1612](https://github.com/fastly/cli/pull/1612)) -- feat(commands/service/version): Add 'service version ...' commands as replacements for 'service-version ...', with unlisted and deprecated aliases of 'service-version ...'. ([#1614](https://github.com/fastly/cli/pull/1614)) - feat(service/purge): Add 'service purge' command as replacement for 'purge', with an unlisted and deprecated alias of 'purge'. ([#1612](https://github.com/fastly/cli/pull/1612)) - feat(service/version): Add 'service version ...' commands as replacements for 'service-version ...', with unlisted and deprecated aliases of 'service-version ...'. ([#1614](https://github.com/fastly/cli/pull/1614)) - feat(vcl): moved the `vcl` command under the `service` command ([#1616](https://github.com/fastly/cli/pull/1616)) From c92dd1fe9ac0e93e0023582e8921321dbe3b207b Mon Sep 17 00:00:00 2001 From: Richard Carillo Date: Thu, 15 Jan 2026 14:11:57 -0500 Subject: [PATCH 8/8] changelog verbiage cleanup --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9119746d7..bdd48d50a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,7 @@ - refactor(argparser/flags.go): add flag conversion utilities for converting string flags to bools and checking ascending and desecnding flags ([#1611](https://github.com/fastly/cli/pull/1611)) - feat(service/purge): Add 'service purge' command as replacement for 'purge', with an unlisted and deprecated alias of 'purge'. ([#1612](https://github.com/fastly/cli/pull/1612)) - feat(service/version): Add 'service version ...' commands as replacements for 'service-version ...', with unlisted and deprecated aliases of 'service-version ...'. ([#1614](https://github.com/fastly/cli/pull/1614)) -- feat(vcl): moved the `vcl` command under the `service` command ([#1616](https://github.com/fastly/cli/pull/1616)) +- feat(vcl): moved the `vcl` command under the `service` command, with an unlisted and deprecated alias of `vcl` ([#1616](https://github.com/fastly/cli/pull/1616)) ### Bug fixes: