[cmd] feat: added version command

Author: MeNsaaH

README.md

@@ -23,11 +23,11 @@ This tool is **HIGHLY DESTRUCTIVE** and can deletes all resources! This should b
 ### TODO
 - [x] Schedule resource refreshing
 - [x] generate Sample Yaml config and load config
+- [x] [Persist state to remote sources](https://github.com/MeNsaaH/reka/issues/4)
+- [ ] [Add More AWS Resources](https://github.com/MeNsaaH/reka/issues/1)
+- [ ] [Add More GCP Resources](https://github.com/MeNsaaH/reka/issues/2)
+- [ ] [Add More Azure Resources](https://github.com/MeNsaaH/reka/issues/6)
 - [ ] [Create Web Dashboard](https://github.com/MeNsaaH/reka/issues/3)
-- [ ] [Persist state to remote sources](https://github.com/MeNsaaH/reka/issues/4)
-- [ ] [Add AWS Resources](https://github.com/MeNsaaH/reka/issues/1)
-- [ ] [Add GCP Resources](https://github.com/MeNsaaH/reka/issues/2)
-- [ ] [Add Azure Resources](https://github.com/MeNsaaH/reka/issues/6)
 
 #### Supported Resources
 Here is a list of all [supported resources](./supported-resources.md) 

cmd/root.go

@@ -41,6 +41,7 @@ var (
 	providers   []*types.Provider
 	backend     state.Backender
 	activeState *state.State
+	verbose     bool
 )
 
 // rootCmd represents the base command when called without any subcommands
@@ -51,6 +52,21 @@ var rootCmd = &cobra.Command{
 	// Uncomment the following line if your bare application
 	// has an action associated with it:
 	Run: func(cmd *cobra.Command, args []string) {
+		// Load Config and Defaults
+		config.LoadConfig()
+
+		cfg = config.GetConfig()
+
+		for _, rule := range cfg.Rules {
+			// Convert Rule in config to rules.Rule type
+			r := *((*rules.Rule)(unsafe.Pointer(&rule)))
+			r.Tags = resource.Tags(rule.Tags)
+			rules.ParseRule(r)
+		}
+
+		// Initialize Provider objects
+		providers = initProviders()
+		backend = state.InitBackend()
 		// RefreshResources on every execution
 		refreshResources(providers)
 		for _, p := range providers {
@@ -87,6 +103,7 @@ func init() {
 	cobra.OnInitialize(initConfig)
 	rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.reka.yaml)")
 	rootCmd.Flags().BoolP("unused-only", "t", false, "Reap only unused resources")
+	rootCmd.PersistentFlags().BoolVarP(&verbose, "verbose", "v", false, "Output verbose logs (DEBUG)")
 }
 
 // initConfig reads in config file and ENV variables if set.
@@ -114,20 +131,11 @@ func initConfig() {
 		log.Info("Using config file:", viper.ConfigFileUsed())
 	}
 
-	// Load Config and Defaults
-	config.LoadConfig()
-	cfg = config.GetConfig()
-
-	for _, rule := range cfg.Rules {
-		// Convert Rule in config to rules.Rule type
-		r := *((*rules.Rule)(unsafe.Pointer(&rule)))
-		r.Tags = resource.Tags(rule.Tags)
-		rules.ParseRule(r)
+	if verbose {
+		config.SetVerboseLogging()
+		log.SetLevel(log.DebugLevel)
 	}
 
-	// Initialize Provider objects
-	providers = initProviders()
-	backend = state.InitBackend()
 }
 
 func initProviders() []*types.Provider {
@@ -146,14 +154,12 @@ func initProviders() []*types.Provider {
 		if err != nil {
 			log.Fatalf("Could not initialize %s Provider: %s", p, err.Error())
 		}
-		// TODO Config providers
 		providers = append(providers, provider)
 	}
 	return providers
 }
 
 // Refresh current status of resources from Providers
-// TODO Reconcile state so that new resources are added to desired states and former resources removed
 func refreshResources(providers []*types.Provider) {
 	// activeState is the current state stored in backend
 	activeState = backend.GetState()
@@ -166,8 +172,6 @@ func refreshResources(providers []*types.Provider) {
 
 	// Add new resources to desired state if they don't already exists
 	// this is to ensure all new resources created are also added to reka's desired state
-	// too many for loops 😫
-	// TODO check for attribute changes not in desired state for instance, if node pool was scaled
 	for currentProvider, currentProviderResources := range activeState.Current {
 		if _, ok := activeState.Desired[currentProvider]; ok {
 			for u, w := range currentProviderResources {
@@ -189,9 +193,6 @@ func refreshResources(providers []*types.Provider) {
 	backend.WriteState(activeState)
 }
 
-func reapResources() {
-}
-
 func containsResource(res []*resource.Resource, r *resource.Resource) bool {
 	for _, rs := range res {
 		if rs.UUID == r.UUID {

cmd/version.go

@@ -0,0 +1,48 @@
+/*
+Copyright © 2021 NAME HERE <EMAIL ADDRESS>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+package cmd
+
+import (
+	"fmt"
+
+	"github.com/spf13/cobra"
+)
+
+var majorVersion = "0"
+var minorVersion = "1"
+
+// versionCmd represents the version command
+var versionCmd = &cobra.Command{
+	Use:   "version",
+	Short: "show reka version",
+	Run: func(cmd *cobra.Command, args []string) {
+		fmt.Printf("Reka v%s.%s\n\nhttps://github.com/mensaah/reka (2021)\n", majorVersion, minorVersion)
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(versionCmd)
+
+	// Here you will define your flags and configuration settings.
+
+	// Cobra supports Persistent Flags which will work for this command
+	// and all subcommands, e.g.:
+	// versionCmd.PersistentFlags().String("foo", "", "A help for foo")
+
+	// Cobra supports local flags which will only run when this command
+	// is called directly, e.g.:
+	// versionCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
+}

config/config.go

@@ -12,7 +12,7 @@ import (
 )
 
 var (
-	config     *Config
+	config     = &Config{}
 	workingDir string
 	err        error
 )
@@ -28,6 +28,7 @@ type Config struct {
 	Timezone        string
 	RefreshInterval int32
 	LogPath         string
+	Verbose         bool
 
 	Database *DatabaseConfig
 
@@ -210,3 +211,8 @@ func StaticPath() string {
 func GetProviders() []string {
 	return config.Providers
 }
+
+// SetVerboseLogging sets logging to be in DEBUG mode
+func SetVerboseLogging() {
+	config.Verbose = true
+}

config/logger.go

@@ -7,11 +7,13 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
-// GetLogger returns a logger for logging tasks to file
-// TODO Create logger per Job with unique filename
+// GetLogger returns a logger for logging manager processes
+// Logs are also persisted to file
 func GetLogger(mgrName, logPath string) *log.Entry {
 	logger := log.New()
-	logger.SetLevel(log.DebugLevel)
+	if config.Verbose {
+		logger.SetLevel(log.DebugLevel)
+	}
 	file, err := os.OpenFile(logPath, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0666)
 	if err == nil {
 		logger.SetOutput(io.MultiWriter(file, os.Stderr))

provider/aws/s3.go

@@ -36,7 +36,7 @@ func getS3BucketRegion(cfg aws.Config, bucketName string) (string, error) {
 }
 
 func getS3BucketTags(svc *s3.Client, bucketName string) (resource.Tags, error) {
-	s3Logger.Debug("Fetching S3 Tags")
+	s3Logger.Debugf("Fetching S3 Tags for %s", bucketName)
 	input := &s3.GetBucketTaggingInput{
 		Bucket: aws.String(bucketName),
 	}