Skip to content

Commit 1c7773d

Browse files
committed
update how commands configured
1 parent c4a9b68 commit 1c7773d

16 files changed

+126
-110
lines changed

registrar-cli/cmd/account.go

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
// Package cmd for parsing command line arguments
2+
package cmd
3+
4+
import (
5+
"github.com/spf13/cobra"
6+
)
7+
8+
// accountCmd represents the account command
9+
var accountCmd = &cobra.Command{
10+
Use: "account",
11+
Short: "account command represents events on account on Threefold grid4",
12+
}
13+
14+
func init() {
15+
rootCmd.AddCommand(accountCmd)
16+
}

registrar-cli/cmd/create_account.go renamed to registrar-cli/cmd/account_create.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77
"github.com/threefoldtech/tfgrid4-sdk-go/registrar-cli/internal/cmd"
88
)
99

10-
// createAccountCmd represents the cancel command
11-
var createAccountCmd = &cobra.Command{
12-
Use: "account",
10+
// accountCreateCmd represents the account create command
11+
var accountCreateCmd = &cobra.Command{
12+
Use: "create",
1313
Short: "create new account in node registrar",
1414
RunE: func(cobraCmd *cobra.Command, args []string) error {
1515
seed, err := cobraCmd.Flags().GetString("seed")
@@ -44,9 +44,9 @@ var createAccountCmd = &cobra.Command{
4444
}
4545

4646
func init() {
47-
createCmd.AddCommand(createAccountCmd)
48-
createAccountCmd.Flags().StringP("seed", "s", "", "account seed key")
49-
createAccountCmd.Flags().StringP("network", "n", "", "network (dev, qa, test, main)")
50-
createAccountCmd.Flags().StringArrayP("relays", "r", nil, "relays urls")
51-
createAccountCmd.Flags().StringP("rmb-enc-key", "k", "", "rmb encryption key")
47+
accountCmd.AddCommand(accountCreateCmd)
48+
accountCreateCmd.Flags().StringP("seed", "s", "", "account seed key")
49+
accountCreateCmd.Flags().StringP("network", "n", "", "network (dev, qa, test, main)")
50+
accountCreateCmd.Flags().StringArrayP("relays", "r", nil, "relays urls")
51+
accountCreateCmd.Flags().StringP("rmb-enc-key", "k", "", "rmb encryption key")
5252
}

registrar-cli/cmd/get_account.go renamed to registrar-cli/cmd/account_get.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77
"github.com/threefoldtech/tfgrid4-sdk-go/registrar-cli/internal/cmd"
88
)
99

10-
// getAccountCmd represents the cancel command
11-
var getAccountCmd = &cobra.Command{
12-
Use: "account",
10+
// accountGetCmd represents the account get command
11+
var accountGetCmd = &cobra.Command{
12+
Use: "get",
1313
Short: "get account from node registrar",
1414
RunE: func(cobraCmd *cobra.Command, args []string) error {
1515
network, err := cobraCmd.Flags().GetString("network")
@@ -39,8 +39,8 @@ var getAccountCmd = &cobra.Command{
3939
}
4040

4141
func init() {
42-
getCmd.AddCommand(getAccountCmd)
43-
getAccountCmd.Flags().StringP("network", "n", "", "network (dev, qa, test, main)")
44-
getAccountCmd.Flags().Uint64P("twin-id", "i", 0, "twin id")
45-
getAccountCmd.Flags().StringP("public-key", "k", "", "account public key")
42+
accountCmd.AddCommand(accountGetCmd)
43+
accountGetCmd.Flags().StringP("network", "n", "", "network (dev, qa, test, main)")
44+
accountGetCmd.Flags().Uint64P("twin-id", "i", 0, "twin id")
45+
accountGetCmd.Flags().StringP("public-key", "k", "", "account public key")
4646
}

registrar-cli/cmd/update_account.go renamed to registrar-cli/cmd/account_update.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77
"github.com/threefoldtech/tfgrid4-sdk-go/registrar-cli/internal/cmd"
88
)
99

10-
// UpdateAccountCmd represents the cancel command
11-
var UpdateAccountCmd = &cobra.Command{
12-
Use: "account",
10+
// accountUpdateCmd represents the account update command
11+
var accountUpdateCmd = &cobra.Command{
12+
Use: "update",
1313
Short: "update account in node registrar",
1414
RunE: func(cobraCmd *cobra.Command, args []string) error {
1515
seed, err := cobraCmd.Flags().GetString("seed")
@@ -44,9 +44,9 @@ var UpdateAccountCmd = &cobra.Command{
4444
}
4545

4646
func init() {
47-
updateCmd.AddCommand(UpdateAccountCmd)
48-
UpdateAccountCmd.Flags().StringP("seed", "s", "", "account seed key")
49-
UpdateAccountCmd.Flags().StringP("network", "n", "", "network (dev, qa, test, main)")
50-
UpdateAccountCmd.Flags().StringArrayP("relays", "r", nil, "relays urls")
51-
UpdateAccountCmd.Flags().StringP("rmb-enc-key", "k", "", "rmb encryption key")
47+
accountCmd.AddCommand(accountUpdateCmd)
48+
accountUpdateCmd.Flags().StringP("seed", "s", "", "account seed key")
49+
accountUpdateCmd.Flags().StringP("network", "n", "", "network (dev, qa, test, main)")
50+
accountUpdateCmd.Flags().StringArrayP("relays", "r", nil, "relays urls")
51+
accountUpdateCmd.Flags().StringP("rmb-enc-key", "k", "", "rmb encryption key")
5252
}

registrar-cli/cmd/create.go

Lines changed: 0 additions & 16 deletions
This file was deleted.

registrar-cli/cmd/farm.go

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
// Package cmd for parsing command line arguments
2+
package cmd
3+
4+
import (
5+
"github.com/spf13/cobra"
6+
)
7+
8+
// createCmd represents the farm command
9+
var farmCmd = &cobra.Command{
10+
Use: "farm",
11+
Short: "farm command represents events on farm on Threefold grid4",
12+
}
13+
14+
func init() {
15+
rootCmd.AddCommand(farmCmd)
16+
}

registrar-cli/cmd/create_farm.go renamed to registrar-cli/cmd/farm_create.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77
"github.com/threefoldtech/tfgrid4-sdk-go/registrar-cli/internal/cmd"
88
)
99

10-
// createFarmCmd represents the cancel command
11-
var createFarmCmd = &cobra.Command{
12-
Use: "farm",
10+
// farmCreateCmd represents the farm create command
11+
var farmCreateCmd = &cobra.Command{
12+
Use: "create",
1313
Short: "create new farm in node registrar",
1414
RunE: func(cobraCmd *cobra.Command, args []string) error {
1515
seed, err := cobraCmd.Flags().GetString("seed")
@@ -44,9 +44,9 @@ var createFarmCmd = &cobra.Command{
4444
}
4545

4646
func init() {
47-
createCmd.AddCommand(createFarmCmd)
48-
createFarmCmd.Flags().StringP("seed", "s", "", "account seed key")
49-
createFarmCmd.Flags().StringP("network", "n", "", "network (dev, qa, test, main)")
50-
createFarmCmd.Flags().StringP("farm-name", "f", "", "farm name")
51-
createFarmCmd.Flags().BoolP("dedicated", "d", false, "is farm dedicated")
47+
farmCmd.AddCommand(farmCreateCmd)
48+
farmCreateCmd.Flags().StringP("seed", "s", "", "account seed key")
49+
farmCreateCmd.Flags().StringP("network", "n", "", "network (dev, qa, test, main)")
50+
farmCreateCmd.Flags().StringP("farm-name", "f", "", "farm name")
51+
farmCreateCmd.Flags().BoolP("dedicated", "d", false, "is farm dedicated")
5252
}

registrar-cli/cmd/get_farm.go renamed to registrar-cli/cmd/farm_get.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99
"github.com/threefoldtech/tfgrid4-sdk-go/registrar-cli/internal/cmd"
1010
)
1111

12-
// getFarmCmd represents the cancel command
13-
var getFarmCmd = &cobra.Command{
14-
Use: "farm",
12+
// farmGetCmd represents the farm get command
13+
var farmGetCmd = &cobra.Command{
14+
Use: "get",
1515
Short: "get farm from node registrar",
1616
RunE: func(cobraCmd *cobra.Command, args []string) error {
1717
network, err := cobraCmd.Flags().GetString("network")
@@ -39,7 +39,7 @@ var getFarmCmd = &cobra.Command{
3939
}
4040

4141
func init() {
42-
getCmd.AddCommand(getFarmCmd)
43-
getFarmCmd.Flags().StringP("network", "n", "", "network (dev, qa, test, main)")
44-
getFarmCmd.Flags().Uint64P("farm-id", "i", 0, "farm id")
42+
farmCmd.AddCommand(farmGetCmd)
43+
farmGetCmd.Flags().StringP("network", "n", "", "network (dev, qa, test, main)")
44+
farmGetCmd.Flags().Uint64P("farm-id", "i", 0, "farm id")
4545
}

registrar-cli/cmd/update_farm.go renamed to registrar-cli/cmd/farm_update.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77
"github.com/threefoldtech/tfgrid4-sdk-go/registrar-cli/internal/cmd"
88
)
99

10-
// UpdateFarmCmd represents the update farm command
11-
var UpdateFarmCmd = &cobra.Command{
12-
Use: "farm",
10+
// farmUpdateCmd represents the farm update command
11+
var farmUpdateCmd = &cobra.Command{
12+
Use: "update",
1313
Short: "update farm in node registrar",
1414
RunE: func(cobraCmd *cobra.Command, args []string) error {
1515
seed, err := cobraCmd.Flags().GetString("seed")
@@ -49,10 +49,10 @@ var UpdateFarmCmd = &cobra.Command{
4949
}
5050

5151
func init() {
52-
updateCmd.AddCommand(UpdateFarmCmd)
53-
UpdateFarmCmd.Flags().StringP("seed", "s", "", "account seed key")
54-
UpdateFarmCmd.Flags().StringP("network", "n", "", "network (dev, qa, test, main)")
55-
UpdateFarmCmd.Flags().Uint64P("farm-id", "i", 0, "farm id")
56-
UpdateFarmCmd.Flags().String("farm-name", "", "new farm name")
57-
UpdateFarmCmd.Flags().BoolP("dedicated", "d", false, "farm is dedicated")
52+
farmCmd.AddCommand(farmUpdateCmd)
53+
farmUpdateCmd.Flags().StringP("seed", "s", "", "account seed key")
54+
farmUpdateCmd.Flags().StringP("network", "n", "", "network (dev, qa, test, main)")
55+
farmUpdateCmd.Flags().Uint64P("farm-id", "i", 0, "farm id")
56+
farmUpdateCmd.Flags().String("farm-name", "", "new farm name")
57+
farmUpdateCmd.Flags().BoolP("dedicated", "d", false, "farm is dedicated")
5858
}

registrar-cli/cmd/get.go

Lines changed: 0 additions & 16 deletions
This file was deleted.

registrar-cli/cmd/node.go

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
// Package cmd for parsing command line arguments
2+
package cmd
3+
4+
import (
5+
"github.com/spf13/cobra"
6+
)
7+
8+
// nodeCmd represents the node command
9+
var nodeCmd = &cobra.Command{
10+
Use: "node",
11+
Short: "node command represents events on node on Threefold grid4",
12+
}
13+
14+
func init() {
15+
rootCmd.AddCommand(nodeCmd)
16+
}

registrar-cli/cmd/get_node.go renamed to registrar-cli/cmd/node_get.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77
"github.com/threefoldtech/tfgrid4-sdk-go/registrar-cli/internal/cmd"
88
)
99

10-
// getNodeCmd represents the cancel command
11-
var getNodeCmd = &cobra.Command{
12-
Use: "node",
10+
// nodeGetCmd represents the node get command
11+
var nodeGetCmd = &cobra.Command{
12+
Use: "get",
1313
Short: "get node from node registrar",
1414
RunE: func(cobraCmd *cobra.Command, args []string) error {
1515
network, err := cobraCmd.Flags().GetString("network")
@@ -39,8 +39,8 @@ var getNodeCmd = &cobra.Command{
3939
}
4040

4141
func init() {
42-
getCmd.AddCommand(getNodeCmd)
43-
getNodeCmd.Flags().StringP("network", "n", "", "network (dev, qa, test, main)")
44-
getNodeCmd.Flags().Uint64("node-id", 0, "node id")
45-
getNodeCmd.Flags().Uint64("twin-id", 0, "twin id")
42+
nodeCmd.AddCommand(nodeGetCmd)
43+
nodeGetCmd.Flags().StringP("network", "n", "", "network (dev, qa, test, main)")
44+
nodeGetCmd.Flags().Uint64("node-id", 0, "node id")
45+
nodeGetCmd.Flags().Uint64("twin-id", 0, "twin id")
4646
}

registrar-cli/cmd/update.go

Lines changed: 0 additions & 16 deletions
This file was deleted.

registrar-cli/cmd/zos_version.go

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
// Package cmd for parsing command line arguments
2+
package cmd
3+
4+
import (
5+
"github.com/spf13/cobra"
6+
)
7+
8+
// zosVersionCmd represents the zos version command
9+
var zosVersionCmd = &cobra.Command{
10+
Use: "zos-version",
11+
Short: "zos-version command represents events on zos-version on Threefold grid4",
12+
}
13+
14+
func init() {
15+
rootCmd.AddCommand(zosVersionCmd)
16+
}

registrar-cli/cmd/get_zos_version.go renamed to registrar-cli/cmd/zos_version_get.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import (
77
"github.com/threefoldtech/tfgrid4-sdk-go/registrar-cli/internal/cmd"
88
)
99

10-
// getZosVersionCmd represents the zos version command
11-
var getZosVersionCmd = &cobra.Command{
12-
Use: "version",
13-
Short: "get zos version from Threefold grid4",
10+
// zosVersionGetCmd represents the zos version get command
11+
var zosVersionGetCmd = &cobra.Command{
12+
Use: "get",
13+
Short: "get zos version from node registrar",
1414
RunE: func(cobraCmd *cobra.Command, args []string) error {
1515
network, err := cobraCmd.Flags().GetString("network")
1616
if err != nil {
@@ -29,6 +29,6 @@ var getZosVersionCmd = &cobra.Command{
2929
}
3030

3131
func init() {
32-
getCmd.AddCommand(getZosVersionCmd)
33-
getZosVersionCmd.Flags().StringP("network", "n", "", "network (dev, qa, test, main)")
32+
zosVersionCmd.AddCommand(zosVersionGetCmd)
33+
zosVersionGetCmd.Flags().StringP("network", "n", "", "network (dev, qa, test, main)")
3434
}

registrar-cli/cmd/update_zos_version.go renamed to registrar-cli/cmd/zos_version_update.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77
"github.com/threefoldtech/tfgrid4-sdk-go/registrar-cli/internal/cmd"
88
)
99

10-
// UpdateZosVersionCmd represents the update farm command
10+
// UpdateZosVersionCmd represents the zos version update command
1111
var UpdateZosVersionCmd = &cobra.Command{
12-
Use: "version",
12+
Use: "update",
1313
Short: "update zos version in node registrar",
1414
RunE: func(cobraCmd *cobra.Command, args []string) error {
1515
seed, err := cobraCmd.Flags().GetString("seed")
@@ -44,7 +44,7 @@ var UpdateZosVersionCmd = &cobra.Command{
4444
}
4545

4646
func init() {
47-
updateCmd.AddCommand(UpdateZosVersionCmd)
47+
zosVersionCmd.AddCommand(UpdateZosVersionCmd)
4848
UpdateZosVersionCmd.Flags().StringP("seed", "s", "", "account seed key")
4949
UpdateZosVersionCmd.Flags().StringP("network", "n", "", "network (dev, qa, test, main)")
5050
UpdateZosVersionCmd.Flags().StringP("version", "v", "v0.0.0", "new zos version")

0 commit comments

Comments
 (0)