[NET-7377]

- CT ENT tests for all consul resource supporting partition and ns.
- bug fix for map keys, keys did not contain partition and ns, so could have been overridden if same key in a different ns and partition is added as a dependency.

.golangci.yml

@@ -68,6 +68,7 @@ linters-settings:
           - github.com/hashicorp/consul-template
           - github.com/hashicorp/consul/api
           - github.com/hashicorp/consul/sdk/testutil
+          - github.com/hashicorp/consul/proto-public/pbresource
           - github.com/hashicorp/go-gatedio
           - github.com/hashicorp/go-hclog
           - github.com/hashicorp/go-multierror

dependency/catalog_node_test.go

@@ -5,10 +5,11 @@ package dependency
 
 import (
 	"fmt"
-	"github.com/hashicorp/consul/proto-public/pbresource"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+
+	"github.com/hashicorp/consul/proto-public/pbresource"
 )
 
 func TestNewCatalogNodeQuery(t *testing.T) {

dependency/catalog_nodes_test.go

@@ -5,10 +5,11 @@ package dependency
 
 import (
 	"fmt"
-	"github.com/hashicorp/consul/proto-public/pbresource"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+
+	"github.com/hashicorp/consul/proto-public/pbresource"
 )
 
 func TestNewCatalogNodesQuery(t *testing.T) {

dependency/catalog_service_test.go

@@ -5,10 +5,11 @@ package dependency
 
 import (
 	"fmt"
-	"github.com/hashicorp/consul/proto-public/pbresource"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+
+	"github.com/hashicorp/consul/proto-public/pbresource"
 )
 
 func TestNewCatalogServiceQuery(t *testing.T) {

dependency/catalog_services_test.go

@@ -5,10 +5,11 @@ package dependency
 
 import (
 	"fmt"
-	"github.com/hashicorp/consul/proto-public/pbresource"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+
+	"github.com/hashicorp/consul/proto-public/pbresource"
 )
 
 func TestNewCatalogServicesQuery(t *testing.T) {

dependency/dependency_test.go

@@ -7,7 +7,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/hashicorp/consul/proto-public/pbresource"
 	"io"
 	"log"
 	"os"
@@ -19,6 +18,7 @@ import (
 
 	"github.com/hashicorp/consul-template/test"
 	"github.com/hashicorp/consul/api"
+	"github.com/hashicorp/consul/proto-public/pbresource"
 	"github.com/hashicorp/consul/sdk/testutil"
 	nomadapi "github.com/hashicorp/nomad/api"
 	vapi "github.com/hashicorp/vault/api"

dependency/health_service_test.go

@@ -5,10 +5,10 @@ package dependency
 
 import (
 	"fmt"
-	"github.com/hashicorp/consul/proto-public/pbresource"
 	"testing"
 
 	"github.com/hashicorp/consul/api"
+	"github.com/hashicorp/consul/proto-public/pbresource"
 	"github.com/stretchr/testify/assert"
 )
 

dependency/kv_get_test.go

@@ -5,11 +5,12 @@ package dependency
 
 import (
 	"fmt"
-	"github.com/hashicorp/consul/proto-public/pbresource"
 	"testing"
 	"time"
 
 	"github.com/stretchr/testify/assert"
+
+	"github.com/hashicorp/consul/proto-public/pbresource"
 )
 
 func TestNewKVGetQuery(t *testing.T) {

dependency/kv_keys_test.go

@@ -5,11 +5,12 @@ package dependency
 
 import (
 	"fmt"
-	"github.com/hashicorp/consul/proto-public/pbresource"
 	"testing"
 	"time"
 
 	"github.com/stretchr/testify/assert"
+
+	"github.com/hashicorp/consul/proto-public/pbresource"
 )
 
 func TestNewKVKeysQuery(t *testing.T) {

dependency/kv_list_test.go

@@ -5,11 +5,12 @@ package dependency
 
 import (
 	"fmt"
-	"github.com/hashicorp/consul/proto-public/pbresource"
 	"testing"
 	"time"
 
 	"github.com/stretchr/testify/assert"
+
+	"github.com/hashicorp/consul/proto-public/pbresource"
 )
 
 func TestNewKVListQuery(t *testing.T) {