github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

v2tenancy: rename v1alpha1 -> v2beta1 (#19227)

pull/19238/head
Semir Patel 1 year ago committed by GitHub
parent
b81c8627db
commit
4c5a46e5e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 201 additions and 201 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      internal/catalog/catalogtest/run_test.go
  2. 4
      internal/catalog/catalogtest/test_integration_v2beta1.go
  3. 10
      internal/tenancy/exports.go
  4. 17
      internal/tenancy/internal/types/namespace.go
  5. 4
      internal/tenancy/internal/types/namespace_test.go
  6. 6
      internal/tenancy/internal/types/types.go
  7. 172
      proto-public/pbtenancy/v1alpha1/namespace.pb.go
  8. 4
      proto-public/pbtenancy/v2beta1/namespace.pb.binary.go
  9. 171
      proto-public/pbtenancy/v2beta1/namespace.pb.go
  10. 2
      proto-public/pbtenancy/v2beta1/namespace.proto
  11. 2
      proto-public/pbtenancy/v2beta1/namespace_deepcopy.gen.go
  12. 2
      proto-public/pbtenancy/v2beta1/namespace_json.gen.go
  13. 4
      proto-public/pbtenancy/v2beta1/resource_types.gen.go
  14. 2
      test/integration/consul-container/test/catalog/catalog_test.go

2
internal/catalog/catalogtest/run_test.go
Unescape View File

@ -38,7 +38,7 @@ func runInMemResourceServiceAndControllers(t *testing.T, deps controllers.Depend
func TestControllers_Integration(t *testing.T) {
client := runInMemResourceServiceAndControllers(t, catalog.DefaultControllerDependencies())
RunCatalogV1Alpha1IntegrationTest(t, client)
RunCatalogV2Beta1IntegrationTest(t, client)
}
func TestControllers_Lifecycle(t *testing.T) {

4
internal/catalog/catalogtest/test_integration_v2beta1.go
Unescape View File

@ -26,7 +26,7 @@ var (
testData embed.FS
)
// RunCatalogV1Alpha1IntegrationTest will push up a bunch of catalog related data and then
// RunCatalogV2Beta1IntegrationTest will push up a bunch of catalog related data and then
// verify that all the expected reconciliations happened correctly. This test is
// intended to exercise a large swathe of behavior of the overall catalog package.
// Besides just controller reconciliation behavior, the intent is also to verify
@ -38,7 +38,7 @@ var (
// is another RunCatalogIntegrationTestLifeCycle function that can be used for those
// purposes. The two are distinct so that the data being published and the assertions
// made against the system can be reused in upgrade tests.
func RunCatalogV1Alpha1IntegrationTest(t *testing.T, client pbresource.ResourceServiceClient) {
func RunCatalogV2Beta1IntegrationTest(t *testing.T, client pbresource.ResourceServiceClient) {
t.Helper()
PublishCatalogV2Beta1IntegrationTestData(t, client)

10
internal/tenancy/exports.go
Unescape View File

@ -11,14 +11,14 @@ import (
var (
// API Group Information
APIGroup = types.GroupName
VersionV1Alpha1 = types.VersionV1Alpha1
CurrentVersion = types.CurrentVersion
APIGroup = types.GroupName
VersionV2Beta1 = types.VersionV2Beta1
CurrentVersion = types.CurrentVersion
// Resource Kind Names.
NamespaceKind = types.NamespaceKind
NamespaceV1Alpha1Type = types.NamespaceV1Alpha1Type
NamespaceKind = types.NamespaceKind
NamespaceV2Beta1Type = types.NamespaceV2Beta1Type
)
// RegisterTypes adds all resource types within the "tenancy" API group

17
internal/tenancy/internal/types/namespace.go
Unescape View File

@ -5,11 +5,12 @@ package types
import (
"fmt"
"strings"
"github.com/hashicorp/consul/agent/dns"
"github.com/hashicorp/consul/internal/resource"
"github.com/hashicorp/consul/proto-public/pbresource"
tenancyv1alpha1 "github.com/hashicorp/consul/proto-public/pbtenancy/v1alpha1"
"strings"
pbtenancy "github.com/hashicorp/consul/proto-public/pbtenancy/v2beta1"
)
const (
@ -17,18 +18,18 @@ const (
)
var (
NamespaceV1Alpha1Type = &pbresource.Type{
NamespaceV2Beta1Type = &pbresource.Type{
Group: GroupName,
GroupVersion: VersionV1Alpha1,
GroupVersion: VersionV2Beta1,
Kind: NamespaceKind,
}
NamespaceType = NamespaceV1Alpha1Type
NamespaceType = NamespaceV2Beta1Type
)
func RegisterNamespace(r resource.Registry) {
r.Register(resource.Registration{
Type: NamespaceV1Alpha1Type,
Proto: &tenancyv1alpha1.Namespace{},
Type: NamespaceType,
Proto: &pbtenancy.Namespace{},
Scope: resource.ScopePartition,
Validate: ValidateNamespace,
Mutate: MutateNamespace,
@ -42,7 +43,7 @@ func MutateNamespace(res *pbresource.Resource) error {
}
func ValidateNamespace(res *pbresource.Resource) error {
var ns tenancyv1alpha1.Namespace
var ns pbtenancy.Namespace
if err := res.Data.UnmarshalTo(&ns); err != nil {
return resource.NewErrDataParse(&ns, err)

4
internal/tenancy/internal/types/namespace_test.go
Unescape View File

@ -21,13 +21,13 @@ import (
"github.com/hashicorp/consul/internal/resource"
"github.com/hashicorp/consul/proto-public/pbresource"
pbtenancy "github.com/hashicorp/consul/proto-public/pbtenancy/v1alpha1"
pbtenancy "github.com/hashicorp/consul/proto-public/pbtenancy/v2beta1"
)
func createNamespaceResource(t *testing.T, data protoreflect.ProtoMessage) *pbresource.Resource {
res := &pbresource.Resource{
Id: &pbresource.ID{
Type: NamespaceV1Alpha1Type,
Type: NamespaceV2Beta1Type,
Tenancy: resource.DefaultPartitionedTenancy(),
Name: "ns1234",
},

6
internal/tenancy/internal/types/types.go
Unescape View File

@ -4,7 +4,7 @@
package types
const (
GroupName = "tenancy"
VersionV1Alpha1 = "v1alpha1"
CurrentVersion = VersionV1Alpha1
GroupName = "tenancy"
VersionV2Beta1 = "v2beta1"
CurrentVersion = VersionV2Beta1
)

172
proto-public/pbtenancy/v1alpha1/namespace.pb.go
Unescape View File

@ -1,172 +0,0 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.30.0
// protoc (unknown)
// source: pbtenancy/v1alpha1/namespace.proto
package tenancyv1alpha1
import (
_ "github.com/hashicorp/consul/proto-public/pbresource"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect"
sync "sync"
)
const (
// Verify that this generated code is sufficiently up-to-date.
_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
// Verify that runtime/protoimpl is sufficiently up-to-date.
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
// The name of the Namespace is in the outer Resource.ID.Name.
// It must be unique within a partition and must be a
// DNS hostname. There are also other reserved names that may not be used.
type Namespace struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
// Description is where the user puts any information they want
// about the namespace. It is not used internally.
Description string `protobuf:"bytes,1,opt,name=description,proto3" json:"description,omitempty"`
}
func (x *Namespace) Reset() {
*x = Namespace{}
if protoimpl.UnsafeEnabled {
mi := &file_pbtenancy_v1alpha1_namespace_proto_msgTypes[0]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *Namespace) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*Namespace) ProtoMessage() {}
func (x *Namespace) ProtoReflect() protoreflect.Message {
mi := &file_pbtenancy_v1alpha1_namespace_proto_msgTypes[0]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use Namespace.ProtoReflect.Descriptor instead.
func (*Namespace) Descriptor() ([]byte, []int) {
return file_pbtenancy_v1alpha1_namespace_proto_rawDescGZIP(), []int{0}
}
func (x *Namespace) GetDescription() string {
if x != nil {
return x.Description
}
return ""
}
var File_pbtenancy_v1alpha1_namespace_proto protoreflect.FileDescriptor
var file_pbtenancy_v1alpha1_namespace_proto_rawDesc = []byte{
0x0a, 0x22, 0x70, 0x62, 0x74, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x2f, 0x76, 0x31, 0x61, 0x6c,
0x70, 0x68, 0x61, 0x31, 0x2f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x2e, 0x70,
0x72, 0x6f, 0x74, 0x6f, 0x12, 0x21, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x74, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x2e, 0x76,
0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x1a, 0x1c, 0x70, 0x62, 0x72, 0x65, 0x73, 0x6f, 0x75,
0x72, 0x63, 0x65, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e,
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x35, 0x0a, 0x09, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61,
0x63, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f,
0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70,
0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x06, 0xa2, 0x93, 0x04, 0x02, 0x08, 0x02, 0x42, 0xab, 0x02, 0x0a,
0x25, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x74, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x2e, 0x76, 0x31,
0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x42, 0x0e, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63,
0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63,
0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75, 0x62, 0x6c,
0x69, 0x63, 0x2f, 0x70, 0x62, 0x74, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x2f, 0x76, 0x31, 0x61,
0x6c, 0x70, 0x68, 0x61, 0x31, 0x3b, 0x74, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x76, 0x31, 0x61,
0x6c, 0x70, 0x68, 0x61, 0x31, 0xa2, 0x02, 0x03, 0x48, 0x43, 0x54, 0xaa, 0x02, 0x21, 0x48, 0x61,
0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x54,
0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x2e, 0x56, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0xca,
0x02, 0x21, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73,
0x75, 0x6c, 0x5c, 0x54, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x5c, 0x56, 0x31, 0x61, 0x6c, 0x70,
0x68, 0x61, 0x31, 0xe2, 0x02, 0x2d, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c,
0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x54, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x5c, 0x56,
0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64,
0x61, 0x74, 0x61, 0xea, 0x02, 0x24, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a,
0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x54, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79,
0x3a, 0x3a, 0x56, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
0x6f, 0x33,
}
var (
file_pbtenancy_v1alpha1_namespace_proto_rawDescOnce sync.Once
file_pbtenancy_v1alpha1_namespace_proto_rawDescData = file_pbtenancy_v1alpha1_namespace_proto_rawDesc
)
func file_pbtenancy_v1alpha1_namespace_proto_rawDescGZIP() []byte {
file_pbtenancy_v1alpha1_namespace_proto_rawDescOnce.Do(func() {
file_pbtenancy_v1alpha1_namespace_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbtenancy_v1alpha1_namespace_proto_rawDescData)
})
return file_pbtenancy_v1alpha1_namespace_proto_rawDescData
}
var file_pbtenancy_v1alpha1_namespace_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
var file_pbtenancy_v1alpha1_namespace_proto_goTypes = []interface{}{
(*Namespace)(nil), // 0: hashicorp.consul.tenancy.v1alpha1.Namespace
}
var file_pbtenancy_v1alpha1_namespace_proto_depIdxs = []int32{
0, // [0:0] is the sub-list for method output_type
0, // [0:0] is the sub-list for method input_type
0, // [0:0] is the sub-list for extension type_name
0, // [0:0] is the sub-list for extension extendee
0, // [0:0] is the sub-list for field type_name
}
func init() { file_pbtenancy_v1alpha1_namespace_proto_init() }
func file_pbtenancy_v1alpha1_namespace_proto_init() {
if File_pbtenancy_v1alpha1_namespace_proto != nil {
return
}
if !protoimpl.UnsafeEnabled {
file_pbtenancy_v1alpha1_namespace_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*Namespace); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
}
type x struct{}
out := protoimpl.TypeBuilder{
File: protoimpl.DescBuilder{
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_pbtenancy_v1alpha1_namespace_proto_rawDesc,
NumEnums: 0,
NumMessages: 1,
NumExtensions: 0,
NumServices: 0,
},
GoTypes: file_pbtenancy_v1alpha1_namespace_proto_goTypes,
DependencyIndexes: file_pbtenancy_v1alpha1_namespace_proto_depIdxs,
MessageInfos: file_pbtenancy_v1alpha1_namespace_proto_msgTypes,
}.Build()
File_pbtenancy_v1alpha1_namespace_proto = out.File
file_pbtenancy_v1alpha1_namespace_proto_rawDesc = nil
file_pbtenancy_v1alpha1_namespace_proto_goTypes = nil
file_pbtenancy_v1alpha1_namespace_proto_depIdxs = nil
}

4
proto-public/pbtenancy/v1alpha1/namespace.pb.binary.go → proto-public/pbtenancy/v2beta1/namespace.pb.binary.go
Unescape View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go-binary. DO NOT EDIT.
// source: pbtenancy/v1alpha1/namespace.proto
// source: pbtenancy/v2beta1/namespace.proto
package tenancyv1alpha1
package tenancyv2beta1
import (
"google.golang.org/protobuf/proto"

171
proto-public/pbtenancy/v2beta1/namespace.pb.go
Unescape View File

@ -0,0 +1,171 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.30.0
// protoc (unknown)
// source: pbtenancy/v2beta1/namespace.proto
package tenancyv2beta1
import (
_ "github.com/hashicorp/consul/proto-public/pbresource"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect"
sync "sync"
)
const (
// Verify that this generated code is sufficiently up-to-date.
_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
// Verify that runtime/protoimpl is sufficiently up-to-date.
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
// The name of the Namespace is in the outer Resource.ID.Name.
// It must be unique within a partition and must be a
// DNS hostname. There are also other reserved names that may not be used.
type Namespace struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
// Description is where the user puts any information they want
// about the namespace. It is not used internally.
Description string `protobuf:"bytes,1,opt,name=description,proto3" json:"description,omitempty"`
}
func (x *Namespace) Reset() {
*x = Namespace{}
if protoimpl.UnsafeEnabled {
mi := &file_pbtenancy_v2beta1_namespace_proto_msgTypes[0]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *Namespace) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*Namespace) ProtoMessage() {}
func (x *Namespace) ProtoReflect() protoreflect.Message {
mi := &file_pbtenancy_v2beta1_namespace_proto_msgTypes[0]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use Namespace.ProtoReflect.Descriptor instead.
func (*Namespace) Descriptor() ([]byte, []int) {
return file_pbtenancy_v2beta1_namespace_proto_rawDescGZIP(), []int{0}
}
func (x *Namespace) GetDescription() string {
if x != nil {
return x.Description
}
return ""
}
var File_pbtenancy_v2beta1_namespace_proto protoreflect.FileDescriptor
var file_pbtenancy_v2beta1_namespace_proto_rawDesc = []byte{
0x0a, 0x21, 0x70, 0x62, 0x74, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x2f, 0x76, 0x32, 0x62, 0x65,
0x74, 0x61, 0x31, 0x2f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x2e, 0x70, 0x72,
0x6f, 0x74, 0x6f, 0x12, 0x20, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x74, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x2e, 0x76, 0x32,
0x62, 0x65, 0x74, 0x61, 0x31, 0x1a, 0x1c, 0x70, 0x62, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63,
0x65, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72,
0x6f, 0x74, 0x6f, 0x22, 0x35, 0x0a, 0x09, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65,
0x12, 0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18,
0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69,
0x6f, 0x6e, 0x3a, 0x06, 0xa2, 0x93, 0x04, 0x02, 0x08, 0x02, 0x42, 0xa4, 0x02, 0x0a, 0x24, 0x63,
0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
0x73, 0x75, 0x6c, 0x2e, 0x74, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x2e, 0x76, 0x32, 0x62, 0x65,
0x74, 0x61, 0x31, 0x42, 0x0e, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x50, 0x72,
0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x49, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f,
0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73,
0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f,
0x70, 0x62, 0x74, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61,
0x31, 0x3b, 0x74, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
0xa2, 0x02, 0x03, 0x48, 0x43, 0x54, 0xaa, 0x02, 0x20, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x54, 0x65, 0x6e, 0x61, 0x6e, 0x63,
0x79, 0x2e, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xca, 0x02, 0x20, 0x48, 0x61, 0x73, 0x68,
0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x54, 0x65, 0x6e,
0x61, 0x6e, 0x63, 0x79, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xe2, 0x02, 0x2c, 0x48,
0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c,
0x54, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x5c,
0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x23, 0x48, 0x61,
0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a,
0x3a, 0x54, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x3a, 0x3a, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61,
0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
file_pbtenancy_v2beta1_namespace_proto_rawDescOnce sync.Once
file_pbtenancy_v2beta1_namespace_proto_rawDescData = file_pbtenancy_v2beta1_namespace_proto_rawDesc
)
func file_pbtenancy_v2beta1_namespace_proto_rawDescGZIP() []byte {
file_pbtenancy_v2beta1_namespace_proto_rawDescOnce.Do(func() {
file_pbtenancy_v2beta1_namespace_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbtenancy_v2beta1_namespace_proto_rawDescData)
})
return file_pbtenancy_v2beta1_namespace_proto_rawDescData
}
var file_pbtenancy_v2beta1_namespace_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
var file_pbtenancy_v2beta1_namespace_proto_goTypes = []interface{}{
(*Namespace)(nil), // 0: hashicorp.consul.tenancy.v2beta1.Namespace
}
var file_pbtenancy_v2beta1_namespace_proto_depIdxs = []int32{
0, // [0:0] is the sub-list for method output_type
0, // [0:0] is the sub-list for method input_type
0, // [0:0] is the sub-list for extension type_name
0, // [0:0] is the sub-list for extension extendee
0, // [0:0] is the sub-list for field type_name
}
func init() { file_pbtenancy_v2beta1_namespace_proto_init() }
func file_pbtenancy_v2beta1_namespace_proto_init() {
if File_pbtenancy_v2beta1_namespace_proto != nil {
return
}
if !protoimpl.UnsafeEnabled {
file_pbtenancy_v2beta1_namespace_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*Namespace); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
}
type x struct{}
out := protoimpl.TypeBuilder{
File: protoimpl.DescBuilder{
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_pbtenancy_v2beta1_namespace_proto_rawDesc,
NumEnums: 0,
NumMessages: 1,
NumExtensions: 0,
NumServices: 0,
},
GoTypes: file_pbtenancy_v2beta1_namespace_proto_goTypes,
DependencyIndexes: file_pbtenancy_v2beta1_namespace_proto_depIdxs,
MessageInfos: file_pbtenancy_v2beta1_namespace_proto_msgTypes,
}.Build()
File_pbtenancy_v2beta1_namespace_proto = out.File
file_pbtenancy_v2beta1_namespace_proto_rawDesc = nil
file_pbtenancy_v2beta1_namespace_proto_goTypes = nil
file_pbtenancy_v2beta1_namespace_proto_depIdxs = nil
}

2
proto-public/pbtenancy/v1alpha1/namespace.proto → proto-public/pbtenancy/v2beta1/namespace.proto
Unescape View File

@ -1,6 +1,6 @@
syntax = "proto3";
package hashicorp.consul.tenancy.v1alpha1;
package hashicorp.consul.tenancy.v2beta1;
import "pbresource/annotations.proto";

2
proto-public/pbtenancy/v1alpha1/namespace_deepcopy.gen.go → proto-public/pbtenancy/v2beta1/namespace_deepcopy.gen.go
Unescape View File

@ -1,5 +1,5 @@
// Code generated by protoc-gen-deepcopy. DO NOT EDIT.
package tenancyv1alpha1
package tenancyv2beta1
import (
proto "google.golang.org/protobuf/proto"

2
proto-public/pbtenancy/v1alpha1/namespace_json.gen.go → proto-public/pbtenancy/v2beta1/namespace_json.gen.go
Unescape View File

@ -1,5 +1,5 @@
// Code generated by protoc-json-shim. DO NOT EDIT.
package tenancyv1alpha1
package tenancyv2beta1
import (
protojson "google.golang.org/protobuf/encoding/protojson"

4
proto-public/pbtenancy/v1alpha1/resource_types.gen.go → proto-public/pbtenancy/v2beta1/resource_types.gen.go
Unescape View File

@ -1,6 +1,6 @@
// Code generated by protoc-gen-resource-types. DO NOT EDIT.
package tenancyv1alpha1
package tenancyv2beta1
import (
"github.com/hashicorp/consul/proto-public/pbresource"
@ -8,7 +8,7 @@ import (
const (
GroupName = "tenancy"
Version = "v1alpha1"
Version = "v2beta1"
NamespaceKind = "Namespace"
)

2
test/integration/consul-container/test/catalog/catalog_test.go
Unescape View File

@ -29,7 +29,7 @@ func TestCatalog(t *testing.T) {
client := pbresource.NewResourceServiceClient(followers[0].GetGRPCConn())
t.Run("one-shot", func(t *testing.T) {
catalogtest.RunCatalogV1Alpha1IntegrationTest(t, client)
catalogtest.RunCatalogV2Beta1IntegrationTest(t, client)
})
t.Run("lifecycle", func(t *testing.T) {

Write Preview
Loading…
Cancel
Save