Merge pull request #832 from SoftLayer/issues831

Update firmware improvements, updated gomega version

Author: allmightyspiff

cliChecker/main.go

@@ -7,7 +7,6 @@ import (
 	sl_plugin "github.ibm.com/SoftLayer/softlayer-cli/plugin"
 )
 
-
 func main() {
 	fmt.Printf("IBMCLOUD SL Command Directory\n")
 
@@ -33,4 +32,4 @@ func main() {
 		fmt.Printf("\tUsage: %s\n", slCmd.Usage)
 		fmt.Printf("==============================================================\n")
 	}
-}
+}

docs/main.go

@@ -1,11 +1,11 @@
 package main
 
 import (
+	"encoding/json"
 	"fmt"
 	"os"
-	"strings"
-	"encoding/json"
 	"regexp"
+	"strings"
 
 	"text/template"
 	// "sort"
@@ -17,7 +17,7 @@ import (
 
 var fileName string
 var rootCmd = &cobra.Command{
-	Use: "doc-gen",
+	Use:   "doc-gen",
 	Short: "Generate the documentation for the sl plugin",
 	RunE: func(Cmd *cobra.Command, args []string) error {
 		CliDocs()
@@ -39,33 +39,31 @@ func checkError(err error) {
 
 // For top level commands, like `sl account` or `sl hardware`
 type SlCmdGroup struct {
-	Name string
+	Name             string
 	CommandShortLink string
-	Commands []SlCmdDoc
-	Help string
+	Commands         []SlCmdDoc
+	Help             string
 }
 
 // For specific commands
 type SlCmdDoc struct {
-	Name string
+	Name             string
 	CommandShortLink string
-	Use string
-	Flags []SlCmdFlag
-	Help string
-	LongHelp string
-	Backtick string
-	CommandPath string
+	Use              string
+	Flags            []SlCmdFlag
+	Help             string
+	LongHelp         string
+	Backtick         string
+	CommandPath      string
 }
 
 // For a commands flags
 type SlCmdFlag struct {
-	Name string
-	Help string
+	Name    string
+	Help    string
 	Default string
 }
 
-
-
 // This function builds the documentation for IBMCLOUD docs
 func CliDocs() {
 	// fmt.Printf("IBMCLOUD SL Command Directory\n")
@@ -75,11 +73,10 @@ func CliDocs() {
 		shortName := strings.ReplaceAll(iCmd.Name(), " ", "_")
 		shortName = strings.ReplaceAll(iCmd.Name(), "-", "_")
 		thisCmdGroup := SlCmdGroup{
-			Name: iCmd.Name(),
+			Name:             iCmd.Name(),
 			CommandShortLink: fmt.Sprintf("sl_%v", shortName),
-			Commands: nil,
-			Help: iCmd.Short,
-
+			Commands:         nil,
+			Help:             iCmd.Short,
 		}
 		if len(iCmd.Commands()) > 0 {
 			thisCmdGroup.Commands = buildSlCmdDoc(iCmd)
@@ -93,7 +90,7 @@ func CliDocs() {
 	jOut, err := json.MarshalIndent(CmdGroups, "", "  ")
 	checkError(err)
 	err = os.WriteFile("sl.json", jOut, 0755) //#nosec G306 -- This is a false positive
-	checkError(err)	
+	checkError(err)
 	// fmt.Println(string(jOut))
 }
 
@@ -172,14 +169,14 @@ func cobraToSl(iCmd *cobra.Command, tlcmd string) SlCmdDoc {
 	shortName = strings.ReplaceAll(shortName, "-", "_")
 	longHelp := getLongHelp(iCmd.Long)
 	thisDoc := SlCmdDoc{
-		Name: iCmd.Name(),
+		Name:             iCmd.Name(),
 		CommandShortLink: shortName,
-		CommandPath: iCmd.CommandPath(),
-		Use: iCmd.UseLine(),
-		Flags: nil,
-		Help: iCmd.Short,
-		LongHelp: longHelp,
-		Backtick:  "```",
+		CommandPath:      iCmd.CommandPath(),
+		Use:              iCmd.UseLine(),
+		Flags:            nil,
+		Help:             iCmd.Short,
+		LongHelp:         longHelp,
+		Backtick:         "```",
 	}
 	thisDoc.Flags = buildSlCmdFlag(iCmd)
 
@@ -196,8 +193,8 @@ func buildSlCmdFlag(topCommand *cobra.Command) []SlCmdFlag {
 			flagName = fmt.Sprintf("%s, %s", pflag.Shorthand, flagName)
 		}
 		thisFlag := SlCmdFlag{
-			Name:flagName,
-			Help: getFlagHelp(pflag.Usage),
+			Name:    flagName,
+			Help:    getFlagHelp(pflag.Usage),
 			Default: pflag.DefValue,
 		}
 		flags = append(flags, thisFlag)

go.mod

@@ -12,42 +12,40 @@ require (
 	github.com/Xuanwo/go-locale v1.1.0
 	github.com/miekg/dns v1.1.50
 	github.com/nicksnyder/go-i18n v1.10.1
-	github.com/onsi/ginkgo v1.16.2
-	github.com/onsi/gomega v1.29.0
+	github.com/onsi/ginkgo/v2 v2.15.0
+	github.com/onsi/gomega v1.31.1
 	github.com/softlayer/softlayer-go v1.1.2
-	github.com/spf13/cobra v1.5.0
+	github.com/spf13/cobra v1.8.0
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.7.0
 	golang.org/x/text v0.14.0
 )
 
 require (
-	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/fatih/color v1.10.0 // indirect
 	github.com/fatih/structs v1.1.0 // indirect
-	github.com/fsnotify/fsnotify v1.4.9 // indirect
+	github.com/go-logr/logr v1.3.0 // indirect
+	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
 	github.com/gofrs/flock v0.8.1 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
-	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
+	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/mattn/go-colorable v0.1.8 // indirect
 	github.com/mattn/go-isatty v0.0.12 // indirect
 	github.com/mattn/go-runewidth v0.0.12 // indirect
 	github.com/nicksnyder/go-i18n/v2 v2.2.0 // indirect
-	github.com/nxadm/tail v1.4.8 // indirect
 	github.com/pelletier/go-toml v1.2.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/rivo/uniseg v0.1.0 // indirect
-	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/softlayer/xmlrpc v0.0.0-20200409220501-5f089df7cb7e // indirect
 	golang.org/x/crypto v0.17.0 // indirect
-	golang.org/x/mod v0.12.0 // indirect
-	golang.org/x/net v0.17.0 // indirect
-	golang.org/x/sys v0.15.0 // indirect
+	golang.org/x/mod v0.14.0 // indirect
+	golang.org/x/net v0.20.0 // indirect
+	golang.org/x/sys v0.16.0 // indirect
 	golang.org/x/term v0.15.0 // indirect
-	golang.org/x/tools v0.12.0 // indirect
+	golang.org/x/tools v0.17.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
-	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 //indirect
 )