luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

commands: move catalog subcommands to subdirs

This commit is contained in:
Frank Schroeder 2017-10-17 13:15:23 +02:00 committed by Frank Schröder
parent abd7c73627
commit 0a9478b1f1
9 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
command/cat/catalog.go → command/catalog/catalog.go
View File

@ -1,4 +1,4 @@
package cat package catalog
import ( import (
"github.com/hashicorp/consul/command/flags" "github.com/hashicorp/consul/command/flags"

2
command/cat/catalog_test.go → command/catalog/catalog_test.go
View File

@ -1,4 +1,4 @@
package cat package catalog
import ( import (
"strings" "strings"

2
command/catlistdc/catalog_list_datacenters.go → command/catalog/list/dc/catalog_list_datacenters.go
View File

@ -1,4 +1,4 @@
package catlistdc package dc
import ( import (
"flag" "flag"

2
command/catlistdc/catalog_list_datacenters_test.go → command/catalog/list/dc/catalog_list_datacenters_test.go
View File

@ -1,4 +1,4 @@
package catlistdc package dc
import ( import (
"strings" "strings"

2
command/catlistnodes/catalog_list_nodes.go → command/catalog/list/nodes/catalog_list_nodes.go
View File

@ -1,4 +1,4 @@
package catlistnodes package nodes
import ( import (
"flag" "flag"

2
command/catlistnodes/catalog_list_nodes_test.go → command/catalog/list/nodes/catalog_list_nodes_test.go
View File

@ -1,4 +1,4 @@
package catlistnodes package nodes
import ( import (
"strings" "strings"

2
command/catlistsvc/catalog_list_services.go → command/catalog/list/services/catalog_list_services.go
View File

@ -1,4 +1,4 @@
package catlistsvc package services
import ( import (
"bytes" "bytes"

2
command/catlistsvc/catalog_list_services_test.go → command/catalog/list/services/catalog_list_services_test.go
View File

@ -1,4 +1,4 @@
package catlistsvc package services
import ( import (
"strings" "strings"

16
command/commands.go
View File

@ -6,10 +6,10 @@ import (
"syscall" "syscall"
agentcmd "github.com/hashicorp/consul/command/agent" agentcmd "github.com/hashicorp/consul/command/agent"
"github.com/hashicorp/consul/command/cat" "github.com/hashicorp/consul/command/catalog"
"github.com/hashicorp/consul/command/catlistdc" catlistdccmd "github.com/hashicorp/consul/command/catalog/list/dc"
"github.com/hashicorp/consul/command/catlistnodes" catlistnodescmd "github.com/hashicorp/consul/command/catalog/list/nodes"
"github.com/hashicorp/consul/command/catlistsvc" catlistsvccmd "github.com/hashicorp/consul/command/catalog/list/services"
"github.com/hashicorp/consul/command/event" "github.com/hashicorp/consul/command/event"
execmd "github.com/hashicorp/consul/command/exec" execmd "github.com/hashicorp/consul/command/exec"
"github.com/hashicorp/consul/command/forceleave" "github.com/hashicorp/consul/command/forceleave"
@ -66,10 +66,10 @@ func init() {
), nil ), nil
}, },
"catalog": func() (cli.Command, error) { return cat.New(), nil }, "catalog": func() (cli.Command, error) { return catalog.New(), nil },
"catalog datacenters": func() (cli.Command, error) { return catlistdc.New(ui), nil }, "catalog datacenters": func() (cli.Command, error) { return catlistdccmd.New(ui), nil },
"catalog nodes": func() (cli.Command, error) { return catlistnodes.New(ui), nil }, "catalog nodes": func() (cli.Command, error) { return catlistnodescmd.New(ui), nil },
"catalog services": func() (cli.Command, error) { return catlistsvc.New(ui), nil }, "catalog services": func() (cli.Command, error) { return catlistsvccmd.New(ui), nil },
"event": func() (cli.Command, error) { return event.New(ui), nil }, "event": func() (cli.Command, error) { return event.New(ui), nil },
"exec": func() (cli.Command, error) { return execmd.New(ui, makeShutdownCh()), nil }, "exec": func() (cli.Command, error) { return execmd.New(ui, makeShutdownCh()), nil },
"force-leave": func() (cli.Command, error) { return forceleave.New(ui), nil }, "force-leave": func() (cli.Command, error) { return forceleave.New(ui), nil },