Backport of test: add test helper to detect if the current build is e…

…nterprise into release/1.17.x (#19612) test: add test helper to detect if the current build is enterprise (#19201) This can help conditionally change test behavior if the test is executing in enterprise without the need to split the test with build tags. Co-authored-by: R.B. Boyer <[email protected]>
hashicorp · Nov 13, 2023 · b0d7faa · b0d7faa
1 parent 45f4294
commit b0d7faa
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/internal/catalog/internal/types/failover_policy_test.go b/internal/catalog/internal/types/failover_policy_test.go
@@ -11,13 +11,13 @@ import (
 	"google.golang.org/protobuf/proto"
 
 	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/internal/resource"
 	"github.com/hashicorp/consul/internal/resource/resourcetest"
 	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
 	"github.com/hashicorp/consul/proto-public/pbresource"
 	"github.com/hashicorp/consul/proto/private/prototest"
 	"github.com/hashicorp/consul/sdk/testutil"
+	"github.com/hashicorp/consul/version/versiontest"
 )
 
 func TestMutateFailoverPolicy(t *testing.T) {
@@ -749,7 +749,7 @@ func TestFailoverPolicyACLs(t *testing.T) {
 		})
 	}
 
-	isEnterprise := (structs.NodeEnterpriseMetaInDefaultPartition().PartitionOrEmpty() == "default")
+	isEnterprise := versiontest.IsEnterprise()
 
 	serviceRead := func(partition, namespace, name string) string {
 		if isEnterprise {

diff --git a/internal/mesh/internal/types/destination_policy_test.go b/internal/mesh/internal/types/destination_policy_test.go
@@ -11,13 +11,13 @@ import (
 	"github.com/stretchr/testify/require"
 	"google.golang.org/protobuf/types/known/durationpb"
 
-	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/internal/resource"
 	"github.com/hashicorp/consul/internal/resource/resourcetest"
 	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
 	"github.com/hashicorp/consul/proto-public/pbresource"
 	"github.com/hashicorp/consul/proto/private/prototest"
 	"github.com/hashicorp/consul/sdk/testutil"
+	"github.com/hashicorp/consul/version/versiontest"
 )
 
 func TestValidateDestinationPolicy(t *testing.T) {
@@ -545,7 +545,7 @@ func TestDestinationPolicyACLs(t *testing.T) {
 		})
 	}
 
-	isEnterprise := (structs.NodeEnterpriseMetaInDefaultPartition().PartitionOrEmpty() == "default")
+	isEnterprise := versiontest.IsEnterprise()
 
 	serviceRead := func(partition, namespace, name string) string {
 		if isEnterprise {

diff --git a/internal/mesh/internal/types/xroute_test.go b/internal/mesh/internal/types/xroute_test.go
@@ -12,12 +12,12 @@ import (
 	"google.golang.org/protobuf/types/known/durationpb"
 	"google.golang.org/protobuf/types/known/wrapperspb"
 
-	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/internal/resource"
 	"github.com/hashicorp/consul/internal/resource/resourcetest"
 	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
 	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
 	"github.com/hashicorp/consul/proto-public/pbresource"
+	"github.com/hashicorp/consul/version/versiontest"
 )
 
 type xRouteParentRefMutateTestcase struct {
@@ -441,7 +441,7 @@ func testXRouteACLs[R XRouteData](t *testing.T, newRoute func(t *testing.T, pare
 		})
 	}
 
-	isEnterprise := (structs.NodeEnterpriseMetaInDefaultPartition().PartitionOrEmpty() == "default")
+	isEnterprise := versiontest.IsEnterprise()
 
 	serviceRead := func(partition, namespace, name string) string {
 		if isEnterprise {

diff --git a/version/versiontest/versiontest.go b/version/versiontest/versiontest.go
@@ -0,0 +1,13 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: BUSL-1.1
+
+package versiontest
+
+import "github.com/hashicorp/consul/version"
+
+// IsEnterprise returns true if the current build is a Consul Enterprise build.
+//
+// This should only be called from test code.
+func IsEnterprise() bool {
+	return version.VersionMetadata == "ent"
+}