golint: remove underscores from Go names

Fixes warnings similiar to ... warning: don't use underscores in Go names; var x_yZ should be xYZ (golint) While the diff speaks for itself a summary of the replace o s/service_deleteCmd/serviceDeleteCmd o s/sub_decision/subDecision o s/endpoint_configCmd/endpointConfigCmd o s/bash_completion_func/bashCompletionFunc o s/len_a/lenA o s/len_b/lenB o s/policy_validateCmd/policyValidateCmd o s/identity_getCmd/identityGetCmd o s/bpf_policy_addCmd/bpfPolicyAddCmd o s/peer_lbl/peerLbl o s/service_updateCmd/serviceUpdateCmd o s/bash_completionCmd/bashCompletionCmd o s/endpoint_disconnectCmd/endpointDisconnectCmd o s/always_allow/alwaysAllow o s/bpf_policyCmd/bpfPolicyCmd o s/bpf_policy_listCmd/bpfPolicyListCmd o s/policy_importCmd/policyImportCmd o s/bpf_policy_deleteCmd/bpfPolicyDeleteCmd o s/policy_traceCmd/policyTraceCmd o s/endpoint_labelsCmd/endpointLabelsCmd o s/endpoint_regenerateCmd/endpointRegenerateCmd o s/pr_{c,r,l4}/pr{C,R,L4} o s/policy_deleteCmd/policyDeleteCmd o s/ip_2/ip2 o s/bpf_ctCmd/bpfCtCmd o s/policy_getCmd/policyGetCmd o s/filter_http/filterHttp o s/filter_90_to_92/filter90To92 o s/service_getCmd/serviceGetCmd o s/bpf_ct_listCmd/bpfCtListCmd o s/service_listCmd/serviceListCmd o s/endpoint_getCmd/endpointGetCmd o s/endpoint_listCmd/endpointListCmd o s/update_ok/updateOk Related-to: #153 (Resolve golint warnings) Signed-off-by: Alexander Alemayhu <alexander@alemayhu.com>
cilium · Mar 18, 2017 · d71b9bd · d71b9bd
1 parent d761e03
commit d71b9bd
Show file tree

Hide file tree

Showing 32 changed files with 142 additions and 142 deletions.
diff --git a/cilium/cmd/bash_completion.go b/cilium/cmd/bash_completion.go
@@ -21,8 +21,8 @@ import (
 	"github.com/spf13/cobra"
 )
 
-// bash_completionCmd represents the bash_completion command
-var bash_completionCmd = &cobra.Command{
+// bashCompletionCmd represents the bash_completion command
+var bashCompletionCmd = &cobra.Command{
 	Use:    "generate-bash-completion",
 	Short:  "Hidden bash completion command",
 	Hidden: true,
@@ -34,5 +34,5 @@ var bash_completionCmd = &cobra.Command{
 }
 
 func init() {
-	RootCmd.AddCommand(bash_completionCmd)
+	RootCmd.AddCommand(bashCompletionCmd)
 }
diff --git a/cilium/cmd/bpf_ct.go b/cilium/cmd/bpf_ct.go
@@ -18,12 +18,12 @@ import (
 	"github.com/spf13/cobra"
 )
 
-// bpf_ctCmd represents the bpf_ct command
-var bpf_ctCmd = &cobra.Command{
+// bpfCtCmd represents the bpf_ct command
+var bpfCtCmd = &cobra.Command{
 	Use:   "ct",
 	Short: "Connection tracking tables",
 }
 
 func init() {
-	bpfCmd.AddCommand(bpf_ctCmd)
+	bpfCmd.AddCommand(bpfCtCmd)
 }
diff --git a/cilium/cmd/bpf_ct_list.go b/cilium/cmd/bpf_ct_list.go
@@ -23,8 +23,8 @@ import (
 	"github.com/spf13/cobra"
 )
 
-// bpf_ct_listCmd represents the bpf_ct_list command
-var bpf_ct_listCmd = &cobra.Command{
+// bpfCtListCmd represents the bpf_ct_list command
+var bpfCtListCmd = &cobra.Command{
 	Use:    "list",
 	Short:  "List connection tracking entries",
 	PreRun: requireEndpointID,
@@ -35,7 +35,7 @@ var bpf_ct_listCmd = &cobra.Command{
 }
 
 func init() {
-	bpf_ctCmd.AddCommand(bpf_ct_listCmd)
+	bpfCtCmd.AddCommand(bpfCtListCmd)
 }
 
 func dumpCtProto(name string, ctType ctmap.CtType) {

diff --git a/cilium/cmd/bpf_policy.go b/cilium/cmd/bpf_policy.go
@@ -18,12 +18,12 @@ import (
 	"github.com/spf13/cobra"
 )
 
-// bpf_policyCmd represents the bpf_policy command
-var bpf_policyCmd = &cobra.Command{
+// bpfPolicyCmd represents the bpf_policy command
+var bpfPolicyCmd = &cobra.Command{
 	Use:   "policy",
 	Short: "Manage policy related BPF maps",
 }
 
 func init() {
-	bpfCmd.AddCommand(bpf_policyCmd)
+	bpfCmd.AddCommand(bpfPolicyCmd)
 }
diff --git a/cilium/cmd/bpf_policy_add.go b/cilium/cmd/bpf_policy_add.go
@@ -24,8 +24,8 @@ import (
 	"github.com/spf13/cobra"
 )
 
-// bpf_policy_addCmd represents the bpf_policy_add command
-var bpf_policy_addCmd = &cobra.Command{
+// bpfPolicyAddCmd represents the bpf_policy_add command
+var bpfPolicyAddCmd = &cobra.Command{
 	Use:    "add <endpoint id> <identity>",
 	Short:  "Add/update policy entry",
 	PreRun: requireEndpointID,
@@ -35,7 +35,7 @@ var bpf_policy_addCmd = &cobra.Command{
 }
 
 func init() {
-	bpf_policyCmd.AddCommand(bpf_policy_addCmd)
+	bpfPolicyCmd.AddCommand(bpfPolicyAddCmd)
 }
 
 func updatePolicyKey(cmd *cobra.Command, args []string, add bool) {
@@ -54,13 +54,13 @@ func updatePolicyKey(cmd *cobra.Command, args []string, add bool) {
 		Fatalf("Cannot open policymap '%s' : %s", file, err)
 	}
 
-	peer_lbl, err := strconv.ParseUint(args[1], 10, 32)
+	peerLbl, err := strconv.ParseUint(args[1], 10, 32)
 	if add == true {
-		if err := policyMap.AllowConsumer(uint32(peer_lbl)); err != nil {
+		if err := policyMap.AllowConsumer(uint32(peerLbl)); err != nil {
 			Fatalf("Cannot add policy key: %s", err)
 		}
 	} else {
-		if err := policyMap.DeleteConsumer(uint32(peer_lbl)); err != nil {
+		if err := policyMap.DeleteConsumer(uint32(peerLbl)); err != nil {
 			Fatalf("Cannot delete policy key: %s", err)
 		}
 	}

diff --git a/cilium/cmd/bpf_policy_delete.go b/cilium/cmd/bpf_policy_delete.go
@@ -18,8 +18,8 @@ import (
 	"github.com/spf13/cobra"
 )
 
-// bpf_policy_deleteCmd represents the bpf_policy_delete command
-var bpf_policy_deleteCmd = &cobra.Command{
+// bpfPolicyDeleteCmd represents the bpf_policy_delete command
+var bpfPolicyDeleteCmd = &cobra.Command{
 	Use:    "delete <endpoint id> <identity>",
 	Short:  "Delete a policy entry",
 	PreRun: requireEndpointID,
@@ -29,5 +29,5 @@ var bpf_policy_deleteCmd = &cobra.Command{
 }
 
 func init() {
-	bpf_policyCmd.AddCommand(bpf_policy_deleteCmd)
+	bpfPolicyCmd.AddCommand(bpfPolicyDeleteCmd)
 }
diff --git a/cilium/cmd/bpf_policy_list.go b/cilium/cmd/bpf_policy_list.go
@@ -29,8 +29,8 @@ import (
 
 var printIDs bool
 
-// bpf_policy_listCmd represents the bpf_policy_list command
-var bpf_policy_listCmd = &cobra.Command{
+// bpfPolicyListCmd represents the bpf_policy_list command
+var bpfPolicyListCmd = &cobra.Command{
 	Use:    "list",
 	Short:  "List contents of a policy BPF map",
 	PreRun: requireEndpointID,
@@ -40,8 +40,8 @@ var bpf_policy_listCmd = &cobra.Command{
 }
 
 func init() {
-	bpf_policyCmd.AddCommand(bpf_policy_listCmd)
-	bpf_policy_listCmd.Flags().BoolVarP(&printIDs, "numeric", "n", false, "Do not resolve IDs")
+	bpfPolicyCmd.AddCommand(bpfPolicyListCmd)
+	bpfPolicyListCmd.Flags().BoolVarP(&printIDs, "numeric", "n", false, "Do not resolve IDs")
 }
 
 func listMap(cmd *cobra.Command, args []string) {

diff --git a/cilium/cmd/endpoint_config.go b/cilium/cmd/endpoint_config.go
@@ -26,8 +26,8 @@ import (
 
 var listOptions bool
 
-// endpoint_configCmd represents the endpoint_config command
-var endpoint_configCmd = &cobra.Command{
+// endpointConfigCmd represents the endpoint_config command
+var endpointConfigCmd = &cobra.Command{
 	Use:     "config <endpoint id> [<option>=(enable|disable) ...]",
 	Short:   "View & modify endpoint configuration",
 	Example: "endpoint config 5421 DropNotification=disable",
@@ -43,8 +43,8 @@ var endpoint_configCmd = &cobra.Command{
 }
 
 func init() {
-	endpointCmd.AddCommand(endpoint_configCmd)
-	endpoint_configCmd.Flags().BoolVarP(&listOptions, "list-options", "", false, "List available options")
+	endpointCmd.AddCommand(endpointConfigCmd)
+	endpointConfigCmd.Flags().BoolVarP(&listOptions, "list-options", "", false, "List available options")
 }
 
 func listEndpointOptions() {

diff --git a/cilium/cmd/endpoint_disconnect.go b/cilium/cmd/endpoint_disconnect.go
@@ -20,8 +20,8 @@ import (
 	"github.com/spf13/cobra"
 )
 
-// endpoint_disconnectCmd represents the endpoint_disconnect command
-var endpoint_disconnectCmd = &cobra.Command{
+// endpointDisconnectCmd represents the endpoint_disconnect command
+var endpointDisconnectCmd = &cobra.Command{
 	Use:    "disconnect <endpoint-id>",
 	Short:  "Disconnect an endpoint from the network",
 	PreRun: requireEndpointID,
@@ -36,6 +36,6 @@ var endpoint_disconnectCmd = &cobra.Command{
 }
 
 func init() {
-	endpointCmd.AddCommand(endpoint_disconnectCmd)
+	endpointCmd.AddCommand(endpointDisconnectCmd)
 
 }
diff --git a/cilium/cmd/endpoint_get.go b/cilium/cmd/endpoint_get.go
@@ -21,8 +21,8 @@ import (
 	"github.com/spf13/cobra"
 )
 
-// endpoint_getCmd represents the endpoint_get command
-var endpoint_getCmd = &cobra.Command{
+// endpointGetCmd represents the endpoint_get command
+var endpointGetCmd = &cobra.Command{
 	Use:     "get <endpoint-id>",
 	Aliases: []string{"inspect, show"},
 	Short:   "Display endpoint information",
@@ -41,5 +41,5 @@ var endpoint_getCmd = &cobra.Command{
 }
 
 func init() {
-	endpointCmd.AddCommand(endpoint_getCmd)
+	endpointCmd.AddCommand(endpointGetCmd)
 }
diff --git a/cilium/cmd/endpoint_labels.go b/cilium/cmd/endpoint_labels.go
@@ -32,8 +32,8 @@ var (
 	toDelete []string
 )
 
-// endpoint_labelsCmd represents the endpoint_labels command
-var endpoint_labelsCmd = &cobra.Command{
+// endpointLabelsCmd represents the endpoint_labels command
+var endpointLabelsCmd = &cobra.Command{
 	Use:    "labels",
 	Short:  "Manage label configuration of endpoint",
 	PreRun: requireEndpointID,
@@ -65,9 +65,9 @@ var endpoint_labelsCmd = &cobra.Command{
 }
 
 func init() {
-	endpointCmd.AddCommand(endpoint_labelsCmd)
-	endpoint_labelsCmd.Flags().StringSliceVarP(&toAdd, "add", "a", []string{}, "Add/enable labels")
-	endpoint_labelsCmd.Flags().StringSliceVarP(&toDelete, "delete", "d", []string{}, "Delete/disable labels")
+	endpointCmd.AddCommand(endpointLabelsCmd)
+	endpointLabelsCmd.Flags().StringSliceVarP(&toAdd, "add", "a", []string{}, "Add/enable labels")
+	endpointLabelsCmd.Flags().StringSliceVarP(&toDelete, "delete", "d", []string{}, "Delete/disable labels")
 }
 
 func printEndpointLabels(lbls *labels.OpLabels) {

diff --git a/cilium/cmd/endpoint_list.go b/cilium/cmd/endpoint_list.go
@@ -26,8 +26,8 @@ import (
 
 var noHeaders bool
 
-// endpoint_listCmd represents the endpoint_list command
-var endpoint_listCmd = &cobra.Command{
+// endpointListCmd represents the endpoint_list command
+var endpointListCmd = &cobra.Command{
 	Use:   "list",
 	Short: "List all endpoints",
 	Run: func(cmd *cobra.Command, args []string) {
@@ -36,8 +36,8 @@ var endpoint_listCmd = &cobra.Command{
 }
 
 func init() {
-	endpointCmd.AddCommand(endpoint_listCmd)
-	endpoint_listCmd.Flags().BoolVar(&noHeaders, "no-headers", false, "Do not print headers")
+	endpointCmd.AddCommand(endpointListCmd)
+	endpointListCmd.Flags().BoolVar(&noHeaders, "no-headers", false, "Do not print headers")
 }
 
 func listEndpoint(w *tabwriter.Writer, ep *models.Endpoint, id string, label string) {

diff --git a/cilium/cmd/endpoint_regenerate.go b/cilium/cmd/endpoint_regenerate.go
@@ -20,8 +20,8 @@ import (
 	"github.com/spf13/cobra"
 )
 
-// endpoint_regenerateCmd represents the endpoint_regenerate command
-var endpoint_regenerateCmd = &cobra.Command{
+// endpointRegenerateCmd represents the endpoint_regenerate command
+var endpointRegenerateCmd = &cobra.Command{
 	Use:    "regenerate <endpoint-id>",
 	Short:  "Force regeneration of endpoint program",
 	PreRun: requireEndpointID,
@@ -36,5 +36,5 @@ var endpoint_regenerateCmd = &cobra.Command{
 }
 
 func init() {
-	endpointCmd.AddCommand(endpoint_regenerateCmd)
+	endpointCmd.AddCommand(endpointRegenerateCmd)
 }
diff --git a/cilium/cmd/identity_get.go b/cilium/cmd/identity_get.go
@@ -25,8 +25,8 @@ import (
 
 var listID bool
 
-// identity_getCmd represents the identity_get command
-var identity_getCmd = &cobra.Command{
+// identityGetCmd represents the identity_get command
+var identityGetCmd = &cobra.Command{
 	Use:   "get",
 	Short: "A brief description of your command",
 	Run: func(cmd *cobra.Command, args []string) {
@@ -50,6 +50,6 @@ var identity_getCmd = &cobra.Command{
 }
 
 func init() {
-	identityCmd.AddCommand(identity_getCmd)
-	identity_getCmd.Flags().BoolVarP(&listID, "list", "", false, "List all identities")
+	identityCmd.AddCommand(identityGetCmd)
+	identityGetCmd.Flags().BoolVarP(&listID, "list", "", false, "List all identities")
 }
diff --git a/cilium/cmd/policy_delete.go b/cilium/cmd/policy_delete.go
@@ -18,8 +18,8 @@ import (
 	"github.com/spf13/cobra"
 )
 
-// policy_deleteCmd represents the policy_delete command
-var policy_deleteCmd = &cobra.Command{
+// policyDeleteCmd represents the policy_delete command
+var policyDeleteCmd = &cobra.Command{
 	Use:    "delete <policy-path>",
 	Short:  "Delete a policy tree node",
 	PreRun: requirePath,
@@ -32,5 +32,5 @@ var policy_deleteCmd = &cobra.Command{
 }
 
 func init() {
-	policyCmd.AddCommand(policy_deleteCmd)
+	policyCmd.AddCommand(policyDeleteCmd)
 }
diff --git a/cilium/cmd/policy_get.go b/cilium/cmd/policy_get.go
@@ -20,8 +20,8 @@ import (
 	"github.com/spf13/cobra"
 )
 
-// policy_getCmd represents the policy_get command
-var policy_getCmd = &cobra.Command{
+// policyGetCmd represents the policy_get command
+var policyGetCmd = &cobra.Command{
 	Use:    "get <policy-path>",
 	Short:  "Display policy node information",
 	PreRun: requirePath,
@@ -36,5 +36,5 @@ var policy_getCmd = &cobra.Command{
 }
 
 func init() {
-	policyCmd.AddCommand(policy_getCmd)
+	policyCmd.AddCommand(policyGetCmd)
 }
diff --git a/cilium/cmd/policy_import.go b/cilium/cmd/policy_import.go
@@ -22,8 +22,8 @@ import (
 
 var printPolicy bool
 
-// policy_importCmd represents the policy_import command
-var policy_importCmd = &cobra.Command{
+// policyImportCmd represents the policy_import command
+var policyImportCmd = &cobra.Command{
 	Use:   "import <path>",
 	Short: "Import security policy",
 	Example: `  cilium policy import ~/app.policy
@@ -52,6 +52,6 @@ var policy_importCmd = &cobra.Command{
 }
 
 func init() {
-	policyCmd.AddCommand(policy_importCmd)
-	policy_importCmd.Flags().BoolVarP(&printPolicy, "print", "", false, "Print policy after import")
+	policyCmd.AddCommand(policyImportCmd)
+	policyImportCmd.Flags().BoolVarP(&printPolicy, "print", "", false, "Print policy after import")
 }
diff --git a/cilium/cmd/policy_trace.go b/cilium/cmd/policy_trace.go
@@ -27,8 +27,8 @@ import (
 
 var src, dst []string
 
-// policy_traceCmd represents the policy_trace command
-var policy_traceCmd = &cobra.Command{
+// policyTraceCmd represents the policy_trace command
+var policyTraceCmd = &cobra.Command{
 	Use:   "trace -s <context> -d <context>",
 	Short: "Trace a policy decision",
 	Long: `Verifies if source ID or LABEL(s) is allowed to consume
@@ -62,11 +62,11 @@ SOURCE:KEY[=VALUE]`,
 }
 
 func init() {
-	policyCmd.AddCommand(policy_traceCmd)
-	policy_traceCmd.Flags().StringSliceVarP(&src, "src", "s", []string{}, "Source label context")
-	policy_traceCmd.MarkFlagRequired("src")
-	policy_traceCmd.Flags().StringSliceVarP(&dst, "dst", "d", []string{}, "Destination label context")
-	policy_traceCmd.MarkFlagRequired("dst")
+	policyCmd.AddCommand(policyTraceCmd)
+	policyTraceCmd.Flags().StringSliceVarP(&src, "src", "s", []string{}, "Source label context")
+	policyTraceCmd.MarkFlagRequired("src")
+	policyTraceCmd.Flags().StringSliceVarP(&dst, "dst", "d", []string{}, "Destination label context")
+	policyTraceCmd.MarkFlagRequired("dst")
 }
 
 func parseAllowedSlice(slice []string) ([]string, error) {

diff --git a/cilium/cmd/policy_validate.go b/cilium/cmd/policy_validate.go
@@ -20,8 +20,8 @@ import (
 	"github.com/spf13/cobra"
 )
 
-// policy_validateCmd represents the policy_validate command
-var policy_validateCmd = &cobra.Command{
+// policyValidateCmd represents the policy_validate command
+var policyValidateCmd = &cobra.Command{
 	Use:    "validate <path>",
 	Short:  "Validate a policy",
 	PreRun: requirePath,
@@ -41,7 +41,7 @@ var policy_validateCmd = &cobra.Command{
 }
 
 func init() {
-	policyCmd.AddCommand(policy_validateCmd)
-	policy_validateCmd.Flags().BoolVarP(&printPolicy, "print", "", false, "Print policy after validation")
+	policyCmd.AddCommand(policyValidateCmd)
+	policyValidateCmd.Flags().BoolVarP(&printPolicy, "print", "", false, "Print policy after validation")
 
 }