Restructure directories and fix k3s upgrade version issue

cmd/apikey.go → cmd/apikey/apikey.go

@@ -1,4 +1,4 @@
-package cmd
+package apikey
 
 import (
 	"errors"
@@ -9,7 +9,8 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var apikeyCmd = &cobra.Command{
+// APIKeyCmd is the root command for `civo apikey`
+var APIKeyCmd = &cobra.Command{
 	Use:     "apikey",
 	Aliases: []string{"apikeys"},
 	Short:   "Manage API keys used to access your Civo account",
@@ -41,12 +42,12 @@ func apiKeyFind(search string) (string, error) {
 }
 
 func init() {
-	rootCmd.AddCommand(apikeyCmd)
-	apikeyCmd.AddCommand(apikeyListCmd)
-	apikeyCmd.AddCommand(apikeySaveCmd)
-	apikeyCmd.AddCommand(apikeyRemoveCmd)
-	apikeyCmd.AddCommand(apikeyCurrentCmd)
-	apikeyCmd.AddCommand(apikeyShowCmd)
+
+	APIKeyCmd.AddCommand(apikeyListCmd)
+	APIKeyCmd.AddCommand(apikeySaveCmd)
+	APIKeyCmd.AddCommand(apikeyRemoveCmd)
+	APIKeyCmd.AddCommand(apikeyCurrentCmd)
+	APIKeyCmd.AddCommand(apikeyShowCmd)
 
 	// Flags for "civo apikey save" command
 	apikeySaveCmd.Flags().BoolVar(&loadAPIKeyFromEnv, "load-from-env", false, "When set, the name and key will be taken from environment variables (see notes above)")

cmd/apikey_current.go → cmd/apikey/apikey_current.go

@@ -1,4 +1,4 @@
-package cmd
+package apikey
 
 import (
 	"fmt"

cmd/apikey_list.go → cmd/apikey/apikey_list.go

@@ -1,4 +1,4 @@
-package cmd
+package apikey
 
 import (
 	"sort"

cmd/apikey_remove.go → cmd/apikey/apikey_remove.go

@@ -1,4 +1,4 @@
-package cmd
+package apikey
 
 import (
 	"fmt"

cmd/apikey_save.go → cmd/apikey/apikey_save.go

@@ -1,4 +1,4 @@
-package cmd
+package apikey
 
 import (
 	"bufio"

cmd/apikey_show.go → cmd/apikey/apikey_show.go

@@ -1,4 +1,4 @@
-package cmd
+package apikey
 
 import (
 	"sort"

cmd/disk_image.go → cmd/diskimage/disk_image.go

@@ -1,12 +1,13 @@
-package cmd
+package diskimage
 
 import (
 	"errors"
 
 	"github.com/spf13/cobra"
 )
 
-var diskImageCmd = &cobra.Command{
+// DiskImageCmd manages disk images
+var DiskImageCmd = &cobra.Command{
 	Use:     "diskimage",
 	Aliases: []string{"diskimages", "template", "templates"},
 	Short:   "Details of Civo disk images",
@@ -20,6 +21,5 @@ var diskImageCmd = &cobra.Command{
 }
 
 func init() {
-	rootCmd.AddCommand(diskImageCmd)
-	diskImageCmd.AddCommand(diskImageListCmd)
+	DiskImageCmd.AddCommand(diskImageListCmd)
 }

cmd/disk_image_list.go → cmd/diskimage/disk_image_list.go

@@ -1,4 +1,4 @@
-package cmd
+package diskimage
 
 import (
 	"os"

cmd/domain.go → cmd/domain/domain.go

@@ -1,12 +1,13 @@
-package cmd
+package domain
 
 import (
 	"errors"
 
 	"github.com/spf13/cobra"
 )
 
-var domainCmd = &cobra.Command{
+// DomainCmd manages domains
+var DomainCmd = &cobra.Command{
 	Use:     "domain",
 	Aliases: []string{"domains"},
 	Short:   "Details of Civo domains",
@@ -33,13 +34,13 @@ var domainRecordCmd = &cobra.Command{
 }
 
 func init() {
-	rootCmd.AddCommand(domainCmd)
-	domainCmd.AddCommand(domainListCmd)
-	domainCmd.AddCommand(domainCreateCmd)
-	domainCmd.AddCommand(domainRemoveCmd)
+
+	DomainCmd.AddCommand(domainListCmd)
+	DomainCmd.AddCommand(domainCreateCmd)
+	DomainCmd.AddCommand(domainRemoveCmd)
 
 	// Domains record cmd
-	domainCmd.AddCommand(domainRecordCmd)
+	DomainCmd.AddCommand(domainRecordCmd)
 	domainRecordCmd.AddCommand(domainRecordListCmd)
 	domainRecordCmd.AddCommand(domainRecordCreateCmd)
 	domainRecordCmd.AddCommand(domainRecordShowCmd)

cmd/domain_create.go → cmd/domain/domain_create.go

@@ -1,4 +1,4 @@
-package cmd
+package domain
 
 import (
 	"fmt"

cmd/domain_list.go → cmd/domain/domain_list.go

@@ -1,4 +1,4 @@
-package cmd
+package domain
 
 import (
 	"github.com/civo/cli/common"

cmd/domain_record_create.go → cmd/domain/domain_record_create.go

@@ -1,4 +1,4 @@
-package cmd
+package domain
 
 import (
 	"fmt"

cmd/domain_record_list.go → cmd/domain/domain_record_list.go

@@ -1,4 +1,4 @@
-package cmd
+package domain
 
 import (
 	"os"

cmd/domain_record_remove.go → cmd/domain/domain_record_remove.go

@@ -1,4 +1,4 @@
-package cmd
+package domain
 
 import (
 	"errors"

cmd/domain_record_show.go → cmd/domain/domain_record_show.go

@@ -1,4 +1,4 @@
-package cmd
+package domain
 
 import (
 	"github.com/civo/civogo"

cmd/domain_remove.go → cmd/domain/domain_remove.go

@@ -1,4 +1,4 @@
-package cmd
+package domain
 
 import (
 	"errors"

cmd/firewall.go → cmd/firewall/firewall.go

@@ -1,12 +1,13 @@
-package cmd
+package firewall
 
 import (
 	"errors"
 
 	"github.com/spf13/cobra"
 )
 
-var firewallCmd = &cobra.Command{
+// FirewallCmd manages Civo firewalls
+var FirewallCmd = &cobra.Command{
 	Use:     "firewall",
 	Aliases: []string{"firewalls", "fw"},
 	Short:   "Details of Civo firewalls",
@@ -33,17 +34,16 @@ var firewallRuleCmd = &cobra.Command{
 }
 
 func init() {
-	rootCmd.AddCommand(firewallCmd)
-	firewallCmd.AddCommand(firewallListCmd)
-	firewallCmd.AddCommand(firewallCreateCmd)
-	firewallCmd.AddCommand(firewallUpdateCmd)
-	firewallCmd.AddCommand(firewallRemoveCmd)
+	FirewallCmd.AddCommand(firewallListCmd)
+	FirewallCmd.AddCommand(firewallCreateCmd)
+	FirewallCmd.AddCommand(firewallUpdateCmd)
+	FirewallCmd.AddCommand(firewallRemoveCmd)
 
 	firewallCreateCmd.Flags().StringVarP(&firewallnetwork, "network", "n", "default", "the network to create the firewall")
 	firewallCreateCmd.Flags().BoolVarP(&createRules, "create-rules", "r", true, "the create rules flag is used to create the default firewall rules, if is not defined will be set to true")
 
 	// Firewalls rule cmd
-	firewallCmd.AddCommand(firewallRuleCmd)
+	FirewallCmd.AddCommand(firewallRuleCmd)
 	firewallRuleCmd.AddCommand(firewallRuleListCmd)
 	firewallRuleCmd.AddCommand(firewallRuleCreateCmd)
 	firewallRuleCmd.AddCommand(firewallRuleRemoveCmd)

cmd/firewall_create.go → cmd/firewall/firewall_create.go

@@ -1,4 +1,4 @@
-package cmd
+package firewall
 
 import (
 	"fmt"

cmd/firewall_list.go → cmd/firewall/firewall_list.go

@@ -1,4 +1,4 @@
-package cmd
+package firewall
 
 import (
 	"github.com/civo/cli/common"

cmd/firewall_remove.go → cmd/firewall/firewall_remove.go

@@ -1,4 +1,4 @@
-package cmd
+package firewall
 
 import (
 	"errors"

cmd/firewall_rule_create.go → cmd/firewall/firewall_rule_create.go

@@ -1,4 +1,4 @@
-package cmd
+package firewall
 
 import (
 	"fmt"

cmd/firewall_rule_list.go → cmd/firewall/firewall_rule_list.go

@@ -1,4 +1,4 @@
-package cmd
+package firewall
 
 import (
 	"os"

cmd/firewall_rule_remove.go → cmd/firewall/firewall_rule_remove.go

@@ -1,4 +1,4 @@
-package cmd
+package firewall
 
 import (
 	"errors"

cmd/firewall_update.go → cmd/firewall/firewall_update.go

@@ -1,4 +1,4 @@
-package cmd
+package firewall
 
 import (
 	"fmt"