flatten cmd pkg

Author: patrick-ogrady

cmd/add/add.go renamed to cmd/add.go

@@ -1,19 +1,14 @@
 // Copyright (C) 2019-2022, Ava Labs, Inc. All rights reserved.
 // See the file LICENSE for licensing terms.
 
-// Package implements "add" sub-commands.
-package add
+package cmd
 
 import (
 	"github.com/spf13/cobra"
 )
 
-func init() {
-	cobra.EnablePrefixMatching = true
-}
-
-// NewCommand implements "subnet-cli add" command.
-func NewCommand() *cobra.Command {
+// NewAddCommand implements "subnet-cli add" command.
+func NewAddCommand() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "add",
 		Short: "Sub-commands for creating resources",

cmd/add/validator.go renamed to cmd/add_validator.go

@@ -1,7 +1,7 @@
 // Copyright (C) 2019-2022, Ava Labs, Inc. All rights reserved.
 // See the file LICENSE for licensing terms.
 
-package add
+package cmd
 
 import (
 	"bytes"

cmd/create/create.go renamed to cmd/create.go

@@ -1,8 +1,7 @@
 // Copyright (C) 2019-2022, Ava Labs, Inc. All rights reserved.
 // See the file LICENSE for licensing terms.
 
-// Package implements "create" sub-commands.
-package create
+package cmd
 
 import (
 	"bytes"
@@ -33,8 +32,8 @@ var (
 	requestTimeout time.Duration
 )
 
-// NewCommand implements "subnet-cli create" command.
-func NewCommand() *cobra.Command {
+// NewCreateCommand implements "subnet-cli create" command.
+func NewCreateCommand() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "create",
 		Short: "Sub-commands for creating resources",

cmd/create/blockchain.go renamed to cmd/create_blockchain.go

@@ -1,7 +1,7 @@
 // Copyright (C) 2019-2022, Ava Labs, Inc. All rights reserved.
 // See the file LICENSE for licensing terms.
 
-package create
+package cmd
 
 import (
 	"context"

cmd/create/key.go renamed to cmd/create_key.go

@@ -1,7 +1,7 @@
 // Copyright (C) 2019-2022, Ava Labs, Inc. All rights reserved.
 // See the file LICENSE for licensing terms.
 
-package create
+package cmd
 
 import (
 	"github.com/ava-labs/subnet-cli/internal/key"

cmd/create/subnet.go renamed to cmd/create_subnet.go

@@ -1,7 +1,7 @@
 // Copyright (C) 2019-2022, Ava Labs, Inc. All rights reserved.
 // See the file LICENSE for licensing terms.
 
-package create
+package cmd
 
 import (
 	"context"

cmd/root.go

@@ -0,0 +1,30 @@
+// Copyright (C) 2019-2022, Ava Labs, Inc. All rights reserved.
+// See the file LICENSE for licensing terms.
+
+package cmd
+
+import (
+	"github.com/spf13/cobra"
+)
+
+var rootCmd = &cobra.Command{
+	Use:        "subnet-cli",
+	Short:      "subnet-cli CLI",
+	SuggestFor: []string{"subnet-cli", "subnetcli", "subnetctl"},
+}
+
+func init() {
+	cobra.EnablePrefixMatching = true
+}
+
+func init() {
+	rootCmd.AddCommand(
+		create.NewCommand(),
+		NewAddCommand(),
+		status.NewCommand(),
+	)
+}
+
+func Execute() error {
+	return rootCmd.Execute()
+}

cmd/status/status.go renamed to cmd/status.go

@@ -1,8 +1,7 @@
 // Copyright (C) 2019-2022, Ava Labs, Inc. All rights reserved.
 // See the file LICENSE for licensing terms.
 
-// Package implements "status" sub-commands.
-package status
+package cmd
 
 import (
 	"time"

cmd/status/blockchain.go renamed to cmd/status_blockchain.go

@@ -2,7 +2,7 @@
 // See the file LICENSE for licensing terms.
 
 // Package implements "status" sub-commands.
-package status
+package cmd
 
 import (
 	"context"

main.go

@@ -1,39 +1,17 @@
 // Copyright (C) 2019-2022, Ava Labs, Inc. All rights reserved.
 // See the file LICENSE for licensing terms.
 
-// "subnet-cli" implements quarkvm client operation interface.
 package main
 
 import (
 	"fmt"
 	"os"
 
-	"github.com/ava-labs/subnet-cli/cmd/add"
-	"github.com/ava-labs/subnet-cli/cmd/create"
-	"github.com/ava-labs/subnet-cli/cmd/status"
-	"github.com/spf13/cobra"
+	"github.com/ava-labs/subnet-cli/cmd"
 )
 
-var rootCmd = &cobra.Command{
-	Use:        "subnet-cli",
-	Short:      "subnet-cli CLI",
-	SuggestFor: []string{"subnet-cli", "subnetcli", "subnetctl"},
-}
-
-func init() {
-	cobra.EnablePrefixMatching = true
-}
-
-func init() {
-	rootCmd.AddCommand(
-		create.NewCommand(),
-		add.NewCommand(),
-		status.NewCommand(),
-	)
-}
-
 func main() {
-	if err := rootCmd.Execute(); err != nil {
+	if err := cmd.Execute(); err != nil {
 		fmt.Fprintf(os.Stderr, "subnet-cli failed %v\n", err)
 		os.Exit(1)
 	}