move domain commands to service/domain

Author: rcaril

pkg/commands/commands.go

@@ -18,7 +18,6 @@ import (
 	dashboardItem "github.com/fastly/cli/pkg/commands/dashboard/item"
 	"github.com/fastly/cli/pkg/commands/dictionary"
 	"github.com/fastly/cli/pkg/commands/dictionaryentry"
-	"github.com/fastly/cli/pkg/commands/domain"
 	"github.com/fastly/cli/pkg/commands/domainv1"
 	"github.com/fastly/cli/pkg/commands/healthcheck"
 	"github.com/fastly/cli/pkg/commands/imageoptimizerdefaults"
@@ -94,6 +93,7 @@ import (
 	"github.com/fastly/cli/pkg/commands/secretstore"
 	"github.com/fastly/cli/pkg/commands/secretstoreentry"
 	"github.com/fastly/cli/pkg/commands/service"
+	"github.com/fastly/cli/pkg/commands/service/domain"
 	"github.com/fastly/cli/pkg/commands/serviceauth"
 	"github.com/fastly/cli/pkg/commands/serviceversion"
 	"github.com/fastly/cli/pkg/commands/shellcomplete"
@@ -221,13 +221,6 @@ func Define( // nolint:revive // function-length
 	dictionaryEntryUpdate := dictionaryentry.NewUpdateCommand(dictionaryEntryCmdRoot.CmdClause, data)
 	dictionaryList := dictionary.NewListCommand(dictionaryCmdRoot.CmdClause, data)
 	dictionaryUpdate := dictionary.NewUpdateCommand(dictionaryCmdRoot.CmdClause, data)
-	domainCmdRoot := domain.NewRootCommand(app, data)
-	domainCreate := domain.NewCreateCommand(domainCmdRoot.CmdClause, data)
-	domainDelete := domain.NewDeleteCommand(domainCmdRoot.CmdClause, data)
-	domainDescribe := domain.NewDescribeCommand(domainCmdRoot.CmdClause, data)
-	domainList := domain.NewListCommand(domainCmdRoot.CmdClause, data)
-	domainUpdate := domain.NewUpdateCommand(domainCmdRoot.CmdClause, data)
-	domainValidate := domain.NewValidateCommand(domainCmdRoot.CmdClause, data)
 	domainv1CmdRoot := domainv1.NewRootCommand(app, data)
 	domainv1Create := domainv1.NewCreateCommand(domainv1CmdRoot.CmdClause, data)
 	domainv1Delete := domainv1.NewDeleteCommand(domainv1CmdRoot.CmdClause, data)
@@ -638,6 +631,13 @@ func Define( // nolint:revive // function-length
 	serviceVersionStage := serviceversion.NewStageCommand(serviceVersionCmdRoot.CmdClause, data)
 	serviceVersionUnstage := serviceversion.NewUnstageCommand(serviceVersionCmdRoot.CmdClause, data)
 	serviceVersionUpdate := serviceversion.NewUpdateCommand(serviceVersionCmdRoot.CmdClause, data)
+	servicedomainCmdRoot := domain.NewRootCommand(serviceCmdRoot.CmdClause, data)
+	servicedomainCreate := domain.NewCreateCommand(servicedomainCmdRoot.CmdClause, data)
+	servicedomainDelete := domain.NewDeleteCommand(servicedomainCmdRoot.CmdClause, data)
+	servicedomainDescribe := domain.NewDescribeCommand(servicedomainCmdRoot.CmdClause, data)
+	servicedomainList := domain.NewListCommand(servicedomainCmdRoot.CmdClause, data)
+	servicedomainUpdate := domain.NewUpdateCommand(servicedomainCmdRoot.CmdClause, data)
+	servicedomainValidate := domain.NewValidateCommand(servicedomainCmdRoot.CmdClause, data)
 	statsCmdRoot := stats.NewRootCommand(app, data)
 	statsHistorical := stats.NewHistoricalCommand(statsCmdRoot.CmdClause, data)
 	statsRealtime := stats.NewRealtimeCommand(statsCmdRoot.CmdClause, data)
@@ -799,13 +799,6 @@ func Define( // nolint:revive // function-length
 		dictionaryEntryUpdate,
 		dictionaryList,
 		dictionaryUpdate,
-		domainCmdRoot,
-		domainCreate,
-		domainDelete,
-		domainDescribe,
-		domainList,
-		domainUpdate,
-		domainValidate,
 		domainv1CmdRoot,
 		domainv1Create,
 		domainv1Delete,
@@ -1201,6 +1194,13 @@ func Define( // nolint:revive // function-length
 		serviceauthDescribe,
 		serviceauthList,
 		serviceauthUpdate,
+		servicedomainCmdRoot,
+		servicedomainCreate,
+		servicedomainDelete,
+		servicedomainDescribe,
+		servicedomainList,
+		servicedomainUpdate,
+		servicedomainValidate,
 		serviceVersionActivate,
 		serviceVersionClone,
 		serviceVersionCmdRoot,

pkg/commands/domain/create.go pkg/commands/service/domain/create.gopkg/commands/domain/create.go renamed to pkg/commands/service/domain/create.go

@@ -9,7 +9,8 @@ import (
 
 	"github.com/fastly/go-fastly/v12/fastly"
 
-	root "github.com/fastly/cli/pkg/commands/domain"
+	root "github.com/fastly/cli/pkg/commands/service"
+	sub "github.com/fastly/cli/pkg/commands/service/domain"
 	"github.com/fastly/cli/pkg/mock"
 	"github.com/fastly/cli/pkg/testutil"
 )
@@ -39,7 +40,7 @@ func TestDomainCreate(t *testing.T) {
 			WantError: errTest.Error(),
 		},
 	}
-	testutil.RunCLIScenarios(t, []string{root.CommandName, "create"}, scenarios)
+	testutil.RunCLIScenarios(t, []string{root.CommandName, sub.CommandName, "create"}, scenarios)
 }
 
 func TestDomainList(t *testing.T) {
@@ -93,7 +94,7 @@ func TestDomainList(t *testing.T) {
 			WantError: errTest.Error(),
 		},
 	}
-	testutil.RunCLIScenarios(t, []string{root.CommandName, "list"}, scenarios)
+	testutil.RunCLIScenarios(t, []string{root.CommandName, sub.CommandName, "list"}, scenarios)
 }
 
 func TestDomainDescribe(t *testing.T) {
@@ -119,7 +120,7 @@ func TestDomainDescribe(t *testing.T) {
 			WantOutput: describeDomainOutput,
 		},
 	}
-	testutil.RunCLIScenarios(t, []string{root.CommandName, "describe"}, scenarios)
+	testutil.RunCLIScenarios(t, []string{root.CommandName, sub.CommandName, "describe"}, scenarios)
 }
 
 func TestDomainUpdate(t *testing.T) {
@@ -156,7 +157,7 @@ func TestDomainUpdate(t *testing.T) {
 			WantOutput: "Updated domain www.example.com (service 123 version 4)",
 		},
 	}
-	testutil.RunCLIScenarios(t, []string{root.CommandName, "update"}, scenarios)
+	testutil.RunCLIScenarios(t, []string{root.CommandName, sub.CommandName, "update"}, scenarios)
 }
 
 func TestDomainDelete(t *testing.T) {
@@ -184,7 +185,7 @@ func TestDomainDelete(t *testing.T) {
 			WantOutput: "Deleted domain www.test.com (service 123 version 4)",
 		},
 	}
-	testutil.RunCLIScenarios(t, []string{root.CommandName, "delete"}, scenarios)
+	testutil.RunCLIScenarios(t, []string{root.CommandName, sub.CommandName, "delete"}, scenarios)
 }
 
 func TestDomainValidate(t *testing.T) {
@@ -257,7 +258,7 @@ func TestDomainValidate(t *testing.T) {
 		},
 	}
 
-	testutil.RunCLIScenarios(t, []string{root.CommandName, "validate"}, scenarios)
+	testutil.RunCLIScenarios(t, []string{root.CommandName, sub.CommandName, "validate"}, scenarios)
 }
 
 var errTest = errors.New("fixture error")