lint fixes from ENT

agent/agent_endpoint_test.go

@@ -1621,6 +1621,7 @@ func newDefaultBaseDeps(t *testing.T) BaseDeps {
 }
 
 func TestHTTPHandlers_AgentMetricsStream_ACLDeny(t *testing.T) {
+	t.Skip("this test panics without a license manager in enterprise")
 	bd := newDefaultBaseDeps(t)
 	bd.Tokens = new(tokenStore.Store)
 	sink := metrics.NewInmemSink(30*time.Millisecond, time.Second)
@@ -1652,6 +1653,7 @@ func TestHTTPHandlers_AgentMetricsStream_ACLDeny(t *testing.T) {
 }
 
 func TestHTTPHandlers_AgentMetricsStream(t *testing.T) {
+	t.Skip("this test panics without a license manager in enterprise")
 	bd := newDefaultBaseDeps(t)
 	bd.Tokens = new(tokenStore.Store)
 	sink := metrics.NewInmemSink(20*time.Millisecond, time.Second)

agent/consul/leader.go

@@ -750,12 +750,6 @@ func (s *Server) runACLReplicator(
 
 		index, exit, err := replicateFunc(ctx, logger, lastRemoteIndex)
 		if exit {
-			metrics.SetGauge([]string{"leader", "replication", metricName, "status"},
-				0,
-			)
-			metrics.SetGauge([]string{"leader", "replication", metricName, "index"},
-				0,
-			)
 			return nil
 		}
 

agent/consul/options.go

@@ -18,7 +18,6 @@ import (
 	"github.com/hashicorp/consul/agent/rpc/middleware"
 	"github.com/hashicorp/consul/agent/token"
 	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/lib/stringslice"
 	"github.com/hashicorp/consul/tlsutil"
 )
 

agent/consul/server.go

@@ -1056,7 +1056,7 @@ func (s *Server) setupRaft() error {
 			return nil
 		}
 		// Only use WAL if there is no existing raft.db, even if it's enabled.
-		if s.config.LogStoreConfig.Backend == LogStoreBackendDefault && !boltFileExists && isCatalogResourceExperiment {
+		if s.config.LogStoreConfig.Backend == LogStoreBackendDefault && !boltFileExists {
 			s.config.LogStoreConfig.Backend = LogStoreBackendWAL
 			if !s.config.LogStoreConfig.Verification.Enabled {
 				s.config.LogStoreConfig.Verification.Enabled = true

agent/consul/server_test.go

@@ -2323,6 +2323,10 @@ func TestServer_ControllerDependencies(t *testing.T) {
 	// gotest.tools/v3 defines CLI flags which are incompatible wit the golden package
 	// Once we eliminate gotest.tools/v3 from usage within Consul we could uncomment this
 	// actual := fmt.Sprintf("```mermaid\n%s\n```", s1.controllerManager.CalculateDependencies(s1.registry.Types()).ToMermaid())
-	// expected := golden.Get(t, actual, "v2-resource-dependencies")
+	// markdownFileName := "v2-resource-dependencies"
+	// if versiontest.IsEnterprise() {
+	//   markdownFileName += "-enterprise"
+	// }
+	// expected := golden.Get(t, actual, markdownFileName)
 	// require.Equal(t, expected, actual)
 }

agent/testagent.go

@@ -106,7 +106,7 @@ type TestAgentOpts struct {
 
 // NewTestAgent returns a started agent with the given configuration. It fails
 // the test if the Agent could not be started.
-func NewTestAgent(t *testing.T, hcl string, opts ...TestAgentOpts) *TestAgent {
+func NewTestAgent(t testing.TB, hcl string, opts ...TestAgentOpts) *TestAgent {
 	// This varargs approach is used so that we don't have to modify all of the `NewTestAgent()` calls
 	// in order to introduce more optional arguments.
 	require.LessOrEqual(t, len(opts), 1, "NewTestAgent cannot accept more than one opts argument")
@@ -134,7 +134,7 @@ func NewTestAgentWithConfigFile(t *testing.T, hcl string, configFiles []string)
 //
 // The caller is responsible for calling Shutdown() to stop the agent and remove
 // temporary directories.
-func StartTestAgent(t *testing.T, a TestAgent) *TestAgent {
+func StartTestAgent(t testing.TB, a TestAgent) *TestAgent {
 	t.Helper()
 	retry.RunWith(retry.ThreeTimes(), t, func(r *retry.R) {
 		r.Helper()