Fixed uncommented exported items

cmd/cli/commands/retagrg.go

@@ -52,8 +52,8 @@ var resourceGroupTagCommand = &cobra.Command{
  }
 
  rules := rules.TagRules{Rules: []rules.Rule{
- rules.Rule{Name: "name", Conditions: []rules.ConditionItem{
- rules.ConditionItem{"type": "rgEqual", "resourceGroup": resourceGroup},
+ {Name: "name", Conditions: []rules.ConditionItem{
+ {"type": "rgEqual", "resourceGroup": resourceGroup},
  },
  Actions: actions,
  },

cmd/cli/commands/rewrite.go

@@ -10,9 +10,6 @@ import (
  "github.com/spf13/cobra"
 )
 
-type ActionExecution struct {
-}
-
 const (
  usageMappingFile = "Location of the tag rules definition (json)"
  usageDryRun = "The tagger will not execute any actions"

cmd/cli/commands/root.go

@@ -8,20 +8,22 @@ import (
  "github.com/spf13/cobra"
 )
 
+var verbose bool
+
+func init() {
+ rootCmd.PersistentFlags().BoolVarP(&verbose, "verbose", "v", false, "verbose output")
+}
+
 var rootCmd = &cobra.Command{
  Use: "tagmanager",
  PersistentPreRun: func(cmd *cobra.Command, args []string) {
- if Verbose {
+ if verbose {
  log.SetLevel(log.InfoLevel)
  }
  },
 }
-var Verbose bool
-
-func init() {
- rootCmd.PersistentFlags().BoolVarP(&Verbose, "verbose", "v", false, "verbose output")
-}
 
+// Execute handles command
 func Execute() {
  if err := rootCmd.Execute(); err != nil {
  fmt.Println(err)

internal/azure/rules/types.go

@@ -11,6 +11,7 @@ import (
  "github.com/pkg/errors"
 )
 
+// NewFromFile reads filename and returns TagRules
 func NewFromFile(filename string) (TagRules, error) {
  dat, err := ioutil.ReadFile(filename)
  if err != nil {
@@ -20,32 +21,39 @@ func NewFromFile(filename string) (TagRules, error) {
  return NewFromString(string(dat))
 }
 
+// NewFromString parses rulesDef and returns TagRules
 func NewFromString(rulesDef string) (TagRules, error) {
  return parseRulesDefinitions(rulesDef)
 }
 
+// TagRules represents rules parsed from a rules definition
 type TagRules struct {
  DryRun *bool `json:"dryrun,omitempty"`
  Rules []Rule `json:"rules"`
 }
 
+// Rule represnts single rule
 type Rule struct {
  Name string `json:"name,omitempty"`
  Conditions []ConditionItem `json:"conditions"`
  Actions []ActionItem `json:"actions"`
 }
 
+// ConditionItem represnts one condition
 type ConditionItem map[string]string
 
+// GetType retrurn the type of the condition
 func (p ConditionItem) GetType() string {
  if val, ok := p["type"]; ok {
  return val
  }
  return ""
 }
 
+// ActionItem represnts a single action
 type ActionItem map[string]string
 
+// GetType retrurn the type of the action
 func (p ActionItem) GetType() string {
  if val, ok := p["type"]; ok {
  return val

internal/azure/rules/types_test.go

@@ -61,25 +61,25 @@ rules:
  }`
  empty = `{}`
  onlyDryRun = `{"dryrun": true}`
- wrongJson = `{ew2`
+ wrongJSON = `{ew2`
  wrongYaml = `223322`
 )
 
 var (
  twoRulesWant = TagRules{Rules: []Rule{
- Rule{Name: "name", Conditions: []ConditionItem{
- ConditionItem{"type": "tagEqual", "tag": "test", "value": "test"},
- ConditionItem{"type": "tagExists", "tag": "test"},
+ {Name: "name", Conditions: []ConditionItem{
+ {"type": "tagEqual", "tag": "test", "value": "test"},
+ {"type": "tagExists", "tag": "test"},
  },
  Actions: []ActionItem{
- ActionItem{"type": "addTag", "tag": "test", "value": "test"},
+ {"type": "addTag", "tag": "test", "value": "test"},
  },
  },
  }}
 )
 
-var dryRunFalse bool = false
-var dryRunTrue bool = true
+var dryRunFalse = false
+var dryRunTrue = true
 
 func TestNewFromString(t *testing.T) {
  type args struct {
@@ -95,7 +95,7 @@ func TestNewFromString(t *testing.T) {
  {name: "only dryrun defined", args: args{rulesDef: onlyDryRun}, want: TagRules{DryRun: &dryRunTrue}, wantErr: false},
  {name: "one rule", args: args{rulesDef: two}, want: twoRulesWant, wantErr: false},
  {name: "one rule yaml", args: args{rulesDef: yamlTwo}, want: twoRulesWant, wantErr: false},
- {name: "wrong json", args: args{rulesDef: wrongJson}, want: TagRules{}, wantErr: true},
+ {name: "wrong json", args: args{rulesDef: wrongJSON}, want: TagRules{}, wantErr: true},
  {name: "wrong yaml", args: args{rulesDef: wrongYaml}, want: TagRules{}, wantErr: true},
  }
 

internal/azure/tagger_test.go

@@ -4,49 +4,49 @@ import (
  "context"
  "testing"
 
+ "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2018-02-01/resources"
  "github.com/nordcloud/azure-tag-manager/internal/azure/rules"
  "github.com/nordcloud/azure-tag-manager/mocks"
- "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2018-02-01/resources"
  "github.com/stretchr/testify/assert"
 )
 
 var (
  twoRulesWant = rules.TagRules{Rules: []rules.Rule{
- rules.Rule{Name: "name", Conditions: []rules.ConditionItem{
- rules.ConditionItem{"type": "tagEqual", "tag": "test", "value": "test"},
- rules.ConditionItem{"type": "tagExists", "tag": "test"},
+ {Name: "name", Conditions: []rules.ConditionItem{
+ {"type": "tagEqual", "tag": "test", "value": "test"},
+ {"type": "tagExists", "tag": "test"},
  },
  Actions: []rules.ActionItem{
- rules.ActionItem{"type": "addTag", "tag": "test2", "value": "test2"},
+ {"type": "addTag", "tag": "test2", "value": "test2"},
  },
  },
  }}
 
  deleteTag = rules.TagRules{Rules: []rules.Rule{
- rules.Rule{Name: "name", Conditions: []rules.ConditionItem{
- rules.ConditionItem{"type": "tagEqual", "tag": "test2", "value": "test2"},
+ {Name: "name", Conditions: []rules.ConditionItem{
+ {"type": "tagEqual", "tag": "test2", "value": "test2"},
  },
  Actions: []rules.ActionItem{
- rules.ActionItem{"type": "delTag", "tag": "test3"},
+ {"type": "delTag", "tag": "test3"},
  },
  },
  }}
 
  deleteAllTags = rules.TagRules{Rules: []rules.Rule{
- rules.Rule{Name: "name", Conditions: []rules.ConditionItem{
- rules.ConditionItem{"type": "tagEqual", "tag": "test2", "value": "test2"},
+ {Name: "name", Conditions: []rules.ConditionItem{
+ {"type": "tagEqual", "tag": "test2", "value": "test2"},
  },
  Actions: []rules.ActionItem{
- rules.ActionItem{"type": "cleanTags"},
+ {"type": "cleanTags"},
  },
  },
  }}
 )
 
 var testResources = []Resource{
- Resource{ID: "1", Region: "westeurope", Tags: map[string]*string{"test": String("test")}, ResourceGroup: String("test"), Name: String("name")},
- Resource{ID: "2", Region: "westeurope", Tags: map[string]*string{"test2": String("test2"), "test3": String("test3")}, ResourceGroup: String("te3st"), Name: String("name2")},
- Resource{ID: "3", Region: "easteurope", Tags: map[string]*string{"test-region": String("other"), "othertest": String("test56")}, ResourceGroup: String("rg2"), Name: String("name3")},
+ {ID: "1", Region: "westeurope", Tags: map[string]*string{"test": String("test")}, ResourceGroup: String("test"), Name: String("name")},
+ {ID: "2", Region: "westeurope", Tags: map[string]*string{"test2": String("test2"), "test3": String("test3")}, ResourceGroup: String("te3st"), Name: String("name2")},
+ {ID: "3", Region: "easteurope", Tags: map[string]*string{"test-region": String("other"), "othertest": String("test56")}, ResourceGroup: String("rg2"), Name: String("name3")},
 }
 
 func TestTagger_ExecuteActions(t *testing.T) {