clean up issue with exported constant used in test, fmt'd/linted

hashicorp · Feb 2, 2023 · 759f50e · 759f50e
1 parent cc59a12
commit 759f50e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/cli/cmd/proxy/loglevel/command.go b/cli/cmd/proxy/loglevel/command.go
@@ -7,16 +7,17 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/hashicorp/consul-k8s/cli/common"
-	"github.com/hashicorp/consul-k8s/cli/common/envoy"
-	"github.com/hashicorp/consul-k8s/cli/common/flag"
-	"github.com/hashicorp/consul-k8s/cli/common/terminal"
 	"github.com/posener/complete"
 	helmCLI "helm.sh/helm/v3/pkg/cli"
 	"k8s.io/apimachinery/pkg/api/validation"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
+
+	"github.com/hashicorp/consul-k8s/cli/common"
+	"github.com/hashicorp/consul-k8s/cli/common/envoy"
+	"github.com/hashicorp/consul-k8s/cli/common/flag"
+	"github.com/hashicorp/consul-k8s/cli/common/terminal"
 )
 
 const (
@@ -172,7 +173,7 @@ func (l *LogLevelCommand) parseFlags(args []string) error {
 }
 
 func (l *LogLevelCommand) validateFlags() error {
-	if l.level != "" && l.reset == true {
+	if l.level != "" && l.reset {
 		return fmt.Errorf("cannot set log level to %q and reset to 'info' at the same time", l.level)
 	}
 	if l.namespace == "" {

diff --git a/cli/cmd/proxy/loglevel/command_test.go b/cli/cmd/proxy/loglevel/command_test.go
@@ -9,14 +9,15 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/hashicorp/consul-k8s/cli/common"
-	"github.com/hashicorp/consul-k8s/cli/common/envoy"
-	"github.com/hashicorp/consul-k8s/cli/common/terminal"
 	"github.com/hashicorp/go-hclog"
 	"github.com/stretchr/testify/require"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes/fake"
+
+	"github.com/hashicorp/consul-k8s/cli/common"
+	"github.com/hashicorp/consul-k8s/cli/common/envoy"
+	"github.com/hashicorp/consul-k8s/cli/common/terminal"
 )
 
 func TestFlagParsingFails(t *testing.T) {

diff --git a/cli/common/envoy/http_test.go b/cli/common/envoy/http_test.go
@@ -577,8 +577,8 @@ func (m *mockPortForwarder) Open(ctx context.Context) (string, error) { return m
 func (m *mockPortForwarder) Close()                                   {}
 
 func testLogConfig() map[string]string {
-	cfg := make(map[string]string, len(envoyLoggers))
-	for k := range envoyLoggers {
+	cfg := make(map[string]string, len(EnvoyLoggers))
+	for k := range EnvoyLoggers {
 		cfg[k] = "debug"
 	}
 	return cfg