From a0e81512c30a58a9b9b70c727872022fc9be41ea Mon Sep 17 00:00:00 2001 From: Daniel Helfand Date: Fri, 11 Jun 2021 17:50:09 -0500 Subject: [PATCH] fix protobuf for refName --- .../datapackaging/v1alpha1/generated.pb.go | 911 +++++++++--------- .../datapackaging/v1alpha1/generated.proto | 44 +- .../apis/datapackaging/v1alpha1/types.go | 2 +- .../datapackaging/validation/validations.go | 4 +- pkg/apiserver/openapi/zz_generated.openapi.go | 2 +- 5 files changed, 481 insertions(+), 482 deletions(-) diff --git a/pkg/apiserver/apis/datapackaging/v1alpha1/generated.pb.go b/pkg/apiserver/apis/datapackaging/v1alpha1/generated.pb.go index 642ab5862..55e3c316e 100644 --- a/pkg/apiserver/apis/datapackaging/v1alpha1/generated.pb.go +++ b/pkg/apiserver/apis/datapackaging/v1alpha1/generated.pb.go @@ -140,38 +140,10 @@ func (m *PackageList) XXX_DiscardUnknown() { var xxx_messageInfo_PackageList proto.InternalMessageInfo -func (m *PackageSpec) Reset() { *m = PackageSpec{} } -func (*PackageSpec) ProtoMessage() {} -func (*PackageSpec) Descriptor() ([]byte, []int) { - return fileDescriptor_ff0bf4d4d6edd19a, []int{4} -} -func (m *PackageSpec) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *PackageSpec) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil -} -func (m *PackageSpec) XXX_Merge(src proto.Message) { - xxx_messageInfo_PackageSpec.Merge(m, src) -} -func (m *PackageSpec) XXX_Size() int { - return m.Size() -} -func (m *PackageSpec) XXX_DiscardUnknown() { - xxx_messageInfo_PackageSpec.DiscardUnknown(m) -} - -var xxx_messageInfo_PackageSpec proto.InternalMessageInfo - func (m *PackageMetadata) Reset() { *m = PackageMetadata{} } func (*PackageMetadata) ProtoMessage() {} func (*PackageMetadata) Descriptor() ([]byte, []int) { - return fileDescriptor_ff0bf4d4d6edd19a, []int{5} + return fileDescriptor_ff0bf4d4d6edd19a, []int{4} } func (m *PackageMetadata) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -199,7 +171,7 @@ var xxx_messageInfo_PackageMetadata proto.InternalMessageInfo func (m *PackageMetadataList) Reset() { *m = PackageMetadataList{} } func (*PackageMetadataList) ProtoMessage() {} func (*PackageMetadataList) Descriptor() ([]byte, []int) { - return fileDescriptor_ff0bf4d4d6edd19a, []int{6} + return fileDescriptor_ff0bf4d4d6edd19a, []int{5} } func (m *PackageMetadataList) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -227,7 +199,7 @@ var xxx_messageInfo_PackageMetadataList proto.InternalMessageInfo func (m *PackageMetadataSpec) Reset() { *m = PackageMetadataSpec{} } func (*PackageMetadataSpec) ProtoMessage() {} func (*PackageMetadataSpec) Descriptor() ([]byte, []int) { - return fileDescriptor_ff0bf4d4d6edd19a, []int{7} + return fileDescriptor_ff0bf4d4d6edd19a, []int{6} } func (m *PackageMetadataSpec) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -252,6 +224,34 @@ func (m *PackageMetadataSpec) XXX_DiscardUnknown() { var xxx_messageInfo_PackageMetadataSpec proto.InternalMessageInfo +func (m *PackageSpec) Reset() { *m = PackageSpec{} } +func (*PackageSpec) ProtoMessage() {} +func (*PackageSpec) Descriptor() ([]byte, []int) { + return fileDescriptor_ff0bf4d4d6edd19a, []int{7} +} +func (m *PackageSpec) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *PackageSpec) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil +} +func (m *PackageSpec) XXX_Merge(src proto.Message) { + xxx_messageInfo_PackageSpec.Merge(m, src) +} +func (m *PackageSpec) XXX_Size() int { + return m.Size() +} +func (m *PackageSpec) XXX_DiscardUnknown() { + xxx_messageInfo_PackageSpec.DiscardUnknown(m) +} + +var xxx_messageInfo_PackageSpec proto.InternalMessageInfo + func (m *ValuesSchema) Reset() { *m = ValuesSchema{} } func (*ValuesSchema) ProtoMessage() {} func (*ValuesSchema) Descriptor() ([]byte, []int) { @@ -285,10 +285,10 @@ func init() { proto.RegisterType((*Maintainer)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apiserver.apis.datapackaging.v1alpha1.Maintainer") proto.RegisterType((*Package)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apiserver.apis.datapackaging.v1alpha1.Package") proto.RegisterType((*PackageList)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apiserver.apis.datapackaging.v1alpha1.PackageList") - proto.RegisterType((*PackageSpec)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apiserver.apis.datapackaging.v1alpha1.PackageSpec") proto.RegisterType((*PackageMetadata)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apiserver.apis.datapackaging.v1alpha1.PackageMetadata") proto.RegisterType((*PackageMetadataList)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apiserver.apis.datapackaging.v1alpha1.PackageMetadataList") proto.RegisterType((*PackageMetadataSpec)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apiserver.apis.datapackaging.v1alpha1.PackageMetadataSpec") + proto.RegisterType((*PackageSpec)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apiserver.apis.datapackaging.v1alpha1.PackageSpec") proto.RegisterType((*ValuesSchema)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apiserver.apis.datapackaging.v1alpha1.ValuesSchema") } @@ -297,70 +297,69 @@ func init() { } var fileDescriptor_ff0bf4d4d6edd19a = []byte{ - // 1001 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0xcd, 0x6f, 0x1b, 0x45, - 0x14, 0xcf, 0xe6, 0x83, 0x38, 0xe3, 0xa4, 0x09, 0x53, 0x10, 0x56, 0x90, 0x9c, 0xc8, 0x17, 0xc2, - 0x21, 0xb3, 0x24, 0x94, 0xaa, 0x12, 0xe2, 0x60, 0x37, 0x08, 0x05, 0x35, 0x69, 0x34, 0x46, 0x11, - 0x20, 0x44, 0x98, 0xac, 0x5f, 0xd7, 0x83, 0xf7, 0x63, 0xba, 0x33, 0xde, 0x12, 0x4e, 0x48, 0xc0, - 0x01, 0x0e, 0xc0, 0x8d, 0x03, 0x17, 0xfe, 0x16, 0x4e, 0x39, 0xf6, 0xd8, 0x53, 0x45, 0x8c, 0xc4, - 0x1f, 0x01, 0x17, 0x34, 0xb3, 0xe3, 0xdd, 0xb5, 0x8d, 0xd5, 0xaa, 0x92, 0x73, 0xdb, 0x7d, 0x5f, - 0xbf, 0xf7, 0x7e, 0xf3, 0xe6, 0xb7, 0x8b, 0xba, 0x3e, 0x57, 0xdd, 0xfe, 0x39, 0xf1, 0xe2, 0xd0, - 0x4d, 0xc3, 0x47, 0x2c, 0x81, 0x5d, 0xc5, 0xa2, 0xaf, 0xfb, 0xae, 0xc7, 0x92, 0x14, 0x82, 0xdd, - 0x1e, 0x13, 0x62, 0xd7, 0x8b, 0x23, 0x95, 0xc4, 0x41, 0x00, 0x89, 0x2b, 0x7a, 0xbe, 0xcb, 0x04, - 0x97, 0x90, 0xa4, 0x90, 0x98, 0x27, 0xb7, 0xc3, 0x14, 0x13, 0xcc, 0xeb, 0x31, 0x9f, 0x47, 0xbe, - 0x9b, 0xee, 0xb1, 0x40, 0x74, 0xd9, 0x9e, 0xeb, 0x43, 0x04, 0x09, 0x53, 0xd0, 0x21, 0x22, 0x89, - 0x55, 0x8c, 0x3f, 0x2e, 0x90, 0x48, 0x86, 0x74, 0x66, 0x90, 0x48, 0x86, 0x74, 0xa6, 0x91, 0xce, - 0x0a, 0x24, 0x22, 0x7a, 0x3e, 0xc9, 0x91, 0xcc, 0x13, 0x19, 0x41, 0x22, 0x43, 0xa4, 0xcd, 0xdd, - 0xd2, 0x0c, 0x7e, 0xec, 0xc7, 0xae, 0x01, 0x3c, 0xef, 0x3f, 0x30, 0x6f, 0xe6, 0xc5, 0x3c, 0x65, - 0x8d, 0x6c, 0x7e, 0xf2, 0x82, 0x23, 0xbb, 0xda, 0xe1, 0xa9, 0x24, 0x98, 0x3a, 0xe3, 0xe6, 0xad, - 0xde, 0x1d, 0x49, 0x78, 0xac, 0xc3, 0x43, 0xe6, 0x75, 0x79, 0x04, 0xc9, 0x45, 0x91, 0x1f, 0x82, - 0x62, 0x6e, 0x3a, 0x99, 0xe5, 0x4e, 0xcb, 0x4a, 0xfa, 0x91, 0xe2, 0x21, 0x4c, 0x24, 0xdc, 0x7e, - 0x56, 0x82, 0xf4, 0xba, 0x10, 0xb2, 0xf1, 0xbc, 0xc6, 0xb7, 0x0e, 0x5a, 0x6f, 0x0a, 0xf1, 0x11, - 0x84, 0x22, 0x60, 0x0a, 0xda, 0x02, 0x3c, 0x2c, 0xd0, 0xa2, 0x14, 0xe0, 0xd5, 0x9c, 0x6d, 0x67, - 0xa7, 0xba, 0x4f, 0xc9, 0x0b, 0x9e, 0x12, 0x19, 0x92, 0x93, 0x1f, 0x0b, 0x69, 0x0a, 0xa1, 0x11, - 0x5a, 0x95, 0xc1, 0xd3, 0xad, 0x45, 0xfd, 0x44, 0x0d, 0x52, 0x83, 0x20, 0x74, 0xc4, 0x78, 0xa4, - 0x98, 0xee, 0x1b, 0x6f, 0xa3, 0xc5, 0x88, 0x85, 0x60, 0xf0, 0x57, 0x5a, 0xab, 0x97, 0x4f, 0xb7, - 0xe6, 0x74, 0xfc, 0x31, 0x0b, 0x81, 0x1a, 0x4f, 0xe3, 0x5f, 0x07, 0xa1, 0xe3, 0x58, 0x9d, 0x98, - 0x83, 0x07, 0xfc, 0x05, 0xaa, 0x68, 0x22, 0xf5, 0x2e, 0xd8, 0xa6, 0xdf, 0x22, 0x19, 0x1f, 0xa4, - 0xcc, 0x47, 0xd1, 0x99, 0x8e, 0x26, 0xe9, 0x1e, 0xb9, 0x7f, 0xfe, 0x25, 0x78, 0xea, 0x08, 0x14, - 0x6b, 0x61, 0x0b, 0x83, 0x0a, 0x1b, 0xcd, 0xab, 0xe2, 0x1f, 0x1d, 0xcb, 0xc9, 0xbc, 0x29, 0xdf, - 0x25, 0xb3, 0xda, 0x5c, 0x52, 0x8c, 0x65, 0x98, 0xca, 0xa7, 0x2f, 0xb1, 0xf5, 0x8f, 0x83, 0x6e, - 0x14, 0x61, 0xf7, 0xb8, 0x54, 0xf8, 0xb3, 0x09, 0x06, 0xc8, 0xf3, 0x31, 0xa0, 0xb3, 0xcd, 0xfc, - 0x1b, 0x16, 0xa8, 0x32, 0xb4, 0x94, 0xa6, 0xff, 0xc1, 0x41, 0x4b, 0x5c, 0x41, 0x28, 0x6b, 0xf3, - 0xdb, 0x0b, 0x3b, 0xd5, 0xfd, 0xce, 0x75, 0x8c, 0xdf, 0x5a, 0xb3, 0x1d, 0x2d, 0x1d, 0x6a, 0x68, - 0x9a, 0x75, 0xd0, 0xf8, 0x63, 0xa9, 0x3c, 0xbc, 0xd9, 0xd7, 0xf7, 0x50, 0x35, 0xab, 0x04, 0xc7, - 0xc5, 0xda, 0xbc, 0x6e, 0xb3, 0x6f, 0xda, 0xc8, 0x23, 0x3b, 0x8c, 0xd9, 0xa2, 0x72, 0x3c, 0x7e, - 0x13, 0x2d, 0xa7, 0x90, 0x48, 0x1e, 0x47, 0xe6, 0x74, 0x57, 0x5a, 0xeb, 0x36, 0x75, 0xf9, 0x34, - 0x33, 0xd3, 0xa1, 0x1f, 0xef, 0xa0, 0x4a, 0xc0, 0x3d, 0x88, 0x24, 0xc8, 0xda, 0xc2, 0xf6, 0x82, - 0xde, 0xce, 0x8c, 0xb2, 0xcc, 0x46, 0x73, 0x2f, 0xde, 0x47, 0x28, 0x81, 0x00, 0x98, 0x84, 0x4e, - 0x53, 0xd5, 0x16, 0x4d, 0xdd, 0x7c, 0xc5, 0x68, 0xee, 0xa1, 0xa5, 0x28, 0xfc, 0x10, 0x6d, 0x79, - 0x9a, 0x13, 0xae, 0x2e, 0x28, 0x3c, 0xec, 0xf3, 0x04, 0x42, 0x88, 0x94, 0x3c, 0x00, 0xe9, 0x25, - 0x5c, 0x28, 0xdd, 0xe0, 0x92, 0x29, 0xf4, 0x86, 0x2d, 0xb4, 0x75, 0x57, 0x87, 0x2b, 0x3e, 0x2d, - 0x9c, 0x3e, 0xab, 0x1e, 0xbe, 0x83, 0x56, 0x6d, 0x03, 0xc7, 0xb1, 0x02, 0x59, 0x7b, 0xc9, 0xd4, - 0x7f, 0xc5, 0xd6, 0x5f, 0xa5, 0x25, 0x1f, 0x1d, 0x89, 0xc4, 0xbf, 0x3a, 0xa8, 0xa2, 0xac, 0x6a, - 0xd4, 0x96, 0xcd, 0xca, 0xf1, 0xd9, 0xad, 0xc5, 0x98, 0x44, 0x15, 0xdb, 0x3a, 0xb4, 0xd2, 0xbc, - 0x19, 0xfc, 0xbb, 0x83, 0x56, 0x53, 0x16, 0xf4, 0x41, 0xb6, 0x8d, 0xe6, 0xd5, 0x2a, 0xa6, 0xbb, - 0x07, 0xb3, 0xeb, 0xee, 0xb4, 0x84, 0x56, 0x90, 0x57, 0xb6, 0xd2, 0x91, 0x8e, 0x1a, 0xdf, 0xcf, - 0xa3, 0xf5, 0xb1, 0xbd, 0xbc, 0x06, 0x11, 0xfb, 0x79, 0x54, 0xc4, 0xc2, 0xd9, 0x11, 0x32, 0x36, - 0xdb, 0x54, 0x25, 0xfb, 0x6e, 0x1e, 0x8d, 0xdf, 0xcf, 0x6b, 0x90, 0xb3, 0x9f, 0xc6, 0xe4, 0x8c, - 0x5f, 0x1b, 0x11, 0x53, 0x34, 0xed, 0xef, 0xc5, 0x09, 0x1a, 0x8c, 0xb0, 0xbd, 0x83, 0xaa, 0x1d, - 0x2e, 0x45, 0xc0, 0x2e, 0x4a, 0xc2, 0x76, 0xd3, 0x96, 0xa8, 0x1e, 0x14, 0x2e, 0x5a, 0x8e, 0xc3, - 0x4d, 0xb4, 0x1e, 0xc4, 0x91, 0x5f, 0xd6, 0x8d, 0x4c, 0xd8, 0x5e, 0xb3, 0xa9, 0xeb, 0xf7, 0x46, - 0xdd, 0x74, 0x3c, 0x1e, 0x1f, 0xa0, 0x0d, 0xd9, 0x8d, 0x13, 0x55, 0xae, 0xb1, 0x60, 0x6a, 0xd4, - 0x6c, 0x8d, 0x8d, 0xf6, 0x98, 0x9f, 0x4e, 0x64, 0xe0, 0x77, 0xd1, 0x1a, 0xf7, 0xe2, 0xa8, 0x7d, - 0xfa, 0x41, 0x8b, 0x49, 0xb8, 0x7d, 0xcb, 0xea, 0xe0, 0xab, 0xb6, 0xc4, 0xda, 0x61, 0xd9, 0x49, - 0x47, 0x63, 0xb5, 0x34, 0x89, 0x24, 0x4e, 0x79, 0x07, 0x12, 0x33, 0xfd, 0xd2, 0xa8, 0x34, 0x9d, - 0x94, 0x7c, 0x74, 0x24, 0x12, 0xff, 0xe6, 0xa0, 0x6a, 0x98, 0xff, 0x4e, 0x68, 0x51, 0x9b, 0xf1, - 0x47, 0xab, 0xf8, 0x77, 0x29, 0x4e, 0xa7, 0xb0, 0x49, 0x5a, 0xee, 0x06, 0x13, 0x84, 0x3c, 0xa6, - 0xc0, 0x8f, 0x13, 0x0e, 0xb2, 0xb6, 0x6c, 0xbe, 0x22, 0x37, 0xf4, 0x9d, 0xbd, 0x9b, 0x5b, 0x69, - 0x29, 0x02, 0x7f, 0x88, 0xb0, 0xec, 0x0b, 0x31, 0x76, 0x18, 0x15, 0xc3, 0xc6, 0xa6, 0x45, 0xc3, - 0xed, 0x89, 0x08, 0xfa, 0x3f, 0x59, 0x8d, 0x08, 0x8d, 0xa8, 0x12, 0xfe, 0x1c, 0xad, 0xc4, 0x02, - 0xa2, 0xe6, 0xc9, 0x61, 0xfa, 0xb6, 0xbd, 0x68, 0xbb, 0x53, 0x2f, 0x9a, 0xfd, 0x93, 0x24, 0x94, - 0x3d, 0x7a, 0xff, 0x2b, 0x05, 0x91, 0xfe, 0x22, 0xb6, 0x5e, 0xb6, 0x1d, 0xac, 0xdc, 0x1f, 0xd6, - 0xa1, 0x45, 0xc9, 0x16, 0xb9, 0xbc, 0xaa, 0xcf, 0x3d, 0xbe, 0xaa, 0xcf, 0x3d, 0xb9, 0xaa, 0xcf, - 0x7d, 0x33, 0xa8, 0x3b, 0x97, 0x83, 0xba, 0xf3, 0x78, 0x50, 0x77, 0x9e, 0x0c, 0xea, 0xce, 0x9f, - 0x83, 0xba, 0xf3, 0xcb, 0x5f, 0xf5, 0xb9, 0x4f, 0x2b, 0x43, 0x22, 0xff, 0x0b, 0x00, 0x00, 0xff, - 0xff, 0xdf, 0x3e, 0xf1, 0x3f, 0x7b, 0x0c, 0x00, 0x00, + // 989 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0x4b, 0x6f, 0x23, 0x45, + 0x10, 0xce, 0xe4, 0x41, 0x9c, 0x76, 0x42, 0x42, 0x2f, 0x08, 0x2b, 0x07, 0x27, 0xf2, 0x85, 0x70, + 0x48, 0x0f, 0x09, 0xcb, 0x6a, 0x25, 0x4e, 0xf1, 0x06, 0xa1, 0xa0, 0x4d, 0x36, 0x6a, 0xa3, 0x08, + 0x10, 0x22, 0x74, 0xc6, 0x95, 0x71, 0xe3, 0x79, 0xf4, 0x76, 0xb7, 0x67, 0x09, 0x27, 0x24, 0x5e, + 0x37, 0xe0, 0xc6, 0x81, 0x0b, 0x77, 0xfe, 0x48, 0x8e, 0x7b, 0xdc, 0xd3, 0x8a, 0x18, 0x89, 0x5f, + 0x00, 0x77, 0x34, 0x3d, 0x3d, 0x0f, 0xdb, 0x58, 0x8b, 0x56, 0xf2, 0xde, 0xc6, 0x55, 0x5f, 0xd5, + 0x57, 0x8f, 0xcf, 0x35, 0x83, 0x7a, 0x3e, 0xd7, 0xbd, 0xc1, 0x05, 0xf1, 0xe2, 0xd0, 0x4d, 0xc2, + 0x47, 0x4c, 0xc2, 0xae, 0x66, 0xd1, 0x57, 0x03, 0xd7, 0x63, 0x32, 0x81, 0x60, 0xb7, 0xcf, 0x84, + 0xd8, 0xf5, 0xe2, 0x48, 0xcb, 0x38, 0x08, 0x40, 0xba, 0xa2, 0xef, 0xbb, 0x4c, 0x70, 0x05, 0x32, + 0x01, 0x69, 0x9e, 0xdc, 0x2e, 0xd3, 0x4c, 0x30, 0xaf, 0xcf, 0x7c, 0x1e, 0xf9, 0x6e, 0xb2, 0xc7, + 0x02, 0xd1, 0x63, 0x7b, 0xae, 0x0f, 0x11, 0x48, 0xa6, 0xa1, 0x4b, 0x84, 0x8c, 0x75, 0x8c, 0x3f, + 0x2a, 0x99, 0x48, 0xc6, 0x74, 0x6e, 0x98, 0x48, 0xc6, 0x74, 0x9e, 0x32, 0x9d, 0x97, 0x4c, 0x44, + 0xf4, 0x7d, 0x52, 0x30, 0x99, 0x27, 0x32, 0xc2, 0x44, 0x72, 0xa6, 0xcd, 0xdd, 0x4a, 0x0f, 0x7e, + 0xec, 0xc7, 0xae, 0x21, 0xbc, 0x18, 0x5c, 0x9a, 0x5f, 0xe6, 0x87, 0x79, 0xca, 0x0a, 0xd9, 0xfc, + 0xf8, 0x39, 0x5b, 0x76, 0x53, 0x87, 0xa7, 0x65, 0x30, 0xb5, 0xc7, 0xcd, 0xdb, 0xfd, 0xbb, 0x8a, + 0xf0, 0x38, 0x85, 0x87, 0xcc, 0xeb, 0xf1, 0x08, 0xe4, 0x55, 0x19, 0x1f, 0x82, 0x66, 0x6e, 0x32, + 0x19, 0xe5, 0x4e, 0x8b, 0x92, 0x83, 0x48, 0xf3, 0x10, 0x26, 0x02, 0xee, 0x3c, 0x2b, 0x40, 0x79, + 0x3d, 0x08, 0xd9, 0x78, 0x5c, 0xeb, 0x1b, 0x07, 0xad, 0x1f, 0x08, 0xf1, 0x21, 0x84, 0x22, 0x60, + 0x1a, 0x3a, 0x02, 0x3c, 0x2c, 0xd0, 0xa2, 0x12, 0xe0, 0x35, 0x9c, 0x6d, 0x67, 0xa7, 0xbe, 0x4f, + 0xc9, 0x73, 0x6e, 0x89, 0xe4, 0xc3, 0x29, 0xd6, 0x42, 0x0e, 0x84, 0x48, 0x19, 0xda, 0xb5, 0xe1, + 0xd3, 0xad, 0xc5, 0xf4, 0x89, 0x1a, 0xa6, 0x16, 0x41, 0xe8, 0x98, 0xf1, 0x48, 0xb3, 0xb4, 0x6e, + 0xbc, 0x8d, 0x16, 0x23, 0x16, 0x82, 0xe1, 0x5f, 0x69, 0xaf, 0x5e, 0x3f, 0xdd, 0x9a, 0x4b, 0xf1, + 0x27, 0x2c, 0x04, 0x6a, 0x3c, 0xad, 0x7f, 0x1c, 0xb4, 0x7c, 0x6a, 0xb6, 0x0e, 0xf8, 0x73, 0x54, + 0x4b, 0xa7, 0x98, 0x0a, 0xc1, 0x56, 0xfc, 0x16, 0xc9, 0x86, 0x41, 0xaa, 0xc3, 0x28, 0xcb, 0x4a, + 0xd1, 0x24, 0xd9, 0x23, 0x0f, 0x2e, 0xbe, 0x00, 0x4f, 0x1f, 0x83, 0x66, 0x6d, 0x6c, 0x39, 0x50, + 0x69, 0xa3, 0x45, 0x56, 0xfc, 0x83, 0x63, 0x07, 0x32, 0x6f, 0xd2, 0x03, 0x99, 0x95, 0x6c, 0x89, + 0xed, 0xc9, 0xcc, 0xa8, 0xe8, 0xbb, 0x32, 0xa7, 0xbf, 0x1d, 0x54, 0xb7, 0x98, 0xfb, 0x5c, 0x69, + 0xfc, 0xe9, 0x44, 0xef, 0xe4, 0xff, 0xf5, 0x9e, 0x46, 0x9b, 0xce, 0x37, 0x2c, 0x4b, 0x2d, 0xb7, + 0x54, 0xfa, 0xfe, 0xde, 0x41, 0x4b, 0x5c, 0x43, 0xa8, 0x1a, 0xf3, 0xdb, 0x0b, 0x3b, 0xf5, 0x7d, + 0x36, 0xf3, 0xc6, 0xdb, 0x6b, 0xb6, 0x9c, 0xa5, 0xa3, 0x94, 0x97, 0x66, 0xf4, 0xad, 0xef, 0xe6, + 0xd1, 0xba, 0x45, 0x1c, 0xe7, 0xc5, 0xcd, 0x7e, 0xed, 0x3f, 0x8d, 0xae, 0x3d, 0x9c, 0x79, 0xf7, + 0x79, 0x6f, 0x53, 0xd7, 0xff, 0xed, 0x3c, 0xba, 0x35, 0x86, 0x7d, 0x01, 0x32, 0xf8, 0x71, 0x4c, + 0x06, 0xfc, 0x85, 0x0d, 0x62, 0x8a, 0x1c, 0xfe, 0x5a, 0x9c, 0x18, 0x83, 0xb9, 0x5b, 0xef, 0xa0, + 0x7a, 0x97, 0x2b, 0x11, 0xb0, 0xab, 0x93, 0xf2, 0x7c, 0xdc, 0xb2, 0x29, 0xea, 0x87, 0xa5, 0x8b, + 0x56, 0x71, 0xf8, 0x00, 0xad, 0x07, 0x71, 0xe4, 0x1f, 0x82, 0xf2, 0x24, 0x17, 0x9a, 0xc7, 0x91, + 0xd9, 0xf8, 0x4a, 0xfb, 0x75, 0x1b, 0xba, 0x7e, 0x7f, 0xd4, 0x4d, 0xc7, 0xf1, 0xf8, 0x10, 0x6d, + 0xa8, 0x5e, 0x2c, 0x75, 0x35, 0xc7, 0x82, 0xc9, 0xd1, 0xb0, 0x39, 0x36, 0x3a, 0x63, 0x7e, 0x3a, + 0x11, 0x81, 0xdf, 0x45, 0x6b, 0xdc, 0x8b, 0xa3, 0xce, 0xd9, 0xfb, 0x6d, 0xa6, 0xe0, 0xce, 0xed, + 0xc6, 0xa2, 0x49, 0xf1, 0x9a, 0x4d, 0xb1, 0x76, 0x54, 0x75, 0xd2, 0x51, 0x2c, 0xbe, 0x8b, 0x56, + 0x85, 0x8c, 0x13, 0xde, 0x05, 0x69, 0xba, 0x5f, 0x32, 0xb1, 0xaf, 0xda, 0xd8, 0xd5, 0xd3, 0x8a, + 0x8f, 0x8e, 0x20, 0xf1, 0xaf, 0x0e, 0xaa, 0x87, 0xc5, 0xf5, 0x55, 0x8d, 0x97, 0xcc, 0x96, 0xbb, + 0xb3, 0xdb, 0x72, 0x79, 0xea, 0xcb, 0xed, 0x94, 0x36, 0x45, 0xab, 0xd5, 0x60, 0x82, 0x90, 0xc7, + 0x34, 0xf8, 0xb1, 0xe4, 0xa0, 0x1a, 0xcb, 0xdb, 0x0b, 0x3b, 0x2b, 0xed, 0x97, 0xd3, 0xff, 0xec, + 0xbd, 0xc2, 0x4a, 0x2b, 0x08, 0xfc, 0x01, 0xc2, 0x6a, 0x20, 0xc4, 0xd8, 0x32, 0x6a, 0x66, 0x1a, + 0x9b, 0x96, 0x0d, 0x77, 0x26, 0x10, 0xf4, 0x3f, 0xa2, 0x5a, 0xbf, 0x2f, 0x15, 0xe7, 0xd6, 0x08, + 0xec, 0x4d, 0xb4, 0x2c, 0xe1, 0xb2, 0x22, 0xae, 0x75, 0x9b, 0x70, 0x99, 0x66, 0x66, 0x9a, 0xfb, + 0x53, 0x68, 0x02, 0x52, 0x95, 0x62, 0x2a, 0xa0, 0x67, 0x99, 0x99, 0xe6, 0x7e, 0xbc, 0x83, 0x6a, + 0x01, 0xf7, 0x20, 0x52, 0xa0, 0x1a, 0x0b, 0xa6, 0xbf, 0xd5, 0xec, 0x9f, 0x98, 0xd9, 0x68, 0xe1, + 0xc5, 0xfb, 0x08, 0x49, 0x08, 0x80, 0x29, 0xe8, 0x1e, 0x68, 0xab, 0x8e, 0xe2, 0x86, 0xd1, 0xc2, + 0x43, 0x2b, 0x28, 0xfc, 0x10, 0x6d, 0x79, 0xe9, 0x12, 0xb8, 0xbe, 0xa2, 0xf0, 0x70, 0xc0, 0x25, + 0x84, 0x10, 0x69, 0x55, 0x1d, 0x4e, 0x26, 0x95, 0x37, 0x6c, 0xa2, 0xad, 0x7b, 0x29, 0x5c, 0xf3, + 0x69, 0x70, 0xfa, 0xac, 0x7c, 0xa9, 0x14, 0x6d, 0x01, 0x27, 0xb1, 0x86, 0x54, 0x50, 0x23, 0x52, + 0xa4, 0x15, 0x1f, 0x1d, 0x41, 0xe2, 0x5f, 0x1c, 0x54, 0xd3, 0xf6, 0x53, 0xa4, 0xb1, 0x6c, 0x2e, + 0xd9, 0x0c, 0xaf, 0xcd, 0xd8, 0x77, 0x4f, 0x79, 0x04, 0x73, 0x2b, 0x2d, 0x8a, 0xc1, 0xbf, 0x39, + 0x68, 0x35, 0x61, 0xc1, 0x00, 0x54, 0xc7, 0x7c, 0x48, 0x19, 0x45, 0xd5, 0xf7, 0x2f, 0x67, 0x57, + 0xdd, 0x59, 0x85, 0xad, 0x1c, 0x5e, 0xd5, 0x4a, 0x47, 0x2a, 0x6a, 0x45, 0x68, 0xc4, 0x8b, 0x3f, + 0x43, 0x2b, 0xb1, 0x80, 0xe8, 0xe0, 0xf4, 0x28, 0x79, 0xdb, 0xbe, 0x16, 0x76, 0xa7, 0xbe, 0x16, + 0xec, 0x67, 0x22, 0xa1, 0xec, 0xd1, 0x7b, 0x5f, 0x6a, 0x88, 0x52, 0x65, 0xb6, 0x5f, 0xb1, 0xac, + 0x2b, 0x0f, 0xf2, 0x3c, 0xb4, 0x4c, 0xd9, 0x26, 0xd7, 0x37, 0xcd, 0xb9, 0xc7, 0x37, 0xcd, 0xb9, + 0x27, 0x37, 0xcd, 0xb9, 0xaf, 0x87, 0x4d, 0xe7, 0x7a, 0xd8, 0x74, 0x1e, 0x0f, 0x9b, 0xce, 0x93, + 0x61, 0xd3, 0xf9, 0x63, 0xd8, 0x74, 0x7e, 0xfe, 0xb3, 0x39, 0xf7, 0x49, 0x2d, 0x6f, 0xe8, 0xdf, + 0x00, 0x00, 0x00, 0xff, 0xff, 0xca, 0x81, 0xbe, 0x0f, 0x58, 0x0c, 0x00, 0x00, } func (m *AppTemplateSpec) Marshal() (dAtA []byte, err error) { @@ -516,83 +515,6 @@ func (m *PackageList) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *PackageSpec) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *PackageSpec) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *PackageSpec) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - { - size, err := m.ValuesSchema.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintGenerated(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x42 - { - size, err := m.Template.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintGenerated(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x3a - i -= len(m.ReleaseNotes) - copy(dAtA[i:], m.ReleaseNotes) - i = encodeVarintGenerated(dAtA, i, uint64(len(m.ReleaseNotes))) - i-- - dAtA[i] = 0x32 - i -= len(m.CapactiyRequirementsDescription) - copy(dAtA[i:], m.CapactiyRequirementsDescription) - i = encodeVarintGenerated(dAtA, i, uint64(len(m.CapactiyRequirementsDescription))) - i-- - dAtA[i] = 0x2a - i -= len(m.ReleasedAt) - copy(dAtA[i:], m.ReleasedAt) - i = encodeVarintGenerated(dAtA, i, uint64(len(m.ReleasedAt))) - i-- - dAtA[i] = 0x22 - if len(m.Licenses) > 0 { - for iNdEx := len(m.Licenses) - 1; iNdEx >= 0; iNdEx-- { - i -= len(m.Licenses[iNdEx]) - copy(dAtA[i:], m.Licenses[iNdEx]) - i = encodeVarintGenerated(dAtA, i, uint64(len(m.Licenses[iNdEx]))) - i-- - dAtA[i] = 0x1a - } - } - i -= len(m.Version) - copy(dAtA[i:], m.Version) - i = encodeVarintGenerated(dAtA, i, uint64(len(m.Version))) - i-- - dAtA[i] = 0x12 - i -= len(m.RefName) - copy(dAtA[i:], m.RefName) - i = encodeVarintGenerated(dAtA, i, uint64(len(m.RefName))) - i-- - dAtA[i] = 0xa - return len(dAtA) - i, nil -} - func (m *PackageMetadata) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -759,6 +681,83 @@ func (m *PackageMetadataSpec) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *PackageSpec) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *PackageSpec) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *PackageSpec) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + { + size, err := m.ValuesSchema.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintGenerated(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x42 + { + size, err := m.Template.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintGenerated(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x3a + i -= len(m.ReleaseNotes) + copy(dAtA[i:], m.ReleaseNotes) + i = encodeVarintGenerated(dAtA, i, uint64(len(m.ReleaseNotes))) + i-- + dAtA[i] = 0x32 + i -= len(m.CapactiyRequirementsDescription) + copy(dAtA[i:], m.CapactiyRequirementsDescription) + i = encodeVarintGenerated(dAtA, i, uint64(len(m.CapactiyRequirementsDescription))) + i-- + dAtA[i] = 0x2a + i -= len(m.ReleasedAt) + copy(dAtA[i:], m.ReleasedAt) + i = encodeVarintGenerated(dAtA, i, uint64(len(m.ReleasedAt))) + i-- + dAtA[i] = 0x22 + if len(m.Licenses) > 0 { + for iNdEx := len(m.Licenses) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.Licenses[iNdEx]) + copy(dAtA[i:], m.Licenses[iNdEx]) + i = encodeVarintGenerated(dAtA, i, uint64(len(m.Licenses[iNdEx]))) + i-- + dAtA[i] = 0x1a + } + } + i -= len(m.Version) + copy(dAtA[i:], m.Version) + i = encodeVarintGenerated(dAtA, i, uint64(len(m.Version))) + i-- + dAtA[i] = 0x12 + i -= len(m.RefName) + copy(dAtA[i:], m.RefName) + i = encodeVarintGenerated(dAtA, i, uint64(len(m.RefName))) + i-- + dAtA[i] = 0xa + return len(dAtA) - i, nil +} + func (m *ValuesSchema) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -857,35 +856,6 @@ func (m *PackageList) Size() (n int) { return n } -func (m *PackageSpec) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.RefName) - n += 1 + l + sovGenerated(uint64(l)) - l = len(m.Version) - n += 1 + l + sovGenerated(uint64(l)) - if len(m.Licenses) > 0 { - for _, s := range m.Licenses { - l = len(s) - n += 1 + l + sovGenerated(uint64(l)) - } - } - l = len(m.ReleasedAt) - n += 1 + l + sovGenerated(uint64(l)) - l = len(m.CapactiyRequirementsDescription) - n += 1 + l + sovGenerated(uint64(l)) - l = len(m.ReleaseNotes) - n += 1 + l + sovGenerated(uint64(l)) - l = m.Template.Size() - n += 1 + l + sovGenerated(uint64(l)) - l = m.ValuesSchema.Size() - n += 1 + l + sovGenerated(uint64(l)) - return n -} - func (m *PackageMetadata) Size() (n int) { if m == nil { return 0 @@ -949,19 +919,48 @@ func (m *PackageMetadataSpec) Size() (n int) { return n } -func (m *ValuesSchema) Size() (n int) { +func (m *PackageSpec) Size() (n int) { if m == nil { return 0 } var l int _ = l - l = m.OpenAPIv3.Size() + l = len(m.RefName) n += 1 + l + sovGenerated(uint64(l)) - return n -} - -func sovGenerated(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 + l = len(m.Version) + n += 1 + l + sovGenerated(uint64(l)) + if len(m.Licenses) > 0 { + for _, s := range m.Licenses { + l = len(s) + n += 1 + l + sovGenerated(uint64(l)) + } + } + l = len(m.ReleasedAt) + n += 1 + l + sovGenerated(uint64(l)) + l = len(m.CapactiyRequirementsDescription) + n += 1 + l + sovGenerated(uint64(l)) + l = len(m.ReleaseNotes) + n += 1 + l + sovGenerated(uint64(l)) + l = m.Template.Size() + n += 1 + l + sovGenerated(uint64(l)) + l = m.ValuesSchema.Size() + n += 1 + l + sovGenerated(uint64(l)) + return n +} + +func (m *ValuesSchema) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = m.OpenAPIv3.Size() + n += 1 + l + sovGenerated(uint64(l)) + return n +} + +func sovGenerated(x uint64) (n int) { + return (math_bits.Len64(x|1) + 6) / 7 } func sozGenerated(x uint64) (n int) { return sovGenerated(uint64((x << 1) ^ uint64((int64(x) >> 63)))) @@ -1013,23 +1012,6 @@ func (this *PackageList) String() string { }, "") return s } -func (this *PackageSpec) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&PackageSpec{`, - `RefName:` + fmt.Sprintf("%v", this.RefName) + `,`, - `Version:` + fmt.Sprintf("%v", this.Version) + `,`, - `Licenses:` + fmt.Sprintf("%v", this.Licenses) + `,`, - `ReleasedAt:` + fmt.Sprintf("%v", this.ReleasedAt) + `,`, - `CapactiyRequirementsDescription:` + fmt.Sprintf("%v", this.CapactiyRequirementsDescription) + `,`, - `ReleaseNotes:` + fmt.Sprintf("%v", this.ReleaseNotes) + `,`, - `Template:` + strings.Replace(strings.Replace(this.Template.String(), "AppTemplateSpec", "AppTemplateSpec", 1), `&`, ``, 1) + `,`, - `ValuesSchema:` + strings.Replace(strings.Replace(this.ValuesSchema.String(), "ValuesSchema", "ValuesSchema", 1), `&`, ``, 1) + `,`, - `}`, - }, "") - return s -} func (this *PackageMetadata) String() string { if this == nil { return "nil" @@ -1079,6 +1061,23 @@ func (this *PackageMetadataSpec) String() string { }, "") return s } +func (this *PackageSpec) String() string { + if this == nil { + return "nil" + } + s := strings.Join([]string{`&PackageSpec{`, + `RefName:` + fmt.Sprintf("%v", this.RefName) + `,`, + `Version:` + fmt.Sprintf("%v", this.Version) + `,`, + `Licenses:` + fmt.Sprintf("%v", this.Licenses) + `,`, + `ReleasedAt:` + fmt.Sprintf("%v", this.ReleasedAt) + `,`, + `CapactiyRequirementsDescription:` + fmt.Sprintf("%v", this.CapactiyRequirementsDescription) + `,`, + `ReleaseNotes:` + fmt.Sprintf("%v", this.ReleaseNotes) + `,`, + `Template:` + strings.Replace(strings.Replace(this.Template.String(), "AppTemplateSpec", "AppTemplateSpec", 1), `&`, ``, 1) + `,`, + `ValuesSchema:` + strings.Replace(strings.Replace(this.ValuesSchema.String(), "ValuesSchema", "ValuesSchema", 1), `&`, ``, 1) + `,`, + `}`, + }, "") + return s +} func (this *ValuesSchema) String() string { if this == nil { return "nil" @@ -1510,7 +1509,7 @@ func (m *PackageList) Unmarshal(dAtA []byte) error { } return nil } -func (m *PackageSpec) Unmarshal(dAtA []byte) error { +func (m *PackageMetadata) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -1533,17 +1532,17 @@ func (m *PackageSpec) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: PackageSpec: wiretype end group for non-group") + return fmt.Errorf("proto: PackageMetadata: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: PackageSpec: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: PackageMetadata: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field RefName", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ObjectMeta", wireType) } - var stringLen uint64 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowGenerated @@ -1553,29 +1552,30 @@ func (m *PackageSpec) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } - intStringLen := int(stringLen) - if intStringLen < 0 { + if msglen < 0 { return ErrInvalidLengthGenerated } - postIndex := iNdEx + intStringLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthGenerated } if postIndex > l { return io.ErrUnexpectedEOF } - m.RefName = string(dAtA[iNdEx:postIndex]) + if err := m.ObjectMeta.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Version", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Spec", wireType) } - var stringLen uint64 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowGenerated @@ -1585,29 +1585,83 @@ func (m *PackageSpec) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } - intStringLen := int(stringLen) - if intStringLen < 0 { + if msglen < 0 { return ErrInvalidLengthGenerated } - postIndex := iNdEx + intStringLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthGenerated } if postIndex > l { return io.ErrUnexpectedEOF } - m.Version = string(dAtA[iNdEx:postIndex]) + if err := m.Spec.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } iNdEx = postIndex - case 3: + default: + iNdEx = preIndex + skippy, err := skipGenerated(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthGenerated + } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthGenerated + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *PackageMetadataList) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: PackageMetadataList: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: PackageMetadataList: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Licenses", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ListMeta", wireType) } - var stringLen uint64 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowGenerated @@ -1617,29 +1671,30 @@ func (m *PackageSpec) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } - intStringLen := int(stringLen) - if intStringLen < 0 { + if msglen < 0 { return ErrInvalidLengthGenerated } - postIndex := iNdEx + intStringLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthGenerated } if postIndex > l { return io.ErrUnexpectedEOF } - m.Licenses = append(m.Licenses, string(dAtA[iNdEx:postIndex])) + if err := m.ListMeta.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } iNdEx = postIndex - case 4: + case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ReleasedAt", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Items", wireType) } - var stringLen uint64 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowGenerated @@ -1649,27 +1704,82 @@ func (m *PackageSpec) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } - intStringLen := int(stringLen) - if intStringLen < 0 { + if msglen < 0 { return ErrInvalidLengthGenerated } - postIndex := iNdEx + intStringLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthGenerated } if postIndex > l { return io.ErrUnexpectedEOF } - m.ReleasedAt = string(dAtA[iNdEx:postIndex]) + m.Items = append(m.Items, PackageMetadata{}) + if err := m.Items[len(m.Items)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } iNdEx = postIndex - case 5: + default: + iNdEx = preIndex + skippy, err := skipGenerated(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthGenerated + } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthGenerated + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *PackageMetadataSpec) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: PackageMetadataSpec: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: PackageMetadataSpec: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field CapactiyRequirementsDescription", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field DisplayName", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -1697,11 +1807,11 @@ func (m *PackageSpec) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.CapactiyRequirementsDescription = string(dAtA[iNdEx:postIndex]) + m.DisplayName = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 6: + case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ReleaseNotes", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field LongDescription", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -1729,13 +1839,13 @@ func (m *PackageSpec) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.ReleaseNotes = string(dAtA[iNdEx:postIndex]) + m.LongDescription = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 7: + case 3: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Template", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ShortDescription", wireType) } - var msglen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowGenerated @@ -1745,30 +1855,29 @@ func (m *PackageSpec) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthGenerated } - postIndex := iNdEx + msglen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthGenerated } if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.Template.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } + m.ShortDescription = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 8: + case 4: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ValuesSchema", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field IconSVGBase64", wireType) } - var msglen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowGenerated @@ -1778,83 +1887,29 @@ func (m *PackageSpec) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthGenerated } - postIndex := iNdEx + msglen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthGenerated } if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.ValuesSchema.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } + m.IconSVGBase64 = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipGenerated(dAtA[iNdEx:]) - if err != nil { - return err - } - if skippy < 0 { - return ErrInvalidLengthGenerated - } - if (iNdEx + skippy) < 0 { - return ErrInvalidLengthGenerated - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *PackageMetadata) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenerated - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: PackageMetadata: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: PackageMetadata: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: + case 5: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ObjectMeta", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ProviderName", wireType) } - var msglen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowGenerated @@ -1864,28 +1919,27 @@ func (m *PackageMetadata) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthGenerated } - postIndex := iNdEx + msglen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthGenerated } if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.ObjectMeta.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } + m.ProviderName = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 2: + case 6: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Spec", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Maintainers", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -1912,68 +1966,16 @@ func (m *PackageMetadata) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.Spec.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + m.Maintainers = append(m.Maintainers, Maintainer{}) + if err := m.Maintainers[len(m.Maintainers)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipGenerated(dAtA[iNdEx:]) - if err != nil { - return err - } - if skippy < 0 { - return ErrInvalidLengthGenerated - } - if (iNdEx + skippy) < 0 { - return ErrInvalidLengthGenerated - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *PackageMetadataList) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenerated - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: PackageMetadataList: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: PackageMetadataList: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: + case 7: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ListMeta", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Categories", wireType) } - var msglen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowGenerated @@ -1983,30 +1985,29 @@ func (m *PackageMetadataList) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthGenerated } - postIndex := iNdEx + msglen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthGenerated } if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.ListMeta.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } + m.Categories = append(m.Categories, string(dAtA[iNdEx:postIndex])) iNdEx = postIndex - case 2: + case 8: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Items", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field SupportDescription", wireType) } - var msglen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowGenerated @@ -2016,25 +2017,23 @@ func (m *PackageMetadataList) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthGenerated } - postIndex := iNdEx + msglen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthGenerated } if postIndex > l { return io.ErrUnexpectedEOF } - m.Items = append(m.Items, PackageMetadata{}) - if err := m.Items[len(m.Items)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } + m.SupportDescription = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex @@ -2060,7 +2059,7 @@ func (m *PackageMetadataList) Unmarshal(dAtA []byte) error { } return nil } -func (m *PackageMetadataSpec) Unmarshal(dAtA []byte) error { +func (m *PackageSpec) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -2083,15 +2082,15 @@ func (m *PackageMetadataSpec) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: PackageMetadataSpec: wiretype end group for non-group") + return fmt.Errorf("proto: PackageSpec: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: PackageMetadataSpec: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: PackageSpec: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field DisplayName", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field RefName", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -2119,11 +2118,11 @@ func (m *PackageMetadataSpec) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.DisplayName = string(dAtA[iNdEx:postIndex]) + m.RefName = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field LongDescription", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Version", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -2151,11 +2150,11 @@ func (m *PackageMetadataSpec) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.LongDescription = string(dAtA[iNdEx:postIndex]) + m.Version = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 3: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ShortDescription", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Licenses", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -2183,11 +2182,11 @@ func (m *PackageMetadataSpec) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.ShortDescription = string(dAtA[iNdEx:postIndex]) + m.Licenses = append(m.Licenses, string(dAtA[iNdEx:postIndex])) iNdEx = postIndex case 4: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field IconSVGBase64", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ReleasedAt", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -2215,11 +2214,11 @@ func (m *PackageMetadataSpec) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.IconSVGBase64 = string(dAtA[iNdEx:postIndex]) + m.ReleasedAt = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 5: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ProviderName", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field CapactiyRequirementsDescription", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -2247,13 +2246,13 @@ func (m *PackageMetadataSpec) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.ProviderName = string(dAtA[iNdEx:postIndex]) + m.CapactiyRequirementsDescription = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 6: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Maintainers", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ReleaseNotes", wireType) } - var msglen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowGenerated @@ -2263,31 +2262,29 @@ func (m *PackageMetadataSpec) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthGenerated } - postIndex := iNdEx + msglen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthGenerated } if postIndex > l { return io.ErrUnexpectedEOF } - m.Maintainers = append(m.Maintainers, Maintainer{}) - if err := m.Maintainers[len(m.Maintainers)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } + m.ReleaseNotes = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 7: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Categories", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Template", wireType) } - var stringLen uint64 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowGenerated @@ -2297,29 +2294,30 @@ func (m *PackageMetadataSpec) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } - intStringLen := int(stringLen) - if intStringLen < 0 { + if msglen < 0 { return ErrInvalidLengthGenerated } - postIndex := iNdEx + intStringLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthGenerated } if postIndex > l { return io.ErrUnexpectedEOF } - m.Categories = append(m.Categories, string(dAtA[iNdEx:postIndex])) + if err := m.Template.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } iNdEx = postIndex case 8: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field SupportDescription", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ValuesSchema", wireType) } - var stringLen uint64 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowGenerated @@ -2329,23 +2327,24 @@ func (m *PackageMetadataSpec) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } - intStringLen := int(stringLen) - if intStringLen < 0 { + if msglen < 0 { return ErrInvalidLengthGenerated } - postIndex := iNdEx + intStringLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthGenerated } if postIndex > l { return io.ErrUnexpectedEOF } - m.SupportDescription = string(dAtA[iNdEx:postIndex]) + if err := m.ValuesSchema.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } iNdEx = postIndex default: iNdEx = preIndex diff --git a/pkg/apiserver/apis/datapackaging/v1alpha1/generated.proto b/pkg/apiserver/apis/datapackaging/v1alpha1/generated.proto index 316c6ff4a..3600ab4cb 100644 --- a/pkg/apiserver/apis/datapackaging/v1alpha1/generated.proto +++ b/pkg/apiserver/apis/datapackaging/v1alpha1/generated.proto @@ -41,28 +41,6 @@ message PackageList { repeated Package items = 2; } -message PackageSpec { - optional string packageName = 1; - - optional string version = 2; - - repeated string licenses = 3; - - optional string releasedAt = 4; - - optional string capacityRequirementsDescription = 5; - - optional string releaseNotes = 6; - - optional AppTemplateSpec template = 7; - - // valuesSchema can be used to show template values that - // can be configured by users when a Package is installed - // in an OpenAPI schema format. - // +optional - optional ValuesSchema valuesSchema = 8; -} - // +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object message PackageMetadata { @@ -101,6 +79,28 @@ message PackageMetadataSpec { optional string supportDescription = 8; } +message PackageSpec { + optional string refName = 1; + + optional string version = 2; + + repeated string licenses = 3; + + optional string releasedAt = 4; + + optional string capacityRequirementsDescription = 5; + + optional string releaseNotes = 6; + + optional AppTemplateSpec template = 7; + + // valuesSchema can be used to show template values that + // can be configured by users when a Package is installed + // in an OpenAPI schema format. + // +optional + optional ValuesSchema valuesSchema = 8; +} + message ValuesSchema { // +optional // +nullable diff --git a/pkg/apiserver/apis/datapackaging/v1alpha1/types.go b/pkg/apiserver/apis/datapackaging/v1alpha1/types.go index 527cf82ea..78d51b3a8 100644 --- a/pkg/apiserver/apis/datapackaging/v1alpha1/types.go +++ b/pkg/apiserver/apis/datapackaging/v1alpha1/types.go @@ -58,7 +58,7 @@ type PackageMetadataList struct { } type PackageSpec struct { - RefName string `json:"refName,omitempty" protobuf:"bytes,1,opt,name=packageName"` + RefName string `json:"refName,omitempty" protobuf:"bytes,1,opt,name=refName"` Version string `json:"version,omitempty" protobuf:"bytes,2,opt,name=version"` Licenses []string `json:"licenses,omitempty" protobuf:"bytes,3,rep,name=licenses"` ReleasedAt string `json:"releasedAt,omitempty" protobuf:"bytes,4,opt,name=releasedAt"` diff --git a/pkg/apiserver/apis/datapackaging/validation/validations.go b/pkg/apiserver/apis/datapackaging/validation/validations.go index da8ace68d..e4878b450 100644 --- a/pkg/apiserver/apis/datapackaging/validation/validations.go +++ b/pkg/apiserver/apis/datapackaging/validation/validations.go @@ -36,7 +36,7 @@ func ValidatePackageVersion(pv datapackaging.Package) field.ErrorList { allErrs := field.ErrorList{} allErrs = append(allErrs, - ValidatePackageSpecPackageName(pv.Spec.RefName, field.NewPath("spec", "packageName"))...) + ValidatePackageSpecPackageName(pv.Spec.RefName, field.NewPath("spec", "refName"))...) allErrs = append(allErrs, ValidatePackageSpecVersion(pv.Spec.Version, field.NewPath("spec", "version"))...) @@ -52,7 +52,7 @@ func ValidatePackageName(pvName, pkgmName string, fldPath *field.Path) field.Err if !strings.HasPrefix(pvName, pkgmName+".") { allErrs = append(allErrs, - field.Invalid(fldPath, pvName, "must begin with + '.'")) + field.Invalid(fldPath, pvName, "must begin with + '.'")) } return allErrs diff --git a/pkg/apiserver/openapi/zz_generated.openapi.go b/pkg/apiserver/openapi/zz_generated.openapi.go index 0c6e88324..f2dace52d 100644 --- a/pkg/apiserver/openapi/zz_generated.openapi.go +++ b/pkg/apiserver/openapi/zz_generated.openapi.go @@ -1437,7 +1437,7 @@ func schema_apiserver_apis_datapackaging_v1alpha1_PackageSpec(ref common.Referen SchemaProps: spec.SchemaProps{ Type: []string{"object"}, Properties: map[string]spec.Schema{ - "packageMetadataName": { + "refName": { SchemaProps: spec.SchemaProps{ Type: []string{"string"}, Format: "",