Skip to content

Commit 0ae5d5a

Browse files
rcarilrcaril
committed
moved domainv1 to domain
1 parent 861ec97 commit 0ae5d5a

10 files changed

Lines changed: 37 additions & 37 deletions

File tree

‎pkg/commands/commands.go‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
dashboardItem "github.com/fastly/cli/pkg/commands/dashboard/item"
1919
"github.com/fastly/cli/pkg/commands/dictionary"
2020
"github.com/fastly/cli/pkg/commands/dictionaryentry"
21-
"github.com/fastly/cli/pkg/commands/domainv1"
21+
"github.com/fastly/cli/pkg/commands/domain"
2222
"github.com/fastly/cli/pkg/commands/healthcheck"
2323
"github.com/fastly/cli/pkg/commands/imageoptimizerdefaults"
2424
"github.com/fastly/cli/pkg/commands/install"
@@ -93,7 +93,7 @@ import (
9393
"github.com/fastly/cli/pkg/commands/secretstore"
9494
"github.com/fastly/cli/pkg/commands/secretstoreentry"
9595
"github.com/fastly/cli/pkg/commands/service"
96-
"github.com/fastly/cli/pkg/commands/service/domain"
96+
servicedomain "github.com/fastly/cli/pkg/commands/service/domain"
9797
"github.com/fastly/cli/pkg/commands/serviceauth"
9898
"github.com/fastly/cli/pkg/commands/serviceversion"
9999
"github.com/fastly/cli/pkg/commands/shellcomplete"
@@ -221,12 +221,12 @@ func Define( // nolint:revive // function-length
221221
dictionaryEntryUpdate := dictionaryentry.NewUpdateCommand(dictionaryEntryCmdRoot.CmdClause, data)
222222
dictionaryList := dictionary.NewListCommand(dictionaryCmdRoot.CmdClause, data)
223223
dictionaryUpdate := dictionary.NewUpdateCommand(dictionaryCmdRoot.CmdClause, data)
224-
domainv1CmdRoot := domainv1.NewRootCommand(app, data)
225-
domainv1Create := domainv1.NewCreateCommand(domainv1CmdRoot.CmdClause, data)
226-
domainv1Delete := domainv1.NewDeleteCommand(domainv1CmdRoot.CmdClause, data)
227-
domainv1Describe := domainv1.NewDescribeCommand(domainv1CmdRoot.CmdClause, data)
228-
domainv1List := domainv1.NewListCommand(domainv1CmdRoot.CmdClause, data)
229-
domainv1Update := domainv1.NewUpdateCommand(domainv1CmdRoot.CmdClause, data)
224+
domainCmdRoot := domain.NewRootCommand(app, data)
225+
domainCreate := domain.NewCreateCommand(domainCmdRoot.CmdClause, data)
226+
domainDelete := domain.NewDeleteCommand(domainCmdRoot.CmdClause, data)
227+
domainDescribe := domain.NewDescribeCommand(domainCmdRoot.CmdClause, data)
228+
domainList := domain.NewListCommand(domainCmdRoot.CmdClause, data)
229+
domainUpdate := domain.NewUpdateCommand(domainCmdRoot.CmdClause, data)
230230
healthcheckCmdRoot := healthcheck.NewRootCommand(app, data)
231231
healthcheckCreate := healthcheck.NewCreateCommand(healthcheckCmdRoot.CmdClause, data)
232232
healthcheckDelete := healthcheck.NewDeleteCommand(healthcheckCmdRoot.CmdClause, data)
@@ -631,13 +631,13 @@ func Define( // nolint:revive // function-length
631631
serviceVersionStage := serviceversion.NewStageCommand(serviceVersionCmdRoot.CmdClause, data)
632632
serviceVersionUnstage := serviceversion.NewUnstageCommand(serviceVersionCmdRoot.CmdClause, data)
633633
serviceVersionUpdate := serviceversion.NewUpdateCommand(serviceVersionCmdRoot.CmdClause, data)
634-
servicedomainCmdRoot := domain.NewRootCommand(serviceCmdRoot.CmdClause, data)
635-
servicedomainCreate := domain.NewCreateCommand(servicedomainCmdRoot.CmdClause, data)
636-
servicedomainDelete := domain.NewDeleteCommand(servicedomainCmdRoot.CmdClause, data)
637-
servicedomainDescribe := domain.NewDescribeCommand(servicedomainCmdRoot.CmdClause, data)
638-
servicedomainList := domain.NewListCommand(servicedomainCmdRoot.CmdClause, data)
639-
servicedomainUpdate := domain.NewUpdateCommand(servicedomainCmdRoot.CmdClause, data)
640-
servicedomainValidate := domain.NewValidateCommand(servicedomainCmdRoot.CmdClause, data)
634+
servicedomainCmdRoot := servicedomain.NewRootCommand(serviceCmdRoot.CmdClause, data)
635+
servicedomainCreate := servicedomain.NewCreateCommand(servicedomainCmdRoot.CmdClause, data)
636+
servicedomainDelete := servicedomain.NewDeleteCommand(servicedomainCmdRoot.CmdClause, data)
637+
servicedomainDescribe := servicedomain.NewDescribeCommand(servicedomainCmdRoot.CmdClause, data)
638+
servicedomainList := servicedomain.NewListCommand(servicedomainCmdRoot.CmdClause, data)
639+
servicedomainUpdate := servicedomain.NewUpdateCommand(servicedomainCmdRoot.CmdClause, data)
640+
servicedomainValidate := servicedomain.NewValidateCommand(servicedomainCmdRoot.CmdClause, data)
641641
statsCmdRoot := stats.NewRootCommand(app, data)
642642
statsHistorical := stats.NewHistoricalCommand(statsCmdRoot.CmdClause, data)
643643
statsRealtime := stats.NewRealtimeCommand(statsCmdRoot.CmdClause, data)
@@ -799,12 +799,12 @@ func Define( // nolint:revive // function-length
799799
dictionaryEntryUpdate,
800800
dictionaryList,
801801
dictionaryUpdate,
802-
domainv1CmdRoot,
803-
domainv1Create,
804-
domainv1Delete,
805-
domainv1Describe,
806-
domainv1List,
807-
domainv1Update,
802+
domainCmdRoot,
803+
domainCreate,
804+
domainDelete,
805+
domainDescribe,
806+
domainList,
807+
domainUpdate,
808808
healthcheckCmdRoot,
809809
healthcheckCreate,
810810
healthcheckDelete,

pkg/commands/domainv1/common.go renamed to pkg/commands/domain/common.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package domainv1
1+
package domain
22

33
import (
44
"fmt"

pkg/commands/domainv1/create.go renamed to pkg/commands/domain/create.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package domainv1
1+
package domain
22

33
import (
44
"context"

pkg/commands/domainv1/delete.go renamed to pkg/commands/domain/delete.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package domainv1
1+
package domain
22

33
import (
44
"context"

pkg/commands/domainv1/describe.go renamed to pkg/commands/domain/describe.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package domainv1
1+
package domain
22

33
import (
44
"context"

pkg/commands/domainv1/doc.go renamed to pkg/commands/domain/doc.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
// Package domainv1 contains commands to inspect and manipulate Fastly domains.
2-
package domainv1
2+
package domain

pkg/commands/domainv1/domain_test.go renamed to pkg/commands/domain/domain_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package domainv1_test
1+
package domain_test
22

33
import (
44
"bytes"
@@ -10,11 +10,11 @@ import (
1010

1111
"github.com/fastly/go-fastly/v12/fastly/domainmanagement/v1/domains"
1212

13-
root "github.com/fastly/cli/pkg/commands/domainv1"
13+
root "github.com/fastly/cli/pkg/commands/domain"
1414
"github.com/fastly/cli/pkg/testutil"
1515
)
1616

17-
func TestDomainV1Create(t *testing.T) {
17+
func TestDomainCreate(t *testing.T) {
1818
fqdn := "www.example.com"
1919
sid := "123"
2020
did := "domain-id"
@@ -83,7 +83,7 @@ func TestDomainV1Create(t *testing.T) {
8383
testutil.RunCLIScenarios(t, []string{root.CommandName, "create"}, scenarios)
8484
}
8585

86-
func TestDomainV1List(t *testing.T) {
86+
func TestDomainList(t *testing.T) {
8787
fqdn := "www.example.com"
8888
sid := "123"
8989
did := "domain-id"
@@ -135,7 +135,7 @@ func TestDomainV1List(t *testing.T) {
135135
testutil.RunCLIScenarios(t, []string{root.CommandName, "list"}, scenarios)
136136
}
137137

138-
func TestDomainV1Describe(t *testing.T) {
138+
func TestDomainDescribe(t *testing.T) {
139139
fqdn := "www.example.com"
140140
sid := "123"
141141
did := "domain-id"
@@ -183,7 +183,7 @@ func TestDomainV1Describe(t *testing.T) {
183183
testutil.RunCLIScenarios(t, []string{root.CommandName, "describe"}, scenarios)
184184
}
185185

186-
func TestDomainV1Update(t *testing.T) {
186+
func TestDomainUpdate(t *testing.T) {
187187
fqdn := "www.example.com"
188188
sid := "123"
189189
did := "domain-id"
@@ -252,7 +252,7 @@ func TestDomainV1Update(t *testing.T) {
252252
testutil.RunCLIScenarios(t, []string{root.CommandName, "update"}, scenarios)
253253
}
254254

255-
func TestDomainV1Delete(t *testing.T) {
255+
func TestDomainDelete(t *testing.T) {
256256
did := "domain-id"
257257

258258
scenarios := []testutil.CLIScenario{

pkg/commands/domainv1/list.go renamed to pkg/commands/domain/list.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package domainv1
1+
package domain
22

33
import (
44
"context"

pkg/commands/domainv1/root.go renamed to pkg/commands/domain/root.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package domainv1
1+
package domain
22

33
import (
44
"io"
@@ -15,7 +15,7 @@ type RootCommand struct {
1515
}
1616

1717
// CommandName is the string to be used to invoke this command.
18-
const CommandName = "domain-v1"
18+
const CommandName = "domain"
1919

2020
// NewRootCommand returns a new command registered in the parent.
2121
func NewRootCommand(parent argparser.Registerer, g *global.Data) *RootCommand {

pkg/commands/domainv1/update.go renamed to pkg/commands/domain/update.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package domainv1
1+
package domain
22

33
import (
44
"context"

0 commit comments

Comments
 (0)