Merge pull request #10187 from hashicorp/fixup/ent-tproxy-test

agent/config_endpoint_test.go

@@ -116,9 +116,10 @@ func TestConfig_Get(t *testing.T) {
 
 		ce, ok := obj.(*structs.MeshConfigEntry)
 		require.True(t, ok, "wrong type %T", obj)
-		// Set indexes to expected values for assertions
+		// Set indexes and EnterpriseMeta to expected values for assertions
 		ce.CreateIndex = 12
 		ce.ModifyIndex = 13
+		ce.EnterpriseMeta = structs.EnterpriseMeta{}
 
 		out, err := a.srv.marshalJSON(req, obj)
 		require.NoError(t, err)

agent/proxycfg/state_test.go

@@ -1814,7 +1814,7 @@ func TestState_WatchesAndUpdates(t *testing.T) {
 					},
 					events: []cache.UpdateEvent{
 						{
-							CorrelationID: "discovery-chain:db",
+							CorrelationID: "discovery-chain:" + db.String(),
 							Result: &structs.DiscoveryChainResponse{
 								Chain: discoverychain.TestCompileConfigEntries(t, "db", "default", "dc1", "trustdomain.consul", "dc1", nil,
 									&structs.ServiceResolverConfigEntry{