From 861ec97bb20efcdb4375036799e702a4a75c00f5 Mon Sep 17 00:00:00 2001
From: Richard Carillo <rcarillo@fastly.com>
Date: Tue, 13 Jan 2026 12:58:27 -0500
Subject: [PATCH 1/5] move domain commands to service/domain

---
 pkg/commands/commands.go                      | 30 +++++++++----------
 pkg/commands/{ => service}/domain/create.go   |  0
 pkg/commands/{ => service}/domain/delete.go   |  0
 pkg/commands/{ => service}/domain/describe.go |  0
 pkg/commands/{ => service}/domain/doc.go      |  0
 .../{ => service}/domain/domain_test.go       | 15 +++++-----
 pkg/commands/{ => service}/domain/list.go     |  0
 pkg/commands/{ => service}/domain/root.go     |  0
 pkg/commands/{ => service}/domain/update.go   |  0
 pkg/commands/{ => service}/domain/validate.go |  0
 10 files changed, 23 insertions(+), 22 deletions(-)
 rename pkg/commands/{ => service}/domain/create.go (100%)
 rename pkg/commands/{ => service}/domain/delete.go (100%)
 rename pkg/commands/{ => service}/domain/describe.go (100%)
 rename pkg/commands/{ => service}/domain/doc.go (100%)
 rename pkg/commands/{ => service}/domain/domain_test.go (94%)
 rename pkg/commands/{ => service}/domain/list.go (100%)
 rename pkg/commands/{ => service}/domain/root.go (100%)
 rename pkg/commands/{ => service}/domain/update.go (100%)
 rename pkg/commands/{ => service}/domain/validate.go (100%)

diff --git a/pkg/commands/commands.go b/pkg/commands/commands.go
index 0e744b566..a18f35b29 100644
--- a/pkg/commands/commands.go
+++ b/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,
diff --git a/pkg/commands/domain/create.go b/pkg/commands/service/domain/create.go
similarity index 100%
rename from pkg/commands/domain/create.go
rename to pkg/commands/service/domain/create.go
diff --git a/pkg/commands/domain/delete.go b/pkg/commands/service/domain/delete.go
similarity index 100%
rename from pkg/commands/domain/delete.go
rename to pkg/commands/service/domain/delete.go
diff --git a/pkg/commands/domain/describe.go b/pkg/commands/service/domain/describe.go
similarity index 100%
rename from pkg/commands/domain/describe.go
rename to pkg/commands/service/domain/describe.go
diff --git a/pkg/commands/domain/doc.go b/pkg/commands/service/domain/doc.go
similarity index 100%
rename from pkg/commands/domain/doc.go
rename to pkg/commands/service/domain/doc.go
diff --git a/pkg/commands/domain/domain_test.go b/pkg/commands/service/domain/domain_test.go
similarity index 94%
rename from pkg/commands/domain/domain_test.go
rename to pkg/commands/service/domain/domain_test.go
index e63ec49a1..b55c347fd 100644
--- a/pkg/commands/domain/domain_test.go
+++ b/pkg/commands/service/domain/domain_test.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")
diff --git a/pkg/commands/domain/list.go b/pkg/commands/service/domain/list.go
similarity index 100%
rename from pkg/commands/domain/list.go
rename to pkg/commands/service/domain/list.go
diff --git a/pkg/commands/domain/root.go b/pkg/commands/service/domain/root.go
similarity index 100%
rename from pkg/commands/domain/root.go
rename to pkg/commands/service/domain/root.go
diff --git a/pkg/commands/domain/update.go b/pkg/commands/service/domain/update.go
similarity index 100%
rename from pkg/commands/domain/update.go
rename to pkg/commands/service/domain/update.go
diff --git a/pkg/commands/domain/validate.go b/pkg/commands/service/domain/validate.go
similarity index 100%
rename from pkg/commands/domain/validate.go
rename to pkg/commands/service/domain/validate.go

From 0ae5d5a5ea03ec9573d11ed2096fc0f3dbb2c786 Mon Sep 17 00:00:00 2001
From: Richard Carillo <rcarillo@fastly.com>
Date: Tue, 13 Jan 2026 13:25:37 -0500
Subject: [PATCH 2/5] moved domainv1 to domain

---
 pkg/commands/commands.go                      | 42 +++++++++----------
 pkg/commands/{domainv1 => domain}/common.go   |  2 +-
 pkg/commands/{domainv1 => domain}/create.go   |  2 +-
 pkg/commands/{domainv1 => domain}/delete.go   |  2 +-
 pkg/commands/{domainv1 => domain}/describe.go |  2 +-
 pkg/commands/{domainv1 => domain}/doc.go      |  2 +-
 .../{domainv1 => domain}/domain_test.go       | 14 +++----
 pkg/commands/{domainv1 => domain}/list.go     |  2 +-
 pkg/commands/{domainv1 => domain}/root.go     |  4 +-
 pkg/commands/{domainv1 => domain}/update.go   |  2 +-
 10 files changed, 37 insertions(+), 37 deletions(-)
 rename pkg/commands/{domainv1 => domain}/common.go (98%)
 rename pkg/commands/{domainv1 => domain}/create.go (99%)
 rename pkg/commands/{domainv1 => domain}/delete.go (98%)
 rename pkg/commands/{domainv1 => domain}/describe.go (99%)
 rename pkg/commands/{domainv1 => domain}/doc.go (82%)
 rename pkg/commands/{domainv1 => domain}/domain_test.go (96%)
 rename pkg/commands/{domainv1 => domain}/list.go (99%)
 rename pkg/commands/{domainv1 => domain}/root.go (93%)
 rename pkg/commands/{domainv1 => domain}/update.go (99%)

diff --git a/pkg/commands/commands.go b/pkg/commands/commands.go
index a18f35b29..abf99630c 100644
--- a/pkg/commands/commands.go
+++ b/pkg/commands/commands.go
@@ -18,7 +18,7 @@ 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/domainv1"
+	"github.com/fastly/cli/pkg/commands/domain"
 	"github.com/fastly/cli/pkg/commands/healthcheck"
 	"github.com/fastly/cli/pkg/commands/imageoptimizerdefaults"
 	"github.com/fastly/cli/pkg/commands/install"
@@ -93,7 +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"
+	servicedomain "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,12 +221,12 @@ func Define( // nolint:revive // function-length
 	dictionaryEntryUpdate := dictionaryentry.NewUpdateCommand(dictionaryEntryCmdRoot.CmdClause, data)
 	dictionaryList := dictionary.NewListCommand(dictionaryCmdRoot.CmdClause, data)
 	dictionaryUpdate := dictionary.NewUpdateCommand(dictionaryCmdRoot.CmdClause, data)
-	domainv1CmdRoot := domainv1.NewRootCommand(app, data)
-	domainv1Create := domainv1.NewCreateCommand(domainv1CmdRoot.CmdClause, data)
-	domainv1Delete := domainv1.NewDeleteCommand(domainv1CmdRoot.CmdClause, data)
-	domainv1Describe := domainv1.NewDescribeCommand(domainv1CmdRoot.CmdClause, data)
-	domainv1List := domainv1.NewListCommand(domainv1CmdRoot.CmdClause, data)
-	domainv1Update := domainv1.NewUpdateCommand(domainv1CmdRoot.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)
 	healthcheckCmdRoot := healthcheck.NewRootCommand(app, data)
 	healthcheckCreate := healthcheck.NewCreateCommand(healthcheckCmdRoot.CmdClause, data)
 	healthcheckDelete := healthcheck.NewDeleteCommand(healthcheckCmdRoot.CmdClause, data)
@@ -631,13 +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)
+	servicedomainCmdRoot := servicedomain.NewRootCommand(serviceCmdRoot.CmdClause, data)
+	servicedomainCreate := servicedomain.NewCreateCommand(servicedomainCmdRoot.CmdClause, data)
+	servicedomainDelete := servicedomain.NewDeleteCommand(servicedomainCmdRoot.CmdClause, data)
+	servicedomainDescribe := servicedomain.NewDescribeCommand(servicedomainCmdRoot.CmdClause, data)
+	servicedomainList := servicedomain.NewListCommand(servicedomainCmdRoot.CmdClause, data)
+	servicedomainUpdate := servicedomain.NewUpdateCommand(servicedomainCmdRoot.CmdClause, data)
+	servicedomainValidate := servicedomain.NewValidateCommand(servicedomainCmdRoot.CmdClause, data)
 	statsCmdRoot := stats.NewRootCommand(app, data)
 	statsHistorical := stats.NewHistoricalCommand(statsCmdRoot.CmdClause, data)
 	statsRealtime := stats.NewRealtimeCommand(statsCmdRoot.CmdClause, data)
@@ -799,12 +799,12 @@ func Define( // nolint:revive // function-length
 		dictionaryEntryUpdate,
 		dictionaryList,
 		dictionaryUpdate,
-		domainv1CmdRoot,
-		domainv1Create,
-		domainv1Delete,
-		domainv1Describe,
-		domainv1List,
-		domainv1Update,
+		domainCmdRoot,
+		domainCreate,
+		domainDelete,
+		domainDescribe,
+		domainList,
+		domainUpdate,
 		healthcheckCmdRoot,
 		healthcheckCreate,
 		healthcheckDelete,
diff --git a/pkg/commands/domainv1/common.go b/pkg/commands/domain/common.go
similarity index 98%
rename from pkg/commands/domainv1/common.go
rename to pkg/commands/domain/common.go
index e4b0289a2..837ed1607 100644
--- a/pkg/commands/domainv1/common.go
+++ b/pkg/commands/domain/common.go
@@ -1,4 +1,4 @@
-package domainv1
+package domain
 
 import (
 	"fmt"
diff --git a/pkg/commands/domainv1/create.go b/pkg/commands/domain/create.go
similarity index 99%
rename from pkg/commands/domainv1/create.go
rename to pkg/commands/domain/create.go
index 26fbb45c0..437fea761 100644
--- a/pkg/commands/domainv1/create.go
+++ b/pkg/commands/domain/create.go
@@ -1,4 +1,4 @@
-package domainv1
+package domain
 
 import (
 	"context"
diff --git a/pkg/commands/domainv1/delete.go b/pkg/commands/domain/delete.go
similarity index 98%
rename from pkg/commands/domainv1/delete.go
rename to pkg/commands/domain/delete.go
index f3eab555b..d85c6a1e9 100644
--- a/pkg/commands/domainv1/delete.go
+++ b/pkg/commands/domain/delete.go
@@ -1,4 +1,4 @@
-package domainv1
+package domain
 
 import (
 	"context"
diff --git a/pkg/commands/domainv1/describe.go b/pkg/commands/domain/describe.go
similarity index 99%
rename from pkg/commands/domainv1/describe.go
rename to pkg/commands/domain/describe.go
index 82aeeb911..d569c7300 100644
--- a/pkg/commands/domainv1/describe.go
+++ b/pkg/commands/domain/describe.go
@@ -1,4 +1,4 @@
-package domainv1
+package domain
 
 import (
 	"context"
diff --git a/pkg/commands/domainv1/doc.go b/pkg/commands/domain/doc.go
similarity index 82%
rename from pkg/commands/domainv1/doc.go
rename to pkg/commands/domain/doc.go
index bcaed6abe..826671756 100644
--- a/pkg/commands/domainv1/doc.go
+++ b/pkg/commands/domain/doc.go
@@ -1,2 +1,2 @@
 // Package domainv1 contains commands to inspect and manipulate Fastly domains.
-package domainv1
+package domain
diff --git a/pkg/commands/domainv1/domain_test.go b/pkg/commands/domain/domain_test.go
similarity index 96%
rename from pkg/commands/domainv1/domain_test.go
rename to pkg/commands/domain/domain_test.go
index 93bc916b7..d4dc284fd 100644
--- a/pkg/commands/domainv1/domain_test.go
+++ b/pkg/commands/domain/domain_test.go
@@ -1,4 +1,4 @@
-package domainv1_test
+package domain_test
 
 import (
 	"bytes"
@@ -10,11 +10,11 @@ import (
 
 	"github.com/fastly/go-fastly/v12/fastly/domainmanagement/v1/domains"
 
-	root "github.com/fastly/cli/pkg/commands/domainv1"
+	root "github.com/fastly/cli/pkg/commands/domain"
 	"github.com/fastly/cli/pkg/testutil"
 )
 
-func TestDomainV1Create(t *testing.T) {
+func TestDomainCreate(t *testing.T) {
 	fqdn := "www.example.com"
 	sid := "123"
 	did := "domain-id"
@@ -83,7 +83,7 @@ func TestDomainV1Create(t *testing.T) {
 	testutil.RunCLIScenarios(t, []string{root.CommandName, "create"}, scenarios)
 }
 
-func TestDomainV1List(t *testing.T) {
+func TestDomainList(t *testing.T) {
 	fqdn := "www.example.com"
 	sid := "123"
 	did := "domain-id"
@@ -135,7 +135,7 @@ func TestDomainV1List(t *testing.T) {
 	testutil.RunCLIScenarios(t, []string{root.CommandName, "list"}, scenarios)
 }
 
-func TestDomainV1Describe(t *testing.T) {
+func TestDomainDescribe(t *testing.T) {
 	fqdn := "www.example.com"
 	sid := "123"
 	did := "domain-id"
@@ -183,7 +183,7 @@ func TestDomainV1Describe(t *testing.T) {
 	testutil.RunCLIScenarios(t, []string{root.CommandName, "describe"}, scenarios)
 }
 
-func TestDomainV1Update(t *testing.T) {
+func TestDomainUpdate(t *testing.T) {
 	fqdn := "www.example.com"
 	sid := "123"
 	did := "domain-id"
@@ -252,7 +252,7 @@ func TestDomainV1Update(t *testing.T) {
 	testutil.RunCLIScenarios(t, []string{root.CommandName, "update"}, scenarios)
 }
 
-func TestDomainV1Delete(t *testing.T) {
+func TestDomainDelete(t *testing.T) {
 	did := "domain-id"
 
 	scenarios := []testutil.CLIScenario{
diff --git a/pkg/commands/domainv1/list.go b/pkg/commands/domain/list.go
similarity index 99%
rename from pkg/commands/domainv1/list.go
rename to pkg/commands/domain/list.go
index 4a0f8b71e..09fc73ece 100644
--- a/pkg/commands/domainv1/list.go
+++ b/pkg/commands/domain/list.go
@@ -1,4 +1,4 @@
-package domainv1
+package domain
 
 import (
 	"context"
diff --git a/pkg/commands/domainv1/root.go b/pkg/commands/domain/root.go
similarity index 93%
rename from pkg/commands/domainv1/root.go
rename to pkg/commands/domain/root.go
index 945db65cc..010393278 100644
--- a/pkg/commands/domainv1/root.go
+++ b/pkg/commands/domain/root.go
@@ -1,4 +1,4 @@
-package domainv1
+package domain
 
 import (
 	"io"
@@ -15,7 +15,7 @@ type RootCommand struct {
 }
 
 // CommandName is the string to be used to invoke this command.
-const CommandName = "domain-v1"
+const CommandName = "domain"
 
 // NewRootCommand returns a new command registered in the parent.
 func NewRootCommand(parent argparser.Registerer, g *global.Data) *RootCommand {
diff --git a/pkg/commands/domainv1/update.go b/pkg/commands/domain/update.go
similarity index 99%
rename from pkg/commands/domainv1/update.go
rename to pkg/commands/domain/update.go
index de74f6b21..d6977c110 100644
--- a/pkg/commands/domainv1/update.go
+++ b/pkg/commands/domain/update.go
@@ -1,4 +1,4 @@
-package domainv1
+package domain
 
 import (
 	"context"

From fc6d98591b7853083be27a062534277f94c14d8e Mon Sep 17 00:00:00 2001
From: Richard Carillo <rcarillo@fastly.com>
Date: Tue, 13 Jan 2026 13:32:03 -0500
Subject: [PATCH 3/5] changelog update

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f18dbec44..0c7e35cd3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## [Unreleased]
 
 ### Breaking:
+- 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:
 - feat(rust): Allow testing with prerelease Rust versions ([#1604](https://github.com/fastly/cli/pull/1604))

From 0901b7cce7a78af6ab383af31e1187187c2fbc12 Mon Sep 17 00:00:00 2001
From: Richard Carillo <rcarillo@fastly.com>
Date: Tue, 13 Jan 2026 14:05:57 -0500
Subject: [PATCH 4/5] commands updated in run_test.go

---
 pkg/app/run_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/app/run_test.go b/pkg/app/run_test.go
index e951b37bc..39788ade2 100644
--- a/pkg/app/run_test.go
+++ b/pkg/app/run_test.go
@@ -73,7 +73,6 @@ dashboard
 dictionary
 dictionary-entry
 domain
-domain-v1
 healthcheck
 imageoptimizer
 install
@@ -93,6 +92,7 @@ secret-store
 secret-store-entry
 service
 service-auth
+service-domain
 service-version
 stats
 tls-config

From 8f2d8788540309b8dccaa05add5361f419e55d6d Mon Sep 17 00:00:00 2001
From: Richard Carillo <rcarillo@fastly.com>
Date: Tue, 13 Jan 2026 14:17:56 -0500
Subject: [PATCH 5/5] removed non-top level test from run_test.go

---
 pkg/app/run_test.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkg/app/run_test.go b/pkg/app/run_test.go
index 39788ade2..b724d261f 100644
--- a/pkg/app/run_test.go
+++ b/pkg/app/run_test.go
@@ -92,7 +92,6 @@ secret-store
 secret-store-entry
 service
 service-auth
-service-domain
 service-version
 stats
 tls-config