feat(general): lots of changes have been made

Author: Rihoj

cmd/docs.go

@@ -0,0 +1,38 @@
+/*
+Copyright © 2022 James Ray [email protected]
+
+*/
+package cmd
+
+import (
+	"log"
+
+	"github.com/spf13/cobra"
+	"github.com/spf13/cobra/doc"
+)
+
+// docsCmd represents the docs command
+var docsCmd = &cobra.Command{
+	Use:   "docs",
+	Short: "Auto Generates MarkDown documentation",
+	Run: func(cmd *cobra.Command, args []string) {
+		err := doc.GenMarkdownTree(rootCmd, "./docs")
+		if err != nil {
+			log.Fatal(err)
+		}
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(docsCmd)
+
+	// Here you will define your flags and configuration settings.
+
+	// Cobra supports Persistent Flags which will work for this command
+	// and all subcommands, e.g.:
+	// docsCmd.PersistentFlags().String("foo", "", "A help for foo")
+
+	// Cobra supports local flags which will only run when this command
+	// is called directly, e.g.:
+	// docsCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
+}

cmd/init.go

@@ -5,35 +5,28 @@ Copyright © 2022 James Ray [email protected]
 package cmd
 
 import (
-	"log"
-	"os"
-	"path/filepath"
-
+	"github.com/rayprogramming/toolsium/lib/config"
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 )
 
 // initCmd represents the init command
 var initCmd = &cobra.Command{
 	Use:   "init",
 	Short: "Setup toolsium",
 	Run: func(cmd *cobra.Command, args []string) {
-		home, err := os.UserHomeDir()
+		err := config.CreateConfig()
 		cobra.CheckErr(err)
-		if err := viper.WriteConfigAs(filepath.Join(home, cfgFileName)); err != nil {
-			log.Fatal(err)
-		}
 	},
 }
 
 func init() {
 	rootCmd.AddCommand(initCmd)
 
 	initCmd.Flags().StringP("mfa_serial", "m", "", "The MFA serial for your account")
-	viper.BindPFlag("mfa_serial", initCmd.Flags().Lookup("mfa_serial"))
-	viper.SetDefault("mfa_serial", "")
+	config.GetViper().BindPFlag("mfa_serial", initCmd.Flags().Lookup("mfa_serial"))
+	config.GetViper().SetDefault("mfa_serial", "")
 
 	initCmd.Flags().StringP("department", "d", "", "Department filter")
-	viper.BindPFlag("department", initCmd.Flags().Lookup("department"))
-	viper.SetDefault("department", "")
+	config.GetViper().BindPFlag("department", initCmd.Flags().Lookup("department"))
+	config.GetViper().SetDefault("department", "")
 }

cmd/papi.go

@@ -61,14 +61,4 @@ to quickly create a Cobra application.`,
 
 func init() {
 	manageCmd.AddCommand(papiCmd)
-
-	// Here you will define your flags and configuration settings.
-
-	// Cobra supports Persistent Flags which will work for this command
-	// and all subcommands, e.g.:
-	// papiCmd.PersistentFlags().String("foo", "", "A help for foo")
-
-	// Cobra supports local flags which will only run when this command
-	// is called directly, e.g.:
-	// papiCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
 }

cmd/root.go

@@ -8,13 +8,8 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/rayprogramming/toolsium/lib/config"
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
-)
-
-const (
-	cfgFileName = ".toolsium"
-	cfgFileType = "json"
 )
 
 var (
@@ -24,33 +19,11 @@ var (
 // rootCmd represents the base command when called without any subcommands
 var rootCmd = &cobra.Command{
 	Use:   "toolsium",
-	Short: "A brief description of your application",
-	Long: `A longer description that spans multiple lines and likely contains
-examples and usage of using your application. For example:
-
-Cobra is a CLI library for Go that empowers applications.
-This application is a tool to generate the needed files
-to quickly create a Cobra application.`,
-	// Uncomment the following line if your bare application
-	// has an action associated with it:
-	// Run: func(cmd *cobra.Command, args []string) {
-	// 	cfg, err := config.LoadDefaultConfig(context.TODO())
-	// 	cfg.Credentials = aws.NewCredentialsCache(&lib.MfaProvider{})
-
-	// 	if err != nil {
-	// 		log.Fatal(err)
-	// 	}
-
-	// 	client := s3.NewFromConfig(cfg)
-	// 	output, err := client.ListBuckets(context.TODO(), &s3.ListBucketsInput{})
-	// 	if err != nil {
-	// 		log.Fatal(err)
-	// 	}
-
-	// 	for _, object := range output.Buckets {
-	// 		log.Printf("Bucket=%s", aws.ToString(object.Name))
-	// 	}
-	// },
+	Short: "A handy set of tools for developers",
+	Long: `Toolsium is desgined to allow developers to quickly access common resources they would be expected to use.
+	
+These tools can include default filters, easy access to start a session on an ec2 machine, and other features.
+`,
 }
 
 // Execute adds all child commands to the root command and sets flags appropriately.
@@ -64,31 +37,15 @@ func Execute() {
 
 func init() {
 	cobra.OnInitialize(initConfig)
-
-	rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", fmt.Sprintf("config file (default is $HOME/%v.%v)", cfgFileName, cfgFileType))
+	confDir, err := config.GetConfigDir()
+	cobra.CheckErr(err)
+	rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", fmt.Sprintf("config file (default is %v)", confDir))
 	// Instead of profiles for now, I recommend just passing in different config files.
+
 }
 
 // initConfig reads in config file and ENV variables if set.
 func initConfig() {
-	if cfgFile != "" {
-		// Use config file from the flag.
-		viper.SetConfigFile(cfgFile)
-	} else {
-		// Find home directory.
-		home, err := os.UserHomeDir()
-		cobra.CheckErr(err)
-
-		// Search config in home directory with name ".toolsium" (without extension).
-		viper.AddConfigPath(home)
-		viper.SetConfigType(cfgFileType)
-		viper.SetConfigName(cfgFileName)
-	}
-
-	viper.AutomaticEnv() // read in environment variables that match
-
-	// If a config file is found, read it in.
-	if err := viper.ReadInConfig(); err == nil {
-		fmt.Fprintln(os.Stderr, "Using config file:", viper.ConfigFileUsed())
-	}
+	err := config.Configure(cfgFile)
+	cobra.CheckErr(err)
 }

docs/toolsium.md

@@ -0,0 +1,27 @@
+## toolsium
+
+A handy set of tools for developers
+
+### Synopsis
+
+Toolsium is desgined to allow developers to quickly access common resources they would be expected to use.
+	
+These tools can include default filters, easy access to start a session on an ec2 machine, and other features.
+
+
+### Options
+
+```
+      --config string   config file (default is $HOME/.toolsium.json)
+  -h, --help            help for toolsium
+```
+
+### SEE ALSO
+
+* [toolsium completion](toolsium_completion.md)	 - Generate the autocompletion script for the specified shell
+* [toolsium docs](toolsium_docs.md)	 - Auto Generates MarkDown documentation
+* [toolsium init](toolsium_init.md)	 - Setup toolsium
+* [toolsium manage](toolsium_manage.md)	 - A brief description of your command
+* [toolsium mfa](toolsium_mfa.md)	 - A brief description of your command
+
+###### Auto generated by spf13/cobra on 27-Aug-2022

docs/toolsium_completion.md

@@ -0,0 +1,31 @@
+## toolsium completion
+
+Generate the autocompletion script for the specified shell
+
+### Synopsis
+
+Generate the autocompletion script for toolsium for the specified shell.
+See each sub-command's help for details on how to use the generated script.
+
+
+### Options
+
+```
+  -h, --help   help for completion
+```
+
+### Options inherited from parent commands
+
+```
+      --config string   config file (default is $HOME/.toolsium.json)
+```
+
+### SEE ALSO
+
+* [toolsium](toolsium.md)	 - A handy set of tools for developers
+* [toolsium completion bash](toolsium_completion_bash.md)	 - Generate the autocompletion script for bash
+* [toolsium completion fish](toolsium_completion_fish.md)	 - Generate the autocompletion script for fish
+* [toolsium completion powershell](toolsium_completion_powershell.md)	 - Generate the autocompletion script for powershell
+* [toolsium completion zsh](toolsium_completion_zsh.md)	 - Generate the autocompletion script for zsh
+
+###### Auto generated by spf13/cobra on 27-Aug-2022

docs/toolsium_completion_bash.md

@@ -0,0 +1,50 @@
+## toolsium completion bash
+
+Generate the autocompletion script for bash
+
+### Synopsis
+
+Generate the autocompletion script for the bash shell.
+
+This script depends on the 'bash-completion' package.
+If it is not installed already, you can install it via your OS's package manager.
+
+To load completions in your current shell session:
+
+	source <(toolsium completion bash)
+
+To load completions for every new session, execute once:
+
+#### Linux:
+
+	toolsium completion bash > /etc/bash_completion.d/toolsium
+
+#### macOS:
+
+	toolsium completion bash > $(brew --prefix)/etc/bash_completion.d/toolsium
+
+You will need to start a new shell for this setup to take effect.
+
+
+```
+toolsium completion bash
+```
+
+### Options
+
+```
+  -h, --help              help for bash
+      --no-descriptions   disable completion descriptions
+```
+
+### Options inherited from parent commands
+
+```
+      --config string   config file (default is $HOME/.toolsium.json)
+```
+
+### SEE ALSO
+
+* [toolsium completion](toolsium_completion.md)	 - Generate the autocompletion script for the specified shell
+
+###### Auto generated by spf13/cobra on 27-Aug-2022

docs/toolsium_completion_fish.md

@@ -0,0 +1,41 @@
+## toolsium completion fish
+
+Generate the autocompletion script for fish
+
+### Synopsis
+
+Generate the autocompletion script for the fish shell.
+
+To load completions in your current shell session:
+
+	toolsium completion fish | source
+
+To load completions for every new session, execute once:
+
+	toolsium completion fish > ~/.config/fish/completions/toolsium.fish
+
+You will need to start a new shell for this setup to take effect.
+
+
+```
+toolsium completion fish [flags]
+```
+
+### Options
+
+```
+  -h, --help              help for fish
+      --no-descriptions   disable completion descriptions
+```
+
+### Options inherited from parent commands
+
+```
+      --config string   config file (default is $HOME/.toolsium.json)
+```
+
+### SEE ALSO
+
+* [toolsium completion](toolsium_completion.md)	 - Generate the autocompletion script for the specified shell
+
+###### Auto generated by spf13/cobra on 27-Aug-2022

docs/toolsium_completion_powershell.md

@@ -0,0 +1,38 @@
+## toolsium completion powershell
+
+Generate the autocompletion script for powershell
+
+### Synopsis
+
+Generate the autocompletion script for powershell.
+
+To load completions in your current shell session:
+
+	toolsium completion powershell | Out-String | Invoke-Expression
+
+To load completions for every new session, add the output of the above command
+to your powershell profile.
+
+
+```
+toolsium completion powershell [flags]
+```
+
+### Options
+
+```
+  -h, --help              help for powershell
+      --no-descriptions   disable completion descriptions
+```
+
+### Options inherited from parent commands
+
+```
+      --config string   config file (default is $HOME/.toolsium.json)
+```
+
+### SEE ALSO
+
+* [toolsium completion](toolsium_completion.md)	 - Generate the autocompletion script for the specified shell
+
+###### Auto generated by spf13/cobra on 27-Aug-2022