Merge pull request #9956 from hashicorp/tenants/patch-1

Backport enterprise changes to prevent merge conflicts

agent/consul/state/query.go

@@ -59,3 +59,10 @@ func uuidStringToBytes(uuid string) ([]byte, error) {
 	}
 	return dec, nil
 }
+
+// BoolQuery is a type used to query a boolean condition that may include an
+// enterprise identifier.
+type BoolQuery struct {
+	Value bool
+	structs.EnterpriseMeta
+}

agent/consul/state/schema_oss_test.go

@@ -2,4 +2,5 @@
 
 package state
 
-var stateStoreSchemaExpected = "TestStateStoreSchema.golden"
+func addEnterpriseIndexerTestCases(testcases map[string]func() map[string]indexerTestCase) {
+}

agent/consul/state/schema_test.go

@@ -38,6 +38,7 @@ func TestNewDBSchema_Indexers(t *testing.T) {
 		tableMeshTopology:    testIndexerTableMeshTopology,
 		tableGatewayServices: testIndexerTableGatewayServices,
 	}
+	addEnterpriseIndexerTestCases(testcases)
 
 	for _, table := range schema.Tables {
 		if testcases[table.Name] == nil {

proto/pbcommon/common.pb.go

@@ -398,6 +398,8 @@ func (m *QueryMeta) GetConsistencyLevel() string {
 type EnterpriseMeta struct {
 	// Namespace in which the entity exists.
 	Namespace string `protobuf:"bytes,1,opt,name=Namespace,proto3" json:"Namespace,omitempty"`
+	// Tenant in which the entity exists.
+	Tenant string `protobuf:"bytes,2,opt,name=Tenant,proto3" json:"Tenant,omitempty"`
 }
 
 func (m *EnterpriseMeta) Reset()         { *m = EnterpriseMeta{} }
@@ -445,45 +447,45 @@ func init() {
 func init() { proto.RegisterFile("proto/pbcommon/common.proto", fileDescriptor_a6f5ac44994d718c) }
 
 var fileDescriptor_a6f5ac44994d718c = []byte{
-	// 594 bytes of a gzipped FileDescriptorProto
+	// 606 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xcf, 0x4e, 0xd4, 0x40,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xcd, 0x6e, 0xd3, 0x4c,
-	0x1c, 0x6e, 0x75, 0x59, 0xb7, 0xbf, 0x05, 0x82, 0x13, 0x62, 0x2a, 0x9a, 0xee, 0xa6, 0x31, 0x86,
+	0x14, 0x8d, 0xbf, 0x2f, 0x0d, 0xf1, 0x4d, 0x5b, 0x95, 0x51, 0x85, 0x4c, 0x41, 0x4e, 0x14, 0x21,
-	0x10, 0x6d, 0x13, 0xbc, 0xe1, 0x09, 0x16, 0x34, 0xc4, 0xad, 0xc4, 0x8a, 0x31, 0xf1, 0x36, 0xdb,
+	0x54, 0x55, 0x10, 0x4b, 0x65, 0x57, 0x56, 0x6d, 0xda, 0xa2, 0x8a, 0x98, 0x0a, 0x13, 0x84, 0xc4,
-	0xfd, 0x6d, 0x77, 0x62, 0xdb, 0xa9, 0xd3, 0x29, 0x2c, 0x6f, 0xe0, 0xd1, 0x23, 0xf1, 0xe4, 0x83,
+	0x6e, 0xe2, 0xdc, 0x38, 0x23, 0xec, 0x19, 0x33, 0x1e, 0xb7, 0xe9, 0x1b, 0xb0, 0x64, 0x59, 0xb1,
-	0xf8, 0x00, 0x1c, 0x39, 0x7a, 0x42, 0x65, 0xdf, 0xc0, 0x27, 0x30, 0x9d, 0x16, 0x28, 0xc2, 0x01,
+	0xe2, 0x41, 0x78, 0x80, 0x2e, 0xbb, 0x64, 0x55, 0xa0, 0x79, 0x03, 0x9e, 0x00, 0x79, 0xec, 0xb6,
-	0x4f, 0xbb, 0xdf, 0xd7, 0xef, 0x9b, 0xf9, 0xfd, 0xf9, 0x5a, 0x78, 0x90, 0x0a, 0x2e, 0xb9, 0x9b,
+	0x2e, 0xed, 0x22, 0xac, 0x92, 0x73, 0x7c, 0xce, 0xcc, 0xfd, 0x39, 0x36, 0x3c, 0x88, 0xa5, 0x50,
-	0x0e, 0x02, 0x1e, 0xc7, 0x3c, 0x71, 0xcb, 0x1f, 0x47, 0xb1, 0xa4, 0x59, 0xa2, 0x25, 0x2b, 0xe4,
+	0xc2, 0x89, 0x07, 0xbe, 0x88, 0x22, 0xc1, 0x9d, 0xfc, 0xa7, 0xa3, 0x59, 0x52, 0xcb, 0xd1, 0x8a,
-	0x3c, 0x8c, 0xd0, 0x55, 0xec, 0x20, 0x1f, 0xb9, 0xc3, 0x5c, 0x50, 0xc9, 0xce, 0x74, 0x4b, 0x8b,
+	0x1d, 0x08, 0x11, 0x84, 0xe8, 0x68, 0x76, 0x90, 0x8e, 0x9c, 0x61, 0x2a, 0xa9, 0x62, 0x17, 0xba,
-	0x21, 0x0f, 0x79, 0x79, 0x50, 0xf1, 0xaf, 0x64, 0xed, 0x18, 0x0c, 0x9f, 0x8e, 0xe4, 0x76, 0x32,
+	0x95, 0xe5, 0x40, 0x04, 0x22, 0x3f, 0x28, 0xfb, 0x97, 0xb3, 0xed, 0x08, 0x4c, 0x8f, 0x8e, 0xd4,
-	0xc4, 0x09, 0x71, 0xa1, 0xdd, 0x13, 0x48, 0x25, 0x2a, 0x68, 0xea, 0x5d, 0x7d, 0xb9, 0xb1, 0x31,
+	0x1e, 0x1f, 0xe2, 0x84, 0x38, 0xd0, 0xe8, 0x4a, 0xa4, 0x0a, 0x35, 0xb4, 0x8c, 0x96, 0xb1, 0x5a,
-	0xf7, 0xe7, 0xa4, 0x63, 0x0c, 0x70, 0x92, 0x8a, 0x35, 0xfb, 0xa9, 0xed, 0xd7, 0x15, 0x85, 0xc1,
+	0xdd, 0x5a, 0xf8, 0x7d, 0xd6, 0x34, 0x07, 0x38, 0x89, 0xe5, 0x46, 0xfb, 0x69, 0xdb, 0x2b, 0x2b,
-	0xe3, 0x43, 0x36, 0x3a, 0x28, 0x0d, 0xb7, 0xae, 0x35, 0xd4, 0x14, 0xf6, 0x2a, 0x2c, 0xec, 0x52,
+	0x32, 0x83, 0x2b, 0x86, 0x6c, 0x74, 0x94, 0x1b, 0xfe, 0xbb, 0xd5, 0x50, 0x52, 0xb4, 0xd7, 0x61,
-	0x11, 0xa2, 0xdc, 0xa4, 0x92, 0x06, 0x98, 0x48, 0x14, 0xc4, 0x02, 0xb8, 0x40, 0xea, 0x52, 0xc3,
+	0xa9, 0x4f, 0x65, 0x80, 0x6a, 0x9b, 0x2a, 0xea, 0x23, 0x57, 0x28, 0x89, 0x0d, 0x70, 0x85, 0xf4,
-	0xaf, 0x31, 0xf6, 0x0a, 0xcc, 0xbe, 0x17, 0x4c, 0xa2, 0x8f, 0x9f, 0x72, 0xcc, 0x24, 0x59, 0x84,
+	0xa5, 0xa6, 0x57, 0x62, 0xda, 0x6b, 0x30, 0xff, 0x4e, 0x32, 0x85, 0x1e, 0x7e, 0x4c, 0x31, 0x51,
-	0x99, 0x5d, 0xfe, 0x11, 0x93, 0x4a, 0x5a, 0x82, 0xb5, 0xc6, 0xe7, 0x6f, 0x1d, 0xdd, 0xfe, 0xda,
+	0x64, 0x19, 0xe6, 0xfa, 0xe2, 0x03, 0xf2, 0x42, 0x9a, 0x83, 0x8d, 0xea, 0xa7, 0xaf, 0x4d, 0xa3,
-	0x80, 0xd9, 0x37, 0x39, 0x8a, 0x83, 0x9d, 0xb4, 0x68, 0x3d, 0xbb, 0x5e, 0x4c, 0x1e, 0xc1, 0x9c,
+	0xfd, 0xa5, 0x0a, 0xf3, 0xaf, 0x53, 0x94, 0x47, 0xfb, 0x71, 0xd6, 0x7a, 0x72, 0xbb, 0x98, 0x3c,
-	0xc7, 0x12, 0x25, 0xac, 0x55, 0xee, 0x5f, 0x26, 0xc9, 0x4b, 0x98, 0xf5, 0xe8, 0x44, 0x11, 0xbb,
+	0x82, 0x05, 0x97, 0x71, 0x2d, 0x2c, 0x55, 0xee, 0x5d, 0x27, 0xc9, 0x0b, 0x98, 0x77, 0xe9, 0x44,
-	0x2c, 0x46, 0xf3, 0x76, 0x57, 0x5f, 0x6e, 0xaf, 0xde, 0x77, 0xca, 0x41, 0x3b, 0x67, 0x83, 0x76,
+	0x13, 0x7d, 0x16, 0xa1, 0xf5, 0x7f, 0xcb, 0x58, 0x6d, 0xac, 0xdf, 0xef, 0xe4, 0x83, 0xee, 0x5c,
-	0x36, 0xab, 0x41, 0x6f, 0xb4, 0x8e, 0x4e, 0x3a, 0xda, 0xe1, 0xcf, 0x8e, 0xee, 0x5f, 0x32, 0x16,
+	0x0c, 0xba, 0xb3, 0x5d, 0x0c, 0x7a, 0xab, 0x7e, 0x72, 0xd6, 0xac, 0x1c, 0xff, 0x68, 0x1a, 0xde,
-	0x1d, 0xae, 0x47, 0x11, 0xdf, 0x7f, 0x2b, 0x69, 0x84, 0x66, 0xa3, 0xab, 0x2f, 0xb7, 0xfc, 0x1a,
+	0x35, 0x63, 0xd6, 0xe1, 0x66, 0x18, 0x8a, 0xc3, 0x37, 0x8a, 0x86, 0x68, 0x55, 0x5b, 0xc6, 0x6a,
-	0x43, 0x9e, 0xc0, 0xdd, 0xa2, 0x39, 0x26, 0xb0, 0xc7, 0x93, 0x8c, 0x65, 0x12, 0x13, 0x69, 0xce,
+	0xdd, 0x2b, 0x31, 0xe4, 0x09, 0xdc, 0xcd, 0x9a, 0x63, 0x12, 0xbb, 0x82, 0x27, 0x2c, 0x51, 0xc8,
-	0x28, 0xd9, 0xd5, 0x07, 0x64, 0x09, 0x5a, 0xef, 0x32, 0xec, 0xd1, 0x60, 0x8c, 0x66, 0x53, 0x89,
+	0x95, 0x35, 0xa7, 0x65, 0x37, 0x1f, 0x90, 0x15, 0xa8, 0xbf, 0x4d, 0xb0, 0x4b, 0xfd, 0x31, 0x5a,
-	0xce, 0x31, 0xd9, 0x81, 0x05, 0x8f, 0x4e, 0xd4, 0xa9, 0x67, 0x55, 0x99, 0x77, 0x6e, 0x5e, 0xf6,
+	0x35, 0x2d, 0xba, 0xc4, 0x64, 0x1f, 0x96, 0x5c, 0x3a, 0xd1, 0xa7, 0x5e, 0x54, 0x65, 0xdd, 0x99,
-	0x15, 0x33, 0x79, 0x0e, 0x4d, 0x8f, 0x4e, 0xd6, 0x43, 0x34, 0x5b, 0x37, 0x3f, 0xa6, 0xb2, 0x90,
+	0xbd, 0xec, 0x1b, 0x66, 0xf2, 0x1c, 0x6a, 0x2e, 0x9d, 0x6c, 0x06, 0x68, 0xd5, 0x67, 0x3f, 0xa6,
-	0xc7, 0x30, 0xef, 0xe5, 0x99, 0xf4, 0x71, 0x8f, 0x46, 0x6c, 0x48, 0x25, 0x9a, 0x86, 0xaa, 0xf7,
+	0xb0, 0x90, 0xc7, 0xb0, 0xe8, 0xa6, 0x89, 0xf2, 0xf0, 0x80, 0x86, 0x6c, 0x48, 0x15, 0x5a, 0xa6,
-	0x1f, 0xb6, 0x18, 0xb4, 0xba, 0x75, 0x7b, 0xb4, 0x25, 0x04, 0x17, 0x26, 0xfc, 0xc7, 0xa0, 0xeb,
+	0xae, 0xf7, 0x2f, 0x36, 0x1b, 0xb4, 0xbe, 0x75, 0x6f, 0xb4, 0x23, 0xa5, 0x90, 0x16, 0xfc, 0xc3,
-	0x46, 0x72, 0x0f, 0x9a, 0x2f, 0x58, 0x54, 0xc4, 0xa8, 0xad, 0xd6, 0x5d, 0xa1, 0x2a, 0x1c, 0xdf,
+	0xa0, 0xcb, 0x46, 0x72, 0x0f, 0x6a, 0xbb, 0x2c, 0xcc, 0x62, 0xd4, 0xd0, 0xeb, 0x2e, 0x50, 0x11,
-	0x75, 0x30, 0xd4, 0x52, 0x3c, 0x94, 0xb4, 0x48, 0x46, 0x2d, 0xe6, 0x7e, 0x09, 0xc8, 0x16, 0xb4,
+	0x8e, 0x6f, 0x06, 0x98, 0x7a, 0x29, 0x2e, 0x2a, 0x9a, 0x25, 0xa3, 0x14, 0x73, 0x2f, 0x07, 0x64,
-	0xfb, 0x34, 0x93, 0x3d, 0x9e, 0x48, 0x1a, 0x48, 0x95, 0x8b, 0x1b, 0x56, 0x52, 0xf7, 0x91, 0x2e,
+	0x07, 0x1a, 0x3d, 0x9a, 0xa8, 0xae, 0xe0, 0x8a, 0xfa, 0x4a, 0xe7, 0x62, 0xc6, 0x4a, 0xca, 0x3e,
-	0xb4, 0x5f, 0x25, 0x7c, 0x3f, 0xe9, 0x23, 0x1d, 0xa2, 0x50, 0xc9, 0x69, 0xf9, 0x75, 0x8a, 0xac,
+	0xd2, 0x82, 0xc6, 0x4b, 0x2e, 0x0e, 0x79, 0x0f, 0xe9, 0x10, 0xa5, 0x4e, 0x4e, 0xdd, 0x2b, 0x53,
-	0xc0, 0xc2, 0xf9, 0x4e, 0x83, 0x83, 0x3e, 0xee, 0x61, 0xa4, 0x92, 0x61, 0xf8, 0x57, 0xf8, 0xaa,
+	0x64, 0x0d, 0x96, 0x2e, 0x77, 0xea, 0x1f, 0xf5, 0xf0, 0x00, 0x43, 0x9d, 0x0c, 0xd3, 0xbb, 0xc1,
-	0x7c, 0x07, 0xe6, 0xb7, 0x8a, 0x17, 0x22, 0x15, 0x2c, 0x43, 0xd5, 0xc2, 0x43, 0x30, 0x5e, 0xd3,
+	0x17, 0xe5, 0xef, 0xc2, 0xe2, 0x4e, 0xf6, 0x42, 0xc4, 0x92, 0x25, 0xa8, 0x5b, 0x78, 0x08, 0xe6,
-	0x18, 0xb3, 0x94, 0x06, 0x58, 0x05, 0xfc, 0x82, 0xd8, 0xe8, 0x1f, 0xfd, 0xb6, 0xb4, 0xa3, 0x53,
+	0x2b, 0x1a, 0x61, 0x12, 0x53, 0x1f, 0x8b, 0x80, 0x5f, 0x11, 0xd9, 0x30, 0xfa, 0xc8, 0x29, 0xcf,
-	0x4b, 0x3f, 0x3e, 0xb5, 0xf4, 0x5f, 0xa7, 0x96, 0xfe, 0x65, 0x6a, 0x69, 0x87, 0x53, 0x4b, 0x3b,
+	0xbb, 0x30, 0xbd, 0x02, 0x6d, 0xf5, 0x4e, 0x7e, 0xd9, 0x95, 0x93, 0x73, 0xdb, 0x38, 0x3d, 0xb7,
-	0x9e, 0x5a, 0xda, 0x8f, 0xa9, 0xa5, 0x7d, 0x58, 0x09, 0x99, 0x1c, 0xe7, 0x03, 0x27, 0xe0, 0xb1,
+	0x8d, 0x9f, 0xe7, 0xb6, 0xf1, 0x79, 0x6a, 0x57, 0x8e, 0xa7, 0x76, 0xe5, 0x74, 0x6a, 0x57, 0xbe,
-	0x3b, 0xa6, 0xd9, 0x98, 0x05, 0x5c, 0xa4, 0x6e, 0xc0, 0x93, 0x2c, 0x8f, 0xdc, 0xcb, 0xdf, 0x9c,
+	0x4f, 0xed, 0xca, 0xfb, 0xb5, 0x80, 0xa9, 0x71, 0x3a, 0xe8, 0xf8, 0x22, 0x72, 0xc6, 0x34, 0x19,
-	0x41, 0x53, 0xe1, 0x67, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xee, 0xfb, 0xa8, 0x19, 0x8c, 0x04,
+	0x33, 0x5f, 0xc8, 0xd8, 0xf1, 0x05, 0x4f, 0xd2, 0xd0, 0xb9, 0xfe, 0x2d, 0x1a, 0xd4, 0x34, 0x7e,
-	0x00, 0x00,
+	0xf6, 0x27, 0x00, 0x00, 0xff, 0xff, 0x6f, 0x3a, 0xc6, 0x28, 0xa4, 0x04, 0x00, 0x00,
 }
 
 func (m *RaftIndex) Marshal() (dAtA []byte, err error) {
@@ -766,6 +768,13 @@ func (m *EnterpriseMeta) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	_ = i
 	var l int
 	_ = l
+	if len(m.Tenant) > 0 {
+		i -= len(m.Tenant)
+		copy(dAtA[i:], m.Tenant)
+		i = encodeVarintCommon(dAtA, i, uint64(len(m.Tenant)))
+		i--
+		dAtA[i] = 0x12
+	}
 	if len(m.Namespace) > 0 {
 		i -= len(m.Namespace)
 		copy(dAtA[i:], m.Namespace)
@@ -899,6 +908,10 @@ func (m *EnterpriseMeta) Size() (n int) {
 	if l > 0 {
 		n += 1 + l + sovCommon(uint64(l))
 	}
+	l = len(m.Tenant)
+	if l > 0 {
+		n += 1 + l + sovCommon(uint64(l))
+	}
 	return n
 }
 
@@ -1735,6 +1748,38 @@ func (m *EnterpriseMeta) Unmarshal(dAtA []byte) error {
 			}
 			m.Namespace = string(dAtA[iNdEx:postIndex])
 			iNdEx = postIndex
+		case 2:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Tenant", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowCommon
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthCommon
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthCommon
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Tenant = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
 			skippy, err := skipCommon(dAtA[iNdEx:])

proto/pbcommon/common.proto

@@ -139,4 +139,6 @@ message QueryMeta  {
 message EnterpriseMeta {
    // Namespace in which the entity exists.
    string Namespace = 1;
+   // Tenant in which the entity exists.
+   string Tenant = 2;
 }