diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json index c3325ee886a..078cff53343 100644 --- a/api/openapi-spec/swagger.json +++ b/api/openapi-spec/swagger.json @@ -32308,7 +32308,8 @@ "required": [ "name", "namespaced", - "kind" + "kind", + "verbs" ], "properties": { "kind": { @@ -32322,6 +32323,13 @@ "namespaced": { "description": "namespaced indicates if a resource is namespaced or not.", "type": "boolean" + }, + "verbs": { + "description": "verbs is a list of supported kube verbs (this includes get, list, watch, create, update, patch, delete, deletecollection, and proxy)", + "type": "array", + "items": { + "type": "string" + } } } }, diff --git a/api/swagger-spec/apps_v1beta1.json b/api/swagger-spec/apps_v1beta1.json index a42638e2dae..00f03c2a4f2 100644 --- a/api/swagger-spec/apps_v1beta1.json +++ b/api/swagger-spec/apps_v1beta1.json @@ -2885,7 +2885,8 @@ "required": [ "name", "namespaced", - "kind" + "kind", + "verbs" ], "properties": { "name": { @@ -2899,6 +2900,12 @@ "kind": { "type": "string", "description": "kind is the kind for the resource (e.g. 'Foo' is the kind for a resource 'foo')" + }, + "verbs": { + "type": "array", + "items": { + "type": "string" + } } } } diff --git a/api/swagger-spec/authentication.k8s.io_v1beta1.json b/api/swagger-spec/authentication.k8s.io_v1beta1.json index 7279f5ee7b2..5b137bd795c 100644 --- a/api/swagger-spec/authentication.k8s.io_v1beta1.json +++ b/api/swagger-spec/authentication.k8s.io_v1beta1.json @@ -300,7 +300,8 @@ "required": [ "name", "namespaced", - "kind" + "kind", + "verbs" ], "properties": { "name": { @@ -314,6 +315,12 @@ "kind": { "type": "string", "description": "kind is the kind for the resource (e.g. 'Foo' is the kind for a resource 'foo')" + }, + "verbs": { + "type": "array", + "items": { + "type": "string" + } } } } diff --git a/api/swagger-spec/authorization.k8s.io_v1beta1.json b/api/swagger-spec/authorization.k8s.io_v1beta1.json index 0ebefafecae..21c83608aba 100644 --- a/api/swagger-spec/authorization.k8s.io_v1beta1.json +++ b/api/swagger-spec/authorization.k8s.io_v1beta1.json @@ -513,7 +513,8 @@ "required": [ "name", "namespaced", - "kind" + "kind", + "verbs" ], "properties": { "name": { @@ -527,6 +528,12 @@ "kind": { "type": "string", "description": "kind is the kind for the resource (e.g. 'Foo' is the kind for a resource 'foo')" + }, + "verbs": { + "type": "array", + "items": { + "type": "string" + } } } } diff --git a/api/swagger-spec/autoscaling_v1.json b/api/swagger-spec/autoscaling_v1.json index 09cdb13ebed..f5597bb9440 100644 --- a/api/swagger-spec/autoscaling_v1.json +++ b/api/swagger-spec/autoscaling_v1.json @@ -1445,7 +1445,8 @@ "required": [ "name", "namespaced", - "kind" + "kind", + "verbs" ], "properties": { "name": { @@ -1459,6 +1460,12 @@ "kind": { "type": "string", "description": "kind is the kind for the resource (e.g. 'Foo' is the kind for a resource 'foo')" + }, + "verbs": { + "type": "array", + "items": { + "type": "string" + } } } } diff --git a/api/swagger-spec/batch_v1.json b/api/swagger-spec/batch_v1.json index 86dac5078c4..789074aadf7 100644 --- a/api/swagger-spec/batch_v1.json +++ b/api/swagger-spec/batch_v1.json @@ -2865,7 +2865,8 @@ "required": [ "name", "namespaced", - "kind" + "kind", + "verbs" ], "properties": { "name": { @@ -2879,6 +2880,12 @@ "kind": { "type": "string", "description": "kind is the kind for the resource (e.g. 'Foo' is the kind for a resource 'foo')" + }, + "verbs": { + "type": "array", + "items": { + "type": "string" + } } } } diff --git a/api/swagger-spec/batch_v2alpha1.json b/api/swagger-spec/batch_v2alpha1.json index dc54a48a072..17a6c06732e 100644 --- a/api/swagger-spec/batch_v2alpha1.json +++ b/api/swagger-spec/batch_v2alpha1.json @@ -68,7 +68,8 @@ "required": [ "name", "namespaced", - "kind" + "kind", + "verbs" ], "properties": { "name": { @@ -82,6 +83,12 @@ "kind": { "type": "string", "description": "kind is the kind for the resource (e.g. 'Foo' is the kind for a resource 'foo')" + }, + "verbs": { + "type": "array", + "items": { + "type": "string" + } } } } diff --git a/api/swagger-spec/certificates.k8s.io_v1alpha1.json b/api/swagger-spec/certificates.k8s.io_v1alpha1.json index c33f051bdb8..5c07179c9a8 100644 --- a/api/swagger-spec/certificates.k8s.io_v1alpha1.json +++ b/api/swagger-spec/certificates.k8s.io_v1alpha1.json @@ -1133,7 +1133,8 @@ "required": [ "name", "namespaced", - "kind" + "kind", + "verbs" ], "properties": { "name": { @@ -1147,6 +1148,12 @@ "kind": { "type": "string", "description": "kind is the kind for the resource (e.g. 'Foo' is the kind for a resource 'foo')" + }, + "verbs": { + "type": "array", + "items": { + "type": "string" + } } } } diff --git a/api/swagger-spec/extensions_v1beta1.json b/api/swagger-spec/extensions_v1beta1.json index d987ffe1f9c..65a689fbe8f 100644 --- a/api/swagger-spec/extensions_v1beta1.json +++ b/api/swagger-spec/extensions_v1beta1.json @@ -10737,7 +10737,8 @@ "required": [ "name", "namespaced", - "kind" + "kind", + "verbs" ], "properties": { "name": { @@ -10751,6 +10752,12 @@ "kind": { "type": "string", "description": "kind is the kind for the resource (e.g. 'Foo' is the kind for a resource 'foo')" + }, + "verbs": { + "type": "array", + "items": { + "type": "string" + } } } } diff --git a/api/swagger-spec/policy_v1beta1.json b/api/swagger-spec/policy_v1beta1.json index 0dc6f55c9ff..ee3838f1643 100644 --- a/api/swagger-spec/policy_v1beta1.json +++ b/api/swagger-spec/policy_v1beta1.json @@ -1455,7 +1455,8 @@ "required": [ "name", "namespaced", - "kind" + "kind", + "verbs" ], "properties": { "name": { @@ -1469,6 +1470,12 @@ "kind": { "type": "string", "description": "kind is the kind for the resource (e.g. 'Foo' is the kind for a resource 'foo')" + }, + "verbs": { + "type": "array", + "items": { + "type": "string" + } } } } diff --git a/api/swagger-spec/rbac.authorization.k8s.io_v1alpha1.json b/api/swagger-spec/rbac.authorization.k8s.io_v1alpha1.json index c2da8c139bb..f708d091739 100644 --- a/api/swagger-spec/rbac.authorization.k8s.io_v1alpha1.json +++ b/api/swagger-spec/rbac.authorization.k8s.io_v1alpha1.json @@ -3363,7 +3363,8 @@ "required": [ "name", "namespaced", - "kind" + "kind", + "verbs" ], "properties": { "name": { @@ -3377,6 +3378,12 @@ "kind": { "type": "string", "description": "kind is the kind for the resource (e.g. 'Foo' is the kind for a resource 'foo')" + }, + "verbs": { + "type": "array", + "items": { + "type": "string" + } } } } diff --git a/api/swagger-spec/storage.k8s.io_v1beta1.json b/api/swagger-spec/storage.k8s.io_v1beta1.json index ae8526ed4fe..41cc3efc143 100644 --- a/api/swagger-spec/storage.k8s.io_v1beta1.json +++ b/api/swagger-spec/storage.k8s.io_v1beta1.json @@ -968,7 +968,8 @@ "required": [ "name", "namespaced", - "kind" + "kind", + "verbs" ], "properties": { "name": { @@ -982,6 +983,12 @@ "kind": { "type": "string", "description": "kind is the kind for the resource (e.g. 'Foo' is the kind for a resource 'foo')" + }, + "verbs": { + "type": "array", + "items": { + "type": "string" + } } } } diff --git a/api/swagger-spec/v1.json b/api/swagger-spec/v1.json index 4d11224da4b..02068ffd1fb 100644 --- a/api/swagger-spec/v1.json +++ b/api/swagger-spec/v1.json @@ -19982,7 +19982,8 @@ "required": [ "name", "namespaced", - "kind" + "kind", + "verbs" ], "properties": { "name": { @@ -19996,6 +19997,12 @@ "kind": { "type": "string", "description": "kind is the kind for the resource (e.g. 'Foo' is the kind for a resource 'foo')" + }, + "verbs": { + "type": "array", + "items": { + "type": "string" + } } } } diff --git a/cmd/kube-controller-manager/app/BUILD b/cmd/kube-controller-manager/app/BUILD index f1405b5603f..3de42bcd91e 100644 --- a/cmd/kube-controller-manager/app/BUILD +++ b/cmd/kube-controller-manager/app/BUILD @@ -24,6 +24,8 @@ go_library( "//pkg/apimachinery/registered:go_default_library", "//pkg/apis/batch:go_default_library", "//pkg/apis/componentconfig:go_default_library", + "//pkg/apis/extensions:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/clientset_generated/release_1_5:go_default_library", "//pkg/client/clientset_generated/release_1_5/typed/core/v1:go_default_library", "//pkg/client/leaderelection:go_default_library", diff --git a/docs/api-reference/apps/v1beta1/definitions.html b/docs/api-reference/apps/v1beta1/definitions.html index c8a0391d89b..a0ab2f00d27 100755 --- a/docs/api-reference/apps/v1beta1/definitions.html +++ b/docs/api-reference/apps/v1beta1/definitions.html @@ -2130,6 +2130,13 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

string

+ +

verbs

+ +

true

+

string array

+ + @@ -4444,7 +4451,7 @@ Examples:
diff --git a/docs/api-reference/authentication.k8s.io/v1beta1/definitions.html b/docs/api-reference/authentication.k8s.io/v1beta1/definitions.html index b173f628379..2e90fe62412 100755 --- a/docs/api-reference/authentication.k8s.io/v1beta1/definitions.html +++ b/docs/api-reference/authentication.k8s.io/v1beta1/definitions.html @@ -885,6 +885,13 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

string

+ +

verbs

+ +

true

+

string array

+ + @@ -900,7 +907,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i diff --git a/docs/api-reference/authorization.k8s.io/v1beta1/definitions.html b/docs/api-reference/authorization.k8s.io/v1beta1/definitions.html index 3ee15f75d2f..247f24e4590 100755 --- a/docs/api-reference/authorization.k8s.io/v1beta1/definitions.html +++ b/docs/api-reference/authorization.k8s.io/v1beta1/definitions.html @@ -754,6 +754,13 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

string

+ +

verbs

+ +

true

+

string array

+ + @@ -1161,7 +1168,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i diff --git a/docs/api-reference/autoscaling/v1/definitions.html b/docs/api-reference/autoscaling/v1/definitions.html index 52df174dcdb..66efe5c2a54 100755 --- a/docs/api-reference/autoscaling/v1/definitions.html +++ b/docs/api-reference/autoscaling/v1/definitions.html @@ -1297,6 +1297,13 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

string

+ +

verbs

+ +

true

+

string array

+ + @@ -1368,7 +1375,7 @@ Examples:
diff --git a/docs/api-reference/batch/v1/definitions.html b/docs/api-reference/batch/v1/definitions.html index eeb0cda9a2b..ec42d4588a9 100755 --- a/docs/api-reference/batch/v1/definitions.html +++ b/docs/api-reference/batch/v1/definitions.html @@ -2041,6 +2041,13 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

string

+ +

verbs

+ +

true

+

string array

+ + @@ -4376,7 +4383,7 @@ Examples:
diff --git a/docs/api-reference/batch/v2alpha1/definitions.html b/docs/api-reference/batch/v2alpha1/definitions.html index ec5cff00ad9..c526ca00a06 100755 --- a/docs/api-reference/batch/v2alpha1/definitions.html +++ b/docs/api-reference/batch/v2alpha1/definitions.html @@ -472,6 +472,13 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

string

+ +

verbs

+ +

true

+

string array

+ + @@ -487,7 +494,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } diff --git a/docs/api-reference/certificates.k8s.io/v1alpha1/definitions.html b/docs/api-reference/certificates.k8s.io/v1alpha1/definitions.html index 972bc2c5751..82e4d51bfb7 100755 --- a/docs/api-reference/certificates.k8s.io/v1alpha1/definitions.html +++ b/docs/api-reference/certificates.k8s.io/v1alpha1/definitions.html @@ -1274,6 +1274,13 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

string

+ +

verbs

+ +

true

+

string array

+ + @@ -1345,7 +1352,7 @@ Examples:
diff --git a/docs/api-reference/extensions/v1beta1/definitions.html b/docs/api-reference/extensions/v1beta1/definitions.html index 16eac5aaa5f..b85cc15696f 100755 --- a/docs/api-reference/extensions/v1beta1/definitions.html +++ b/docs/api-reference/extensions/v1beta1/definitions.html @@ -5731,6 +5731,13 @@ Both these may change in the future. Incoming requests are matched against the h

string

+ +

verbs

+ +

true

+

string array

+ + @@ -6818,7 +6825,7 @@ Both these may change in the future. Incoming requests are matched against the h diff --git a/docs/api-reference/policy/v1beta1/definitions.html b/docs/api-reference/policy/v1beta1/definitions.html index 20843d9ea97..1de041534c9 100755 --- a/docs/api-reference/policy/v1beta1/definitions.html +++ b/docs/api-reference/policy/v1beta1/definitions.html @@ -1290,6 +1290,13 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

string

+ +

verbs

+ +

true

+

string array

+ + @@ -1402,7 +1409,7 @@ Examples:
diff --git a/docs/api-reference/rbac.authorization.k8s.io/v1alpha1/definitions.html b/docs/api-reference/rbac.authorization.k8s.io/v1alpha1/definitions.html index fea6fb209c5..6cc4d7198a3 100755 --- a/docs/api-reference/rbac.authorization.k8s.io/v1alpha1/definitions.html +++ b/docs/api-reference/rbac.authorization.k8s.io/v1alpha1/definitions.html @@ -1487,6 +1487,13 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

string

+ +

verbs

+ +

true

+

string array

+ + @@ -1730,7 +1737,7 @@ Examples:
diff --git a/docs/api-reference/storage.k8s.io/v1beta1/definitions.html b/docs/api-reference/storage.k8s.io/v1beta1/definitions.html index c7b48f5b1cd..3183c895070 100755 --- a/docs/api-reference/storage.k8s.io/v1beta1/definitions.html +++ b/docs/api-reference/storage.k8s.io/v1beta1/definitions.html @@ -1135,6 +1135,13 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

string

+ +

verbs

+ +

true

+

string array

+ + @@ -1206,7 +1213,7 @@ Examples:
diff --git a/docs/api-reference/v1/definitions.html b/docs/api-reference/v1/definitions.html index 01b06e39d41..d18cd4a3f33 100755 --- a/docs/api-reference/v1/definitions.html +++ b/docs/api-reference/v1/definitions.html @@ -6719,6 +6719,13 @@ Examples:

string

+ +

verbs

+ +

true

+

string array

+ + @@ -8613,7 +8620,7 @@ Examples:
diff --git a/federation/apis/openapi-spec/swagger.json b/federation/apis/openapi-spec/swagger.json index a3e92ce4370..ab22e6ff0ef 100644 --- a/federation/apis/openapi-spec/swagger.json +++ b/federation/apis/openapi-spec/swagger.json @@ -8555,7 +8555,8 @@ "required": [ "name", "namespaced", - "kind" + "kind", + "verbs" ], "properties": { "kind": { @@ -8569,6 +8570,13 @@ "namespaced": { "description": "namespaced indicates if a resource is namespaced or not.", "type": "boolean" + }, + "verbs": { + "description": "verbs is a list of supported kube verbs (this includes get, list, watch, create, update, patch, delete, deletecollection, and proxy)", + "type": "array", + "items": { + "type": "string" + } } } }, diff --git a/pkg/apis/meta/v1/BUILD b/pkg/apis/meta/v1/BUILD index a0489cb46ca..738f72b61b2 100644 --- a/pkg/apis/meta/v1/BUILD +++ b/pkg/apis/meta/v1/BUILD @@ -38,6 +38,7 @@ go_library( "//vendor:github.com/gogo/protobuf/proto", "//vendor:github.com/gogo/protobuf/sortkeys", "//vendor:github.com/google/gofuzz", + "//vendor:github.com/ugorji/go/codec", ], ) @@ -48,6 +49,7 @@ go_test( "group_version_test.go", "helpers_test.go", "time_test.go", + "types_test.go", ], library = "go_default_library", tags = ["automanaged"], diff --git a/pkg/apis/meta/v1/generated.pb.go b/pkg/apis/meta/v1/generated.pb.go index cf7372339d1..da20a2b1ba1 100644 --- a/pkg/apis/meta/v1/generated.pb.go +++ b/pkg/apis/meta/v1/generated.pb.go @@ -50,6 +50,7 @@ limitations under the License. Time Timestamp TypeMeta + Verbs */ package v1 @@ -180,6 +181,10 @@ func (m *TypeMeta) Reset() { *m = TypeMeta{} } func (*TypeMeta) ProtoMessage() {} func (*TypeMeta) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{24} } +func (m *Verbs) Reset() { *m = Verbs{} } +func (*Verbs) ProtoMessage() {} +func (*Verbs) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{25} } + func init() { proto.RegisterType((*APIGroup)(nil), "k8s.io.kubernetes.pkg.apis.meta.v1.APIGroup") proto.RegisterType((*APIGroupList)(nil), "k8s.io.kubernetes.pkg.apis.meta.v1.APIGroupList") @@ -206,6 +211,7 @@ func init() { proto.RegisterType((*Time)(nil), "k8s.io.kubernetes.pkg.apis.meta.v1.Time") proto.RegisterType((*Timestamp)(nil), "k8s.io.kubernetes.pkg.apis.meta.v1.Timestamp") proto.RegisterType((*TypeMeta)(nil), "k8s.io.kubernetes.pkg.apis.meta.v1.TypeMeta") + proto.RegisterType((*Verbs)(nil), "k8s.io.kubernetes.pkg.apis.meta.v1.Verbs") } func (m *APIGroup) Marshal() (data []byte, err error) { size := m.Size() @@ -322,6 +328,16 @@ func (m *APIResource) MarshalTo(data []byte) (int, error) { i++ i = encodeVarintGenerated(data, i, uint64(len(m.Kind))) i += copy(data[i:], m.Kind) + if m.Verbs != nil { + data[i] = 0x22 + i++ + i = encodeVarintGenerated(data, i, uint64(m.Verbs.Size())) + n2, err := m.Verbs.MarshalTo(data[i:]) + if err != nil { + return 0, err + } + i += n2 + } return i, nil } @@ -836,11 +852,11 @@ func (m *Status) MarshalTo(data []byte) (int, error) { data[i] = 0xa i++ i = encodeVarintGenerated(data, i, uint64(m.ListMeta.Size())) - n2, err := m.ListMeta.MarshalTo(data[i:]) + n3, err := m.ListMeta.MarshalTo(data[i:]) if err != nil { return 0, err } - i += n2 + i += n3 data[i] = 0x12 i++ i = encodeVarintGenerated(data, i, uint64(len(m.Status))) @@ -857,11 +873,11 @@ func (m *Status) MarshalTo(data []byte) (int, error) { data[i] = 0x2a i++ i = encodeVarintGenerated(data, i, uint64(m.Details.Size())) - n3, err := m.Details.MarshalTo(data[i:]) + n4, err := m.Details.MarshalTo(data[i:]) if err != nil { return 0, err } - i += n3 + i += n4 } data[i] = 0x30 i++ @@ -994,6 +1010,39 @@ func (m *TypeMeta) MarshalTo(data []byte) (int, error) { return i, nil } +func (m Verbs) Marshal() (data []byte, err error) { + size := m.Size() + data = make([]byte, size) + n, err := m.MarshalTo(data) + if err != nil { + return nil, err + } + return data[:n], nil +} + +func (m Verbs) MarshalTo(data []byte) (int, error) { + var i int + _ = i + var l int + _ = l + if len(m) > 0 { + for _, s := range m { + data[i] = 0xa + i++ + l = len(s) + for l >= 1<<7 { + data[i] = uint8(uint64(l)&0x7f | 0x80) + l >>= 7 + i++ + } + data[i] = uint8(l) + i++ + i += copy(data[i:], s) + } + } + return i, nil +} + func encodeFixed64Generated(data []byte, offset int, v uint64) int { data[offset] = uint8(v) data[offset+1] = uint8(v >> 8) @@ -1063,6 +1112,10 @@ func (m *APIResource) Size() (n int) { n += 2 l = len(m.Kind) n += 1 + l + sovGenerated(uint64(l)) + if m.Verbs != nil { + l = m.Verbs.Size() + n += 1 + l + sovGenerated(uint64(l)) + } return n } @@ -1321,6 +1374,18 @@ func (m *TypeMeta) Size() (n int) { return n } +func (m Verbs) Size() (n int) { + var l int + _ = l + if len(m) > 0 { + for _, s := range m { + l = len(s) + n += 1 + l + sovGenerated(uint64(l)) + } + } + return n +} + func sovGenerated(x uint64) (n int) { for { n++ @@ -1365,6 +1430,7 @@ func (this *APIResource) String() string { `Name:` + fmt.Sprintf("%v", this.Name) + `,`, `Namespaced:` + fmt.Sprintf("%v", this.Namespaced) + `,`, `Kind:` + fmt.Sprintf("%v", this.Kind) + `,`, + `Verbs:` + strings.Replace(fmt.Sprintf("%v", this.Verbs), "Verbs", "Verbs", 1) + `,`, `}`, }, "") return s @@ -1917,6 +1983,39 @@ func (m *APIResource) Unmarshal(data []byte) error { } m.Kind = string(data[iNdEx:postIndex]) iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Verbs", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := data[iNdEx] + iNdEx++ + msglen |= (int(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthGenerated + } + postIndex := iNdEx + msglen + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Verbs == nil { + m.Verbs = Verbs{} + } + if err := m.Verbs.Unmarshal(data[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipGenerated(data[iNdEx:]) @@ -4465,6 +4564,85 @@ func (m *TypeMeta) Unmarshal(data []byte) error { } return nil } +func (m *Verbs) 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: Verbs: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: Verbs: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Items", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + 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 ErrInvalidLengthGenerated + } + postIndex := iNdEx + intStringLen + if postIndex > l { + return io.ErrUnexpectedEOF + } + *m = append(*m, 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) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func skipGenerated(data []byte) (n int, err error) { l := len(data) iNdEx := 0 @@ -4571,94 +4749,97 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 1416 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xcc, 0x57, 0x4f, 0x6f, 0xdb, 0xc6, - 0x12, 0x17, 0x25, 0x4b, 0x91, 0x46, 0xd6, 0xb3, 0xc3, 0xe7, 0xe0, 0x31, 0x06, 0x9e, 0xa4, 0xc7, - 0x3c, 0x14, 0x0e, 0x90, 0x48, 0xb0, 0x51, 0x14, 0x41, 0xda, 0x14, 0x30, 0x6d, 0x27, 0x30, 0x12, - 0x27, 0xc6, 0x3a, 0x48, 0x8b, 0x34, 0x87, 0xd2, 0xe4, 0x5a, 0x66, 0x25, 0x91, 0xec, 0xee, 0x4a, - 0x88, 0xd0, 0x43, 0x83, 0x02, 0x05, 0x7a, 0x28, 0x8a, 0x1c, 0x8b, 0x1e, 0x8a, 0x18, 0xe8, 0x07, - 0xe8, 0x57, 0xe8, 0x2d, 0xb7, 0xe6, 0xd8, 0x43, 0x61, 0x34, 0x2e, 0x7a, 0xea, 0x37, 0xf0, 0xa9, - 0xd8, 0xe5, 0x2e, 0x45, 0xca, 0x51, 0x4c, 0x23, 0x3d, 0xf4, 0x24, 0xee, 0xfc, 0xf9, 0xcd, 0x6f, - 0x67, 0x66, 0x67, 0x57, 0xb0, 0xd2, 0xbd, 0x46, 0x5b, 0x5e, 0xd0, 0xee, 0x0e, 0x76, 0x31, 0xf1, - 0x31, 0xc3, 0xb4, 0x1d, 0x76, 0x3b, 0x6d, 0x3b, 0xf4, 0x68, 0xbb, 0x8f, 0x99, 0xdd, 0x1e, 0x2e, - 0xb7, 0x3b, 0xd8, 0xc7, 0xc4, 0x66, 0xd8, 0x6d, 0x85, 0x24, 0x60, 0x81, 0x6e, 0x46, 0x3e, 0xad, - 0xb1, 0x4f, 0x2b, 0xec, 0x76, 0x5a, 0xdc, 0xa7, 0xc5, 0x7d, 0x5a, 0xc3, 0xe5, 0xc5, 0xab, 0x1d, - 0x8f, 0xed, 0x0f, 0x76, 0x5b, 0x4e, 0xd0, 0x6f, 0x77, 0x82, 0x4e, 0xd0, 0x16, 0xae, 0xbb, 0x83, - 0x3d, 0xb1, 0x12, 0x0b, 0xf1, 0x15, 0x41, 0x2e, 0x5e, 0x7d, 0x35, 0x0d, 0x32, 0xf0, 0x99, 0xd7, - 0xc7, 0x93, 0x0c, 0x16, 0xdf, 0x7e, 0xbd, 0x39, 0x75, 0xf6, 0x71, 0xdf, 0x3e, 0xe1, 0xb5, 0xfc, - 0x6a, 0xaf, 0x01, 0xf3, 0x7a, 0x6d, 0xcf, 0x67, 0x94, 0x91, 0x49, 0x17, 0xf3, 0xa7, 0x02, 0x94, - 0x57, 0xb7, 0x37, 0x6f, 0x91, 0x60, 0x10, 0xea, 0x4d, 0x98, 0xf1, 0xed, 0x3e, 0x36, 0xb4, 0xa6, - 0xb6, 0x54, 0xb1, 0x66, 0x9f, 0x1f, 0x36, 0x72, 0x47, 0x87, 0x8d, 0x99, 0xbb, 0x76, 0x1f, 0x23, - 0xa1, 0xd1, 0x3f, 0x81, 0xf2, 0x10, 0x13, 0xea, 0x05, 0x3e, 0x35, 0xf2, 0xcd, 0xc2, 0x52, 0x75, - 0xe5, 0xbd, 0xd6, 0xe9, 0xc9, 0x6a, 0x09, 0xf8, 0x07, 0x91, 0xe3, 0xcd, 0x80, 0xac, 0x7b, 0xd4, - 0x09, 0x86, 0x98, 0x8c, 0xac, 0x79, 0x19, 0xa3, 0x2c, 0x95, 0x14, 0xc5, 0xf8, 0xfa, 0x17, 0x1a, - 0xcc, 0x87, 0x04, 0xef, 0x61, 0x42, 0xb0, 0x2b, 0xf5, 0x46, 0xa1, 0xa9, 0xbd, 0x71, 0x50, 0x43, - 0x06, 0x9d, 0xdf, 0x9e, 0x40, 0x47, 0x27, 0xe2, 0xe9, 0x07, 0x1a, 0x2c, 0x52, 0x4c, 0x86, 0x98, - 0xac, 0xba, 0x2e, 0xc1, 0x94, 0x5a, 0xa3, 0xb5, 0x9e, 0x87, 0x7d, 0xb6, 0xb6, 0xb9, 0x8e, 0xa8, - 0x31, 0x23, 0x72, 0x70, 0x23, 0x0b, 0x9d, 0x9d, 0x69, 0x28, 0x96, 0x29, 0xf9, 0x2c, 0x4e, 0x35, - 0xa1, 0xe8, 0x35, 0x24, 0x4c, 0x17, 0x66, 0x55, 0x09, 0xef, 0x78, 0x94, 0xe9, 0xf7, 0xa1, 0xd4, - 0xe1, 0x0b, 0x6a, 0x68, 0x82, 0xde, 0x95, 0x2c, 0xf4, 0x14, 0x82, 0xf5, 0x2f, 0xc9, 0xa6, 0x24, - 0x96, 0x14, 0x49, 0x2c, 0xf3, 0x4b, 0x0d, 0xaa, 0xab, 0xdb, 0x9b, 0x08, 0xd3, 0x60, 0x40, 0x1c, - 0x9c, 0xa1, 0x59, 0x56, 0x00, 0xf8, 0x2f, 0x0d, 0x6d, 0x07, 0xbb, 0x46, 0xbe, 0xa9, 0x2d, 0x95, - 0x2d, 0x5d, 0xda, 0xc1, 0xdd, 0x58, 0x83, 0x12, 0x56, 0x1c, 0xb5, 0xeb, 0xf9, 0xae, 0xa8, 0x73, - 0x02, 0xf5, 0xb6, 0xe7, 0xbb, 0x48, 0x68, 0xcc, 0x1f, 0x35, 0x98, 0x4b, 0xf0, 0x10, 0x3b, 0xbe, - 0x06, 0xb3, 0x9d, 0x44, 0xb5, 0x25, 0xa7, 0x05, 0xe9, 0x3d, 0x9b, 0xec, 0x04, 0x94, 0xb2, 0xd4, - 0x1d, 0xa8, 0x10, 0x89, 0xa4, 0x3a, 0xba, 0x9d, 0x31, 0x5d, 0x8a, 0xc1, 0x38, 0x4e, 0x42, 0x48, - 0xd1, 0x18, 0xd7, 0xfc, 0x23, 0x4a, 0x9d, 0xea, 0x71, 0x7d, 0x29, 0x71, 0x8a, 0x78, 0x89, 0x2a, - 0xd6, 0xec, 0x94, 0x33, 0x70, 0x4a, 0xfb, 0xe5, 0xff, 0x01, 0xed, 0x77, 0xbd, 0xfc, 0xed, 0xb3, - 0x46, 0xee, 0xc9, 0xaf, 0xcd, 0x9c, 0xb9, 0x09, 0xe5, 0xf5, 0x01, 0xb1, 0x19, 0x4f, 0xec, 0x0d, - 0x28, 0xbb, 0xf2, 0x5b, 0x94, 0xa3, 0x60, 0xfd, 0x4f, 0x9d, 0x75, 0x65, 0x73, 0x7c, 0xd8, 0xa8, - 0xf1, 0x71, 0xd6, 0x52, 0x02, 0x14, 0xbb, 0x98, 0x8f, 0xa0, 0xb6, 0xf1, 0x38, 0x0c, 0x08, 0xbb, - 0x17, 0x32, 0x91, 0x89, 0xb7, 0xa0, 0x84, 0x85, 0x40, 0xa0, 0x95, 0xc7, 0x6d, 0x1a, 0x99, 0x21, - 0xa9, 0xd5, 0x2f, 0x41, 0x11, 0x3f, 0xb6, 0x1d, 0x26, 0xfb, 0xad, 0x26, 0xcd, 0x8a, 0x1b, 0x5c, - 0x88, 0x22, 0x9d, 0x79, 0x0f, 0xe0, 0x16, 0x8e, 0xa1, 0x57, 0x61, 0x4e, 0xd5, 0x2a, 0xdd, 0x40, - 0xff, 0x91, 0xce, 0x73, 0x28, 0xad, 0x46, 0x93, 0xf6, 0xe6, 0x23, 0xa8, 0x88, 0x26, 0xe3, 0x7d, - 0xca, 0x29, 0x88, 0x1e, 0x93, 0x28, 0x31, 0x05, 0x61, 0x81, 0x22, 0x5d, 0xdc, 0xe8, 0xf9, 0x69, - 0x8d, 0x9e, 0xc8, 0x6b, 0x0f, 0x6a, 0x91, 0xaf, 0x3a, 0x7b, 0x99, 0x22, 0x5c, 0x81, 0xb2, 0xa2, - 0x29, 0xa3, 0xc4, 0xd3, 0x56, 0x01, 0xa1, 0xd8, 0x22, 0x11, 0x6d, 0x1f, 0x52, 0x07, 0x26, 0x5b, - 0xb0, 0xcb, 0x70, 0x4e, 0x36, 0xad, 0x8c, 0x35, 0x27, 0xcd, 0xce, 0xa9, 0x9c, 0x29, 0x7d, 0x22, - 0xd2, 0xe7, 0x60, 0x4c, 0x1b, 0xd2, 0x6f, 0x70, 0xa4, 0xb3, 0x53, 0x31, 0xbf, 0xd1, 0x60, 0x3e, - 0x89, 0x94, 0xbd, 0x7c, 0xd9, 0x83, 0x9c, 0x3e, 0xd2, 0x12, 0x19, 0xf9, 0x5e, 0x83, 0x85, 0xd4, - 0xd6, 0xce, 0x54, 0xf1, 0x33, 0x90, 0x4a, 0x36, 0x47, 0xe1, 0x0c, 0xcd, 0xf1, 0x73, 0x1e, 0x6a, - 0x77, 0xec, 0x5d, 0xdc, 0xdb, 0xc1, 0x3d, 0xec, 0xb0, 0x80, 0xe8, 0x23, 0xa8, 0xf6, 0x6d, 0xe6, - 0xec, 0x0b, 0xa9, 0xba, 0x72, 0xac, 0x2c, 0x23, 0x29, 0x85, 0xd3, 0xda, 0x1a, 0x83, 0x6c, 0xf8, - 0x8c, 0x8c, 0xac, 0x7f, 0x4b, 0x42, 0xd5, 0x84, 0x06, 0x25, 0x63, 0x89, 0x17, 0x82, 0x58, 0x6f, - 0x3c, 0x0e, 0xf9, 0x5c, 0x3a, 0xeb, 0xb3, 0x24, 0x45, 0x00, 0xe1, 0x4f, 0x07, 0x1e, 0xc1, 0x7d, - 0xec, 0xb3, 0xf1, 0x0b, 0x61, 0x6b, 0x02, 0x1d, 0x9d, 0x88, 0xb7, 0xf8, 0x3e, 0xcc, 0x4f, 0x52, - 0xd7, 0xe7, 0xa1, 0xd0, 0xc5, 0xa3, 0xa8, 0x56, 0x88, 0x7f, 0xea, 0x0b, 0x50, 0x1c, 0xda, 0xbd, - 0x81, 0x3c, 0x89, 0x28, 0x5a, 0x5c, 0xcf, 0x5f, 0xd3, 0xcc, 0x1f, 0x34, 0x30, 0xa6, 0x11, 0xd1, - 0xff, 0x9b, 0x00, 0xb2, 0xaa, 0x92, 0x55, 0xe1, 0x36, 0x1e, 0x45, 0xa8, 0x1b, 0x50, 0x0e, 0x42, - 0xfe, 0x9e, 0x0b, 0x88, 0xac, 0xf8, 0x65, 0x55, 0xc5, 0x7b, 0x52, 0x7e, 0x7c, 0xd8, 0xb8, 0x90, - 0x82, 0x57, 0x0a, 0x14, 0xbb, 0xea, 0x26, 0x94, 0x04, 0x1f, 0x6a, 0x14, 0xc4, 0x6d, 0x04, 0x7c, - 0xae, 0x3e, 0x10, 0x12, 0x24, 0x35, 0xe6, 0x67, 0x50, 0xe6, 0x57, 0xed, 0x16, 0x66, 0x36, 0x6f, - 0x1e, 0x8a, 0x7b, 0x7b, 0x77, 0x3c, 0xbf, 0x2b, 0xa9, 0xc5, 0xcd, 0xb3, 0x23, 0xe5, 0x28, 0xb6, - 0x78, 0xd5, 0x78, 0xcd, 0x9f, 0x71, 0xbc, 0x5e, 0x81, 0x0a, 0x0a, 0x02, 0xb6, 0x6d, 0xb3, 0x7d, - 0xaa, 0x37, 0xa0, 0x18, 0xf2, 0x0f, 0x79, 0x75, 0x56, 0xf8, 0x31, 0x10, 0x1a, 0x14, 0xc9, 0xcd, - 0xaf, 0x35, 0xb8, 0x38, 0xf5, 0x2e, 0xe3, 0xaf, 0x12, 0x27, 0x5e, 0x49, 0xfa, 0xf1, 0xab, 0x64, - 0x6c, 0x87, 0x12, 0x56, 0xfa, 0xbb, 0x50, 0x4b, 0x5d, 0x80, 0x72, 0x03, 0x17, 0xa4, 0x5b, 0x2d, - 0x15, 0x0d, 0xa5, 0x6d, 0xcd, 0x3f, 0xf3, 0x50, 0xda, 0x61, 0x36, 0x1b, 0x50, 0xfd, 0x21, 0x94, - 0x79, 0xef, 0xb9, 0x36, 0xb3, 0x45, 0xe4, 0x8c, 0x6f, 0x33, 0x95, 0xf8, 0x71, 0x9a, 0x95, 0x04, - 0xc5, 0x78, 0xfc, 0x82, 0xa4, 0x22, 0x8a, 0x24, 0x17, 0x5f, 0x90, 0x51, 0x6c, 0x24, 0xb5, 0x7c, - 0x48, 0xf4, 0x31, 0xa5, 0x76, 0x47, 0x1d, 0xfc, 0x78, 0x48, 0x6c, 0x45, 0x62, 0xa4, 0xf4, 0xfa, - 0x3b, 0x50, 0x22, 0xd8, 0xa6, 0x81, 0x6f, 0xcc, 0x08, 0xcb, 0xba, 0x82, 0x44, 0x42, 0x7a, 0x7c, - 0xd8, 0x98, 0x95, 0xe0, 0x62, 0x8d, 0xa4, 0xb5, 0xfe, 0x21, 0x9c, 0x73, 0x31, 0xb3, 0xbd, 0x1e, - 0x35, 0x8a, 0x62, 0x97, 0xcb, 0x99, 0x5e, 0x28, 0x02, 0x6a, 0x3d, 0x72, 0xb4, 0xaa, 0x9c, 0x91, - 0x5c, 0x20, 0x05, 0xc7, 0x67, 0xa9, 0x13, 0xb8, 0xd8, 0x28, 0x35, 0xb5, 0xa5, 0xe2, 0x78, 0x96, - 0xae, 0x05, 0x2e, 0x46, 0x42, 0x63, 0x3e, 0xd5, 0xa0, 0x1a, 0x21, 0xad, 0xd9, 0x03, 0x8a, 0xf5, - 0xe5, 0x78, 0x0f, 0x51, 0xa9, 0x2f, 0x2a, 0x9f, 0xfb, 0xa3, 0x10, 0x1f, 0x1f, 0x36, 0x2a, 0xc2, - 0x8c, 0x2f, 0x62, 0xfa, 0x89, 0x0c, 0xe5, 0x4f, 0xc9, 0xd0, 0x25, 0x28, 0xee, 0x79, 0xb8, 0xa7, - 0x86, 0x7b, 0x3c, 0x96, 0x6f, 0x72, 0x21, 0x8a, 0x74, 0xe6, 0x77, 0x79, 0xa8, 0xa5, 0x36, 0x97, - 0xe1, 0xed, 0x1c, 0xcf, 0xfb, 0x7c, 0x86, 0x37, 0xc4, 0xd4, 0x9b, 0x45, 0xff, 0x00, 0x4a, 0x0e, - 0xdf, 0x9f, 0xfa, 0xa7, 0xd2, 0xce, 0x5e, 0x08, 0x91, 0x97, 0x71, 0x17, 0x89, 0x25, 0x45, 0x12, - 0x4e, 0xbf, 0x05, 0xe7, 0x09, 0x66, 0x64, 0xb4, 0xba, 0xc7, 0x30, 0xd9, 0xc1, 0x4e, 0xe0, 0xbb, - 0x51, 0xb1, 0x8b, 0x71, 0x86, 0xcf, 0xa3, 0x49, 0x03, 0x74, 0xd2, 0xc7, 0xec, 0xc1, 0xcc, 0x7d, - 0xaf, 0x8f, 0x79, 0xd2, 0xa9, 0x84, 0x89, 0x9e, 0x8b, 0x71, 0xd2, 0x95, 0xb3, 0xd2, 0xf3, 0xdc, - 0xf8, 0xb6, 0x1f, 0x44, 0x8d, 0x5e, 0x1c, 0xe7, 0xe6, 0x2e, 0x17, 0xa2, 0x48, 0x77, 0x7d, 0x81, - 0x5f, 0x59, 0x5f, 0x1d, 0x34, 0x72, 0x4f, 0x0f, 0x1a, 0xb9, 0x67, 0x07, 0xf2, 0xfa, 0xfa, 0x08, - 0x2a, 0x3c, 0x1a, 0x65, 0x76, 0x3f, 0xfc, 0xbb, 0x43, 0x9a, 0x1f, 0x43, 0x99, 0xf7, 0x91, 0x18, - 0x91, 0xaa, 0x34, 0xda, 0xd4, 0xd2, 0xac, 0x00, 0xd8, 0xa1, 0x97, 0x9e, 0x88, 0xf1, 0x1c, 0x1a, - 0xff, 0x5b, 0x40, 0x09, 0x2b, 0xeb, 0xff, 0xcf, 0x5f, 0xd6, 0x73, 0x2f, 0x5e, 0xd6, 0x73, 0xbf, - 0xbc, 0xac, 0xe7, 0x9e, 0x1c, 0xd5, 0xb5, 0xe7, 0x47, 0x75, 0xed, 0xc5, 0x51, 0x5d, 0xfb, 0xed, - 0xa8, 0xae, 0x3d, 0xfd, 0xbd, 0x9e, 0x7b, 0x98, 0x1f, 0x2e, 0xff, 0x15, 0x00, 0x00, 0xff, 0xff, - 0xf6, 0xd1, 0x29, 0xc5, 0xf3, 0x10, 0x00, 0x00, + // 1459 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xcc, 0x57, 0x4f, 0x6f, 0x1b, 0x45, + 0x14, 0xf7, 0xda, 0xb1, 0x6b, 0x3f, 0xc7, 0x24, 0x5d, 0x52, 0xe1, 0x46, 0xc2, 0x36, 0x5b, 0x84, + 0x52, 0xa9, 0xb5, 0x95, 0x08, 0xa1, 0xaa, 0x50, 0xa4, 0x6c, 0x92, 0x56, 0xa1, 0x4d, 0x1b, 0x4d, + 0xaa, 0x82, 0x4a, 0x0f, 0x6c, 0xbc, 0x13, 0x67, 0xb1, 0xbd, 0xbb, 0xcc, 0x8c, 0xad, 0x5a, 0x1c, + 0xa8, 0x38, 0x71, 0x40, 0xa8, 0x47, 0xc4, 0x01, 0x35, 0x12, 0x1f, 0x80, 0xaf, 0xc0, 0xad, 0x37, + 0xca, 0x8d, 0x03, 0xb2, 0x68, 0x10, 0x27, 0xbe, 0x41, 0x4e, 0x68, 0x66, 0x67, 0xf6, 0x8f, 0x53, + 0x37, 0x1b, 0x95, 0x03, 0x27, 0xef, 0xbc, 0x3f, 0xbf, 0xf7, 0x9b, 0xf7, 0xde, 0xbc, 0x19, 0xc3, + 0x4a, 0xf7, 0x0a, 0x6d, 0x3a, 0x5e, 0xab, 0x3b, 0xd8, 0xc5, 0xc4, 0xc5, 0x0c, 0xd3, 0x96, 0xdf, + 0xed, 0xb4, 0x2c, 0xdf, 0xa1, 0xad, 0x3e, 0x66, 0x56, 0x6b, 0xb8, 0xdc, 0xea, 0x60, 0x17, 0x13, + 0x8b, 0x61, 0xbb, 0xe9, 0x13, 0x8f, 0x79, 0xba, 0x11, 0xf8, 0x34, 0x23, 0x9f, 0xa6, 0xdf, 0xed, + 0x34, 0xb9, 0x4f, 0x93, 0xfb, 0x34, 0x87, 0xcb, 0x8b, 0x97, 0x3b, 0x0e, 0xdb, 0x1f, 0xec, 0x36, + 0xdb, 0x5e, 0xbf, 0xd5, 0xf1, 0x3a, 0x5e, 0x4b, 0xb8, 0xee, 0x0e, 0xf6, 0xc4, 0x4a, 0x2c, 0xc4, + 0x57, 0x00, 0xb9, 0x78, 0xf9, 0xc5, 0x34, 0xc8, 0xc0, 0x65, 0x4e, 0x1f, 0x4f, 0x32, 0x58, 0x7c, + 0xf7, 0xe5, 0xe6, 0xb4, 0xbd, 0x8f, 0xfb, 0xd6, 0x31, 0xaf, 0xe5, 0x17, 0x7b, 0x0d, 0x98, 0xd3, + 0x6b, 0x39, 0x2e, 0xa3, 0x8c, 0x4c, 0xba, 0x18, 0xbf, 0xe4, 0xa0, 0xb8, 0xba, 0xbd, 0x79, 0x83, + 0x78, 0x03, 0x5f, 0x6f, 0xc0, 0x8c, 0x6b, 0xf5, 0x71, 0x55, 0x6b, 0x68, 0x4b, 0x25, 0x73, 0xf6, + 0xe9, 0xb8, 0x9e, 0x39, 0x1c, 0xd7, 0x67, 0x6e, 0x5b, 0x7d, 0x8c, 0x84, 0x46, 0xff, 0x1c, 0x8a, + 0x43, 0x4c, 0xa8, 0xe3, 0xb9, 0xb4, 0x9a, 0x6d, 0xe4, 0x96, 0xca, 0x2b, 0x1f, 0x34, 0x4f, 0x4e, + 0x56, 0x53, 0xc0, 0xdf, 0x0b, 0x1c, 0xaf, 0x7b, 0x64, 0xdd, 0xa1, 0x6d, 0x6f, 0x88, 0xc9, 0xc8, + 0x9c, 0x97, 0x31, 0x8a, 0x52, 0x49, 0x51, 0x88, 0xaf, 0x7f, 0xad, 0xc1, 0xbc, 0x4f, 0xf0, 0x1e, + 0x26, 0x04, 0xdb, 0x52, 0x5f, 0xcd, 0x35, 0xb4, 0x57, 0x0e, 0x5a, 0x95, 0x41, 0xe7, 0xb7, 0x27, + 0xd0, 0xd1, 0xb1, 0x78, 0xfa, 0x81, 0x06, 0x8b, 0x14, 0x93, 0x21, 0x26, 0xab, 0xb6, 0x4d, 0x30, + 0xa5, 0xe6, 0x68, 0xad, 0xe7, 0x60, 0x97, 0xad, 0x6d, 0xae, 0x23, 0x5a, 0x9d, 0x11, 0x39, 0xb8, + 0x96, 0x86, 0xce, 0xce, 0x34, 0x14, 0xd3, 0x90, 0x7c, 0x16, 0xa7, 0x9a, 0x50, 0xf4, 0x12, 0x12, + 0x86, 0x0d, 0xb3, 0xaa, 0x84, 0xb7, 0x1c, 0xca, 0xf4, 0xbb, 0x50, 0xe8, 0xf0, 0x05, 0xad, 0x6a, + 0x82, 0xde, 0xa5, 0x34, 0xf4, 0x14, 0x82, 0xf9, 0x9a, 0x64, 0x53, 0x10, 0x4b, 0x8a, 0x24, 0x96, + 0xf1, 0x9b, 0x06, 0xe5, 0xd5, 0xed, 0x4d, 0x84, 0xa9, 0x37, 0x20, 0x6d, 0x9c, 0xa2, 0x59, 0x56, + 0x00, 0xf8, 0x2f, 0xf5, 0xad, 0x36, 0xb6, 0xab, 0xd9, 0x86, 0xb6, 0x54, 0x34, 0x75, 0x69, 0x07, + 0xb7, 0x43, 0x0d, 0x8a, 0x59, 0x71, 0xd4, 0xae, 0xe3, 0xda, 0xa2, 0xce, 0x31, 0xd4, 0x9b, 0x8e, + 0x6b, 0x23, 0xa1, 0xd1, 0x3f, 0x82, 0xfc, 0x10, 0x93, 0x5d, 0x9e, 0x7b, 0xde, 0x0a, 0x17, 0xd3, + 0x6c, 0xee, 0x1e, 0x77, 0x30, 0x4b, 0x87, 0xe3, 0x7a, 0x5e, 0x7c, 0xa2, 0x00, 0xc2, 0xf8, 0x59, + 0x83, 0xb9, 0xd8, 0x9e, 0x44, 0xf6, 0xae, 0xc0, 0x6c, 0x27, 0xd6, 0x39, 0x72, 0x7f, 0x0b, 0x92, + 0xc9, 0x6c, 0xbc, 0xab, 0x50, 0xc2, 0x52, 0x6f, 0x43, 0x89, 0x48, 0x24, 0x75, 0x3a, 0x5a, 0x29, + 0x53, 0xaf, 0x18, 0x44, 0x71, 0x62, 0x42, 0x8a, 0x22, 0x5c, 0xe3, 0xef, 0xa0, 0x0c, 0xea, 0xbc, + 0xe8, 0x4b, 0xb1, 0x13, 0xc9, 0xcb, 0x5d, 0x32, 0x67, 0xa7, 0x9c, 0xa7, 0x13, 0x5a, 0x39, 0xfb, + 0x3f, 0x68, 0xe5, 0xab, 0xc5, 0xef, 0x9f, 0xd4, 0x33, 0x8f, 0xfe, 0x68, 0x64, 0x8c, 0x4d, 0x28, + 0xae, 0x0f, 0x88, 0xc5, 0x78, 0x62, 0xaf, 0x41, 0xd1, 0x96, 0xdf, 0xa2, 0x1c, 0x39, 0xf3, 0x2d, + 0x35, 0x37, 0x94, 0xcd, 0xd1, 0xb8, 0x5e, 0xe1, 0xa3, 0xb1, 0xa9, 0x04, 0x28, 0x74, 0x31, 0x1e, + 0x40, 0x65, 0xe3, 0xa1, 0xef, 0x11, 0x76, 0xc7, 0x67, 0x22, 0x13, 0xef, 0x40, 0x01, 0x0b, 0x81, + 0x40, 0x2b, 0x46, 0x2d, 0x1f, 0x98, 0x21, 0xa9, 0xd5, 0x2f, 0x40, 0x1e, 0x3f, 0xb4, 0xda, 0x4c, + 0xf6, 0x6e, 0x45, 0x9a, 0xe5, 0x37, 0xb8, 0x10, 0x05, 0x3a, 0xe3, 0x0e, 0xc0, 0x0d, 0x1c, 0x42, + 0xaf, 0xc2, 0x9c, 0xaa, 0x55, 0xb2, 0x81, 0xde, 0x90, 0xce, 0x73, 0x28, 0xa9, 0x46, 0x93, 0xf6, + 0xc6, 0x03, 0x28, 0x89, 0x26, 0xe3, 0x3d, 0xcf, 0x29, 0x88, 0x1e, 0x93, 0x28, 0x21, 0x05, 0x61, + 0x81, 0x02, 0x5d, 0x78, 0x68, 0xb2, 0xd3, 0x0e, 0x4d, 0x2c, 0xaf, 0x3d, 0xa8, 0x04, 0xbe, 0xea, + 0x1c, 0xa7, 0x8a, 0x70, 0x09, 0x8a, 0x8a, 0xa6, 0x8c, 0x12, 0x4e, 0x6e, 0x05, 0x84, 0x42, 0x8b, + 0x58, 0xb4, 0x7d, 0x48, 0x1c, 0x98, 0x74, 0xc1, 0x2e, 0xc2, 0x19, 0xd9, 0xb4, 0x32, 0xd6, 0x9c, + 0x34, 0x3b, 0xa3, 0x72, 0xa6, 0xf4, 0xb1, 0x48, 0x5f, 0x41, 0x75, 0xda, 0xc0, 0x7f, 0x85, 0x23, + 0x9d, 0x9e, 0x8a, 0xf1, 0x9d, 0x06, 0xf3, 0x71, 0xa4, 0xf4, 0xe5, 0x4b, 0x1f, 0xe4, 0xe4, 0xf1, + 0x18, 0xcb, 0xc8, 0x8f, 0x1a, 0x2c, 0x24, 0xb6, 0x76, 0xaa, 0x8a, 0x9f, 0x82, 0x54, 0xbc, 0x39, + 0x72, 0xa7, 0x68, 0x8e, 0x5f, 0xb3, 0x50, 0xb9, 0x65, 0xed, 0xe2, 0xde, 0x0e, 0xee, 0xe1, 0x36, + 0xf3, 0x88, 0x3e, 0x82, 0x72, 0xdf, 0x62, 0xed, 0x7d, 0x21, 0x55, 0xd7, 0x97, 0x99, 0x66, 0x24, + 0x25, 0x70, 0x9a, 0x5b, 0x11, 0xc8, 0x86, 0xcb, 0xc8, 0xc8, 0x7c, 0x5d, 0x12, 0x2a, 0xc7, 0x34, + 0x28, 0x1e, 0x4b, 0xbc, 0x36, 0xc4, 0x7a, 0xe3, 0xa1, 0xcf, 0xe7, 0xd2, 0x69, 0x9f, 0x38, 0x09, + 0x02, 0x08, 0x7f, 0x31, 0x70, 0x08, 0xee, 0x63, 0x97, 0x45, 0xaf, 0x8d, 0xad, 0x09, 0x74, 0x74, + 0x2c, 0xde, 0xe2, 0x87, 0x30, 0x3f, 0x49, 0x5d, 0x9f, 0x87, 0x5c, 0x17, 0x8f, 0x82, 0x5a, 0x21, + 0xfe, 0xa9, 0x2f, 0x40, 0x7e, 0x68, 0xf5, 0x06, 0xf2, 0x24, 0xa2, 0x60, 0x71, 0x35, 0x7b, 0x45, + 0x33, 0x7e, 0xd2, 0xa0, 0x3a, 0x8d, 0x88, 0xfe, 0x66, 0x0c, 0xc8, 0x2c, 0x4b, 0x56, 0xb9, 0x9b, + 0x78, 0x14, 0xa0, 0x6e, 0x40, 0xd1, 0xf3, 0xf9, 0xdb, 0xd0, 0x23, 0xb2, 0xe2, 0x17, 0x55, 0x15, + 0xef, 0x48, 0xf9, 0xd1, 0xb8, 0x7e, 0x2e, 0x01, 0xaf, 0x14, 0x28, 0x74, 0xd5, 0x0d, 0x28, 0x08, + 0x3e, 0xb4, 0x9a, 0x13, 0xb7, 0x11, 0xf0, 0xb9, 0x7a, 0x4f, 0x48, 0x90, 0xd4, 0x18, 0x5f, 0x42, + 0x91, 0x5f, 0xb5, 0x5b, 0x98, 0x59, 0xbc, 0x79, 0x28, 0xee, 0xed, 0xdd, 0x72, 0xdc, 0xae, 0xa4, + 0x16, 0x36, 0xcf, 0x8e, 0x94, 0xa3, 0xd0, 0xe2, 0x45, 0xe3, 0x35, 0x7b, 0xca, 0xf1, 0x7a, 0x09, + 0x4a, 0xc8, 0xf3, 0xd8, 0xb6, 0xc5, 0xf6, 0xa9, 0x5e, 0x87, 0xbc, 0xcf, 0x3f, 0xe4, 0xd5, 0x29, + 0x5e, 0x08, 0x42, 0x83, 0x02, 0xb9, 0xf1, 0xad, 0x06, 0xe7, 0xa7, 0xde, 0x65, 0xfc, 0x85, 0xd3, + 0x0e, 0x57, 0x92, 0x7e, 0xf8, 0xc2, 0x89, 0xec, 0x50, 0xcc, 0x4a, 0x7f, 0x1f, 0x2a, 0x89, 0x0b, + 0x50, 0x6e, 0xe0, 0x9c, 0x74, 0xab, 0x24, 0xa2, 0xa1, 0xa4, 0xad, 0xf1, 0x4f, 0x16, 0x0a, 0x3b, + 0xcc, 0x62, 0x03, 0xaa, 0xdf, 0x87, 0x22, 0xef, 0x3d, 0xdb, 0x62, 0x96, 0x88, 0x9c, 0xf2, 0x9d, + 0xa7, 0x12, 0x1f, 0xa5, 0x59, 0x49, 0x50, 0x88, 0xc7, 0x2f, 0x48, 0x2a, 0xa2, 0x48, 0x72, 0xe1, + 0x05, 0x19, 0xc4, 0x46, 0x52, 0xcb, 0x87, 0x44, 0x1f, 0x53, 0x6a, 0x75, 0xd4, 0xc1, 0x0f, 0x87, + 0xc4, 0x56, 0x20, 0x46, 0x4a, 0xaf, 0xbf, 0x07, 0x05, 0x82, 0x2d, 0xea, 0xb9, 0xe2, 0xdd, 0x56, + 0x32, 0x6b, 0x0a, 0x12, 0x09, 0xe9, 0xd1, 0xb8, 0x3e, 0x2b, 0xc1, 0xc5, 0x1a, 0x49, 0x6b, 0xfd, + 0x13, 0x38, 0x63, 0x63, 0x66, 0x39, 0x3d, 0x5a, 0xcd, 0x8b, 0x5d, 0x2e, 0xa7, 0x7a, 0xa1, 0x08, + 0xa8, 0xf5, 0xc0, 0xd1, 0x2c, 0x73, 0x46, 0x72, 0x81, 0x14, 0x1c, 0x9f, 0xa5, 0x6d, 0xcf, 0xc6, + 0xd5, 0x42, 0x43, 0x5b, 0xca, 0x47, 0xb3, 0x74, 0xcd, 0xb3, 0x31, 0x12, 0x1a, 0xe3, 0xb1, 0x06, + 0xe5, 0x00, 0x69, 0xcd, 0x1a, 0x50, 0xac, 0x2f, 0x87, 0x7b, 0x08, 0x4a, 0x7d, 0x5e, 0xf9, 0xdc, + 0x1d, 0xf9, 0xf8, 0x68, 0x5c, 0x2f, 0x09, 0x33, 0xbe, 0x08, 0xe9, 0xc7, 0x32, 0x94, 0x3d, 0x21, + 0x43, 0x17, 0x20, 0xbf, 0xe7, 0xe0, 0x9e, 0x1a, 0xee, 0xe1, 0x58, 0xbe, 0xce, 0x85, 0x28, 0xd0, + 0x19, 0x3f, 0x64, 0xa1, 0x92, 0xd8, 0x5c, 0x8a, 0x77, 0x78, 0x38, 0xef, 0xb3, 0x29, 0xde, 0x10, + 0xd3, 0x1f, 0xde, 0x1f, 0x43, 0xa1, 0xcd, 0xf7, 0xa7, 0xfe, 0xf5, 0xb4, 0xd2, 0x17, 0x42, 0xe4, + 0x25, 0xea, 0x22, 0xb1, 0xa4, 0x48, 0xc2, 0xe9, 0x37, 0xe0, 0x2c, 0xc1, 0x8c, 0x8c, 0x56, 0xf7, + 0x18, 0x26, 0x3b, 0xb8, 0xed, 0xb9, 0x76, 0x50, 0xec, 0x7c, 0x98, 0xe1, 0xb3, 0x68, 0xd2, 0x00, + 0x1d, 0xf7, 0x31, 0x7a, 0x30, 0x73, 0xd7, 0xe9, 0x63, 0x9e, 0x74, 0x2a, 0x61, 0x82, 0xe7, 0x62, + 0x98, 0x74, 0xe5, 0xac, 0xf4, 0x3c, 0x37, 0xae, 0xe5, 0x7a, 0x41, 0xa3, 0xe7, 0xa3, 0xdc, 0xdc, + 0xe6, 0x42, 0x14, 0xe8, 0xae, 0x2e, 0xf0, 0x2b, 0xeb, 0x9b, 0x83, 0x7a, 0xe6, 0xf1, 0x41, 0x3d, + 0xf3, 0xe4, 0x40, 0x5e, 0x5f, 0x9f, 0x42, 0x89, 0x47, 0xa3, 0xcc, 0xea, 0xfb, 0xff, 0x75, 0x48, + 0xe3, 0x33, 0x28, 0xf2, 0x3e, 0x12, 0x23, 0x52, 0x95, 0x46, 0x9b, 0x5a, 0x9a, 0x15, 0x00, 0xcb, + 0x77, 0x92, 0x13, 0x31, 0x9c, 0x43, 0xd1, 0xbf, 0x05, 0x14, 0xb3, 0x32, 0x56, 0x20, 0xf8, 0x2f, + 0xc4, 0x67, 0xa0, 0xc3, 0x70, 0x3f, 0x31, 0x03, 0x37, 0xb9, 0x00, 0x05, 0xf2, 0xe8, 0xc6, 0x36, + 0xdf, 0x7e, 0xfa, 0xbc, 0x96, 0x79, 0xf6, 0xbc, 0x96, 0xf9, 0xfd, 0x79, 0x2d, 0xf3, 0xe8, 0xb0, + 0xa6, 0x3d, 0x3d, 0xac, 0x69, 0xcf, 0x0e, 0x6b, 0xda, 0x9f, 0x87, 0x35, 0xed, 0xf1, 0x5f, 0xb5, + 0xcc, 0xfd, 0xec, 0x70, 0xf9, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc7, 0xa0, 0x5e, 0x60, 0x73, + 0x11, 0x00, 0x00, } diff --git a/pkg/apis/meta/v1/generated.proto b/pkg/apis/meta/v1/generated.proto index 02dc5df5032..780dbe04e85 100644 --- a/pkg/apis/meta/v1/generated.proto +++ b/pkg/apis/meta/v1/generated.proto @@ -69,6 +69,10 @@ message APIResource { // kind is the kind for the resource (e.g. 'Foo' is the kind for a resource 'foo') optional string kind = 3; + + // verbs is a list of supported kube verbs (this includes get, list, watch, create, + // update, patch, delete, deletecollection, and proxy) + optional Verbs verbs = 4; } // APIResourceList is a list of APIResource, it is used to expose the name of the @@ -408,3 +412,13 @@ message TypeMeta { optional string apiVersion = 2; } +// Verbs masks the value so protobuf can generate +// +// +protobuf.nullable=true +// +protobuf.options.(gogoproto.goproto_stringer)=false +message Verbs { + // items, if empty, will result in an empty slice + + repeated string items = 1; +} + diff --git a/pkg/apis/meta/v1/zz_generated.deepcopy.go b/pkg/apis/meta/v1/zz_generated.deepcopy.go index 76d62844a4a..56063b2ecf7 100644 --- a/pkg/apis/meta/v1/zz_generated.deepcopy.go +++ b/pkg/apis/meta/v1/zz_generated.deepcopy.go @@ -81,6 +81,13 @@ func DeepCopy_v1_APIResource(in interface{}, out interface{}, c *conversion.Clon out.Name = in.Name out.Namespaced = in.Namespaced out.Kind = in.Kind + if in.Verbs != nil { + in, out := &in.Verbs, &out.Verbs + *out = make(Verbs, len(*in)) + copy(*out, *in) + } else { + out.Verbs = nil + } return nil } } @@ -95,7 +102,9 @@ func DeepCopy_v1_APIResourceList(in interface{}, out interface{}, c *conversion. in, out := &in.APIResources, &out.APIResources *out = make([]APIResource, len(*in)) for i := range *in { - (*out)[i] = (*in)[i] + if err := DeepCopy_v1_APIResource(&(*in)[i], &(*out)[i], c); err != nil { + return err + } } } else { out.APIResources = nil diff --git a/pkg/client/typed/discovery/BUILD b/pkg/client/typed/discovery/BUILD index e79cb621a31..53705d55e71 100644 --- a/pkg/client/typed/discovery/BUILD +++ b/pkg/client/typed/discovery/BUILD @@ -53,6 +53,7 @@ go_test( "//pkg/client/restclient:go_default_library", "//pkg/client/restclient/fake:go_default_library", "//pkg/runtime/schema:go_default_library", + "//pkg/util/sets:go_default_library", "//pkg/version:go_default_library", "//vendor:github.com/emicklei/go-restful/swagger", "//vendor:github.com/stretchr/testify/assert", @@ -73,5 +74,6 @@ go_test( "//pkg/client/typed/discovery:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", + "//pkg/util/sets:go_default_library", ], ) diff --git a/pkg/controller/namespace/BUILD b/pkg/controller/namespace/BUILD index 15ce51b132f..0a81e63cad1 100644 --- a/pkg/controller/namespace/BUILD +++ b/pkg/controller/namespace/BUILD @@ -24,6 +24,7 @@ go_library( "//pkg/apis/meta/v1:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/client/clientset_generated/release_1_5:go_default_library", + "//pkg/client/typed/discovery:go_default_library", "//pkg/client/typed/dynamic:go_default_library", "//pkg/controller:go_default_library", "//pkg/runtime:go_default_library", @@ -53,6 +54,7 @@ go_test( "//pkg/client/clientset_generated/release_1_5/fake:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", + "//pkg/client/typed/discovery:go_default_library", "//pkg/client/typed/dynamic:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", diff --git a/pkg/generated/openapi/zz_generated.openapi.go b/pkg/generated/openapi/zz_generated.openapi.go index 155f9b1bbcd..5a9324a4ea1 100644 --- a/pkg/generated/openapi/zz_generated.openapi.go +++ b/pkg/generated/openapi/zz_generated.openapi.go @@ -5968,8 +5968,22 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ Format: "", }, }, + "verbs": { + SchemaProps: spec.SchemaProps{ + Description: "verbs is a list of supported kube verbs (this includes get, list, watch, create, update, patch, delete, deletecollection, and proxy)", + Type: []string{"array"}, + Items: &spec.SchemaOrArray{ + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Type: []string{"string"}, + Format: "", + }, + }, + }, + }, + }, }, - Required: []string{"name", "namespaced", "kind"}, + Required: []string{"name", "namespaced", "kind", "verbs"}, }, }, Dependencies: []string{}, diff --git a/pkg/genericapiserver/BUILD b/pkg/genericapiserver/BUILD index 607fd84e9b1..0f6d0f2142c 100644 --- a/pkg/genericapiserver/BUILD +++ b/pkg/genericapiserver/BUILD @@ -97,9 +97,11 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", + "//pkg/api/meta:go_default_library", "//pkg/api/rest:go_default_library", "//pkg/api/testapi:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apimachinery:go_default_library", "//pkg/apimachinery/registered:go_default_library", "//pkg/apis/autoscaling:go_default_library", "//pkg/apis/extensions:go_default_library", @@ -109,6 +111,7 @@ go_test( "//pkg/auth/user:go_default_library", "//pkg/generated/openapi:go_default_library", "//pkg/genericapiserver/options:go_default_library", + "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", "//pkg/storage/etcd/testing:go_default_library", "//pkg/storage/storagebackend:go_default_library", diff --git a/pkg/kubectl/cmd/BUILD b/pkg/kubectl/cmd/BUILD index 454b4db5d8e..3e07f32abaa 100644 --- a/pkg/kubectl/cmd/BUILD +++ b/pkg/kubectl/cmd/BUILD @@ -78,6 +78,7 @@ go_library( "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", "//pkg/client/restclient:go_default_library", + "//pkg/client/typed/discovery:go_default_library", "//pkg/client/unversioned:go_default_library", "//pkg/client/unversioned/clientcmd:go_default_library", "//pkg/client/unversioned/portforward:go_default_library", diff --git a/test/test_owners.csv b/test/test_owners.csv index 0acf7251f28..16d074c1fa1 100644 --- a/test/test_owners.csv +++ b/test/test_owners.csv @@ -571,6 +571,7 @@ k8s.io/kubernetes/pkg/apis/componentconfig,jbeda,1 k8s.io/kubernetes/pkg/apis/extensions,bgrant0607,1 k8s.io/kubernetes/pkg/apis/extensions/v1beta1,madhusudancs,1 k8s.io/kubernetes/pkg/apis/extensions/validation,nikhiljindal,1 +k8s.io/kubernetes/pkg/apis/meta/v1,sttts,0 k8s.io/kubernetes/pkg/apis/policy/validation,deads2k,1 k8s.io/kubernetes/pkg/apis/rbac/validation,erictune,0 k8s.io/kubernetes/pkg/apis/storage/validation,caesarxuchao,1