From 237ef0de9b4b74022d1252c9c56f1fd68624e64a Mon Sep 17 00:00:00 2001 From: Kazuyoshi Kato Date: Wed, 20 Apr 2022 03:30:52 +0000 Subject: [PATCH] Remove all gogoproto extensions This commit removes the following gogoproto extensions; - gogoproto.nullable - gogoproto.customename - gogoproto.unmarshaller_all - gogoproto.stringer_all - gogoproto.sizer_all - gogoproto.marshaler_all - gogoproto.goproto_unregonized_all - gogoproto.goproto_stringer_all - gogoproto.goproto_getters_all None of them are supported by Google's toolchain (see #6564). Signed-off-by: Kazuyoshi Kato --- Makefile | 3 +- api/events/task.pb.go | 84 ++--- api/events/task.proto | 2 +- api/next.pb.txt | 132 ------- api/services/containers/v1/containers.pb.go | 336 ++++++++++-------- api/services/containers/v1/containers.proto | 14 +- api/services/content/v1/content.pb.go | 239 +++++++------ api/services/content/v1/content.proto | 10 +- api/services/images/v1/images.pb.go | 246 +++++++------ api/services/images/v1/images.proto | 12 +- .../introspection/v1/introspection.pb.go | 97 +++-- .../introspection/v1/introspection.proto | 6 +- api/services/leases/v1/leases.pb.go | 173 ++++----- api/services/leases/v1/leases.proto | 6 +- api/services/namespaces/v1/namespace.pb.go | 264 ++++++++------ api/services/namespaces/v1/namespace.proto | 12 +- api/services/sandbox/v1/sandbox.pb.go | 271 +++++++------- api/services/sandbox/v1/sandbox.proto | 10 +- api/services/snapshots/v1/snapshots.pb.go | 224 ++++++------ api/services/snapshots/v1/snapshots.proto | 8 +- api/types/platform.pb.go | 22 +- api/types/platform.proto | 2 +- api/types/sandbox.pb.go | 135 +++---- api/types/sandbox.proto | 6 +- client.go | 2 +- cmd/ctr/commands/plugins/plugins.go | 2 +- containerstore.go | 20 +- content/proxy/content_store.go | 8 +- contrib/snapshotservice/service.go | 10 +- image_store.go | 18 +- leases/proxy/manager.go | 4 +- namespaces.go | 4 +- pkg/runtimeoptions/v1/api.pb.go | 34 +- pkg/runtimeoptions/v1/api.proto | 9 - sandbox/helpers.go | 12 +- sandbox_store.go | 6 +- script/setup/install-dev-tools | 3 +- services/containers/helpers.go | 14 +- services/containers/local.go | 8 +- .../content/contentserver/contentserver.go | 14 +- services/images/helpers.go | 14 +- services/images/local.go | 6 +- services/introspection/local.go | 13 +- services/leases/service.go | 4 +- services/namespaces/local.go | 4 +- services/sandbox/store_local.go | 8 +- services/snapshots/service.go | 10 +- snapshots/proxy/proxy.go | 6 +- 48 files changed, 1301 insertions(+), 1246 deletions(-) diff --git a/Makefile b/Makefile index a6bad72ef..d74d90be5 100644 --- a/Makefile +++ b/Makefile @@ -168,6 +168,7 @@ protos: bin/protoc-gen-gogoctrd ## generate protobuf @(PATH="${ROOTDIR}/bin:${PATH}" protobuild --quiet ${NON_API_PACKAGES}) @mv ${TMPDIR}/vendor ${ROOTDIR} @rm -rf ${TMPDIR} + go-fix-acronym -w -a '(Io|Uuid|Os)$$' $(shell find api -name '*.pb.go') check-protos: protos ## check if protobufs needs to be generated again @echo "$(WHALE) $@" @@ -185,8 +186,6 @@ proto-fmt: ## check format of proto files @echo "$(WHALE) $@" @test -z "$$(find . -path ./vendor -prune -o -path ./protobuf/google/rpc -prune -o -name '*.proto' -type f -exec grep -Hn -e "^ " {} \; | tee /dev/stderr)" || \ (echo "$(ONI) please indent proto files with tabs only" && false) - @test -z "$$(find . -path ./vendor -prune -o -name '*.proto' -type f -exec grep -Hn "Meta meta = " {} \; | grep -v '(gogoproto.nullable) = false' | tee /dev/stderr)" || \ - (echo "$(ONI) meta fields in proto files must have option (gogoproto.nullable) = false" && false) build: ## build the go packages @echo "$(WHALE) $@" diff --git a/api/events/task.pb.go b/api/events/task.pb.go index 2b2fa633c..60af6452d 100644 --- a/api/events/task.pb.go +++ b/api/events/task.pb.go @@ -499,47 +499,47 @@ func init() { } var fileDescriptor_8db0813f7adfb63c = []byte{ - // 629 bytes of a gzipped FileDescriptorProto + // 626 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x95, 0xcd, 0x6e, 0xd3, 0x40, - 0x10, 0xc7, 0x6b, 0xa7, 0x75, 0xd3, 0x09, 0x55, 0xcb, 0xaa, 0x2a, 0x21, 0x07, 0x27, 0x32, 0x97, - 0x9c, 0x6c, 0x11, 0x24, 0x38, 0x20, 0xa4, 0x7e, 0x84, 0x43, 0x0e, 0x55, 0x8a, 0xdb, 0x13, 0x97, - 0x68, 0x93, 0xdd, 0x24, 0x4b, 0x13, 0xaf, 0x65, 0x8f, 0x51, 0x91, 0x38, 0xf0, 0x28, 0x3c, 0x0b, - 0xe2, 0xd0, 0x23, 0x47, 0x4e, 0x15, 0xf5, 0x03, 0x70, 0xe2, 0x01, 0xd0, 0x7a, 0x1d, 0xb7, 0x25, - 0x02, 0x8a, 0x25, 0x4e, 0xd9, 0x99, 0x9d, 0xfd, 0xcf, 0xcc, 0x6f, 0x27, 0x6b, 0x78, 0x3a, 0x11, - 0x38, 0x4d, 0x86, 0xee, 0x48, 0xce, 0xbd, 0x91, 0x0c, 0x90, 0x8a, 0x80, 0x47, 0xec, 0xe6, 0x92, - 0x86, 0xc2, 0xe3, 0x6f, 0x79, 0x80, 0xb1, 0x87, 0x34, 0x3e, 0x73, 0xc3, 0x48, 0xa2, 0x24, 0xf7, - 0xaf, 0x23, 0x5c, 0xbd, 0xdb, 0xd8, 0x99, 0xc8, 0x89, 0xcc, 0x76, 0x3d, 0xb5, 0xd2, 0x81, 0x8d, - 0xe6, 0x44, 0xca, 0xc9, 0x8c, 0x7b, 0x99, 0x35, 0x4c, 0xc6, 0x1e, 0x8a, 0x39, 0x8f, 0x91, 0xce, - 0xc3, 0x3c, 0xe0, 0x6e, 0x15, 0xe0, 0xbb, 0x90, 0xc7, 0xde, 0x5c, 0x26, 0x01, 0xe6, 0xe7, 0xf6, - 0xfe, 0x7a, 0xae, 0x48, 0x19, 0xce, 0x92, 0x89, 0x08, 0xbc, 0xb1, 0xe0, 0x33, 0x16, 0x52, 0x9c, - 0x6a, 0x05, 0xe7, 0xbb, 0x01, 0x70, 0x4a, 0xe3, 0xb3, 0xc3, 0x88, 0x53, 0xe4, 0xa4, 0x03, 0xf7, - 0x8a, 0xc3, 0x03, 0xc1, 0xea, 0x46, 0xcb, 0x68, 0x6f, 0x1c, 0x6c, 0xa5, 0x97, 0xcd, 0xda, 0xe1, - 0xc2, 0xdf, 0xeb, 0xfa, 0xb5, 0x22, 0xa8, 0xc7, 0xc8, 0x2e, 0x58, 0xc3, 0x24, 0x60, 0x33, 0x5e, - 0x37, 0x55, 0xb4, 0x9f, 0x5b, 0xc4, 0x03, 0x2b, 0x92, 0x12, 0xc7, 0x71, 0xbd, 0xd2, 0xaa, 0xb4, - 0x6b, 0x9d, 0x07, 0xee, 0x0d, 0x5e, 0x59, 0x2f, 0xee, 0x91, 0xea, 0xc5, 0xcf, 0xc3, 0xc8, 0x63, - 0x30, 0x85, 0xac, 0xaf, 0xb6, 0x8c, 0x76, 0xad, 0xf3, 0xd0, 0x5d, 0x82, 0xeb, 0xaa, 0x3a, 0x7b, - 0xfd, 0x03, 0x2b, 0xbd, 0x6c, 0x9a, 0xbd, 0xbe, 0x6f, 0x0a, 0x49, 0x6c, 0x80, 0xd1, 0x94, 0x8f, - 0xce, 0x42, 0x29, 0x02, 0xac, 0xaf, 0x65, 0xf9, 0x6f, 0x78, 0xc8, 0x36, 0x54, 0x42, 0xc1, 0xea, - 0x56, 0xcb, 0x68, 0x6f, 0xfa, 0x6a, 0xe9, 0xbc, 0x82, 0x0d, 0xa5, 0x73, 0x82, 0x34, 0xc2, 0x52, - 0xed, 0xe6, 0x92, 0xe6, 0xb5, 0xe4, 0xe7, 0x9c, 0x61, 0x97, 0xcf, 0x78, 0x49, 0x86, 0x4b, 0xa2, - 0xa4, 0x09, 0x35, 0x7e, 0x2e, 0x70, 0x10, 0x23, 0xc5, 0x44, 0x21, 0x54, 0x3b, 0xa0, 0x5c, 0x27, - 0x99, 0x87, 0x3c, 0x83, 0x0d, 0x65, 0x71, 0x36, 0xa0, 0x98, 0x43, 0x6b, 0xb8, 0x7a, 0xd0, 0xdc, - 0xc5, 0xad, 0xbb, 0xa7, 0x8b, 0x41, 0xf3, 0xab, 0x3a, 0x78, 0x1f, 0xc9, 0x2e, 0x98, 0x82, 0x69, - 0x56, 0x39, 0xcb, 0xae, 0x6f, 0x0a, 0xe6, 0xbc, 0x01, 0x4b, 0x13, 0x26, 0x3b, 0xb0, 0x16, 0x23, - 0x13, 0x81, 0x2e, 0xdd, 0xd7, 0x86, 0xba, 0xe7, 0x18, 0x99, 0x4c, 0x70, 0x71, 0xcf, 0xda, 0xca, - 0xfd, 0x3c, 0x8a, 0xb2, 0x22, 0xb5, 0x9f, 0x47, 0x11, 0x69, 0x40, 0x15, 0x79, 0x34, 0x17, 0x01, - 0x9d, 0x65, 0xf5, 0x55, 0xfd, 0xc2, 0x76, 0x3e, 0x19, 0x50, 0x55, 0xc9, 0x5e, 0x9e, 0x0b, 0x2c, - 0x39, 0x74, 0x66, 0xce, 0xeb, 0x56, 0x13, 0x0b, 0x90, 0x95, 0xdf, 0x82, 0x5c, 0xfd, 0x33, 0xc8, - 0xb5, 0xbb, 0x83, 0x74, 0x5e, 0xc0, 0xba, 0xea, 0xa1, 0xdf, 0x3f, 0x2a, 0xd3, 0x82, 0x33, 0x85, - 0x4d, 0x8d, 0x80, 0x8f, 0xf6, 0x19, 0xe3, 0xac, 0x14, 0x87, 0x47, 0xb0, 0xce, 0xcf, 0xf9, 0x68, - 0x50, 0xc0, 0x80, 0xf4, 0xb2, 0x69, 0x29, 0xcd, 0x5e, 0xd7, 0xb7, 0xd4, 0x56, 0x8f, 0x39, 0xef, - 0x61, 0x6b, 0x91, 0x29, 0x9b, 0xfb, 0xff, 0x98, 0x6b, 0xf9, 0x02, 0x9c, 0x3d, 0xfd, 0xef, 0x38, - 0xa6, 0x49, 0x5c, 0x2e, 0xb1, 0xb3, 0x0f, 0x35, 0xa5, 0xe0, 0xf3, 0x38, 0x99, 0x97, 0x94, 0x18, - 0xc3, 0x76, 0xf6, 0xcc, 0x15, 0x4f, 0x43, 0x49, 0x06, 0xb7, 0x1f, 0x1c, 0xf3, 0xd7, 0x07, 0xe7, - 0xe0, 0xf8, 0xe2, 0xca, 0x5e, 0xf9, 0x7a, 0x65, 0xaf, 0x7c, 0x48, 0x6d, 0xe3, 0x22, 0xb5, 0x8d, - 0x2f, 0xa9, 0x6d, 0x7c, 0x4b, 0x6d, 0xe3, 0xe3, 0x0f, 0xdb, 0x78, 0xdd, 0xf9, 0x87, 0x2f, 0xcd, - 0x73, 0xfd, 0x33, 0xb4, 0xb2, 0x19, 0x7c, 0xf2, 0x33, 0x00, 0x00, 0xff, 0xff, 0xfd, 0x3c, 0xdf, - 0xcc, 0xa6, 0x06, 0x00, 0x00, + 0x10, 0x80, 0x6b, 0xa7, 0x75, 0xd3, 0x09, 0x55, 0xcb, 0xaa, 0x2a, 0x21, 0x07, 0x27, 0x32, 0x97, + 0x70, 0xb1, 0xa5, 0x20, 0xc1, 0x01, 0x21, 0xf5, 0x27, 0x1c, 0x72, 0xa8, 0x5a, 0xdc, 0x9e, 0xb8, + 0x44, 0x9b, 0xec, 0x26, 0x59, 0x9a, 0x78, 0x2d, 0x7b, 0x8c, 0x8a, 0xc4, 0x81, 0x47, 0xe1, 0x59, + 0x10, 0x87, 0x1e, 0x39, 0x72, 0xaa, 0xa8, 0x0f, 0x3c, 0x01, 0x0f, 0x80, 0xd6, 0x6b, 0xbb, 0x2d, + 0x15, 0x50, 0x2c, 0x71, 0xca, 0xce, 0xec, 0xec, 0xfc, 0x7c, 0x33, 0x19, 0xc3, 0xd3, 0xa9, 0xc0, + 0x59, 0x32, 0x72, 0xc7, 0x72, 0xe1, 0x8d, 0x65, 0x80, 0x54, 0x04, 0x3c, 0x62, 0xd7, 0x8f, 0x34, + 0x14, 0x1e, 0x7f, 0xcb, 0x03, 0x8c, 0x3d, 0xa4, 0xf1, 0xa9, 0x1b, 0x46, 0x12, 0x25, 0xb9, 0x7f, + 0x65, 0xe1, 0xea, 0xdb, 0xd6, 0xd6, 0x54, 0x4e, 0x65, 0x76, 0xeb, 0xa9, 0x93, 0x36, 0x6c, 0xb5, + 0xa7, 0x52, 0x4e, 0xe7, 0xdc, 0xcb, 0xa4, 0x51, 0x32, 0xf1, 0x50, 0x2c, 0x78, 0x8c, 0x74, 0x11, + 0xe6, 0x06, 0x77, 0xcb, 0x00, 0xdf, 0x85, 0x3c, 0xf6, 0x16, 0x32, 0x09, 0x30, 0x7f, 0xb7, 0xf3, + 0xd7, 0x77, 0x65, 0xc8, 0x70, 0x9e, 0x4c, 0x45, 0xe0, 0x4d, 0x04, 0x9f, 0xb3, 0x90, 0xe2, 0x4c, + 0x7b, 0x70, 0xbe, 0x1b, 0x00, 0x27, 0x34, 0x3e, 0xdd, 0x8f, 0x38, 0x45, 0x4e, 0x7a, 0x70, 0xaf, + 0x7c, 0x3c, 0x14, 0xac, 0x69, 0x74, 0x8c, 0xee, 0xda, 0xde, 0x46, 0x7a, 0xd1, 0x6e, 0xec, 0x17, + 0xfa, 0x41, 0xdf, 0x6f, 0x94, 0x46, 0x03, 0x46, 0xb6, 0xc1, 0x1a, 0x25, 0x01, 0x9b, 0xf3, 0xa6, + 0xa9, 0xac, 0xfd, 0x5c, 0x22, 0x1e, 0x58, 0x91, 0x94, 0x38, 0x89, 0x9b, 0xb5, 0x4e, 0xad, 0xdb, + 0xe8, 0x3d, 0x70, 0xaf, 0xf1, 0xca, 0x6a, 0x71, 0x0f, 0x54, 0x2d, 0x7e, 0x6e, 0x46, 0x1e, 0x83, + 0x29, 0x64, 0x73, 0xb9, 0x63, 0x74, 0x1b, 0xbd, 0x87, 0xee, 0x2d, 0xb8, 0xae, 0xca, 0x73, 0x70, + 0xe8, 0x9b, 0x42, 0x12, 0x1b, 0x60, 0x3c, 0xe3, 0xe3, 0xd3, 0x50, 0x8a, 0x00, 0x9b, 0x2b, 0x59, + 0xdc, 0x6b, 0x1a, 0xb2, 0x09, 0xb5, 0x50, 0xb0, 0xa6, 0xd5, 0x31, 0xba, 0xeb, 0xbe, 0x3a, 0x3a, + 0xaf, 0x60, 0x4d, 0xbd, 0x3f, 0x46, 0x1a, 0x61, 0xa5, 0x32, 0x73, 0x97, 0xe6, 0x95, 0xcb, 0xcf, + 0x39, 0xbb, 0x3e, 0x9f, 0xf3, 0x8a, 0xec, 0x6e, 0x39, 0x25, 0x6d, 0x68, 0xf0, 0x33, 0x81, 0xc3, + 0x18, 0x29, 0x26, 0x0a, 0x9d, 0xba, 0x01, 0xa5, 0x3a, 0xce, 0x34, 0xe4, 0x19, 0xac, 0x29, 0x89, + 0xb3, 0x21, 0xc5, 0x1c, 0x56, 0xcb, 0xd5, 0x03, 0xe6, 0x16, 0xdd, 0x76, 0x4f, 0x8a, 0x01, 0xf3, + 0xeb, 0xda, 0x78, 0x17, 0xc9, 0x36, 0x98, 0x82, 0x69, 0x56, 0x7b, 0x56, 0x7a, 0xd1, 0x36, 0x07, + 0x7d, 0xdf, 0x14, 0xcc, 0x79, 0x03, 0x96, 0x26, 0x4b, 0xb6, 0x60, 0x25, 0x46, 0x26, 0x02, 0x9d, + 0xba, 0xaf, 0x05, 0xd5, 0xdf, 0x18, 0x99, 0x4c, 0xb0, 0xe8, 0xaf, 0x96, 0x72, 0x3d, 0x8f, 0xa2, + 0x2c, 0x49, 0xad, 0xe7, 0x51, 0x44, 0x5a, 0x50, 0x47, 0x1e, 0x2d, 0x44, 0x40, 0xe7, 0x59, 0x7e, + 0x75, 0xbf, 0x94, 0x9d, 0x4f, 0x06, 0xd4, 0x55, 0xb0, 0x97, 0x67, 0x02, 0x2b, 0x0e, 0x9b, 0x99, + 0xf3, 0xba, 0x51, 0x44, 0x01, 0xb2, 0xf6, 0x5b, 0x90, 0xcb, 0x7f, 0x06, 0xb9, 0x72, 0x77, 0x90, + 0xce, 0x0b, 0x58, 0x55, 0x35, 0x1c, 0x1e, 0x1e, 0x54, 0x29, 0xc1, 0x99, 0xc1, 0xba, 0x46, 0xc0, + 0xc7, 0xbb, 0x8c, 0x71, 0x56, 0x89, 0xc3, 0x23, 0x58, 0xe5, 0x67, 0x7c, 0x3c, 0x2c, 0x61, 0x40, + 0x7a, 0xd1, 0xb6, 0x94, 0xcf, 0x41, 0xdf, 0xb7, 0xd4, 0xd5, 0x80, 0x39, 0xef, 0x61, 0xa3, 0x88, + 0x94, 0xcd, 0xfd, 0x7f, 0x8c, 0x75, 0xbb, 0x01, 0xce, 0x8e, 0xfe, 0x77, 0x1c, 0xd1, 0x24, 0xae, + 0x16, 0xd8, 0xd9, 0x85, 0x86, 0xf2, 0xe0, 0xf3, 0x38, 0x59, 0x54, 0x74, 0x31, 0x81, 0xcd, 0x6c, + 0xbd, 0x95, 0xab, 0xa1, 0x22, 0x83, 0x9b, 0x0b, 0xc7, 0xfc, 0x75, 0xe1, 0xec, 0x1d, 0x9d, 0x5f, + 0xda, 0x4b, 0x5f, 0x2f, 0xed, 0xa5, 0x0f, 0xa9, 0x6d, 0x9c, 0xa7, 0xb6, 0xf1, 0x25, 0xb5, 0x8d, + 0x6f, 0xa9, 0x6d, 0x7c, 0xfc, 0x61, 0x1b, 0xaf, 0x7b, 0xff, 0xf0, 0x85, 0x79, 0xae, 0x7f, 0x46, + 0x56, 0x36, 0x83, 0x4f, 0x7e, 0x06, 0x00, 0x00, 0xff, 0xff, 0xe1, 0x48, 0xb3, 0x88, 0x9e, 0x06, + 0x00, 0x00, } // Field returns the value for the given fieldpath as a string, if defined. @@ -1553,7 +1553,7 @@ func (this *TaskCreate) String() string { `ContainerID:` + fmt.Sprintf("%v", this.ContainerID) + `,`, `Bundle:` + fmt.Sprintf("%v", this.Bundle) + `,`, `Rootfs:` + repeatedStringForRootfs + `,`, - `IO:` + strings.Replace(this.IO.String(), "TaskIO", "TaskIO", 1) + `,`, + `Io:` + strings.Replace(this.IO.String(), "TaskIO", "TaskIO", 1) + `,`, `Checkpoint:` + fmt.Sprintf("%v", this.Checkpoint) + `,`, `Pid:` + fmt.Sprintf("%v", this.Pid) + `,`, `XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`, @@ -1824,7 +1824,7 @@ func (m *TaskCreate) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 4: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field IO", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Io", wireType) } var msglen int for shift := uint(0); ; shift += 7 { diff --git a/api/events/task.proto b/api/events/task.proto index 205b2beca..dc2c5b2bf 100644 --- a/api/events/task.proto +++ b/api/events/task.proto @@ -30,7 +30,7 @@ message TaskCreate { string container_id = 1; string bundle = 2; repeated containerd.types.Mount rootfs = 3; - TaskIO io = 4 [(gogoproto.customname) = "IO"]; + TaskIO io = 4; string checkpoint = 5; uint32 pid = 6; } diff --git a/api/next.pb.txt b/api/next.pb.txt index 99f49206a..e664aecec 100644 --- a/api/next.pb.txt +++ b/api/next.pb.txt @@ -542,9 +542,6 @@ file { label: LABEL_OPTIONAL type: TYPE_MESSAGE type_name: ".containerd.events.TaskIO" - options { - 65004: "IO" - } json_name: "io" } field { @@ -2043,9 +2040,6 @@ file { label: LABEL_REPEATED type: TYPE_MESSAGE type_name: ".containerd.services.containers.v1.Container.ExtensionsEntry" - options { - 65001: 0 - } json_name: "extensions" } field { @@ -2133,9 +2127,6 @@ file { label: LABEL_OPTIONAL type: TYPE_MESSAGE type_name: ".containerd.services.containers.v1.Container" - options { - 65001: 0 - } json_name: "container" } } @@ -2157,9 +2148,6 @@ file { label: LABEL_REPEATED type: TYPE_MESSAGE type_name: ".containerd.services.containers.v1.Container" - options { - 65001: 0 - } json_name: "containers" } } @@ -2171,9 +2159,6 @@ file { label: LABEL_OPTIONAL type: TYPE_MESSAGE type_name: ".containerd.services.containers.v1.Container" - options { - 65001: 0 - } json_name: "container" } } @@ -2185,9 +2170,6 @@ file { label: LABEL_OPTIONAL type: TYPE_MESSAGE type_name: ".containerd.services.containers.v1.Container" - options { - 65001: 0 - } json_name: "container" } } @@ -2199,9 +2181,6 @@ file { label: LABEL_OPTIONAL type: TYPE_MESSAGE type_name: ".containerd.services.containers.v1.Container" - options { - 65001: 0 - } json_name: "container" } field { @@ -2221,9 +2200,6 @@ file { label: LABEL_OPTIONAL type: TYPE_MESSAGE type_name: ".containerd.services.containers.v1.Container" - options { - 65001: 0 - } json_name: "container" } } @@ -2373,9 +2349,6 @@ file { label: LABEL_OPTIONAL type: TYPE_MESSAGE type_name: ".containerd.services.content.v1.Info" - options { - 65001: 0 - } json_name: "info" } } @@ -2387,9 +2360,6 @@ file { label: LABEL_OPTIONAL type: TYPE_MESSAGE type_name: ".containerd.services.content.v1.Info" - options { - 65001: 0 - } json_name: "info" } field { @@ -2409,9 +2379,6 @@ file { label: LABEL_OPTIONAL type: TYPE_MESSAGE type_name: ".containerd.services.content.v1.Info" - options { - 65001: 0 - } json_name: "info" } } @@ -2433,9 +2400,6 @@ file { label: LABEL_REPEATED type: TYPE_MESSAGE type_name: ".containerd.services.content.v1.Info" - options { - 65001: 0 - } json_name: "info" } } @@ -2576,9 +2540,6 @@ file { label: LABEL_REPEATED type: TYPE_MESSAGE type_name: ".containerd.services.content.v1.Status" - options { - 65001: 0 - } json_name: "statuses" } } @@ -3141,9 +3102,6 @@ file { label: LABEL_OPTIONAL type: TYPE_MESSAGE type_name: ".containerd.types.Descriptor" - options { - 65001: 0 - } json_name: "target" } field { @@ -3212,9 +3170,6 @@ file { label: LABEL_OPTIONAL type: TYPE_MESSAGE type_name: ".containerd.services.images.v1.Image" - options { - 65001: 0 - } json_name: "image" } } @@ -3226,9 +3181,6 @@ file { label: LABEL_OPTIONAL type: TYPE_MESSAGE type_name: ".containerd.services.images.v1.Image" - options { - 65001: 0 - } json_name: "image" } } @@ -3240,9 +3192,6 @@ file { label: LABEL_OPTIONAL type: TYPE_MESSAGE type_name: ".containerd.services.images.v1.Image" - options { - 65001: 0 - } json_name: "image" } field { @@ -3262,9 +3211,6 @@ file { label: LABEL_OPTIONAL type: TYPE_MESSAGE type_name: ".containerd.services.images.v1.Image" - options { - 65001: 0 - } json_name: "image" } } @@ -3286,9 +3232,6 @@ file { label: LABEL_REPEATED type: TYPE_MESSAGE type_name: ".containerd.services.images.v1.Image" - options { - 65001: 0 - } json_name: "images" } } @@ -3353,9 +3296,6 @@ file { number: 1 label: LABEL_OPTIONAL type: TYPE_STRING - options { - 65004: "OS" - } json_name: "os" } field { @@ -3453,9 +3393,6 @@ file { label: LABEL_REPEATED type: TYPE_MESSAGE type_name: ".containerd.types.Platform" - options { - 65001: 0 - } json_name: "platforms" } field { @@ -3520,9 +3457,6 @@ file { label: LABEL_REPEATED type: TYPE_MESSAGE type_name: ".containerd.services.introspection.v1.Plugin" - options { - 65001: 0 - } json_name: "plugins" } } @@ -3533,9 +3467,6 @@ file { number: 1 label: LABEL_OPTIONAL type: TYPE_STRING - options { - 65004: "UUID" - } json_name: "uuid" } } @@ -3728,9 +3659,6 @@ file { label: LABEL_OPTIONAL type: TYPE_MESSAGE type_name: ".containerd.services.leases.v1.Resource" - options { - 65001: 0 - } json_name: "resource" } } @@ -3749,9 +3677,6 @@ file { label: LABEL_OPTIONAL type: TYPE_MESSAGE type_name: ".containerd.services.leases.v1.Resource" - options { - 65001: 0 - } json_name: "resource" } } @@ -3773,9 +3698,6 @@ file { label: LABEL_REPEATED type: TYPE_MESSAGE type_name: ".containerd.services.leases.v1.Resource" - options { - 65001: 0 - } json_name: "resources" } } @@ -3879,9 +3801,6 @@ file { label: LABEL_OPTIONAL type: TYPE_MESSAGE type_name: ".containerd.services.namespaces.v1.Namespace" - options { - 65001: 0 - } json_name: "namespace" } } @@ -3903,9 +3822,6 @@ file { label: LABEL_REPEATED type: TYPE_MESSAGE type_name: ".containerd.services.namespaces.v1.Namespace" - options { - 65001: 0 - } json_name: "namespaces" } } @@ -3917,9 +3833,6 @@ file { label: LABEL_OPTIONAL type: TYPE_MESSAGE type_name: ".containerd.services.namespaces.v1.Namespace" - options { - 65001: 0 - } json_name: "namespace" } } @@ -3931,9 +3844,6 @@ file { label: LABEL_OPTIONAL type: TYPE_MESSAGE type_name: ".containerd.services.namespaces.v1.Namespace" - options { - 65001: 0 - } json_name: "namespace" } } @@ -3945,9 +3855,6 @@ file { label: LABEL_OPTIONAL type: TYPE_MESSAGE type_name: ".containerd.services.namespaces.v1.Namespace" - options { - 65001: 0 - } json_name: "namespace" } field { @@ -3967,9 +3874,6 @@ file { label: LABEL_OPTIONAL type: TYPE_MESSAGE type_name: ".containerd.services.namespaces.v1.Namespace" - options { - 65001: 0 - } json_name: "namespace" } } @@ -4037,9 +3941,6 @@ file { label: LABEL_OPTIONAL type: TYPE_MESSAGE type_name: ".containerd.types.Sandbox.Runtime" - options { - 65001: 0 - } json_name: "runtime" } field { @@ -4056,9 +3957,6 @@ file { label: LABEL_REPEATED type: TYPE_MESSAGE type_name: ".containerd.types.Sandbox.LabelsEntry" - options { - 65001: 0 - } json_name: "labels" } field { @@ -4083,9 +3981,6 @@ file { label: LABEL_REPEATED type: TYPE_MESSAGE type_name: ".containerd.types.Sandbox.ExtensionsEntry" - options { - 65001: 0 - } json_name: "extensions" } nested_type { @@ -4170,9 +4065,6 @@ file { label: LABEL_OPTIONAL type: TYPE_MESSAGE type_name: ".containerd.types.Sandbox" - options { - 65001: 0 - } json_name: "sandbox" } } @@ -4184,9 +4076,6 @@ file { label: LABEL_OPTIONAL type: TYPE_MESSAGE type_name: ".containerd.types.Sandbox" - options { - 65001: 0 - } json_name: "sandbox" } } @@ -4198,9 +4087,6 @@ file { label: LABEL_OPTIONAL type: TYPE_MESSAGE type_name: ".containerd.types.Sandbox" - options { - 65001: 0 - } json_name: "sandbox" } field { @@ -4219,9 +4105,6 @@ file { label: LABEL_OPTIONAL type: TYPE_MESSAGE type_name: ".containerd.types.Sandbox" - options { - 65001: 0 - } json_name: "sandbox" } } @@ -4256,9 +4139,6 @@ file { label: LABEL_REPEATED type: TYPE_MESSAGE type_name: ".containerd.types.Sandbox" - options { - 65001: 0 - } json_name: "list" } } @@ -4813,9 +4693,6 @@ file { label: LABEL_OPTIONAL type: TYPE_MESSAGE type_name: ".containerd.services.snapshots.v1.Info" - options { - 65001: 0 - } json_name: "info" } } @@ -4834,9 +4711,6 @@ file { label: LABEL_OPTIONAL type: TYPE_MESSAGE type_name: ".containerd.services.snapshots.v1.Info" - options { - 65001: 0 - } json_name: "info" } field { @@ -4856,9 +4730,6 @@ file { label: LABEL_OPTIONAL type: TYPE_MESSAGE type_name: ".containerd.services.snapshots.v1.Info" - options { - 65001: 0 - } json_name: "info" } } @@ -4887,9 +4758,6 @@ file { label: LABEL_REPEATED type: TYPE_MESSAGE type_name: ".containerd.services.snapshots.v1.Info" - options { - 65001: 0 - } json_name: "info" } } diff --git a/api/services/containers/v1/containers.pb.go b/api/services/containers/v1/containers.pb.go index f1081014e..4e16dbda7 100644 --- a/api/services/containers/v1/containers.pb.go +++ b/api/services/containers/v1/containers.pb.go @@ -78,7 +78,7 @@ type Container struct { // that should be unique against other extensions. When updating extension // data, one should only update the specified extension using field paths // to select a specific map key. - Extensions map[string]types.Any `protobuf:"bytes,10,rep,name=extensions,proto3" json:"extensions" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + Extensions map[string]*types.Any `protobuf:"bytes,10,rep,name=extensions,proto3" json:"extensions,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Sandbox ID this container belongs to. Sandbox string `protobuf:"bytes,11,opt,name=sandbox,proto3" json:"sandbox,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -200,10 +200,10 @@ func (m *GetContainerRequest) XXX_DiscardUnknown() { var xxx_messageInfo_GetContainerRequest proto.InternalMessageInfo type GetContainerResponse struct { - Container Container `protobuf:"bytes,1,opt,name=container,proto3" json:"container"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Container *Container `protobuf:"bytes,1,opt,name=container,proto3" json:"container,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *GetContainerResponse) Reset() { *m = GetContainerResponse{} } @@ -288,10 +288,10 @@ func (m *ListContainersRequest) XXX_DiscardUnknown() { var xxx_messageInfo_ListContainersRequest proto.InternalMessageInfo type ListContainersResponse struct { - Containers []Container `protobuf:"bytes,1,rep,name=containers,proto3" json:"containers"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Containers []*Container `protobuf:"bytes,1,rep,name=containers,proto3" json:"containers,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *ListContainersResponse) Reset() { *m = ListContainersResponse{} } @@ -327,10 +327,10 @@ func (m *ListContainersResponse) XXX_DiscardUnknown() { var xxx_messageInfo_ListContainersResponse proto.InternalMessageInfo type CreateContainerRequest struct { - Container Container `protobuf:"bytes,1,opt,name=container,proto3" json:"container"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Container *Container `protobuf:"bytes,1,opt,name=container,proto3" json:"container,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *CreateContainerRequest) Reset() { *m = CreateContainerRequest{} } @@ -366,10 +366,10 @@ func (m *CreateContainerRequest) XXX_DiscardUnknown() { var xxx_messageInfo_CreateContainerRequest proto.InternalMessageInfo type CreateContainerResponse struct { - Container Container `protobuf:"bytes,1,opt,name=container,proto3" json:"container"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Container *Container `protobuf:"bytes,1,opt,name=container,proto3" json:"container,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *CreateContainerResponse) Reset() { *m = CreateContainerResponse{} } @@ -413,7 +413,7 @@ type UpdateContainerRequest struct { // Container provides the target values, as declared by the mask, for the update. // // The ID field must be set. - Container Container `protobuf:"bytes,1,opt,name=container,proto3" json:"container"` + Container *Container `protobuf:"bytes,1,opt,name=container,proto3" json:"container,omitempty"` // UpdateMask specifies which fields to perform the update on. If empty, // the operation applies to all fields. UpdateMask *types.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"` @@ -455,10 +455,10 @@ func (m *UpdateContainerRequest) XXX_DiscardUnknown() { var xxx_messageInfo_UpdateContainerRequest proto.InternalMessageInfo type UpdateContainerResponse struct { - Container Container `protobuf:"bytes,1,opt,name=container,proto3" json:"container"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Container *Container `protobuf:"bytes,1,opt,name=container,proto3" json:"container,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *UpdateContainerResponse) Reset() { *m = UpdateContainerResponse{} } @@ -573,7 +573,7 @@ var xxx_messageInfo_ListContainerMessage proto.InternalMessageInfo func init() { proto.RegisterType((*Container)(nil), "containerd.services.containers.v1.Container") - proto.RegisterMapType((map[string]types.Any)(nil), "containerd.services.containers.v1.Container.ExtensionsEntry") + proto.RegisterMapType((map[string]*types.Any)(nil), "containerd.services.containers.v1.Container.ExtensionsEntry") proto.RegisterMapType((map[string]string)(nil), "containerd.services.containers.v1.Container.LabelsEntry") proto.RegisterType((*Container_Runtime)(nil), "containerd.services.containers.v1.Container.Runtime") proto.RegisterType((*GetContainerRequest)(nil), "containerd.services.containers.v1.GetContainerRequest") @@ -593,59 +593,58 @@ func init() { } var fileDescriptor_311afb8e15951042 = []byte{ - // 820 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xcb, 0x6e, 0x13, 0x49, - 0x14, 0x4d, 0xdb, 0x4e, 0x7b, 0x7c, 0x3d, 0xd2, 0x8c, 0x6a, 0x3c, 0x9e, 0x9e, 0x1e, 0xc9, 0x71, - 0xbc, 0xb2, 0x46, 0xd0, 0x4e, 0x0c, 0x22, 0x2f, 0x36, 0x79, 0x0b, 0x48, 0x50, 0xd4, 0x81, 0x0d, - 0x2c, 0x42, 0xdb, 0xae, 0x38, 0x8d, 0xfb, 0x45, 0x57, 0xd9, 0x8a, 0xc5, 0x22, 0xf0, 0x21, 0xac, - 0xf9, 0x95, 0x2c, 0x59, 0xb2, 0x8a, 0x88, 0xc5, 0x87, 0xa0, 0xaa, 0xae, 0x76, 0x77, 0xfc, 0x20, - 0x76, 0x42, 0x76, 0x75, 0x5d, 0xf7, 0xdc, 0x7b, 0xea, 0xdc, 0x3a, 0xe5, 0x86, 0xbd, 0xa6, 0x49, - 0x4f, 0xda, 0x35, 0xad, 0xee, 0xda, 0x95, 0xba, 0xeb, 0x50, 0xc3, 0x74, 0xb0, 0xdf, 0x88, 0x2f, - 0x0d, 0xcf, 0xac, 0x10, 0xec, 0x77, 0xcc, 0x3a, 0x26, 0xd1, 0xef, 0xa4, 0xd2, 0x59, 0x8c, 0x45, - 0x9a, 0xe7, 0xbb, 0xd4, 0x45, 0xf3, 0x11, 0x4e, 0x0b, 0x31, 0x5a, 0x2c, 0xab, 0xb3, 0xa8, 0xe6, - 0x9a, 0x6e, 0xd3, 0xe5, 0xd9, 0x15, 0xb6, 0x0a, 0x80, 0xea, 0xbf, 0x4d, 0xd7, 0x6d, 0x5a, 0xb8, - 0xc2, 0xa3, 0x5a, 0xfb, 0xb8, 0x62, 0x38, 0x5d, 0xb1, 0xf5, 0xdf, 0xe0, 0x16, 0xb6, 0x3d, 0x1a, - 0x6e, 0x16, 0x07, 0x37, 0x8f, 0x4d, 0x6c, 0x35, 0x8e, 0x6c, 0x83, 0xb4, 0x44, 0xc6, 0xdc, 0x60, - 0x06, 0x35, 0x6d, 0x4c, 0xa8, 0x61, 0x7b, 0x41, 0x42, 0xe9, 0x93, 0x0c, 0x99, 0xcd, 0x90, 0x22, - 0xca, 0x43, 0xc2, 0x6c, 0x28, 0x52, 0x51, 0x2a, 0x67, 0x36, 0xe4, 0xde, 0xc5, 0x5c, 0xe2, 0xc9, - 0x96, 0x9e, 0x30, 0x1b, 0xe8, 0x00, 0x64, 0xcb, 0xa8, 0x61, 0x8b, 0x28, 0x89, 0x62, 0xb2, 0x9c, - 0xad, 0x2e, 0x6b, 0xd7, 0x1e, 0x55, 0xeb, 0x57, 0xd5, 0xf6, 0x38, 0x74, 0xdb, 0xa1, 0x7e, 0x57, - 0x17, 0x75, 0x50, 0x0e, 0x66, 0x4d, 0xdb, 0x68, 0x62, 0x25, 0xc9, 0x9a, 0xe9, 0x41, 0x80, 0x9e, - 0x43, 0xda, 0x6f, 0x3b, 0x8c, 0xa3, 0x92, 0x2a, 0x4a, 0xe5, 0x6c, 0xf5, 0xe1, 0x54, 0x8d, 0xf4, - 0x00, 0xab, 0x87, 0x45, 0x50, 0x19, 0x52, 0xc4, 0xc3, 0x75, 0x65, 0x96, 0x17, 0xcb, 0x69, 0x81, - 0x1a, 0x5a, 0xa8, 0x86, 0xb6, 0xee, 0x74, 0x75, 0x9e, 0x81, 0x8a, 0x90, 0x25, 0x8e, 0xe1, 0x91, - 0x13, 0x97, 0x52, 0xec, 0x2b, 0x32, 0x67, 0x15, 0xff, 0x09, 0xcd, 0xc3, 0xef, 0x61, 0x78, 0xd4, - 0xc2, 0x5d, 0x25, 0x7d, 0x35, 0xe5, 0x19, 0xee, 0xa2, 0x15, 0x80, 0xba, 0x8f, 0x0d, 0x8a, 0x1b, - 0x47, 0x06, 0x55, 0x7e, 0xe3, 0x4d, 0xd5, 0xa1, 0xa6, 0x2f, 0xc2, 0x11, 0xe8, 0x19, 0x91, 0xbd, - 0x4e, 0x19, 0xb4, 0xed, 0x35, 0x42, 0x68, 0xe6, 0x7a, 0xa8, 0xc8, 0x5e, 0xa7, 0xa8, 0x06, 0x80, - 0x4f, 0x29, 0x76, 0x88, 0xe9, 0x3a, 0x44, 0x01, 0x3e, 0xa0, 0xc7, 0x53, 0xe9, 0xb6, 0xdd, 0x87, - 0xf3, 0x21, 0x6d, 0xa4, 0xce, 0x2f, 0xe6, 0x66, 0xf4, 0x58, 0x55, 0xa4, 0x40, 0x9a, 0x18, 0x4e, - 0xa3, 0xe6, 0x9e, 0x2a, 0x59, 0x7e, 0xee, 0x30, 0x54, 0x57, 0x20, 0x1b, 0x9b, 0x2f, 0xfa, 0x13, - 0x92, 0x4c, 0x1c, 0x7e, 0x85, 0x74, 0xb6, 0x64, 0x93, 0xee, 0x18, 0x56, 0x1b, 0x2b, 0x89, 0x60, - 0xd2, 0x3c, 0x58, 0x4d, 0x2c, 0x4b, 0xea, 0x3e, 0xa4, 0xc5, 0xc4, 0x10, 0x82, 0x94, 0x63, 0xd8, - 0x58, 0xe0, 0xf8, 0x1a, 0x69, 0x90, 0x76, 0x3d, 0xca, 0x0f, 0x95, 0xf8, 0xc9, 0xfc, 0xc2, 0x24, - 0xf5, 0x10, 0xfe, 0x18, 0x38, 0xc8, 0x08, 0x36, 0xff, 0xc7, 0xd9, 0x8c, 0x2b, 0x19, 0x71, 0x2c, - 0xdd, 0x87, 0xbf, 0x76, 0x31, 0xed, 0x4b, 0xa5, 0xe3, 0x77, 0x6d, 0x4c, 0xe8, 0x38, 0xa3, 0x94, - 0x4e, 0x20, 0x77, 0x35, 0x9d, 0x78, 0xae, 0x43, 0x30, 0x3a, 0x80, 0x4c, 0x5f, 0x7c, 0x0e, 0xcb, - 0x56, 0xef, 0x4d, 0x33, 0x22, 0x31, 0x92, 0xa8, 0x48, 0x69, 0x11, 0xfe, 0xde, 0x33, 0x49, 0xd4, - 0x8a, 0x84, 0xd4, 0x14, 0x48, 0x1f, 0x9b, 0x16, 0xc5, 0x3e, 0x51, 0xa4, 0x62, 0x92, 0x8d, 0x4a, - 0x84, 0x25, 0x0b, 0xf2, 0x83, 0x10, 0x41, 0x4f, 0x07, 0x88, 0x1a, 0x73, 0xd8, 0xcd, 0xf8, 0xc5, - 0xaa, 0x94, 0xde, 0x42, 0x7e, 0x93, 0x5f, 0xef, 0x21, 0xf1, 0x7e, 0xbd, 0x18, 0x2d, 0xf8, 0x67, - 0xa8, 0xd7, 0x9d, 0x29, 0xff, 0x59, 0x82, 0xfc, 0x4b, 0xee, 0xbe, 0xbb, 0x3f, 0x19, 0x5a, 0x83, - 0x6c, 0xe0, 0x74, 0xfe, 0xaa, 0x8b, 0x5b, 0x3b, 0xfc, 0x30, 0xec, 0xb0, 0x87, 0x7f, 0xdf, 0x20, - 0x2d, 0x5d, 0x3c, 0x23, 0x6c, 0xcd, 0x64, 0x19, 0x22, 0x7a, 0x67, 0xb2, 0x2c, 0x40, 0x7e, 0x0b, - 0x5b, 0x78, 0x84, 0x2a, 0xe3, 0xcc, 0x52, 0x83, 0xdc, 0x95, 0xfb, 0xb8, 0x8f, 0x09, 0x61, 0xff, - 0x02, 0x4f, 0x6f, 0xc9, 0x2d, 0xc6, 0xaa, 0xfa, 0x7d, 0x16, 0x20, 0xba, 0xf0, 0xa8, 0x03, 0xc9, - 0x5d, 0x4c, 0xd1, 0xa3, 0x09, 0xca, 0x8d, 0xb0, 0xbd, 0xba, 0x34, 0x35, 0x4e, 0xc8, 0xfd, 0x1e, - 0x52, 0xec, 0xa8, 0x68, 0x92, 0x3f, 0xce, 0x91, 0xb6, 0x56, 0x57, 0x6e, 0x80, 0x14, 0xcd, 0x3f, - 0x4a, 0x00, 0x6c, 0xeb, 0x90, 0xfa, 0xd8, 0xb0, 0x6f, 0xc1, 0x61, 0x69, 0x5a, 0xa4, 0x98, 0xe8, - 0x82, 0x84, 0xce, 0x40, 0x0e, 0x1c, 0x8a, 0x26, 0x39, 0xc8, 0xe8, 0x87, 0x43, 0x5d, 0xbd, 0x09, - 0x54, 0x88, 0x70, 0x06, 0x72, 0xe0, 0x85, 0x89, 0x08, 0x8c, 0xf6, 0xf7, 0x44, 0x04, 0xc6, 0x39, - 0xee, 0x35, 0xc8, 0x81, 0x3f, 0x26, 0x22, 0x30, 0xda, 0x4a, 0x6a, 0x7e, 0xc8, 0xf9, 0xdb, 0xec, - 0x7b, 0x70, 0xe3, 0xcd, 0xf9, 0x65, 0x61, 0xe6, 0xeb, 0x65, 0x61, 0xe6, 0x43, 0xaf, 0x20, 0x9d, - 0xf7, 0x0a, 0xd2, 0x97, 0x5e, 0x41, 0xfa, 0xd6, 0x2b, 0x48, 0xaf, 0x76, 0x6e, 0xf1, 0x89, 0xbb, - 0x16, 0x45, 0x35, 0x99, 0x77, 0x7c, 0xf0, 0x23, 0x00, 0x00, 0xff, 0xff, 0xf1, 0x68, 0x0f, 0x41, - 0x33, 0x0b, 0x00, 0x00, + // 806 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0x4b, 0x6f, 0xda, 0x58, + 0x14, 0x8e, 0x81, 0x98, 0xe1, 0x30, 0xd2, 0x8c, 0xee, 0x30, 0x8c, 0xc7, 0x23, 0x11, 0xc2, 0x0a, + 0x8d, 0x5a, 0x93, 0xd0, 0xaa, 0x79, 0x75, 0x93, 0xb7, 0xda, 0x92, 0xaa, 0x72, 0xda, 0x4d, 0x5b, + 0x29, 0x35, 0xf8, 0x40, 0xac, 0xe0, 0x47, 0x7d, 0x2f, 0x28, 0xa8, 0x8b, 0xb4, 0xbf, 0xa2, 0xeb, + 0xfe, 0x9b, 0x2c, 0xbb, 0xec, 0xaa, 0x6a, 0x50, 0x7f, 0x48, 0xe5, 0x6b, 0x1b, 0x3b, 0x40, 0x12, + 0xc8, 0x63, 0x77, 0x0f, 0xf7, 0x7c, 0xf7, 0x7c, 0xe7, 0x3b, 0xf7, 0xbb, 0x18, 0x6a, 0x2d, 0x83, + 0x1d, 0x76, 0xea, 0x4a, 0xc3, 0x36, 0x2b, 0x0d, 0xdb, 0x62, 0x9a, 0x61, 0xa1, 0xab, 0xc7, 0x97, + 0x9a, 0x63, 0x54, 0x28, 0xba, 0x5d, 0xa3, 0x81, 0x34, 0xfa, 0x9d, 0x56, 0xba, 0x8b, 0xb1, 0x48, + 0x71, 0x5c, 0x9b, 0xd9, 0x64, 0x3e, 0xc2, 0x29, 0x21, 0x46, 0x89, 0x65, 0x75, 0x17, 0xe5, 0x5c, + 0xcb, 0x6e, 0xd9, 0x3c, 0xbb, 0xe2, 0xad, 0x7c, 0xa0, 0xfc, 0x6f, 0xcb, 0xb6, 0x5b, 0x6d, 0xac, + 0xf0, 0xa8, 0xde, 0x69, 0x56, 0x34, 0xab, 0x17, 0x6c, 0xfd, 0x37, 0xbc, 0x85, 0xa6, 0xc3, 0xc2, + 0xcd, 0xe2, 0xf0, 0x66, 0xd3, 0xc0, 0xb6, 0x7e, 0x60, 0x6a, 0xf4, 0x28, 0xc8, 0x98, 0x1b, 0xce, + 0x60, 0x86, 0x89, 0x94, 0x69, 0xa6, 0xe3, 0x27, 0x94, 0x3e, 0x8b, 0x90, 0xd9, 0x0c, 0x29, 0x92, + 0x3c, 0x24, 0x0c, 0x5d, 0x12, 0x8a, 0x42, 0x39, 0xb3, 0x21, 0xf6, 0xbf, 0xcf, 0x25, 0x9e, 0x6c, + 0xa9, 0x09, 0x43, 0x27, 0x2f, 0x40, 0x6c, 0x6b, 0x75, 0x6c, 0x53, 0x29, 0x51, 0x4c, 0x96, 0xb3, + 0xd5, 0x65, 0xe5, 0xca, 0x56, 0x95, 0xc1, 0xa9, 0x4a, 0x8d, 0x43, 0xb7, 0x2d, 0xe6, 0xf6, 0xd4, + 0xe0, 0x1c, 0x92, 0x83, 0x59, 0xc3, 0xd4, 0x5a, 0x28, 0x25, 0xbd, 0x62, 0xaa, 0x1f, 0x90, 0xe7, + 0x90, 0x76, 0x3b, 0x96, 0xc7, 0x51, 0x4a, 0x15, 0x85, 0x72, 0xb6, 0xfa, 0x70, 0xaa, 0x42, 0xaa, + 0x8f, 0x55, 0xc3, 0x43, 0x48, 0x19, 0x52, 0xd4, 0xc1, 0x86, 0x34, 0xcb, 0x0f, 0xcb, 0x29, 0xbe, + 0x1a, 0x4a, 0xa8, 0x86, 0xb2, 0x6e, 0xf5, 0x54, 0x9e, 0x41, 0x8a, 0x90, 0xa5, 0x96, 0xe6, 0xd0, + 0x43, 0x9b, 0x31, 0x74, 0x25, 0x91, 0xb3, 0x8a, 0xff, 0x44, 0xe6, 0xe1, 0xf7, 0x30, 0x3c, 0x38, + 0xc2, 0x9e, 0x94, 0x3e, 0x9f, 0xf2, 0x0c, 0x7b, 0x64, 0x05, 0xa0, 0xe1, 0xa2, 0xc6, 0x50, 0x3f, + 0xd0, 0x98, 0xf4, 0x1b, 0x2f, 0x2a, 0x8f, 0x14, 0x7d, 0x19, 0x8e, 0x40, 0xcd, 0x04, 0xd9, 0xeb, + 0xcc, 0x83, 0x76, 0x1c, 0x3d, 0x84, 0x66, 0xae, 0x86, 0x06, 0xd9, 0xeb, 0x8c, 0xbc, 0x05, 0xc0, + 0x63, 0x86, 0x16, 0x35, 0x6c, 0x8b, 0x4a, 0xc0, 0x07, 0xf4, 0x78, 0x2a, 0xdd, 0xb6, 0x07, 0x70, + 0x7f, 0x48, 0xb1, 0xf3, 0x88, 0x04, 0x69, 0xaa, 0x59, 0x7a, 0xdd, 0x3e, 0x96, 0xb2, 0xbc, 0xe3, + 0x30, 0x94, 0x57, 0x20, 0x1b, 0x9b, 0x2c, 0xf9, 0x13, 0x92, 0x9e, 0x2c, 0xfc, 0xf2, 0xa8, 0xde, + 0xd2, 0x9b, 0x71, 0x57, 0x6b, 0x77, 0x50, 0x4a, 0xf8, 0x33, 0xe6, 0xc1, 0x6a, 0x62, 0x59, 0x90, + 0xf7, 0x20, 0x1d, 0xcc, 0x8a, 0x10, 0x48, 0x59, 0x9a, 0x89, 0x01, 0x8e, 0xaf, 0x89, 0x02, 0x69, + 0xdb, 0x61, 0xbc, 0x9d, 0xc4, 0x25, 0x93, 0x0b, 0x93, 0xe4, 0x7d, 0xf8, 0x63, 0xa8, 0x85, 0x31, + 0x6c, 0xfe, 0x8f, 0xb3, 0xb9, 0xe8, 0xc8, 0x88, 0x63, 0xe9, 0x3e, 0xfc, 0xb5, 0x8b, 0x6c, 0x20, + 0x92, 0x8a, 0xef, 0x3b, 0x48, 0xd9, 0x45, 0x16, 0x29, 0xd5, 0x21, 0x77, 0x3e, 0x9d, 0x3a, 0xb6, + 0x45, 0x91, 0x3c, 0x85, 0xcc, 0x40, 0x76, 0x0e, 0xcb, 0x56, 0xef, 0x4d, 0x33, 0x1c, 0x35, 0x82, + 0x97, 0x16, 0xe1, 0xef, 0x9a, 0x41, 0xa3, 0x22, 0x34, 0x24, 0x25, 0x41, 0xba, 0x69, 0xb4, 0x19, + 0xba, 0x54, 0x12, 0x8a, 0x49, 0x6f, 0x48, 0x41, 0x58, 0x6a, 0x42, 0x7e, 0x18, 0x12, 0x10, 0xab, + 0x01, 0x44, 0x25, 0x39, 0x6c, 0x5a, 0x66, 0x31, 0x7c, 0x49, 0x87, 0xfc, 0x26, 0xbf, 0xcc, 0x23, + 0x82, 0xdd, 0xa6, 0x00, 0x08, 0xff, 0x8c, 0x54, 0xb9, 0x03, 0x9d, 0xbf, 0x08, 0x90, 0x7f, 0xc5, + 0xfd, 0x75, 0x97, 0xdd, 0x90, 0x35, 0xc8, 0xfa, 0x2e, 0xe6, 0x2f, 0x76, 0x70, 0x2f, 0x47, 0x4d, + 0xbf, 0xe3, 0x3d, 0xea, 0x7b, 0x1a, 0x3d, 0x52, 0x83, 0x27, 0xc2, 0x5b, 0x7b, 0x52, 0x8c, 0x50, + 0xbc, 0x03, 0x29, 0x16, 0x20, 0xbf, 0x85, 0x6d, 0x1c, 0xa3, 0xc4, 0x25, 0x46, 0x38, 0x77, 0xe3, + 0xf6, 0x90, 0x52, 0xef, 0x6d, 0xbf, 0x45, 0x56, 0xd5, 0x9f, 0xb3, 0x00, 0xd1, 0x95, 0x26, 0x5d, + 0x48, 0xee, 0x22, 0x23, 0x8f, 0x26, 0x38, 0x6e, 0x8c, 0xa5, 0xe5, 0xa5, 0xa9, 0x71, 0x81, 0xd0, + 0x1f, 0x20, 0xe5, 0xb5, 0x4a, 0x26, 0xf9, 0x3b, 0x1c, 0x6b, 0x5c, 0x79, 0xe5, 0x1a, 0xc8, 0xa0, + 0xf8, 0x27, 0x01, 0xc0, 0xdb, 0xda, 0x67, 0x2e, 0x6a, 0xe6, 0x0d, 0x38, 0x2c, 0x4d, 0x8b, 0x0c, + 0x26, 0xba, 0x20, 0x90, 0x13, 0x10, 0x7d, 0x3f, 0x92, 0x49, 0x1a, 0x19, 0xff, 0x40, 0xc8, 0xab, + 0xd7, 0x81, 0x06, 0x22, 0x9c, 0x80, 0xe8, 0xbb, 0x60, 0x22, 0x02, 0xe3, 0x3d, 0x3d, 0x11, 0x81, + 0x8b, 0xbc, 0xf6, 0x06, 0x44, 0xdf, 0x1f, 0x13, 0x11, 0x18, 0x6f, 0x25, 0x39, 0x3f, 0xe2, 0xf9, + 0x6d, 0xef, 0x2b, 0x6f, 0xe3, 0xdd, 0xe9, 0x59, 0x61, 0xe6, 0xdb, 0x59, 0x61, 0xe6, 0x63, 0xbf, + 0x20, 0x9c, 0xf6, 0x0b, 0xc2, 0xd7, 0x7e, 0x41, 0xf8, 0xd1, 0x2f, 0x08, 0xaf, 0x77, 0x6e, 0xf0, + 0xe1, 0xba, 0x16, 0x45, 0x75, 0x91, 0x57, 0x7c, 0xf0, 0x2b, 0x00, 0x00, 0xff, 0xff, 0x54, 0x96, + 0x6a, 0x94, 0x09, 0x0b, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -971,16 +970,18 @@ func (m *Container) MarshalToSizedBuffer(dAtA []byte) (int, error) { for k := range m.Extensions { v := m.Extensions[k] baseI := i - { - size, err := (&v).MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if v != nil { + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintContainers(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintContainers(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0x12 } - i-- - dAtA[i] = 0x12 i -= len(k) copy(dAtA[i:], k) i = encodeVarintContainers(dAtA, i, uint64(len(k))) @@ -1193,16 +1194,18 @@ func (m *GetContainerResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } - { - size, err := m.Container.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if m.Container != nil { + { + size, err := m.Container.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintContainers(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintContainers(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0xa } - i-- - dAtA[i] = 0xa return len(dAtA) - i, nil } @@ -1307,16 +1310,18 @@ func (m *CreateContainerRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } - { - size, err := m.Container.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if m.Container != nil { + { + size, err := m.Container.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintContainers(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintContainers(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0xa } - i-- - dAtA[i] = 0xa return len(dAtA) - i, nil } @@ -1344,16 +1349,18 @@ func (m *CreateContainerResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } - { - size, err := m.Container.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if m.Container != nil { + { + size, err := m.Container.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintContainers(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintContainers(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0xa } - i-- - dAtA[i] = 0xa return len(dAtA) - i, nil } @@ -1393,16 +1400,18 @@ func (m *UpdateContainerRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) i-- dAtA[i] = 0x12 } - { - size, err := m.Container.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if m.Container != nil { + { + size, err := m.Container.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintContainers(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintContainers(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0xa } - i-- - dAtA[i] = 0xa return len(dAtA) - i, nil } @@ -1430,16 +1439,18 @@ func (m *UpdateContainerResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } - { - size, err := m.Container.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if m.Container != nil { + { + size, err := m.Container.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintContainers(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintContainers(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0xa } - i-- - dAtA[i] = 0xa return len(dAtA) - i, nil } @@ -1577,8 +1588,12 @@ func (m *Container) Size() (n int) { for k, v := range m.Extensions { _ = k _ = v - l = v.Size() - mapEntrySize := 1 + len(k) + sovContainers(uint64(len(k))) + 1 + l + sovContainers(uint64(l)) + l = 0 + if v != nil { + l = v.Size() + l += 1 + sovContainers(uint64(l)) + } + mapEntrySize := 1 + len(k) + sovContainers(uint64(len(k))) + l n += mapEntrySize + 1 + sovContainers(uint64(mapEntrySize)) } } @@ -1634,8 +1649,10 @@ func (m *GetContainerResponse) Size() (n int) { } var l int _ = l - l = m.Container.Size() - n += 1 + l + sovContainers(uint64(l)) + if m.Container != nil { + l = m.Container.Size() + n += 1 + l + sovContainers(uint64(l)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -1684,8 +1701,10 @@ func (m *CreateContainerRequest) Size() (n int) { } var l int _ = l - l = m.Container.Size() - n += 1 + l + sovContainers(uint64(l)) + if m.Container != nil { + l = m.Container.Size() + n += 1 + l + sovContainers(uint64(l)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -1698,8 +1717,10 @@ func (m *CreateContainerResponse) Size() (n int) { } var l int _ = l - l = m.Container.Size() - n += 1 + l + sovContainers(uint64(l)) + if m.Container != nil { + l = m.Container.Size() + n += 1 + l + sovContainers(uint64(l)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -1712,8 +1733,10 @@ func (m *UpdateContainerRequest) Size() (n int) { } var l int _ = l - l = m.Container.Size() - n += 1 + l + sovContainers(uint64(l)) + if m.Container != nil { + l = m.Container.Size() + n += 1 + l + sovContainers(uint64(l)) + } if m.UpdateMask != nil { l = m.UpdateMask.Size() n += 1 + l + sovContainers(uint64(l)) @@ -1730,8 +1753,10 @@ func (m *UpdateContainerResponse) Size() (n int) { } var l int _ = l - l = m.Container.Size() - n += 1 + l + sovContainers(uint64(l)) + if m.Container != nil { + l = m.Container.Size() + n += 1 + l + sovContainers(uint64(l)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -1795,7 +1820,7 @@ func (this *Container) String() string { keysForExtensions = append(keysForExtensions, k) } github_com_gogo_protobuf_sortkeys.Strings(keysForExtensions) - mapStringForExtensions := "map[string]types.Any{" + mapStringForExtensions := "map[string]*types.Any{" for _, k := range keysForExtensions { mapStringForExtensions += fmt.Sprintf("%v: %v,", k, this.Extensions[k]) } @@ -1845,7 +1870,7 @@ func (this *GetContainerResponse) String() string { return "nil" } s := strings.Join([]string{`&GetContainerResponse{`, - `Container:` + strings.Replace(strings.Replace(this.Container.String(), "Container", "Container", 1), `&`, ``, 1) + `,`, + `Container:` + strings.Replace(this.Container.String(), "Container", "Container", 1) + `,`, `XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`, `}`, }, "") @@ -1866,9 +1891,9 @@ func (this *ListContainersResponse) String() string { if this == nil { return "nil" } - repeatedStringForContainers := "[]Container{" + repeatedStringForContainers := "[]*Container{" for _, f := range this.Containers { - repeatedStringForContainers += strings.Replace(strings.Replace(f.String(), "Container", "Container", 1), `&`, ``, 1) + "," + repeatedStringForContainers += strings.Replace(f.String(), "Container", "Container", 1) + "," } repeatedStringForContainers += "}" s := strings.Join([]string{`&ListContainersResponse{`, @@ -1883,7 +1908,7 @@ func (this *CreateContainerRequest) String() string { return "nil" } s := strings.Join([]string{`&CreateContainerRequest{`, - `Container:` + strings.Replace(strings.Replace(this.Container.String(), "Container", "Container", 1), `&`, ``, 1) + `,`, + `Container:` + strings.Replace(this.Container.String(), "Container", "Container", 1) + `,`, `XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`, `}`, }, "") @@ -1894,7 +1919,7 @@ func (this *CreateContainerResponse) String() string { return "nil" } s := strings.Join([]string{`&CreateContainerResponse{`, - `Container:` + strings.Replace(strings.Replace(this.Container.String(), "Container", "Container", 1), `&`, ``, 1) + `,`, + `Container:` + strings.Replace(this.Container.String(), "Container", "Container", 1) + `,`, `XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`, `}`, }, "") @@ -1905,7 +1930,7 @@ func (this *UpdateContainerRequest) String() string { return "nil" } s := strings.Join([]string{`&UpdateContainerRequest{`, - `Container:` + strings.Replace(strings.Replace(this.Container.String(), "Container", "Container", 1), `&`, ``, 1) + `,`, + `Container:` + strings.Replace(this.Container.String(), "Container", "Container", 1) + `,`, `UpdateMask:` + strings.Replace(fmt.Sprintf("%v", this.UpdateMask), "FieldMask", "types.FieldMask", 1) + `,`, `XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`, `}`, @@ -1917,7 +1942,7 @@ func (this *UpdateContainerResponse) String() string { return "nil" } s := strings.Join([]string{`&UpdateContainerResponse{`, - `Container:` + strings.Replace(strings.Replace(this.Container.String(), "Container", "Container", 1), `&`, ``, 1) + `,`, + `Container:` + strings.Replace(this.Container.String(), "Container", "Container", 1) + `,`, `XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`, `}`, }, "") @@ -2411,10 +2436,10 @@ func (m *Container) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Extensions == nil { - m.Extensions = make(map[string]types.Any) + m.Extensions = make(map[string]*types.Any) } var mapkey string - mapvalue := &types.Any{} + var mapvalue *types.Any for iNdEx < postIndex { entryPreIndex := iNdEx var wire uint64 @@ -2508,7 +2533,7 @@ func (m *Container) Unmarshal(dAtA []byte) error { iNdEx += skippy } } - m.Extensions[mapkey] = *mapvalue + m.Extensions[mapkey] = mapvalue iNdEx = postIndex case 11: if wireType != 2 { @@ -2824,6 +2849,9 @@ func (m *GetContainerResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } + if m.Container == nil { + m.Container = &Container{} + } if err := m.Container.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -2991,7 +3019,7 @@ func (m *ListContainersResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Containers = append(m.Containers, Container{}) + m.Containers = append(m.Containers, &Container{}) if err := m.Containers[len(m.Containers)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -3076,6 +3104,9 @@ func (m *CreateContainerRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } + if m.Container == nil { + m.Container = &Container{} + } if err := m.Container.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -3160,6 +3191,9 @@ func (m *CreateContainerResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } + if m.Container == nil { + m.Container = &Container{} + } if err := m.Container.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -3244,6 +3278,9 @@ func (m *UpdateContainerRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } + if m.Container == nil { + m.Container = &Container{} + } if err := m.Container.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -3364,6 +3401,9 @@ func (m *UpdateContainerResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } + if m.Container == nil { + m.Container = &Container{} + } if err := m.Container.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/api/services/containers/v1/containers.proto b/api/services/containers/v1/containers.proto index 1547d6274..c27b7c23c 100644 --- a/api/services/containers/v1/containers.proto +++ b/api/services/containers/v1/containers.proto @@ -113,7 +113,7 @@ message Container { // that should be unique against other extensions. When updating extension // data, one should only update the specified extension using field paths // to select a specific map key. - map extensions = 10 [(gogoproto.nullable) = false]; + map extensions = 10; // Sandbox ID this container belongs to. string sandbox = 11; @@ -124,7 +124,7 @@ message GetContainerRequest { } message GetContainerResponse { - Container container = 1 [(gogoproto.nullable) = false]; + Container container = 1; } message ListContainersRequest { @@ -142,15 +142,15 @@ message ListContainersRequest { } message ListContainersResponse { - repeated Container containers = 1 [(gogoproto.nullable) = false]; + repeated Container containers = 1; } message CreateContainerRequest { - Container container = 1 [(gogoproto.nullable) = false]; + Container container = 1; } message CreateContainerResponse { - Container container = 1 [(gogoproto.nullable) = false]; + Container container = 1; } // UpdateContainerRequest updates the metadata on one or more container. @@ -162,7 +162,7 @@ message UpdateContainerRequest { // Container provides the target values, as declared by the mask, for the update. // // The ID field must be set. - Container container = 1 [(gogoproto.nullable) = false]; + Container container = 1; // UpdateMask specifies which fields to perform the update on. If empty, // the operation applies to all fields. @@ -170,7 +170,7 @@ message UpdateContainerRequest { } message UpdateContainerResponse { - Container container = 1 [(gogoproto.nullable) = false]; + Container container = 1; } message DeleteContainerRequest { diff --git a/api/services/content/v1/content.pb.go b/api/services/content/v1/content.pb.go index 4b1933fb2..508db65d3 100644 --- a/api/services/content/v1/content.pb.go +++ b/api/services/content/v1/content.pb.go @@ -165,7 +165,7 @@ func (m *InfoRequest) XXX_DiscardUnknown() { var xxx_messageInfo_InfoRequest proto.InternalMessageInfo type InfoResponse struct { - Info Info `protobuf:"bytes,1,opt,name=info,proto3" json:"info"` + Info *Info `protobuf:"bytes,1,opt,name=info,proto3" json:"info,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -204,7 +204,7 @@ func (m *InfoResponse) XXX_DiscardUnknown() { var xxx_messageInfo_InfoResponse proto.InternalMessageInfo type UpdateRequest struct { - Info Info `protobuf:"bytes,1,opt,name=info,proto3" json:"info"` + Info *Info `protobuf:"bytes,1,opt,name=info,proto3" json:"info,omitempty"` // UpdateMask specifies which fields to perform the update on. If empty, // the operation applies to all fields. // @@ -250,7 +250,7 @@ func (m *UpdateRequest) XXX_DiscardUnknown() { var xxx_messageInfo_UpdateRequest proto.InternalMessageInfo type UpdateResponse struct { - Info Info `protobuf:"bytes,1,opt,name=info,proto3" json:"info"` + Info *Info `protobuf:"bytes,1,opt,name=info,proto3" json:"info,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -338,7 +338,7 @@ func (m *ListContentRequest) XXX_DiscardUnknown() { var xxx_messageInfo_ListContentRequest proto.InternalMessageInfo type ListContentResponse struct { - Info []Info `protobuf:"bytes,1,rep,name=info,proto3" json:"info"` + Info []*Info `protobuf:"bytes,1,rep,name=info,proto3" json:"info,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -668,10 +668,10 @@ func (m *ListStatusesRequest) XXX_DiscardUnknown() { var xxx_messageInfo_ListStatusesRequest proto.InternalMessageInfo type ListStatusesResponse struct { - Statuses []Status `protobuf:"bytes,1,rep,name=statuses,proto3" json:"statuses"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Statuses []*Status `protobuf:"bytes,1,rep,name=statuses,proto3" json:"statuses,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *ListStatusesResponse) Reset() { *m = ListStatusesResponse{} } @@ -931,68 +931,68 @@ func init() { } var fileDescriptor_468430ba3e400391 = []byte{ - // 976 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xcd, 0x8e, 0xdb, 0x44, - 0x1c, 0xdf, 0xb1, 0x1d, 0xef, 0xe6, 0x9f, 0x6d, 0x15, 0xcd, 0x46, 0x55, 0x64, 0xa4, 0x34, 0x58, - 0x80, 0x22, 0x4a, 0x9d, 0x6d, 0xda, 0x03, 0xa5, 0x12, 0x90, 0x2e, 0x5b, 0x75, 0xa5, 0x2e, 0x20, - 0x37, 0x65, 0x51, 0x2f, 0x65, 0x92, 0x4c, 0x82, 0xb5, 0x89, 0x9d, 0x7a, 0x26, 0x11, 0xcb, 0x89, - 0x07, 0xe0, 0xce, 0x53, 0xf0, 0x0a, 0x9c, 0xf7, 0xc8, 0x11, 0x71, 0xa8, 0xd8, 0x3c, 0x09, 0x9a, - 0xf1, 0x38, 0x89, 0xf3, 0x81, 0x9d, 0x65, 0x6f, 0x33, 0x93, 0xdf, 0xef, 0xff, 0xfd, 0xe1, 0xc0, - 0xb3, 0xbe, 0xc7, 0x7f, 0x1c, 0xb7, 0x9d, 0x4e, 0x30, 0xac, 0x77, 0x02, 0x9f, 0x13, 0xcf, 0xa7, - 0x61, 0x77, 0xf1, 0x48, 0x46, 0x5e, 0x9d, 0xd1, 0x70, 0xe2, 0x75, 0x28, 0x93, 0xef, 0xd4, 0xe7, - 0xf5, 0xc9, 0x83, 0xf8, 0xe8, 0x8c, 0xc2, 0x80, 0x07, 0xb8, 0x32, 0x67, 0x38, 0x31, 0xda, 0x89, - 0x21, 0x93, 0x07, 0x56, 0xa9, 0x1f, 0xf4, 0x03, 0x09, 0xad, 0x8b, 0x53, 0xc4, 0xb2, 0xaa, 0xfd, - 0x20, 0xe8, 0x0f, 0x68, 0x5d, 0xde, 0xda, 0xe3, 0x5e, 0xbd, 0xe7, 0xd1, 0x41, 0xf7, 0xcd, 0x90, - 0xb0, 0x73, 0x85, 0xb8, 0xbb, 0x8c, 0xe0, 0xde, 0x90, 0x32, 0x4e, 0x86, 0x23, 0x05, 0x78, 0x6f, - 0x19, 0x40, 0x87, 0x23, 0x7e, 0x11, 0xfd, 0x68, 0xff, 0xae, 0x81, 0x71, 0xe2, 0xf7, 0x02, 0x7c, - 0x07, 0xcc, 0xae, 0xd7, 0xa7, 0x8c, 0x97, 0x51, 0x15, 0xd5, 0xf2, 0xae, 0xba, 0x61, 0x0c, 0x06, - 0xf3, 0x7e, 0xa6, 0x65, 0xad, 0x8a, 0x6a, 0xba, 0x2b, 0xcf, 0xf8, 0x31, 0x40, 0x27, 0xa4, 0x84, - 0xd3, 0xee, 0x1b, 0xc2, 0xcb, 0x7a, 0x15, 0xd5, 0x0a, 0x0d, 0xcb, 0x89, 0xd4, 0x38, 0xb1, 0x1a, - 0xa7, 0x15, 0xdb, 0xe1, 0xe6, 0x15, 0xba, 0xc9, 0x05, 0x75, 0x3c, 0xea, 0xc6, 0x54, 0x23, 0x9d, - 0xaa, 0xd0, 0x4d, 0x8e, 0x9f, 0x83, 0x39, 0x20, 0x6d, 0x3a, 0x60, 0xe5, 0x5c, 0x55, 0xaf, 0x15, - 0x1a, 0x87, 0xce, 0x7f, 0x47, 0xd4, 0x11, 0x7e, 0x39, 0x2f, 0x24, 0xe5, 0xd8, 0xe7, 0xe1, 0x85, - 0xab, 0xf8, 0xd6, 0x63, 0x28, 0x2c, 0x3c, 0xe3, 0x22, 0xe8, 0xe7, 0xf4, 0x42, 0xf9, 0x2d, 0x8e, - 0xb8, 0x04, 0xb9, 0x09, 0x19, 0x8c, 0x23, 0xaf, 0xf3, 0x6e, 0x74, 0xf9, 0x4c, 0xfb, 0x14, 0xd9, - 0x1f, 0x42, 0x41, 0x88, 0x75, 0xe9, 0xdb, 0xb1, 0x88, 0xce, 0x86, 0xa8, 0xd9, 0x5f, 0xc3, 0x7e, - 0x04, 0x63, 0xa3, 0xc0, 0x67, 0x14, 0x7f, 0x0e, 0x86, 0xe7, 0xf7, 0x02, 0x89, 0x2a, 0x34, 0x3e, - 0xc8, 0x62, 0xf9, 0x53, 0xe3, 0xf2, 0xdd, 0xdd, 0x1d, 0x57, 0xf2, 0xec, 0x5f, 0x11, 0xdc, 0x7a, - 0x25, 0x23, 0x11, 0x6b, 0xfe, 0x9f, 0x12, 0xf1, 0x13, 0x28, 0x44, 0xa1, 0x95, 0xb5, 0x24, 0x1d, - 0x5d, 0x97, 0x89, 0x67, 0xa2, 0xdc, 0x4e, 0x09, 0x3b, 0x77, 0x55, 0xde, 0xc4, 0xd9, 0xfe, 0x16, - 0x6e, 0xc7, 0xd6, 0xdc, 0x90, 0x83, 0x0e, 0xe0, 0x17, 0x1e, 0xe3, 0x47, 0x11, 0x24, 0x76, 0xb2, - 0x0c, 0xbb, 0x3d, 0x6f, 0xc0, 0x69, 0xc8, 0xca, 0xa8, 0xaa, 0xd7, 0xf2, 0x6e, 0x7c, 0xb5, 0x5f, - 0xc1, 0x41, 0x02, 0xbf, 0x62, 0x86, 0x7e, 0x4d, 0x33, 0x4a, 0x5f, 0xd1, 0x01, 0xe5, 0x74, 0xc9, - 0x90, 0x4d, 0x79, 0xfe, 0x1e, 0xb0, 0x4b, 0x49, 0x37, 0x1b, 0x5a, 0xbc, 0x07, 0xbd, 0x1e, 0xa3, - 0x5c, 0x75, 0x93, 0xba, 0xcd, 0x7a, 0x4c, 0x9f, 0xf7, 0x98, 0xdd, 0x84, 0x83, 0x84, 0x64, 0xe5, - 0xe0, 0x5c, 0x04, 0x5a, 0x16, 0xd1, 0x25, 0x9c, 0x48, 0xc1, 0xfb, 0xae, 0x3c, 0xdb, 0x7f, 0x23, - 0x30, 0x5f, 0x72, 0xc2, 0xc7, 0x4c, 0xb4, 0x1d, 0xe3, 0x24, 0x54, 0x6d, 0x87, 0xd2, 0xdb, 0x4e, - 0xa1, 0x57, 0x3a, 0x56, 0xdb, 0xa6, 0x63, 0x8b, 0xa0, 0x87, 0xb4, 0x27, 0xdd, 0xca, 0xbb, 0xe2, - 0xb8, 0x60, 0xbe, 0x91, 0x30, 0xbf, 0x04, 0x39, 0x1e, 0x70, 0x32, 0x28, 0xe7, 0xe4, 0x73, 0x74, - 0xc1, 0x16, 0xec, 0xd1, 0x9f, 0x46, 0xb4, 0xc3, 0x69, 0xb7, 0x6c, 0x4a, 0x21, 0xb3, 0xbb, 0xfd, - 0x3e, 0xdc, 0x8a, 0x7c, 0x8b, 0x83, 0xae, 0x94, 0xa1, 0x99, 0x32, 0x51, 0xa5, 0x31, 0x64, 0x56, - 0x1e, 0x26, 0x93, 0x2f, 0x2a, 0x04, 0x1f, 0xa5, 0x15, 0x88, 0xe2, 0x2b, 0x96, 0x5d, 0x8f, 0xaa, - 0x2e, 0x7a, 0xa5, 0x2c, 0xbd, 0x4c, 0x7f, 0x80, 0x52, 0x92, 0xa0, 0x0c, 0x79, 0x0e, 0x7b, 0x4c, - 0xbd, 0xa9, 0x5a, 0xcd, 0x68, 0x8a, 0xaa, 0xd6, 0x19, 0xdb, 0x7e, 0xa7, 0xc1, 0xc1, 0x59, 0xe8, - 0xad, 0x54, 0xec, 0x11, 0x98, 0xa4, 0xc3, 0xbd, 0xc0, 0x97, 0xae, 0xde, 0x6e, 0xdc, 0x4b, 0x93, - 0x2f, 0x85, 0x34, 0x25, 0xc5, 0x55, 0xd4, 0x38, 0xa6, 0xda, 0x3c, 0x81, 0xb3, 0x44, 0xe9, 0x9b, - 0x12, 0x65, 0x24, 0x13, 0xb5, 0x90, 0xf2, 0xdc, 0xda, 0x8a, 0x35, 0xe7, 0x15, 0x8b, 0xcf, 0x66, - 0x23, 0x7e, 0x57, 0x06, 0xe5, 0x8b, 0x4c, 0x46, 0x27, 0x3d, 0xbf, 0xe9, 0x89, 0xff, 0x9b, 0x06, - 0xa5, 0xa4, 0x1a, 0x95, 0xc3, 0x1b, 0x89, 0x70, 0xb2, 0x31, 0xb5, 0xeb, 0x37, 0xa6, 0xbe, 0x4d, - 0x63, 0x6e, 0xd7, 0x86, 0xf3, 0x71, 0x66, 0x26, 0x86, 0x5f, 0x15, 0xf6, 0x9b, 0xed, 0x20, 0xe4, - 0x1b, 0x3b, 0xf0, 0x63, 0x07, 0x0a, 0x0b, 0x4e, 0xe3, 0x3d, 0x30, 0x5e, 0xb6, 0x9a, 0xad, 0xe2, - 0x0e, 0xce, 0x43, 0xee, 0xcc, 0x3d, 0x69, 0x1d, 0x17, 0x11, 0x06, 0x30, 0x8f, 0xbe, 0x39, 0x3d, - 0x3d, 0x69, 0x15, 0xb5, 0xc6, 0x1f, 0xbb, 0xb0, 0xab, 0xc2, 0x8c, 0x89, 0xfa, 0x30, 0xb9, 0x97, - 0x65, 0x88, 0x2b, 0x13, 0xac, 0x4f, 0xb2, 0x81, 0x55, 0x06, 0xfb, 0x60, 0x46, 0x6b, 0x0c, 0xdf, - 0x4f, 0xe3, 0x25, 0x96, 0xaf, 0xe5, 0x64, 0x85, 0x2b, 0x45, 0x6f, 0xc1, 0x10, 0x63, 0x00, 0x37, - 0xd2, 0x78, 0xab, 0x3b, 0xd0, 0x7a, 0xb8, 0x15, 0x27, 0x52, 0x78, 0x88, 0xf0, 0x77, 0x60, 0x46, - 0x9b, 0x0c, 0x3f, 0x4a, 0x13, 0xb0, 0x6e, 0xe3, 0x59, 0x77, 0x56, 0x2a, 0xe9, 0x58, 0x7c, 0x36, - 0x0a, 0x57, 0xc4, 0x5e, 0x4a, 0x77, 0x65, 0x75, 0x2f, 0xa6, 0xbb, 0xb2, 0x66, 0xe3, 0x1d, 0x22, - 0x91, 0x26, 0xb5, 0xc6, 0xee, 0x67, 0x9c, 0xd7, 0x59, 0xd3, 0xb4, 0xb4, 0x1e, 0x2e, 0x60, 0x7f, - 0x71, 0x5a, 0xe3, 0x4c, 0xa1, 0x5f, 0x5a, 0x06, 0xd6, 0xa3, 0xed, 0x48, 0x4a, 0xf5, 0x04, 0x72, - 0xb2, 0x53, 0xd2, 0x75, 0xae, 0x19, 0x79, 0xe9, 0x3a, 0xd7, 0x0d, 0xb0, 0x1a, 0x3a, 0x44, 0xf8, - 0x14, 0x72, 0xb2, 0x87, 0x71, 0x6a, 0xe7, 0x2c, 0xb6, 0xfa, 0xa6, 0xea, 0x78, 0xfa, 0xfa, 0xf2, - 0xaa, 0xb2, 0xf3, 0xd7, 0x55, 0x65, 0xe7, 0x97, 0x69, 0x05, 0x5d, 0x4e, 0x2b, 0xe8, 0xcf, 0x69, - 0x05, 0xfd, 0x33, 0xad, 0xa0, 0xd7, 0x5f, 0x5e, 0xf7, 0x6f, 0xd4, 0x13, 0x75, 0x6c, 0x9b, 0x52, - 0xd7, 0xc3, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x54, 0x3b, 0xab, 0x0f, 0x91, 0x0d, 0x00, 0x00, + // 971 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0x4f, 0x6f, 0x1b, 0x45, + 0x14, 0xcf, 0xec, 0xda, 0x9b, 0xf8, 0x39, 0x8d, 0xac, 0x89, 0x55, 0x59, 0x8b, 0x64, 0xcc, 0x0a, + 0x90, 0x45, 0xe9, 0x3a, 0x75, 0x7b, 0x68, 0xa9, 0x04, 0xb8, 0x21, 0x55, 0x83, 0x1a, 0x15, 0x6d, + 0x0d, 0x41, 0xb9, 0x54, 0x63, 0x7b, 0x6c, 0x56, 0xb1, 0x77, 0xdd, 0x9d, 0xb1, 0x45, 0x38, 0x71, + 0xe2, 0x2b, 0xf0, 0x29, 0xf8, 0x0a, 0x9c, 0x7b, 0xe4, 0x88, 0x38, 0x20, 0x9a, 0x4f, 0x82, 0xe6, + 0xcf, 0xda, 0x5e, 0xff, 0x61, 0xd7, 0xa1, 0xb7, 0x99, 0xf1, 0xfb, 0xbd, 0xff, 0xbf, 0xf7, 0xd6, + 0xf0, 0x74, 0xe0, 0xf3, 0x1f, 0x26, 0x1d, 0xb7, 0x1b, 0x8e, 0x1a, 0xdd, 0x30, 0xe0, 0xc4, 0x0f, + 0x68, 0xd4, 0x5b, 0x3c, 0x92, 0xb1, 0xdf, 0x60, 0x34, 0x9a, 0xfa, 0x5d, 0xca, 0xe4, 0x3b, 0x0d, + 0x78, 0x63, 0x7a, 0x2f, 0x3e, 0xba, 0xe3, 0x28, 0xe4, 0x21, 0xae, 0xce, 0x11, 0x6e, 0x2c, 0xed, + 0xc6, 0x22, 0xd3, 0x7b, 0x76, 0x79, 0x10, 0x0e, 0x42, 0x29, 0xda, 0x10, 0x27, 0x85, 0xb2, 0x6b, + 0x83, 0x30, 0x1c, 0x0c, 0x69, 0x43, 0xde, 0x3a, 0x93, 0x7e, 0xa3, 0xef, 0xd3, 0x61, 0xef, 0xd5, + 0x88, 0xb0, 0x4b, 0x2d, 0xf1, 0xfe, 0xb2, 0x04, 0xf7, 0x47, 0x94, 0x71, 0x32, 0x1a, 0x6b, 0x81, + 0xf7, 0x96, 0x05, 0xe8, 0x68, 0xcc, 0xaf, 0xd4, 0x8f, 0xce, 0x6f, 0x06, 0xe4, 0x4e, 0x83, 0x7e, + 0x88, 0x6f, 0x83, 0xd5, 0xf3, 0x07, 0x94, 0xf1, 0x0a, 0xaa, 0xa1, 0x7a, 0xc1, 0xd3, 0x37, 0x8c, + 0x21, 0xc7, 0xfc, 0x9f, 0x68, 0xc5, 0xa8, 0xa1, 0xba, 0xe9, 0xc9, 0x33, 0x7e, 0x04, 0xd0, 0x8d, + 0x28, 0xe1, 0xb4, 0xf7, 0x8a, 0xf0, 0x8a, 0x59, 0x43, 0xf5, 0x62, 0xd3, 0x76, 0x95, 0x19, 0x37, + 0x36, 0xe3, 0xb6, 0x63, 0x3f, 0xbc, 0x82, 0x96, 0x6e, 0x71, 0x01, 0x9d, 0x8c, 0x7b, 0x31, 0x34, + 0x97, 0x0e, 0xd5, 0xd2, 0x2d, 0x8e, 0x9f, 0x81, 0x35, 0x24, 0x1d, 0x3a, 0x64, 0x95, 0x7c, 0xcd, + 0xac, 0x17, 0x9b, 0x47, 0xee, 0x7f, 0x67, 0xd4, 0x15, 0x71, 0xb9, 0xcf, 0x25, 0xe4, 0x24, 0xe0, + 0xd1, 0x95, 0xa7, 0xf1, 0xf6, 0x23, 0x28, 0x2e, 0x3c, 0xe3, 0x12, 0x98, 0x97, 0xf4, 0x4a, 0xc7, + 0x2d, 0x8e, 0xb8, 0x0c, 0xf9, 0x29, 0x19, 0x4e, 0x54, 0xd4, 0x05, 0x4f, 0x5d, 0x3e, 0x33, 0x1e, + 0x22, 0xe7, 0x23, 0x28, 0x0a, 0xb5, 0x1e, 0x7d, 0x3d, 0x11, 0xd9, 0xd9, 0x90, 0x35, 0xe7, 0x19, + 0xec, 0x2b, 0x31, 0x36, 0x0e, 0x03, 0x46, 0xf1, 0x43, 0xc8, 0xf9, 0x41, 0x3f, 0x94, 0x52, 0xc5, + 0xe6, 0x87, 0x59, 0x3c, 0xf7, 0x24, 0xc2, 0xf9, 0x05, 0xc1, 0xad, 0x6f, 0x65, 0x0e, 0x62, 0x9b, + 0x37, 0xd6, 0x85, 0x1f, 0x43, 0x51, 0xa5, 0x53, 0xf6, 0x8f, 0x0c, 0x6e, 0x5d, 0xf6, 0x9f, 0x8a, + 0x16, 0x3b, 0x23, 0xec, 0xd2, 0xd3, 0xb5, 0x12, 0x67, 0xe7, 0x6b, 0x38, 0x88, 0xfd, 0xf8, 0xdf, + 0x41, 0xb9, 0x80, 0x9f, 0xfb, 0x8c, 0x1f, 0xab, 0x1f, 0xe3, 0xc0, 0x2a, 0xb0, 0xdb, 0xf7, 0x87, + 0x9c, 0x46, 0xac, 0x82, 0x6a, 0x66, 0xbd, 0xe0, 0xc5, 0x57, 0xe7, 0x05, 0x1c, 0x26, 0xe4, 0x57, + 0x1c, 0x30, 0xb7, 0x76, 0xa0, 0xfc, 0x15, 0x1d, 0x52, 0x4e, 0x97, 0x5c, 0xd8, 0x54, 0xcf, 0xef, + 0x01, 0x7b, 0x94, 0xf4, 0xb2, 0x49, 0x8b, 0xf7, 0xb0, 0xdf, 0x67, 0x94, 0x6b, 0xd6, 0xe8, 0xdb, + 0x8c, 0x4b, 0xe6, 0x9c, 0x4b, 0x4e, 0x0b, 0x0e, 0x13, 0x9a, 0x75, 0x68, 0x73, 0x15, 0x68, 0x59, + 0x45, 0x8f, 0x70, 0x22, 0x15, 0xef, 0x7b, 0xf2, 0xec, 0xfc, 0x85, 0xc0, 0x7a, 0xc9, 0x09, 0x9f, + 0x30, 0x41, 0x2f, 0xc6, 0x49, 0xa4, 0xe9, 0x85, 0xd2, 0xe9, 0xa5, 0xa5, 0x57, 0x98, 0x69, 0x6c, + 0xc3, 0xcc, 0x12, 0x98, 0x11, 0xed, 0xcb, 0xb0, 0x0a, 0x9e, 0x38, 0x2e, 0xb8, 0x9f, 0x4b, 0xb8, + 0x5f, 0x86, 0x3c, 0x0f, 0x39, 0x19, 0x56, 0xf2, 0xf2, 0x59, 0x5d, 0xb0, 0x0d, 0x7b, 0xf4, 0xc7, + 0x31, 0xed, 0x72, 0xda, 0xab, 0x58, 0x52, 0xc9, 0xec, 0xee, 0x7c, 0x00, 0xb7, 0x54, 0x6c, 0x71, + 0xd2, 0xb5, 0x31, 0x34, 0x33, 0xe6, 0x7c, 0x03, 0x07, 0xb1, 0x88, 0xce, 0xde, 0xe7, 0x60, 0x31, + 0xf9, 0xa2, 0x53, 0xf0, 0x71, 0x5a, 0x6b, 0x68, 0xbc, 0x46, 0x39, 0x0d, 0xd5, 0x6f, 0xea, 0x95, + 0xb2, 0xf4, 0x06, 0xbd, 0x80, 0x72, 0x12, 0xa0, 0x1d, 0x79, 0x02, 0x7b, 0x4c, 0xbf, 0xe9, 0x2e, + 0xcd, 0xea, 0xca, 0x0c, 0xe7, 0xfc, 0x6d, 0xc0, 0xe1, 0x79, 0xe4, 0xaf, 0xf4, 0xea, 0x31, 0x58, + 0xa4, 0xcb, 0xfd, 0x30, 0x90, 0x41, 0x1e, 0x34, 0xef, 0xa4, 0x69, 0x96, 0x4a, 0x5a, 0x12, 0xe2, + 0x69, 0x68, 0x9c, 0x4d, 0x63, 0x5e, 0xba, 0x59, 0x89, 0xcc, 0x4d, 0x25, 0xca, 0x25, 0x4b, 0xb4, + 0x50, 0xec, 0xfc, 0xda, 0x5e, 0xb5, 0xe6, 0xbd, 0x8a, 0xcf, 0x67, 0x43, 0x7c, 0x57, 0xa6, 0xe3, + 0x8b, 0x4c, 0x4e, 0x27, 0x23, 0x7f, 0xd7, 0x33, 0xfd, 0x57, 0x03, 0xca, 0x49, 0x33, 0xba, 0x7a, + 0xef, 0x24, 0xc3, 0x49, 0x4a, 0x1a, 0x37, 0xa7, 0xa4, 0xb9, 0x0d, 0x25, 0xb7, 0x23, 0xe0, 0x7c, + 0x90, 0x59, 0x89, 0xb1, 0x57, 0x83, 0xfd, 0x56, 0x27, 0x8c, 0xf8, 0x46, 0xee, 0x7d, 0xe2, 0x42, + 0x71, 0x21, 0x68, 0xbc, 0x07, 0xb9, 0x97, 0xed, 0x56, 0xbb, 0xb4, 0x83, 0x0b, 0x90, 0x3f, 0xf7, + 0x4e, 0xdb, 0x27, 0x25, 0x84, 0x01, 0xac, 0xe3, 0x17, 0x67, 0x67, 0xa7, 0xed, 0x92, 0xd1, 0xfc, + 0x7d, 0x17, 0x76, 0x75, 0x9a, 0x31, 0xd1, 0x9f, 0x1e, 0x77, 0x32, 0x0d, 0x6e, 0xe5, 0x82, 0xfd, + 0x69, 0x36, 0x61, 0x5d, 0xc1, 0x01, 0x58, 0x6a, 0x69, 0xe1, 0xbb, 0x69, 0xb8, 0xc4, 0x92, 0xb5, + 0xdd, 0xac, 0xe2, 0xda, 0xd0, 0x6b, 0xc8, 0x89, 0x01, 0x80, 0x9b, 0x69, 0xb8, 0xd5, 0xbd, 0x67, + 0xdf, 0xdf, 0x0a, 0xa3, 0x0c, 0x1e, 0x21, 0xfc, 0x1d, 0x58, 0x6a, 0x87, 0xe1, 0x07, 0x69, 0x0a, + 0xd6, 0xed, 0x3a, 0xfb, 0xf6, 0x4a, 0x27, 0x9d, 0x88, 0x0f, 0x43, 0x11, 0x8a, 0xd8, 0x48, 0xe9, + 0xa1, 0xac, 0x6e, 0xc4, 0xf4, 0x50, 0xd6, 0xec, 0xba, 0x23, 0x24, 0xca, 0xa4, 0x17, 0xd8, 0xdd, + 0x8c, 0xe3, 0x31, 0x6b, 0x99, 0x96, 0x16, 0xc3, 0x15, 0xec, 0x2f, 0xce, 0x69, 0x9c, 0x29, 0xf5, + 0x4b, 0x6b, 0xc0, 0x7e, 0xb0, 0x1d, 0x48, 0x9b, 0x9e, 0x42, 0x5e, 0x32, 0x25, 0xdd, 0xe6, 0x9a, + 0x91, 0x97, 0x6e, 0x73, 0xdd, 0x00, 0xab, 0xa3, 0x23, 0x84, 0xcf, 0x20, 0x2f, 0x39, 0x8c, 0x53, + 0x99, 0xb3, 0x48, 0xf5, 0x4d, 0xdd, 0xf1, 0xe4, 0xe2, 0xcd, 0xdb, 0xea, 0xce, 0x9f, 0x6f, 0xab, + 0x3b, 0x3f, 0x5f, 0x57, 0xd1, 0x9b, 0xeb, 0x2a, 0xfa, 0xe3, 0xba, 0x8a, 0xfe, 0xb9, 0xae, 0xa2, + 0x8b, 0x2f, 0x6f, 0xfa, 0x47, 0xe9, 0xb1, 0x3e, 0x76, 0x2c, 0x69, 0xeb, 0xfe, 0xbf, 0x01, 0x00, + 0x00, 0xff, 0xff, 0x25, 0xc9, 0x15, 0xb2, 0x73, 0x0d, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1678,16 +1678,18 @@ func (m *InfoResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } - { - size, err := m.Info.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if m.Info != nil { + { + size, err := m.Info.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintContent(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintContent(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0xa } - i-- - dAtA[i] = 0xa return len(dAtA) - i, nil } @@ -1727,16 +1729,18 @@ func (m *UpdateRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x12 } - { - size, err := m.Info.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if m.Info != nil { + { + size, err := m.Info.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintContent(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintContent(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0xa } - i-- - dAtA[i] = 0xa return len(dAtA) - i, nil } @@ -1764,16 +1768,18 @@ func (m *UpdateResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } - { - size, err := m.Info.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if m.Info != nil { + { + size, err := m.Info.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintContent(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintContent(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0xa } - i-- - dAtA[i] = 0xa return len(dAtA) - i, nil } @@ -2453,8 +2459,10 @@ func (m *InfoResponse) Size() (n int) { } var l int _ = l - l = m.Info.Size() - n += 1 + l + sovContent(uint64(l)) + if m.Info != nil { + l = m.Info.Size() + n += 1 + l + sovContent(uint64(l)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -2467,8 +2475,10 @@ func (m *UpdateRequest) Size() (n int) { } var l int _ = l - l = m.Info.Size() - n += 1 + l + sovContent(uint64(l)) + if m.Info != nil { + l = m.Info.Size() + n += 1 + l + sovContent(uint64(l)) + } if m.UpdateMask != nil { l = m.UpdateMask.Size() n += 1 + l + sovContent(uint64(l)) @@ -2485,8 +2495,10 @@ func (m *UpdateResponse) Size() (n int) { } var l int _ = l - l = m.Info.Size() - n += 1 + l + sovContent(uint64(l)) + if m.Info != nil { + l = m.Info.Size() + n += 1 + l + sovContent(uint64(l)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -2825,7 +2837,7 @@ func (this *InfoResponse) String() string { return "nil" } s := strings.Join([]string{`&InfoResponse{`, - `Info:` + strings.Replace(strings.Replace(this.Info.String(), "Info", "Info", 1), `&`, ``, 1) + `,`, + `Info:` + strings.Replace(this.Info.String(), "Info", "Info", 1) + `,`, `XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`, `}`, }, "") @@ -2836,7 +2848,7 @@ func (this *UpdateRequest) String() string { return "nil" } s := strings.Join([]string{`&UpdateRequest{`, - `Info:` + strings.Replace(strings.Replace(this.Info.String(), "Info", "Info", 1), `&`, ``, 1) + `,`, + `Info:` + strings.Replace(this.Info.String(), "Info", "Info", 1) + `,`, `UpdateMask:` + strings.Replace(fmt.Sprintf("%v", this.UpdateMask), "FieldMask", "types.FieldMask", 1) + `,`, `XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`, `}`, @@ -2848,7 +2860,7 @@ func (this *UpdateResponse) String() string { return "nil" } s := strings.Join([]string{`&UpdateResponse{`, - `Info:` + strings.Replace(strings.Replace(this.Info.String(), "Info", "Info", 1), `&`, ``, 1) + `,`, + `Info:` + strings.Replace(this.Info.String(), "Info", "Info", 1) + `,`, `XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`, `}`, }, "") @@ -2869,9 +2881,9 @@ func (this *ListContentResponse) String() string { if this == nil { return "nil" } - repeatedStringForInfo := "[]Info{" + repeatedStringForInfo := "[]*Info{" for _, f := range this.Info { - repeatedStringForInfo += strings.Replace(strings.Replace(f.String(), "Info", "Info", 1), `&`, ``, 1) + "," + repeatedStringForInfo += strings.Replace(f.String(), "Info", "Info", 1) + "," } repeatedStringForInfo += "}" s := strings.Join([]string{`&ListContentResponse{`, @@ -2970,9 +2982,9 @@ func (this *ListStatusesResponse) String() string { if this == nil { return "nil" } - repeatedStringForStatuses := "[]Status{" + repeatedStringForStatuses := "[]*Status{" for _, f := range this.Statuses { - repeatedStringForStatuses += strings.Replace(strings.Replace(f.String(), "Status", "Status", 1), `&`, ``, 1) + "," + repeatedStringForStatuses += strings.Replace(f.String(), "Status", "Status", 1) + "," } repeatedStringForStatuses += "}" s := strings.Join([]string{`&ListStatusesResponse{`, @@ -3486,6 +3498,9 @@ func (m *InfoResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } + if m.Info == nil { + m.Info = &Info{} + } if err := m.Info.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -3570,6 +3585,9 @@ func (m *UpdateRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } + if m.Info == nil { + m.Info = &Info{} + } if err := m.Info.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -3690,6 +3708,9 @@ func (m *UpdateResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } + if m.Info == nil { + m.Info = &Info{} + } if err := m.Info.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -3857,7 +3878,7 @@ func (m *ListContentResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Info = append(m.Info, Info{}) + m.Info = append(m.Info, &Info{}) if err := m.Info[len(m.Info)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -4728,7 +4749,7 @@ func (m *ListStatusesResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Statuses = append(m.Statuses, Status{}) + m.Statuses = append(m.Statuses, &Status{}) if err := m.Statuses[len(m.Statuses)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/api/services/content/v1/content.proto b/api/services/content/v1/content.proto index 405f14e8a..47fc36430 100644 --- a/api/services/content/v1/content.proto +++ b/api/services/content/v1/content.proto @@ -114,11 +114,11 @@ message InfoRequest { } message InfoResponse { - Info info = 1 [(gogoproto.nullable) = false]; + Info info = 1; } message UpdateRequest { - Info info = 1 [(gogoproto.nullable) = false]; + Info info = 1; // UpdateMask specifies which fields to perform the update on. If empty, // the operation applies to all fields. @@ -130,7 +130,7 @@ message UpdateRequest { } message UpdateResponse { - Info info = 1 [(gogoproto.nullable) = false]; + Info info = 1; } message ListContentRequest { @@ -148,7 +148,7 @@ message ListContentRequest { } message ListContentResponse { - repeated Info info = 1 [(gogoproto.nullable) = false]; + repeated Info info = 1; } message DeleteContentRequest { @@ -201,7 +201,7 @@ message ListStatusesRequest { } message ListStatusesResponse { - repeated Status statuses = 1 [(gogoproto.nullable) = false]; + repeated Status statuses = 1; } // WriteAction defines the behavior of a WriteRequest. diff --git a/api/services/images/v1/images.pb.go b/api/services/images/v1/images.pb.go index e310c8fdb..36477ec00 100644 --- a/api/services/images/v1/images.pb.go +++ b/api/services/images/v1/images.pb.go @@ -44,7 +44,7 @@ type Image struct { // The combined size of a key/value pair cannot exceed 4096 bytes. Labels map[string]string `protobuf:"bytes,2,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Target describes the content entry point of the image. - Target types.Descriptor `protobuf:"bytes,3,opt,name=target,proto3" json:"target"` + Target *types.Descriptor `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"` // CreatedAt is the time the image was first created. CreatedAt *types1.Timestamp `protobuf:"bytes,7,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"` // UpdatedAt is the last time the image was mutated. @@ -165,7 +165,7 @@ func (m *GetImageResponse) XXX_DiscardUnknown() { var xxx_messageInfo_GetImageResponse proto.InternalMessageInfo type CreateImageRequest struct { - Image Image `protobuf:"bytes,1,opt,name=image,proto3" json:"image"` + Image *Image `protobuf:"bytes,1,opt,name=image,proto3" json:"image,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -204,7 +204,7 @@ func (m *CreateImageRequest) XXX_DiscardUnknown() { var xxx_messageInfo_CreateImageRequest proto.InternalMessageInfo type CreateImageResponse struct { - Image Image `protobuf:"bytes,1,opt,name=image,proto3" json:"image"` + Image *Image `protobuf:"bytes,1,opt,name=image,proto3" json:"image,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -246,7 +246,7 @@ type UpdateImageRequest struct { // Image provides a full or partial image for update. // // The name field must be set or an error will be returned. - Image Image `protobuf:"bytes,1,opt,name=image,proto3" json:"image"` + Image *Image `protobuf:"bytes,1,opt,name=image,proto3" json:"image,omitempty"` // UpdateMask specifies which fields to perform the update on. If empty, // the operation applies to all fields. UpdateMask *types1.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"` @@ -288,7 +288,7 @@ func (m *UpdateImageRequest) XXX_DiscardUnknown() { var xxx_messageInfo_UpdateImageRequest proto.InternalMessageInfo type UpdateImageResponse struct { - Image Image `protobuf:"bytes,1,opt,name=image,proto3" json:"image"` + Image *Image `protobuf:"bytes,1,opt,name=image,proto3" json:"image,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -376,7 +376,7 @@ func (m *ListImagesRequest) XXX_DiscardUnknown() { var xxx_messageInfo_ListImagesRequest proto.InternalMessageInfo type ListImagesResponse struct { - Images []Image `protobuf:"bytes,1,rep,name=images,proto3" json:"images"` + Images []*Image `protobuf:"bytes,1,rep,name=images,proto3" json:"images,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -477,48 +477,47 @@ func init() { } var fileDescriptor_8666fa071128ae5f = []byte{ - // 647 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0x4d, 0x6f, 0xd3, 0x40, - 0x10, 0xad, 0x93, 0xd4, 0x6d, 0x27, 0x07, 0xca, 0x52, 0x21, 0xcb, 0x40, 0x1a, 0x45, 0x20, 0xe5, - 0xc2, 0x9a, 0x86, 0x0b, 0x6d, 0x11, 0xa2, 0xa5, 0xa5, 0x20, 0x15, 0x0e, 0xe6, 0xab, 0xe2, 0x52, - 0x6d, 0x92, 0x89, 0xb1, 0x62, 0xc7, 0xc6, 0xbb, 0x89, 0x94, 0x1b, 0xff, 0x01, 0x7e, 0x54, 0x8f, - 0x88, 0x13, 0x27, 0x44, 0xf3, 0x4b, 0x90, 0x77, 0xd7, 0x34, 0x4d, 0x22, 0xdc, 0x94, 0xde, 0x66, - 0xed, 0xf7, 0x66, 0xde, 0xbc, 0xd9, 0xb1, 0x61, 0xcf, 0xf3, 0xc5, 0xa7, 0x7e, 0x93, 0xb6, 0xa2, - 0xd0, 0x69, 0x45, 0x3d, 0xc1, 0xfc, 0x1e, 0x26, 0xed, 0xf1, 0x90, 0xc5, 0xbe, 0xc3, 0x31, 0x19, - 0xf8, 0x2d, 0xe4, 0x8e, 0x1f, 0x32, 0x0f, 0xb9, 0x33, 0xd8, 0xd0, 0x11, 0x8d, 0x93, 0x48, 0x44, - 0xe4, 0xce, 0x19, 0x9e, 0x66, 0x58, 0xaa, 0x11, 0x83, 0x0d, 0x7b, 0xcd, 0x8b, 0xbc, 0x48, 0x22, - 0x9d, 0x34, 0x52, 0x24, 0xfb, 0x96, 0x17, 0x45, 0x5e, 0x80, 0x8e, 0x3c, 0x35, 0xfb, 0x1d, 0x07, - 0xc3, 0x58, 0x0c, 0xf5, 0xcb, 0xea, 0xe4, 0xcb, 0x8e, 0x8f, 0x41, 0xfb, 0x38, 0x64, 0xbc, 0xab, - 0x11, 0xeb, 0x93, 0x08, 0xe1, 0x87, 0xc8, 0x05, 0x0b, 0x63, 0x0d, 0xd8, 0xbe, 0x50, 0x6b, 0x62, - 0x18, 0x23, 0x77, 0xda, 0xc8, 0x5b, 0x89, 0x1f, 0x8b, 0x28, 0x51, 0xe4, 0xda, 0x8f, 0x02, 0x2c, - 0xbe, 0x4c, 0x1b, 0x20, 0x04, 0x4a, 0x3d, 0x16, 0xa2, 0x65, 0x54, 0x8d, 0xfa, 0x8a, 0x2b, 0x63, - 0xf2, 0x02, 0xcc, 0x80, 0x35, 0x31, 0xe0, 0x56, 0xa1, 0x5a, 0xac, 0x97, 0x1b, 0x0f, 0xe8, 0x3f, - 0x0d, 0xa0, 0x32, 0x13, 0x3d, 0x94, 0x94, 0xfd, 0x9e, 0x48, 0x86, 0xae, 0xe6, 0x93, 0x2d, 0x30, - 0x05, 0x4b, 0x3c, 0x14, 0x56, 0xb1, 0x6a, 0xd4, 0xcb, 0x8d, 0xdb, 0xe3, 0x99, 0xa4, 0x36, 0xba, - 0xf7, 0x57, 0xdb, 0x6e, 0xe9, 0xe4, 0xd7, 0xfa, 0x82, 0xab, 0x19, 0x64, 0x13, 0xa0, 0x95, 0x20, - 0x13, 0xd8, 0x3e, 0x66, 0xc2, 0x5a, 0x92, 0x7c, 0x9b, 0x2a, 0x5b, 0x68, 0x66, 0x0b, 0x7d, 0x9b, - 0xd9, 0xe2, 0xae, 0x68, 0xf4, 0x8e, 0xa4, 0xf6, 0xe3, 0x76, 0x46, 0x5d, 0xce, 0xa7, 0x6a, 0xf4, - 0x8e, 0xb0, 0x37, 0xa1, 0x3c, 0xd6, 0x08, 0x59, 0x85, 0x62, 0x17, 0x87, 0xda, 0x9d, 0x34, 0x24, - 0x6b, 0xb0, 0x38, 0x60, 0x41, 0x1f, 0xad, 0x82, 0x7c, 0xa6, 0x0e, 0x5b, 0x85, 0x47, 0x46, 0xed, - 0x1e, 0x5c, 0x3b, 0x40, 0x21, 0xcd, 0x70, 0xf1, 0x73, 0x1f, 0xb9, 0x98, 0xe5, 0x6e, 0xed, 0x35, - 0xac, 0x9e, 0xc1, 0x78, 0x1c, 0xf5, 0x38, 0x92, 0x2d, 0x58, 0x94, 0x76, 0x4a, 0x60, 0xb9, 0x71, - 0xf7, 0x22, 0x86, 0xbb, 0x8a, 0x52, 0x7b, 0x0f, 0xe4, 0x99, 0xec, 0xfc, 0x5c, 0xe5, 0xa7, 0x97, - 0xc8, 0xa8, 0x07, 0xa0, 0xf3, 0x7e, 0x80, 0x1b, 0xe7, 0xf2, 0x6a, 0xa9, 0xff, 0x9f, 0xf8, 0xab, - 0x01, 0xe4, 0x9d, 0x34, 0xfc, 0x6a, 0x15, 0x93, 0x6d, 0x28, 0xab, 0x41, 0xca, 0x45, 0x92, 0x03, - 0x9a, 0x35, 0xf7, 0xe7, 0xe9, 0xae, 0xbd, 0x62, 0xbc, 0xeb, 0xea, 0x5b, 0x92, 0xc6, 0x69, 0xbb, - 0xe7, 0x44, 0x5d, 0x59, 0xbb, 0xf7, 0xe1, 0xfa, 0xa1, 0xcf, 0xd5, 0xc0, 0x79, 0xd6, 0xac, 0x05, - 0x4b, 0x1d, 0x3f, 0x10, 0x98, 0x70, 0xcb, 0xa8, 0x16, 0xeb, 0x2b, 0x6e, 0x76, 0xac, 0x1d, 0x01, - 0x19, 0x87, 0x6b, 0x19, 0xbb, 0x60, 0xaa, 0x22, 0x12, 0x3e, 0x9f, 0x0e, 0xcd, 0xac, 0x3d, 0x06, - 0xb2, 0x87, 0x01, 0x4e, 0xd8, 0x3e, 0xeb, 0x03, 0x40, 0xa0, 0xc4, 0x87, 0xbd, 0x96, 0x74, 0x70, - 0xd9, 0x95, 0x71, 0xe3, 0x5b, 0x09, 0x4c, 0x25, 0x8a, 0x74, 0xa0, 0x78, 0x80, 0x82, 0xd0, 0x1c, - 0x0d, 0x13, 0xcb, 0x60, 0x3b, 0x17, 0xc6, 0xeb, 0xa6, 0xbb, 0x50, 0x4a, 0xad, 0x20, 0x79, 0xdf, - 0x9f, 0x29, 0x7b, 0xed, 0x8d, 0x39, 0x18, 0xba, 0x58, 0x04, 0xa6, 0xba, 0xee, 0x24, 0x8f, 0x3c, - 0xbd, 0x6d, 0x76, 0x63, 0x1e, 0xca, 0x59, 0x41, 0x75, 0xe1, 0x72, 0x0b, 0x4e, 0x2f, 0x4b, 0x6e, - 0xc1, 0x59, 0x57, 0xf9, 0x0d, 0x98, 0x6a, 0xfe, 0xb9, 0x05, 0xa7, 0xaf, 0x89, 0x7d, 0x73, 0x6a, - 0x8d, 0xf6, 0xd3, 0xff, 0xd9, 0xee, 0xd1, 0xc9, 0x69, 0x65, 0xe1, 0xe7, 0x69, 0x65, 0xe1, 0xcb, - 0xa8, 0x62, 0x9c, 0x8c, 0x2a, 0xc6, 0xf7, 0x51, 0xc5, 0xf8, 0x3d, 0xaa, 0x18, 0x1f, 0x9f, 0x5c, - 0xf2, 0xdf, 0xbb, 0xad, 0xa2, 0xa6, 0x29, 0x2b, 0x3d, 0xfc, 0x13, 0x00, 0x00, 0xff, 0xff, 0xa2, - 0xd0, 0x9c, 0x61, 0xc4, 0x07, 0x00, 0x00, + // 634 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0xcd, 0x6e, 0xd3, 0x40, + 0x10, 0xae, 0x93, 0xd4, 0x6d, 0x27, 0x07, 0xca, 0x52, 0x21, 0xcb, 0x40, 0x88, 0x22, 0x90, 0x72, + 0x61, 0x4d, 0x03, 0x07, 0xfa, 0x23, 0xa4, 0x42, 0x4b, 0x41, 0x2a, 0x08, 0x0c, 0x48, 0x88, 0x4b, + 0xb5, 0x49, 0x26, 0xc6, 0x8a, 0xff, 0xf0, 0x6e, 0x22, 0xe5, 0xc6, 0x0b, 0x70, 0xe3, 0xa1, 0x7a, + 0xe0, 0xc0, 0x91, 0x23, 0xcd, 0x93, 0x20, 0xef, 0xae, 0x69, 0x9a, 0x44, 0x38, 0x85, 0xde, 0x66, + 0xbd, 0xdf, 0x37, 0x3f, 0xdf, 0xcc, 0x78, 0x61, 0xdf, 0xf3, 0xc5, 0xa7, 0x41, 0x9b, 0x76, 0xe2, + 0xd0, 0xe9, 0xc4, 0x91, 0x60, 0x7e, 0x84, 0x69, 0x77, 0xd2, 0x64, 0x89, 0xef, 0x70, 0x4c, 0x87, + 0x7e, 0x07, 0xb9, 0xe3, 0x87, 0xcc, 0x43, 0xee, 0x0c, 0x37, 0xb5, 0x45, 0x93, 0x34, 0x16, 0x31, + 0xb9, 0x75, 0x86, 0xa7, 0x39, 0x96, 0x6a, 0xc4, 0x70, 0xd3, 0xde, 0xf0, 0x62, 0x2f, 0x96, 0x48, + 0x27, 0xb3, 0x14, 0xc9, 0xbe, 0xe1, 0xc5, 0xb1, 0x17, 0xa0, 0x23, 0x4f, 0xed, 0x41, 0xcf, 0xc1, + 0x30, 0x11, 0x23, 0x7d, 0x59, 0x9f, 0xbe, 0xec, 0xf9, 0x18, 0x74, 0x8f, 0x43, 0xc6, 0xfb, 0x1a, + 0x71, 0x7b, 0x1a, 0x21, 0xfc, 0x10, 0xb9, 0x60, 0x61, 0xa2, 0x01, 0x3b, 0x0b, 0x95, 0x26, 0x46, + 0x09, 0x72, 0xa7, 0x8b, 0xbc, 0x93, 0xfa, 0x89, 0x88, 0x53, 0x45, 0x6e, 0x7c, 0x2f, 0xc1, 0xf2, + 0x8b, 0xac, 0x00, 0x42, 0xa0, 0x12, 0xb1, 0x10, 0x2d, 0xa3, 0x6e, 0x34, 0xd7, 0x5c, 0x69, 0x93, + 0xe7, 0x60, 0x06, 0xac, 0x8d, 0x01, 0xb7, 0x4a, 0xf5, 0x72, 0xb3, 0xda, 0xba, 0x4f, 0xff, 0x2a, + 0x00, 0x95, 0x9e, 0xe8, 0x91, 0xa4, 0x1c, 0x44, 0x22, 0x1d, 0xb9, 0x9a, 0x4f, 0x1e, 0x82, 0x29, + 0x58, 0xea, 0xa1, 0xb0, 0xca, 0x75, 0xa3, 0x59, 0x6d, 0xdd, 0x9c, 0xf4, 0x24, 0x73, 0xa3, 0xfb, + 0x7f, 0x72, 0x73, 0x35, 0x96, 0x6c, 0x01, 0x74, 0x52, 0x64, 0x02, 0xbb, 0xc7, 0x4c, 0x58, 0x2b, + 0x92, 0x69, 0x53, 0x25, 0x08, 0xcd, 0x05, 0xa1, 0xef, 0x72, 0x41, 0xdc, 0x35, 0x8d, 0xde, 0x93, + 0xd4, 0x41, 0xd2, 0xcd, 0xa9, 0xab, 0xc5, 0x54, 0x8d, 0xde, 0x13, 0xf6, 0x16, 0x54, 0x27, 0x4a, + 0x20, 0xeb, 0x50, 0xee, 0xe3, 0x48, 0xeb, 0x92, 0x99, 0x64, 0x03, 0x96, 0x87, 0x2c, 0x18, 0xa0, + 0x55, 0x92, 0xdf, 0xd4, 0x61, 0xbb, 0xf4, 0xc8, 0x68, 0xdc, 0x85, 0x2b, 0x87, 0x28, 0xa4, 0x0c, + 0x2e, 0x7e, 0x1e, 0x20, 0x17, 0xf3, 0x74, 0x6d, 0xbc, 0x82, 0xf5, 0x33, 0x18, 0x4f, 0xe2, 0x88, + 0x23, 0xd9, 0x86, 0x65, 0x29, 0xa4, 0x04, 0x56, 0x5b, 0x77, 0x16, 0x91, 0xda, 0x55, 0x94, 0xc6, + 0x6b, 0x20, 0x4f, 0x65, 0xe5, 0xe7, 0x22, 0xff, 0x8f, 0xc7, 0x37, 0x70, 0xed, 0x9c, 0xc7, 0x4b, + 0x48, 0xf2, 0xab, 0x01, 0xe4, 0xbd, 0x14, 0xf9, 0xb2, 0xb2, 0x24, 0x3b, 0x50, 0x55, 0x6d, 0x93, + 0x0b, 0x23, 0xdb, 0x31, 0xaf, 0xcb, 0xcf, 0xb2, 0x9d, 0x7a, 0xc9, 0x78, 0xdf, 0xd5, 0x33, 0x91, + 0xd9, 0x59, 0x89, 0xe7, 0xd2, 0xb9, 0x84, 0x12, 0xef, 0xc1, 0xd5, 0x23, 0x9f, 0xab, 0xc6, 0xf2, + 0xbc, 0x40, 0x0b, 0x56, 0x7a, 0x7e, 0x20, 0x30, 0xe5, 0x96, 0x51, 0x2f, 0x37, 0xd7, 0xdc, 0xfc, + 0xd8, 0x70, 0x81, 0x4c, 0xc2, 0x75, 0x02, 0xbb, 0x60, 0x2a, 0xf7, 0x12, 0xbe, 0x68, 0x06, 0x9a, + 0xd3, 0xd8, 0x05, 0xb2, 0x8f, 0x01, 0x4e, 0x89, 0x3c, 0x6f, 0xb9, 0x09, 0x54, 0xf8, 0x28, 0xea, + 0x48, 0xd5, 0x56, 0x5d, 0x69, 0xb7, 0xbe, 0x55, 0xc0, 0x54, 0xe9, 0x90, 0x1e, 0x94, 0x0f, 0x51, + 0x10, 0x5a, 0x10, 0x7d, 0x6a, 0xdc, 0x6d, 0x67, 0x61, 0xbc, 0x2e, 0xb7, 0x0f, 0x95, 0x4c, 0x04, + 0x52, 0xf4, 0x6f, 0x99, 0x11, 0xd6, 0xde, 0xbc, 0x00, 0x43, 0x07, 0x8b, 0xc1, 0x54, 0x63, 0x4d, + 0x8a, 0xc8, 0xb3, 0xfb, 0x64, 0xb7, 0x2e, 0x42, 0x39, 0x0b, 0xa8, 0x86, 0xac, 0x30, 0xe0, 0xec, + 0x6a, 0x14, 0x06, 0x9c, 0x37, 0xbe, 0x6f, 0xc1, 0x54, 0xfd, 0x2f, 0x0c, 0x38, 0x3b, 0x26, 0xf6, + 0xf5, 0x99, 0xd5, 0x39, 0xc8, 0xde, 0xaa, 0x27, 0x1f, 0x4e, 0x4e, 0x6b, 0x4b, 0x3f, 0x4f, 0x6b, + 0x4b, 0x5f, 0xc6, 0x35, 0xe3, 0x64, 0x5c, 0x33, 0x7e, 0x8c, 0x6b, 0xc6, 0xaf, 0x71, 0xcd, 0xf8, + 0xf8, 0xf8, 0x1f, 0xdf, 0xd5, 0x1d, 0x65, 0xb5, 0x4d, 0x19, 0xe9, 0xc1, 0xef, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xf8, 0xbf, 0x52, 0x9e, 0xa0, 0x07, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -809,16 +808,18 @@ func (m *Image) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x3a } - { - size, err := m.Target.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if m.Target != nil { + { + size, err := m.Target.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintImages(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintImages(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0x1a } - i-- - dAtA[i] = 0x1a if len(m.Labels) > 0 { for k := range m.Labels { v := m.Labels[k] @@ -945,16 +946,18 @@ func (m *CreateImageRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } - { - size, err := m.Image.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if m.Image != nil { + { + size, err := m.Image.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintImages(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintImages(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0xa } - i-- - dAtA[i] = 0xa return len(dAtA) - i, nil } @@ -982,16 +985,18 @@ func (m *CreateImageResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } - { - size, err := m.Image.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if m.Image != nil { + { + size, err := m.Image.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintImages(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintImages(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0xa } - i-- - dAtA[i] = 0xa return len(dAtA) - i, nil } @@ -1031,16 +1036,18 @@ func (m *UpdateImageRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x12 } - { - size, err := m.Image.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if m.Image != nil { + { + size, err := m.Image.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintImages(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintImages(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0xa } - i-- - dAtA[i] = 0xa return len(dAtA) - i, nil } @@ -1068,16 +1075,18 @@ func (m *UpdateImageResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } - { - size, err := m.Image.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if m.Image != nil { + { + size, err := m.Image.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintImages(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintImages(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0xa } - i-- - dAtA[i] = 0xa return len(dAtA) - i, nil } @@ -1231,8 +1240,10 @@ func (m *Image) Size() (n int) { n += mapEntrySize + 1 + sovImages(uint64(mapEntrySize)) } } - l = m.Target.Size() - n += 1 + l + sovImages(uint64(l)) + if m.Target != nil { + l = m.Target.Size() + n += 1 + l + sovImages(uint64(l)) + } if m.CreatedAt != nil { l = m.CreatedAt.Size() n += 1 + l + sovImages(uint64(l)) @@ -1285,8 +1296,10 @@ func (m *CreateImageRequest) Size() (n int) { } var l int _ = l - l = m.Image.Size() - n += 1 + l + sovImages(uint64(l)) + if m.Image != nil { + l = m.Image.Size() + n += 1 + l + sovImages(uint64(l)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -1299,8 +1312,10 @@ func (m *CreateImageResponse) Size() (n int) { } var l int _ = l - l = m.Image.Size() - n += 1 + l + sovImages(uint64(l)) + if m.Image != nil { + l = m.Image.Size() + n += 1 + l + sovImages(uint64(l)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -1313,8 +1328,10 @@ func (m *UpdateImageRequest) Size() (n int) { } var l int _ = l - l = m.Image.Size() - n += 1 + l + sovImages(uint64(l)) + if m.Image != nil { + l = m.Image.Size() + n += 1 + l + sovImages(uint64(l)) + } if m.UpdateMask != nil { l = m.UpdateMask.Size() n += 1 + l + sovImages(uint64(l)) @@ -1331,8 +1348,10 @@ func (m *UpdateImageResponse) Size() (n int) { } var l int _ = l - l = m.Image.Size() - n += 1 + l + sovImages(uint64(l)) + if m.Image != nil { + l = m.Image.Size() + n += 1 + l + sovImages(uint64(l)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -1417,7 +1436,7 @@ func (this *Image) String() string { s := strings.Join([]string{`&Image{`, `Name:` + fmt.Sprintf("%v", this.Name) + `,`, `Labels:` + mapStringForLabels + `,`, - `Target:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Target), "Descriptor", "types.Descriptor", 1), `&`, ``, 1) + `,`, + `Target:` + strings.Replace(fmt.Sprintf("%v", this.Target), "Descriptor", "types.Descriptor", 1) + `,`, `CreatedAt:` + strings.Replace(fmt.Sprintf("%v", this.CreatedAt), "Timestamp", "types1.Timestamp", 1) + `,`, `UpdatedAt:` + strings.Replace(fmt.Sprintf("%v", this.UpdatedAt), "Timestamp", "types1.Timestamp", 1) + `,`, `XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`, @@ -1452,7 +1471,7 @@ func (this *CreateImageRequest) String() string { return "nil" } s := strings.Join([]string{`&CreateImageRequest{`, - `Image:` + strings.Replace(strings.Replace(this.Image.String(), "Image", "Image", 1), `&`, ``, 1) + `,`, + `Image:` + strings.Replace(this.Image.String(), "Image", "Image", 1) + `,`, `XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`, `}`, }, "") @@ -1463,7 +1482,7 @@ func (this *CreateImageResponse) String() string { return "nil" } s := strings.Join([]string{`&CreateImageResponse{`, - `Image:` + strings.Replace(strings.Replace(this.Image.String(), "Image", "Image", 1), `&`, ``, 1) + `,`, + `Image:` + strings.Replace(this.Image.String(), "Image", "Image", 1) + `,`, `XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`, `}`, }, "") @@ -1474,7 +1493,7 @@ func (this *UpdateImageRequest) String() string { return "nil" } s := strings.Join([]string{`&UpdateImageRequest{`, - `Image:` + strings.Replace(strings.Replace(this.Image.String(), "Image", "Image", 1), `&`, ``, 1) + `,`, + `Image:` + strings.Replace(this.Image.String(), "Image", "Image", 1) + `,`, `UpdateMask:` + strings.Replace(fmt.Sprintf("%v", this.UpdateMask), "FieldMask", "types1.FieldMask", 1) + `,`, `XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`, `}`, @@ -1486,7 +1505,7 @@ func (this *UpdateImageResponse) String() string { return "nil" } s := strings.Join([]string{`&UpdateImageResponse{`, - `Image:` + strings.Replace(strings.Replace(this.Image.String(), "Image", "Image", 1), `&`, ``, 1) + `,`, + `Image:` + strings.Replace(this.Image.String(), "Image", "Image", 1) + `,`, `XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`, `}`, }, "") @@ -1507,9 +1526,9 @@ func (this *ListImagesResponse) String() string { if this == nil { return "nil" } - repeatedStringForImages := "[]Image{" + repeatedStringForImages := "[]*Image{" for _, f := range this.Images { - repeatedStringForImages += strings.Replace(strings.Replace(f.String(), "Image", "Image", 1), `&`, ``, 1) + "," + repeatedStringForImages += strings.Replace(f.String(), "Image", "Image", 1) + "," } repeatedStringForImages += "}" s := strings.Join([]string{`&ListImagesResponse{`, @@ -1756,6 +1775,9 @@ func (m *Image) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } + if m.Target == nil { + m.Target = &types.Descriptor{} + } if err := m.Target.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -2082,6 +2104,9 @@ func (m *CreateImageRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } + if m.Image == nil { + m.Image = &Image{} + } if err := m.Image.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -2166,6 +2191,9 @@ func (m *CreateImageResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } + if m.Image == nil { + m.Image = &Image{} + } if err := m.Image.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -2250,6 +2278,9 @@ func (m *UpdateImageRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } + if m.Image == nil { + m.Image = &Image{} + } if err := m.Image.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -2370,6 +2401,9 @@ func (m *UpdateImageResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } + if m.Image == nil { + m.Image = &Image{} + } if err := m.Image.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -2537,7 +2571,7 @@ func (m *ListImagesResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Images = append(m.Images, Image{}) + m.Images = append(m.Images, &Image{}) if err := m.Images[len(m.Images)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/api/services/images/v1/images.proto b/api/services/images/v1/images.proto index da1f7b652..752523c2d 100644 --- a/api/services/images/v1/images.proto +++ b/api/services/images/v1/images.proto @@ -71,7 +71,7 @@ message Image { map labels = 2; // Target describes the content entry point of the image. - containerd.types.Descriptor target = 3 [(gogoproto.nullable) = false]; + containerd.types.Descriptor target = 3; // CreatedAt is the time the image was first created. google.protobuf.Timestamp created_at = 7; @@ -89,18 +89,18 @@ message GetImageResponse { } message CreateImageRequest { - Image image = 1 [(gogoproto.nullable) = false]; + Image image = 1; } message CreateImageResponse { - Image image = 1 [(gogoproto.nullable) = false]; + Image image = 1; } message UpdateImageRequest { // Image provides a full or partial image for update. // // The name field must be set or an error will be returned. - Image image = 1 [(gogoproto.nullable) = false]; + Image image = 1; // UpdateMask specifies which fields to perform the update on. If empty, // the operation applies to all fields. @@ -108,7 +108,7 @@ message UpdateImageRequest { } message UpdateImageResponse { - Image image = 1 [(gogoproto.nullable) = false]; + Image image = 1; } message ListImagesRequest { @@ -126,7 +126,7 @@ message ListImagesRequest { } message ListImagesResponse { - repeated Image images = 1 [(gogoproto.nullable) = false]; + repeated Image images = 1; } message DeleteImageRequest { diff --git a/api/services/introspection/v1/introspection.pb.go b/api/services/introspection/v1/introspection.pb.go index b2332f2c3..b5358ace0 100644 --- a/api/services/introspection/v1/introspection.pb.go +++ b/api/services/introspection/v1/introspection.pb.go @@ -52,7 +52,7 @@ type Plugin struct { // // If the plugin prefers certain platforms over others, they should be // listed from most to least preferred. - Platforms []types.Platform `protobuf:"bytes,4,rep,name=platforms,proto3" json:"platforms"` + Platforms []*types.Platform `protobuf:"bytes,4,rep,name=platforms,proto3" json:"platforms,omitempty"` // Exports allows plugins to provide values about state or configuration to // interested parties. // @@ -158,10 +158,10 @@ func (m *PluginsRequest) XXX_DiscardUnknown() { var xxx_messageInfo_PluginsRequest proto.InternalMessageInfo type PluginsResponse struct { - Plugins []Plugin `protobuf:"bytes,1,rep,name=plugins,proto3" json:"plugins"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Plugins []*Plugin `protobuf:"bytes,1,rep,name=plugins,proto3" json:"plugins,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *PluginsResponse) Reset() { *m = PluginsResponse{} } @@ -248,42 +248,41 @@ func init() { } var fileDescriptor_1a14fda866f10715 = []byte{ - // 548 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0x41, 0x6f, 0xd3, 0x4c, - 0x10, 0xad, 0x9d, 0x34, 0x6e, 0x36, 0xfd, 0xfa, 0xa1, 0x55, 0x55, 0x2c, 0x83, 0x9c, 0x28, 0xe2, - 0x10, 0x21, 0x58, 0xab, 0x01, 0x24, 0x5a, 0x24, 0x0e, 0x51, 0x73, 0x88, 0xd4, 0x43, 0xe5, 0xa8, - 0x1c, 0xb8, 0x54, 0x8e, 0xb3, 0x31, 0x2b, 0x1c, 0xef, 0x76, 0x77, 0x6d, 0x91, 0x1b, 0x3f, 0x2f, - 0x47, 0x8e, 0x9c, 0x02, 0xf5, 0x6f, 0xe0, 0x07, 0x20, 0xef, 0xda, 0x69, 0x72, 0x4b, 0xc4, 0x6d, - 0xe6, 0xcd, 0xbc, 0x99, 0x37, 0xcf, 0x2b, 0x03, 0x3f, 0x22, 0xf2, 0x4b, 0x3a, 0x41, 0x21, 0x9d, - 0x7b, 0x21, 0x4d, 0x64, 0x40, 0x12, 0xcc, 0xa7, 0x9b, 0x61, 0xc0, 0x88, 0x27, 0x30, 0xcf, 0x48, - 0x88, 0x85, 0x47, 0x12, 0xc9, 0xa9, 0x60, 0x38, 0x94, 0x84, 0x26, 0x5e, 0x76, 0xbe, 0x0d, 0x20, - 0xc6, 0xa9, 0xa4, 0xf0, 0xc5, 0x23, 0x1b, 0x55, 0x4c, 0xb4, 0xdd, 0x98, 0x9d, 0x3b, 0x17, 0x3b, - 0x6d, 0x96, 0x0b, 0x86, 0x85, 0xc7, 0xe2, 0x40, 0xce, 0x28, 0x9f, 0xeb, 0x05, 0xce, 0xd3, 0x88, - 0xd2, 0x28, 0xc6, 0x1e, 0x67, 0xa1, 0x27, 0x64, 0x20, 0x53, 0x51, 0x16, 0x9e, 0x95, 0x05, 0x95, - 0x4d, 0xd2, 0x99, 0x87, 0xe7, 0x4c, 0x2e, 0xca, 0xe2, 0x69, 0x44, 0x23, 0xaa, 0x42, 0xaf, 0x88, - 0x34, 0xda, 0xfd, 0x63, 0x82, 0xc6, 0x4d, 0x9c, 0x46, 0x24, 0x81, 0x10, 0xd4, 0x8b, 0x75, 0xb6, - 0xd1, 0x31, 0x7a, 0x4d, 0x5f, 0xc5, 0xf0, 0x0c, 0x98, 0x64, 0x6a, 0x9b, 0x05, 0x32, 0x68, 0xe4, - 0xab, 0xb6, 0x39, 0xba, 0xf2, 0x4d, 0x32, 0x85, 0x0e, 0x38, 0xe2, 0xf8, 0x3e, 0x25, 0x1c, 0x0b, - 0xbb, 0xd6, 0xa9, 0xf5, 0x9a, 0xfe, 0x3a, 0x87, 0x1f, 0x41, 0xb3, 0x12, 0x2c, 0xec, 0x7a, 0xa7, - 0xd6, 0x6b, 0xf5, 0x1d, 0xb4, 0xe1, 0x89, 0xba, 0x09, 0xdd, 0x94, 0x2d, 0x83, 0xfa, 0x72, 0xd5, - 0x3e, 0xf0, 0x1f, 0x29, 0x70, 0x0c, 0x2c, 0xfc, 0x8d, 0x51, 0x2e, 0x85, 0x7d, 0xa8, 0xd8, 0x17, - 0x68, 0x17, 0x47, 0x91, 0x3e, 0x03, 0x0d, 0x35, 0x77, 0x98, 0x48, 0xbe, 0xf0, 0xab, 0x49, 0xb0, - 0x0b, 0x8e, 0xc3, 0x80, 0x05, 0x13, 0x12, 0x13, 0x49, 0xb0, 0xb0, 0x1b, 0x4a, 0xf4, 0x16, 0x06, - 0x5f, 0x83, 0x23, 0x92, 0x10, 0x79, 0x87, 0x39, 0xb7, 0xad, 0x8e, 0xd1, 0x6b, 0xf5, 0x21, 0xd2, - 0x8e, 0x22, 0xce, 0x42, 0x34, 0x56, 0x56, 0xfb, 0x56, 0xd1, 0x33, 0xe4, 0xdc, 0xb9, 0x04, 0xc7, - 0x9b, 0xbb, 0xe0, 0x13, 0x50, 0xfb, 0x8a, 0x17, 0xa5, 0x7d, 0x45, 0x08, 0x4f, 0xc1, 0x61, 0x16, - 0xc4, 0x29, 0xd6, 0x06, 0xfa, 0x3a, 0xb9, 0x34, 0xdf, 0x1b, 0xdd, 0x97, 0xe0, 0x44, 0xcb, 0x15, - 0x3e, 0xbe, 0x4f, 0xb1, 0x90, 0xd0, 0x06, 0xd6, 0x8c, 0xc4, 0x12, 0x73, 0x61, 0x1b, 0x4a, 0x5b, - 0x95, 0x76, 0xef, 0xc0, 0xff, 0xeb, 0x5e, 0xc1, 0x68, 0x22, 0x30, 0xbc, 0x06, 0x16, 0xd3, 0x90, - 0x6a, 0x6e, 0xf5, 0x5f, 0xed, 0x63, 0x51, 0x69, 0x79, 0x35, 0xa2, 0x8b, 0xc0, 0xc9, 0x18, 0xf3, - 0x0c, 0xf3, 0xf5, 0xfc, 0xe7, 0xa0, 0x9e, 0xa6, 0x64, 0xaa, 0x6f, 0x19, 0x1c, 0xe5, 0xab, 0x76, - 0xfd, 0xf6, 0x76, 0x74, 0xe5, 0x2b, 0xb4, 0xff, 0xcb, 0x00, 0xff, 0x8d, 0x36, 0x47, 0xc3, 0x0c, - 0x58, 0xa5, 0x44, 0xf8, 0x76, 0x1f, 0x25, 0xd5, 0xf5, 0xce, 0xbb, 0x3d, 0x59, 0xa5, 0xce, 0x4f, - 0xa0, 0xa1, 0x95, 0xc3, 0xb3, 0xea, 0x4b, 0x55, 0x6f, 0x1f, 0x0d, 0x8b, 0xb7, 0xef, 0xec, 0x28, - 0x67, 0xfb, 0xfe, 0xc1, 0x6c, 0xf9, 0xe0, 0x1e, 0xfc, 0x7c, 0x70, 0x0f, 0xbe, 0xe7, 0xae, 0xb1, - 0xcc, 0x5d, 0xe3, 0x47, 0xee, 0x1a, 0xbf, 0x73, 0xd7, 0xf8, 0x7c, 0xfd, 0x6f, 0x3f, 0x8c, 0x0f, - 0x5b, 0xc0, 0xa4, 0xa1, 0xd4, 0xbe, 0xf9, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x15, 0xc1, 0xc4, 0xe8, - 0x87, 0x04, 0x00, 0x00, + // 529 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0x4d, 0x6f, 0xd3, 0x40, + 0x10, 0xad, 0x9d, 0x36, 0x6e, 0x26, 0xa5, 0xa0, 0x55, 0x55, 0x2c, 0x23, 0x99, 0x28, 0xea, 0x21, + 0x42, 0xb0, 0x56, 0x03, 0x48, 0x6d, 0xb9, 0x55, 0x04, 0xa9, 0x12, 0x87, 0xca, 0x91, 0x90, 0xe0, + 0x82, 0x1c, 0x67, 0x62, 0x56, 0x38, 0xde, 0xed, 0xee, 0xda, 0x22, 0x37, 0x7e, 0x5e, 0x8f, 0x1c, + 0x39, 0x01, 0xcd, 0x0f, 0xe0, 0x37, 0x20, 0x7f, 0xa5, 0xf1, 0x2d, 0x11, 0xb7, 0x99, 0xb7, 0xef, + 0xed, 0xbc, 0x79, 0x5e, 0x19, 0xfc, 0x88, 0xe9, 0x2f, 0xe9, 0x84, 0x86, 0x7c, 0xee, 0x85, 0x3c, + 0xd1, 0x01, 0x4b, 0x50, 0x4e, 0xd7, 0xcb, 0x40, 0x30, 0x4f, 0xa1, 0xcc, 0x58, 0x88, 0xca, 0x63, + 0x89, 0x96, 0x5c, 0x09, 0x0c, 0x35, 0xe3, 0x89, 0x97, 0x9d, 0x36, 0x01, 0x2a, 0x24, 0xd7, 0x9c, + 0x9c, 0xdc, 0xab, 0x69, 0xad, 0xa4, 0x4d, 0x62, 0x76, 0xea, 0x9c, 0x6f, 0x34, 0x59, 0x2f, 0x04, + 0x2a, 0x4f, 0xc4, 0x81, 0x9e, 0x71, 0x39, 0x2f, 0x07, 0x38, 0x8f, 0x23, 0xce, 0xa3, 0x18, 0x3d, + 0x29, 0x42, 0x4f, 0xe9, 0x40, 0xa7, 0xaa, 0x3a, 0x78, 0x52, 0x1d, 0x14, 0xdd, 0x24, 0x9d, 0x79, + 0x38, 0x17, 0x7a, 0x51, 0x1d, 0x1e, 0x45, 0x3c, 0xe2, 0x45, 0xe9, 0xe5, 0x55, 0x89, 0xf6, 0xff, + 0x9a, 0xd0, 0xbe, 0x8e, 0xd3, 0x88, 0x25, 0x84, 0xc0, 0x6e, 0x3e, 0xce, 0x36, 0x7a, 0xc6, 0xa0, + 0xe3, 0x17, 0x35, 0x39, 0x06, 0x93, 0x4d, 0x6d, 0x33, 0x47, 0x2e, 0xdb, 0xcb, 0x5f, 0x4f, 0xcd, + 0xab, 0xb7, 0xbe, 0xc9, 0xa6, 0xc4, 0x81, 0x7d, 0x89, 0x37, 0x29, 0x93, 0xa8, 0xec, 0x56, 0xaf, + 0x35, 0xe8, 0xf8, 0xab, 0x9e, 0x9c, 0x41, 0xa7, 0x36, 0xac, 0xec, 0xdd, 0x5e, 0x6b, 0xd0, 0x1d, + 0x3a, 0x74, 0x2d, 0x93, 0x62, 0x27, 0x7a, 0x5d, 0x51, 0xfc, 0x7b, 0x32, 0x19, 0x83, 0x85, 0xdf, + 0x04, 0x97, 0x5a, 0xd9, 0x7b, 0x85, 0xee, 0x9c, 0x6e, 0x92, 0x25, 0x2d, 0x17, 0xa0, 0xa3, 0x52, + 0x3b, 0x4a, 0xb4, 0x5c, 0xf8, 0xf5, 0x4d, 0xa4, 0x0f, 0x07, 0x61, 0x20, 0x82, 0x09, 0x8b, 0x99, + 0x66, 0xa8, 0xec, 0x76, 0x61, 0xb7, 0x81, 0x91, 0x17, 0xb0, 0xcf, 0x12, 0xa6, 0x3f, 0xa3, 0x94, + 0xb6, 0xd5, 0x33, 0x06, 0xdd, 0x21, 0xa1, 0x65, 0x96, 0x54, 0x8a, 0x90, 0x8e, 0x8b, 0x90, 0x7d, + 0x2b, 0xe7, 0x8c, 0xa4, 0x74, 0x2e, 0xe0, 0x60, 0x7d, 0x16, 0x79, 0x04, 0xad, 0xaf, 0xb8, 0xa8, + 0x82, 0xcb, 0x4b, 0x72, 0x04, 0x7b, 0x59, 0x10, 0xa7, 0x58, 0x46, 0xe7, 0x97, 0xcd, 0x85, 0x79, + 0x66, 0xf4, 0x9f, 0xc1, 0x61, 0x69, 0x57, 0xf9, 0x78, 0x93, 0xa2, 0xd2, 0xc4, 0x06, 0x6b, 0xc6, + 0x62, 0x8d, 0x52, 0xd9, 0x46, 0xe1, 0xad, 0x6e, 0xfb, 0x1f, 0xe1, 0xe1, 0x8a, 0xab, 0x04, 0x4f, + 0x14, 0x92, 0x77, 0x60, 0x89, 0x12, 0x2a, 0xc8, 0xdd, 0xe1, 0xf3, 0x6d, 0x22, 0xf2, 0x6b, 0x71, + 0xff, 0x04, 0x0e, 0xc7, 0x28, 0x33, 0x94, 0xab, 0x9b, 0x09, 0xec, 0xa6, 0x29, 0x9b, 0xd6, 0x9f, + 0x3f, 0xaf, 0x87, 0xbf, 0x0d, 0x78, 0x70, 0xb5, 0x7e, 0x15, 0xc9, 0xc0, 0xaa, 0x2c, 0x91, 0x57, + 0xdb, 0x4c, 0xae, 0xb7, 0x75, 0x5e, 0x6f, 0xa9, 0xaa, 0xdc, 0x7d, 0x80, 0x76, 0xe9, 0x97, 0x1c, + 0xd7, 0x5f, 0xa6, 0x7e, 0xe5, 0x74, 0x94, 0xbf, 0x72, 0x67, 0x43, 0x3b, 0xcd, 0xad, 0x2f, 0x67, + 0xb7, 0x77, 0xee, 0xce, 0xcf, 0x3b, 0x77, 0xe7, 0xfb, 0xd2, 0x35, 0x6e, 0x97, 0xae, 0xf1, 0x63, + 0xe9, 0x1a, 0x7f, 0x96, 0xae, 0xf1, 0xe9, 0xfd, 0xff, 0xfd, 0x1a, 0xde, 0x34, 0x80, 0x49, 0xbb, + 0x70, 0xfb, 0xf2, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x4c, 0x6f, 0xe7, 0xad, 0x71, 0x04, 0x00, + 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -750,9 +749,9 @@ func (this *Plugin) String() string { if this == nil { return "nil" } - repeatedStringForPlatforms := "[]Platform{" + repeatedStringForPlatforms := "[]*Platform{" for _, f := range this.Platforms { - repeatedStringForPlatforms += fmt.Sprintf("%v", f) + "," + repeatedStringForPlatforms += strings.Replace(fmt.Sprintf("%v", f), "Platform", "types.Platform", 1) + "," } repeatedStringForPlatforms += "}" keysForExports := make([]string, 0, len(this.Exports)) @@ -793,9 +792,9 @@ func (this *PluginsResponse) String() string { if this == nil { return "nil" } - repeatedStringForPlugins := "[]Plugin{" + repeatedStringForPlugins := "[]*Plugin{" for _, f := range this.Plugins { - repeatedStringForPlugins += strings.Replace(strings.Replace(f.String(), "Plugin", "Plugin", 1), `&`, ``, 1) + "," + repeatedStringForPlugins += strings.Replace(f.String(), "Plugin", "Plugin", 1) + "," } repeatedStringForPlugins += "}" s := strings.Join([]string{`&PluginsResponse{`, @@ -810,7 +809,7 @@ func (this *ServerResponse) String() string { return "nil" } s := strings.Join([]string{`&ServerResponse{`, - `UUID:` + fmt.Sprintf("%v", this.UUID) + `,`, + `Uuid:` + fmt.Sprintf("%v", this.UUID) + `,`, `XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`, `}`, }, "") @@ -978,7 +977,7 @@ func (m *Plugin) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Platforms = append(m.Platforms, types.Platform{}) + m.Platforms = append(m.Platforms, &types.Platform{}) if err := m.Platforms[len(m.Platforms)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -1341,7 +1340,7 @@ func (m *PluginsResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Plugins = append(m.Plugins, Plugin{}) + m.Plugins = append(m.Plugins, &Plugin{}) if err := m.Plugins[len(m.Plugins)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -1399,7 +1398,7 @@ func (m *ServerResponse) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field UUID", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Uuid", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { diff --git a/api/services/introspection/v1/introspection.proto b/api/services/introspection/v1/introspection.proto index b7f3d1a50..53208efa8 100644 --- a/api/services/introspection/v1/introspection.proto +++ b/api/services/introspection/v1/introspection.proto @@ -57,7 +57,7 @@ message Plugin { // // If the plugin prefers certain platforms over others, they should be // listed from most to least preferred. - repeated types.Platform platforms = 4 [(gogoproto.nullable) = false]; + repeated types.Platform platforms = 4; // Exports allows plugins to provide values about state or configuration to // interested parties. @@ -96,9 +96,9 @@ message PluginsRequest { } message PluginsResponse { - repeated Plugin plugins = 1 [(gogoproto.nullable) = false]; + repeated Plugin plugins = 1; } message ServerResponse { - string uuid = 1 [(gogoproto.customname) = "UUID"]; + string uuid = 1; } diff --git a/api/services/leases/v1/leases.pb.go b/api/services/leases/v1/leases.pb.go index e3d6ee74e..618d734cd 100644 --- a/api/services/leases/v1/leases.pb.go +++ b/api/services/leases/v1/leases.pb.go @@ -320,11 +320,11 @@ func (m *Resource) XXX_DiscardUnknown() { var xxx_messageInfo_Resource proto.InternalMessageInfo type AddResourceRequest struct { - ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` - Resource Resource `protobuf:"bytes,2,opt,name=resource,proto3" json:"resource"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + Resource *Resource `protobuf:"bytes,2,opt,name=resource,proto3" json:"resource,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *AddResourceRequest) Reset() { *m = AddResourceRequest{} } @@ -360,11 +360,11 @@ func (m *AddResourceRequest) XXX_DiscardUnknown() { var xxx_messageInfo_AddResourceRequest proto.InternalMessageInfo type DeleteResourceRequest struct { - ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` - Resource Resource `protobuf:"bytes,2,opt,name=resource,proto3" json:"resource"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + Resource *Resource `protobuf:"bytes,2,opt,name=resource,proto3" json:"resource,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *DeleteResourceRequest) Reset() { *m = DeleteResourceRequest{} } @@ -439,10 +439,10 @@ func (m *ListResourcesRequest) XXX_DiscardUnknown() { var xxx_messageInfo_ListResourcesRequest proto.InternalMessageInfo type ListResourcesResponse struct { - Resources []Resource `protobuf:"bytes,1,rep,name=resources,proto3" json:"resources"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Resources []*Resource `protobuf:"bytes,1,rep,name=resources,proto3" json:"resources,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *ListResourcesResponse) Reset() { *m = ListResourcesResponse{} } @@ -498,47 +498,46 @@ func init() { } var fileDescriptor_fefd70dfe8d93cbf = []byte{ - // 631 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x95, 0xdf, 0x6b, 0xd3, 0x50, - 0x14, 0xc7, 0x97, 0xb6, 0x8b, 0xeb, 0x89, 0x1b, 0x72, 0xd9, 0x46, 0x89, 0x98, 0x95, 0x20, 0xac, - 0xf8, 0x23, 0x71, 0xdd, 0x90, 0xfd, 0x10, 0x61, 0xb5, 0x03, 0x87, 0x45, 0x24, 0xf8, 0x30, 0x7c, - 0x70, 0xa4, 0xc9, 0x5d, 0x0d, 0xa6, 0x4d, 0xcc, 0xbd, 0xad, 0x74, 0x4f, 0xfe, 0x51, 0xfe, 0x11, - 0x7d, 0xf4, 0x49, 0x7c, 0x9a, 0xae, 0x7f, 0x89, 0xf4, 0xfe, 0xb0, 0x3f, 0xc6, 0x96, 0x54, 0xc4, - 0xb7, 0x73, 0x9b, 0xef, 0xf7, 0x9c, 0xcf, 0x39, 0xf7, 0x24, 0x85, 0x7a, 0x2b, 0xa0, 0x1f, 0xba, - 0x4d, 0xcb, 0x8b, 0xda, 0xb6, 0x17, 0x75, 0xa8, 0x1b, 0x74, 0x70, 0xe2, 0x4f, 0x86, 0x6e, 0x1c, - 0xd8, 0x04, 0x27, 0xbd, 0xc0, 0xc3, 0xc4, 0x0e, 0xb1, 0x4b, 0x30, 0xb1, 0x7b, 0x5b, 0x22, 0xb2, - 0xe2, 0x24, 0xa2, 0x11, 0xba, 0x37, 0xd6, 0x5b, 0x52, 0x6b, 0x09, 0x45, 0x6f, 0x4b, 0x5f, 0x6d, - 0x45, 0xad, 0x88, 0x29, 0xed, 0x51, 0xc4, 0x4d, 0xfa, 0xdd, 0x56, 0x14, 0xb5, 0x42, 0x6c, 0xb3, - 0x53, 0xb3, 0x7b, 0x66, 0xe3, 0x76, 0x4c, 0xfb, 0xe2, 0xe1, 0xc6, 0xec, 0x43, 0x1a, 0xb4, 0x31, - 0xa1, 0x6e, 0x3b, 0xe6, 0x02, 0xf3, 0xa7, 0x02, 0x8b, 0x8d, 0x51, 0x05, 0xb4, 0x0e, 0xb9, 0xc0, - 0x2f, 0x29, 0x65, 0xa5, 0x52, 0xac, 0xa9, 0xc3, 0x8b, 0x8d, 0xdc, 0x71, 0xdd, 0xc9, 0x05, 0x3e, - 0xda, 0x03, 0xf0, 0x12, 0xec, 0x52, 0xec, 0x9f, 0xba, 0xb4, 0x94, 0x2b, 0x2b, 0x15, 0xad, 0xaa, - 0x5b, 0x3c, 0xaf, 0x25, 0xf3, 0x5a, 0x6f, 0x65, 0x5e, 0xa7, 0x28, 0xd4, 0x87, 0x14, 0xbd, 0x04, - 0x35, 0x74, 0x9b, 0x38, 0x24, 0xa5, 0x7c, 0x39, 0x5f, 0xd1, 0xaa, 0x4f, 0xac, 0x1b, 0x1b, 0xb4, - 0x18, 0x88, 0xd5, 0x60, 0x96, 0xa3, 0x0e, 0x4d, 0xfa, 0x8e, 0xf0, 0xeb, 0x7b, 0xa0, 0x4d, 0xfc, - 0x8c, 0xee, 0x40, 0xfe, 0x23, 0xee, 0x73, 0x58, 0x67, 0x14, 0xa2, 0x55, 0x58, 0xec, 0xb9, 0x61, - 0x17, 0x33, 0xc0, 0xa2, 0xc3, 0x0f, 0xfb, 0xb9, 0x5d, 0xc5, 0xfc, 0xaa, 0xc0, 0xf2, 0x0b, 0x86, - 0xe4, 0xe0, 0x4f, 0x5d, 0x4c, 0xe8, 0xb5, 0x9d, 0xbe, 0x99, 0xc1, 0xdd, 0x4d, 0xc1, 0x9d, 0xca, - 0xfa, 0xaf, 0xb1, 0x1b, 0xb0, 0x22, 0xf3, 0x93, 0x38, 0xea, 0x10, 0x8c, 0xf6, 0x61, 0x91, 0xd5, - 0x66, 0x7e, 0xad, 0x7a, 0x3f, 0xcb, 0x30, 0x1d, 0x6e, 0x31, 0x0f, 0x60, 0xb9, 0x8e, 0x43, 0x9c, - 0x3e, 0x03, 0x04, 0x05, 0xd2, 0xef, 0x78, 0x8c, 0x67, 0xc9, 0x61, 0xb1, 0xb9, 0x09, 0x5a, 0x23, - 0x20, 0x54, 0x5a, 0x4b, 0x70, 0xeb, 0x2c, 0x08, 0x29, 0x4e, 0x48, 0x49, 0x29, 0xe7, 0x2b, 0x45, - 0x47, 0x1e, 0xcd, 0x06, 0xdc, 0xe6, 0x42, 0x41, 0xfc, 0x0c, 0x54, 0xce, 0xc3, 0x84, 0x59, 0x91, - 0x85, 0xc7, 0x7c, 0x0a, 0x4b, 0x0e, 0x26, 0x51, 0x37, 0xf1, 0xf0, 0x4d, 0xb8, 0xb4, 0x1f, 0xcb, - 0xf1, 0xb1, 0xd8, 0xfc, 0x0c, 0xe8, 0xd0, 0xf7, 0xa5, 0x35, 0xad, 0xe1, 0x63, 0x58, 0x4a, 0x84, - 0x54, 0x2c, 0xf7, 0x66, 0x0a, 0xa5, 0xcc, 0x5c, 0x2b, 0x0c, 0x2e, 0x36, 0x16, 0x9c, 0x3f, 0x76, - 0xf3, 0x1c, 0xd6, 0xe4, 0x90, 0xff, 0x7b, 0x6d, 0x0b, 0x56, 0xc5, 0xe8, 0xd9, 0x99, 0xa4, 0x94, - 0x36, 0x7d, 0x58, 0x9b, 0xd1, 0x8b, 0x3b, 0x7b, 0x05, 0x45, 0x99, 0x54, 0x5e, 0xdb, 0x9c, 0x50, - 0x63, 0x7f, 0xf5, 0x7b, 0x01, 0x54, 0x76, 0xa9, 0x04, 0x61, 0x50, 0xf9, 0x3e, 0xa3, 0x47, 0xf3, - 0xbc, 0x56, 0xfa, 0xe3, 0x8c, 0x6a, 0x81, 0xff, 0x1a, 0x54, 0x7e, 0x07, 0xa9, 0x65, 0xa6, 0xde, - 0x07, 0x7d, 0xfd, 0xca, 0x17, 0xed, 0x68, 0xf4, 0x19, 0x45, 0xa7, 0x50, 0x18, 0xcd, 0x09, 0x3d, - 0x48, 0x5b, 0xdd, 0xf1, 0x0b, 0xa2, 0x3f, 0xcc, 0xa4, 0x15, 0xc0, 0x27, 0xa0, 0x4d, 0x6c, 0x2b, - 0xda, 0x4a, 0xf1, 0x5e, 0xdd, 0xec, 0x6b, 0xd1, 0xdf, 0xc3, 0xca, 0xf4, 0x3a, 0xa2, 0x9d, 0x8c, - 0x23, 0xc9, 0x96, 0xff, 0x1c, 0x96, 0xa7, 0x56, 0x08, 0x6d, 0x67, 0xeb, 0x7b, 0x6a, 0x41, 0xf5, - 0x9d, 0xf9, 0x4c, 0x7c, 0x6a, 0xb5, 0x93, 0xc1, 0xa5, 0xb1, 0xf0, 0xe3, 0xd2, 0x58, 0xf8, 0x32, - 0x34, 0x94, 0xc1, 0xd0, 0x50, 0xbe, 0x0d, 0x0d, 0xe5, 0xd7, 0xd0, 0x50, 0xde, 0x3d, 0xff, 0xcb, - 0x7f, 0xe2, 0x03, 0x1e, 0x35, 0x55, 0xd6, 0xe5, 0xf6, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0x72, - 0xbb, 0x87, 0xeb, 0xd2, 0x07, 0x00, 0x00, + // 623 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x55, 0x4b, 0x6b, 0xdb, 0x4c, + 0x14, 0x8d, 0xec, 0x44, 0x9f, 0x7d, 0xf5, 0x39, 0x94, 0xc1, 0x09, 0x46, 0xa5, 0x8a, 0x11, 0x85, + 0x98, 0x3e, 0xa4, 0xda, 0x09, 0x25, 0x8f, 0x52, 0x48, 0x62, 0x43, 0x0b, 0xa6, 0x14, 0xd1, 0x45, + 0xe8, 0x22, 0x41, 0x96, 0x26, 0xae, 0xa8, 0x6c, 0x29, 0x9a, 0xb1, 0xc1, 0x5d, 0xf5, 0x47, 0xf5, + 0x47, 0x64, 0xd9, 0x55, 0xe9, 0xaa, 0x6d, 0xfc, 0x4b, 0x8a, 0xe7, 0x11, 0x3f, 0x42, 0x22, 0xa5, + 0x94, 0xee, 0xee, 0x58, 0xe7, 0xdc, 0x7b, 0xee, 0x99, 0x23, 0x19, 0x9a, 0xdd, 0x80, 0x7e, 0x18, + 0x74, 0x2c, 0x2f, 0xea, 0xd9, 0x5e, 0xd4, 0xa7, 0x6e, 0xd0, 0xc7, 0x89, 0x3f, 0x5b, 0xba, 0x71, + 0x60, 0x13, 0x9c, 0x0c, 0x03, 0x0f, 0x13, 0x3b, 0xc4, 0x2e, 0xc1, 0xc4, 0x1e, 0xd6, 0x45, 0x65, + 0xc5, 0x49, 0x44, 0x23, 0xf4, 0x60, 0x8a, 0xb7, 0x24, 0xd6, 0x12, 0x88, 0x61, 0x5d, 0x2f, 0x77, + 0xa3, 0x6e, 0xc4, 0x90, 0xf6, 0xa4, 0xe2, 0x24, 0xfd, 0x7e, 0x37, 0x8a, 0xba, 0x21, 0xb6, 0xd9, + 0xa9, 0x33, 0x38, 0xb3, 0x71, 0x2f, 0xa6, 0x23, 0xf1, 0x70, 0x63, 0xf1, 0x21, 0x0d, 0x7a, 0x98, + 0x50, 0xb7, 0x17, 0x73, 0x80, 0xf9, 0x53, 0x81, 0x95, 0xf6, 0x64, 0x02, 0x5a, 0x87, 0x5c, 0xe0, + 0x57, 0x94, 0xaa, 0x52, 0x2b, 0x1e, 0xaa, 0xe3, 0x1f, 0x1b, 0xb9, 0xd7, 0x4d, 0x27, 0x17, 0xf8, + 0x68, 0x17, 0xc0, 0x4b, 0xb0, 0x4b, 0xb1, 0x7f, 0xea, 0xd2, 0x4a, 0xae, 0xaa, 0xd4, 0xb4, 0x86, + 0x6e, 0xf1, 0xbe, 0x96, 0xec, 0x6b, 0xbd, 0x93, 0x7d, 0x9d, 0xa2, 0x40, 0x1f, 0x50, 0xf4, 0x0a, + 0xd4, 0xd0, 0xed, 0xe0, 0x90, 0x54, 0xf2, 0xd5, 0x7c, 0x4d, 0x6b, 0x3c, 0xb3, 0x6e, 0x5d, 0xd0, + 0x62, 0x42, 0xac, 0x36, 0xa3, 0xb4, 0xfa, 0x34, 0x19, 0x39, 0x82, 0xaf, 0xef, 0x82, 0x36, 0xf3, + 0x33, 0xba, 0x07, 0xf9, 0x8f, 0x78, 0xc4, 0xc5, 0x3a, 0x93, 0x12, 0x95, 0x61, 0x65, 0xe8, 0x86, + 0x03, 0xcc, 0x04, 0x16, 0x1d, 0x7e, 0xd8, 0xcb, 0xed, 0x28, 0xe6, 0x17, 0x05, 0x4a, 0x47, 0x4c, + 0x92, 0x83, 0xcf, 0x07, 0x98, 0xd0, 0x1b, 0x37, 0x7d, 0xbb, 0x20, 0x77, 0x27, 0x45, 0xee, 0x5c, + 0xd7, 0xbf, 0x2d, 0xbb, 0x0d, 0xab, 0xb2, 0x3f, 0x89, 0xa3, 0x3e, 0xc1, 0x68, 0x0f, 0x56, 0xd8, + 0x6c, 0xc6, 0xd7, 0x1a, 0x0f, 0xb3, 0x98, 0xe9, 0x70, 0x8a, 0xb9, 0x0f, 0xa5, 0x26, 0x0e, 0x71, + 0xba, 0x07, 0x08, 0x96, 0xc9, 0xa8, 0xef, 0x31, 0x3d, 0x05, 0x87, 0xd5, 0xe6, 0x26, 0x68, 0xed, + 0x80, 0x50, 0x49, 0xad, 0xc0, 0x7f, 0x67, 0x41, 0x48, 0x71, 0x42, 0x2a, 0x4a, 0x35, 0x5f, 0x2b, + 0x3a, 0xf2, 0x68, 0xb6, 0xe1, 0x7f, 0x0e, 0x14, 0x8a, 0x5f, 0x80, 0xca, 0xf5, 0x30, 0x60, 0x56, + 0xc9, 0x82, 0x63, 0x3e, 0x87, 0x82, 0x83, 0x49, 0x34, 0x48, 0x3c, 0x7c, 0x9b, 0x5c, 0x3a, 0x8a, + 0xa5, 0x7d, 0xac, 0x36, 0xcf, 0x01, 0x1d, 0xf8, 0xbe, 0xa4, 0xa6, 0x2d, 0x7c, 0x04, 0x85, 0x44, + 0x40, 0x45, 0xb8, 0x37, 0x53, 0x54, 0x5e, 0x75, 0xbe, 0x22, 0x9a, 0x14, 0xd6, 0xa4, 0xbd, 0xff, + 0x70, 0xaa, 0x05, 0x65, 0x61, 0x37, 0x3b, 0x93, 0x94, 0xa1, 0xe6, 0x09, 0xac, 0x2d, 0xe0, 0xc5, + 0x3d, 0xb5, 0xa0, 0x28, 0x9b, 0xca, 0xab, 0xca, 0x2c, 0x67, 0xca, 0x6c, 0x7c, 0x5b, 0x06, 0x95, + 0x5d, 0x21, 0x41, 0x18, 0x54, 0x9e, 0x5e, 0xf4, 0xe4, 0x2e, 0x2f, 0x91, 0xfe, 0x34, 0x23, 0x5a, + 0x08, 0x7f, 0x03, 0x2a, 0xf7, 0x3d, 0x75, 0xcc, 0x5c, 0xfa, 0xf5, 0xf5, 0x6b, 0xdf, 0xaf, 0xd6, + 0xe4, 0xa3, 0x89, 0x4e, 0x61, 0x79, 0xe2, 0x10, 0x7a, 0x94, 0x16, 0xd4, 0xe9, 0xeb, 0xa0, 0x3f, + 0xce, 0x84, 0x15, 0x82, 0x8f, 0x41, 0x9b, 0xc9, 0x26, 0xaa, 0xa7, 0x70, 0xaf, 0xe7, 0xf8, 0x46, + 0xe9, 0x27, 0xb0, 0x3a, 0x1f, 0x41, 0xb4, 0x9d, 0xd1, 0x92, 0x6c, 0xfd, 0x3f, 0x41, 0x69, 0x2e, + 0x3c, 0x68, 0x2b, 0xdb, 0xde, 0x73, 0xd1, 0xd4, 0xb7, 0xef, 0x46, 0xe2, 0xae, 0x1d, 0x1e, 0x5f, + 0x5c, 0x1a, 0x4b, 0xdf, 0x2f, 0x8d, 0xa5, 0xcf, 0x63, 0x43, 0xb9, 0x18, 0x1b, 0xca, 0xd7, 0xb1, + 0xa1, 0xfc, 0x1a, 0x1b, 0xca, 0xfb, 0x97, 0x7f, 0xf8, 0xbf, 0xbb, 0xcf, 0xab, 0x8e, 0xca, 0xb6, + 0xdc, 0xfa, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x3e, 0xfe, 0x71, 0xc0, 0xc0, 0x07, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1164,16 +1163,18 @@ func (m *AddResourceRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } - { - size, err := m.Resource.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if m.Resource != nil { + { + size, err := m.Resource.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintLeases(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintLeases(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0x12 } - i-- - dAtA[i] = 0x12 if len(m.ID) > 0 { i -= len(m.ID) copy(dAtA[i:], m.ID) @@ -1208,16 +1209,18 @@ func (m *DeleteResourceRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } - { - size, err := m.Resource.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if m.Resource != nil { + { + size, err := m.Resource.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintLeases(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintLeases(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0x12 } - i-- - dAtA[i] = 0x12 if len(m.ID) > 0 { i -= len(m.ID) copy(dAtA[i:], m.ID) @@ -1467,8 +1470,10 @@ func (m *AddResourceRequest) Size() (n int) { if l > 0 { n += 1 + l + sovLeases(uint64(l)) } - l = m.Resource.Size() - n += 1 + l + sovLeases(uint64(l)) + if m.Resource != nil { + l = m.Resource.Size() + n += 1 + l + sovLeases(uint64(l)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -1485,8 +1490,10 @@ func (m *DeleteResourceRequest) Size() (n int) { if l > 0 { n += 1 + l + sovLeases(uint64(l)) } - l = m.Resource.Size() - n += 1 + l + sovLeases(uint64(l)) + if m.Resource != nil { + l = m.Resource.Size() + n += 1 + l + sovLeases(uint64(l)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -1646,7 +1653,7 @@ func (this *AddResourceRequest) String() string { } s := strings.Join([]string{`&AddResourceRequest{`, `ID:` + fmt.Sprintf("%v", this.ID) + `,`, - `Resource:` + strings.Replace(strings.Replace(this.Resource.String(), "Resource", "Resource", 1), `&`, ``, 1) + `,`, + `Resource:` + strings.Replace(this.Resource.String(), "Resource", "Resource", 1) + `,`, `XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`, `}`, }, "") @@ -1658,7 +1665,7 @@ func (this *DeleteResourceRequest) String() string { } s := strings.Join([]string{`&DeleteResourceRequest{`, `ID:` + fmt.Sprintf("%v", this.ID) + `,`, - `Resource:` + strings.Replace(strings.Replace(this.Resource.String(), "Resource", "Resource", 1), `&`, ``, 1) + `,`, + `Resource:` + strings.Replace(this.Resource.String(), "Resource", "Resource", 1) + `,`, `XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`, `}`, }, "") @@ -1679,9 +1686,9 @@ func (this *ListResourcesResponse) String() string { if this == nil { return "nil" } - repeatedStringForResources := "[]Resource{" + repeatedStringForResources := "[]*Resource{" for _, f := range this.Resources { - repeatedStringForResources += strings.Replace(strings.Replace(f.String(), "Resource", "Resource", 1), `&`, ``, 1) + "," + repeatedStringForResources += strings.Replace(f.String(), "Resource", "Resource", 1) + "," } repeatedStringForResources += "}" s := strings.Join([]string{`&ListResourcesResponse{`, @@ -2718,6 +2725,9 @@ func (m *AddResourceRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } + if m.Resource == nil { + m.Resource = &Resource{} + } if err := m.Resource.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -2834,6 +2844,9 @@ func (m *DeleteResourceRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } + if m.Resource == nil { + m.Resource = &Resource{} + } if err := m.Resource.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -3001,7 +3014,7 @@ func (m *ListResourcesResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Resources = append(m.Resources, Resource{}) + m.Resources = append(m.Resources, &Resource{}) if err := m.Resources[len(m.Resources)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/api/services/leases/v1/leases.proto b/api/services/leases/v1/leases.proto index 56f2bb490..8eff9ce2f 100644 --- a/api/services/leases/v1/leases.proto +++ b/api/services/leases/v1/leases.proto @@ -99,13 +99,13 @@ message Resource { message AddResourceRequest { string id = 1; - Resource resource = 2 [(gogoproto.nullable) = false]; + Resource resource = 2; } message DeleteResourceRequest { string id = 1; - Resource resource = 2 [(gogoproto.nullable) = false]; + Resource resource = 2; } message ListResourcesRequest { @@ -113,5 +113,5 @@ message ListResourcesRequest { } message ListResourcesResponse { - repeated Resource resources = 1 [(gogoproto.nullable) = false]; + repeated Resource resources = 1 ; } diff --git a/api/services/namespaces/v1/namespace.pb.go b/api/services/namespaces/v1/namespace.pb.go index 2384a08db..b81ab29b0 100644 --- a/api/services/namespaces/v1/namespace.pb.go +++ b/api/services/namespaces/v1/namespace.pb.go @@ -117,10 +117,10 @@ func (m *GetNamespaceRequest) XXX_DiscardUnknown() { var xxx_messageInfo_GetNamespaceRequest proto.InternalMessageInfo type GetNamespaceResponse struct { - Namespace Namespace `protobuf:"bytes,1,opt,name=namespace,proto3" json:"namespace"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Namespace *Namespace `protobuf:"bytes,1,opt,name=namespace,proto3" json:"namespace,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *GetNamespaceResponse) Reset() { *m = GetNamespaceResponse{} } @@ -195,10 +195,10 @@ func (m *ListNamespacesRequest) XXX_DiscardUnknown() { var xxx_messageInfo_ListNamespacesRequest proto.InternalMessageInfo type ListNamespacesResponse struct { - Namespaces []Namespace `protobuf:"bytes,1,rep,name=namespaces,proto3" json:"namespaces"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Namespaces []*Namespace `protobuf:"bytes,1,rep,name=namespaces,proto3" json:"namespaces,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *ListNamespacesResponse) Reset() { *m = ListNamespacesResponse{} } @@ -234,10 +234,10 @@ func (m *ListNamespacesResponse) XXX_DiscardUnknown() { var xxx_messageInfo_ListNamespacesResponse proto.InternalMessageInfo type CreateNamespaceRequest struct { - Namespace Namespace `protobuf:"bytes,1,opt,name=namespace,proto3" json:"namespace"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Namespace *Namespace `protobuf:"bytes,1,opt,name=namespace,proto3" json:"namespace,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *CreateNamespaceRequest) Reset() { *m = CreateNamespaceRequest{} } @@ -273,10 +273,10 @@ func (m *CreateNamespaceRequest) XXX_DiscardUnknown() { var xxx_messageInfo_CreateNamespaceRequest proto.InternalMessageInfo type CreateNamespaceResponse struct { - Namespace Namespace `protobuf:"bytes,1,opt,name=namespace,proto3" json:"namespace"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Namespace *Namespace `protobuf:"bytes,1,opt,name=namespace,proto3" json:"namespace,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *CreateNamespaceResponse) Reset() { *m = CreateNamespaceResponse{} } @@ -320,7 +320,7 @@ type UpdateNamespaceRequest struct { // Namespace provides the target value, as declared by the mask, for the update. // // The namespace field must be set. - Namespace Namespace `protobuf:"bytes,1,opt,name=namespace,proto3" json:"namespace"` + Namespace *Namespace `protobuf:"bytes,1,opt,name=namespace,proto3" json:"namespace,omitempty"` // UpdateMask specifies which fields to perform the update on. If empty, // the operation applies to all fields. // @@ -366,10 +366,10 @@ func (m *UpdateNamespaceRequest) XXX_DiscardUnknown() { var xxx_messageInfo_UpdateNamespaceRequest proto.InternalMessageInfo type UpdateNamespaceResponse struct { - Namespace Namespace `protobuf:"bytes,1,opt,name=namespace,proto3" json:"namespace"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Namespace *Namespace `protobuf:"bytes,1,opt,name=namespace,proto3" json:"namespace,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *UpdateNamespaceResponse) Reset() { *m = UpdateNamespaceResponse{} } @@ -462,42 +462,41 @@ func init() { } var fileDescriptor_8c41761eaeea4fd3 = []byte{ - // 547 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x55, 0x4d, 0x6f, 0xd3, 0x40, - 0x10, 0xcd, 0x26, 0xc1, 0x52, 0xc6, 0x17, 0xb4, 0x04, 0x13, 0x19, 0xc9, 0x04, 0x9f, 0x8a, 0x54, - 0xad, 0xd5, 0x20, 0x41, 0x3f, 0x6e, 0x85, 0xb6, 0x07, 0x0a, 0x42, 0x96, 0xb8, 0xc0, 0x01, 0x9c, - 0x64, 0xe3, 0x9a, 0x38, 0xb6, 0xf1, 0xae, 0x2d, 0x45, 0x1c, 0xe0, 0xdf, 0x70, 0xe1, 0x87, 0xe4, - 0xc8, 0x91, 0x13, 0x6a, 0xf3, 0x4b, 0xd0, 0xae, 0x9d, 0x38, 0x34, 0x46, 0xb8, 0x81, 0x72, 0x9b, - 0xb1, 0xf7, 0xcd, 0x7b, 0x3b, 0x7a, 0xcf, 0x86, 0x67, 0xae, 0xc7, 0xcf, 0x92, 0x3e, 0x19, 0x84, - 0x13, 0x6b, 0x10, 0x06, 0xdc, 0xf1, 0x02, 0x1a, 0x0f, 0x57, 0x4b, 0x27, 0xf2, 0x2c, 0x46, 0xe3, - 0xd4, 0x1b, 0x50, 0x66, 0x05, 0xce, 0x84, 0xb2, 0xc8, 0x11, 0x65, 0xba, 0x53, 0x74, 0x24, 0x8a, - 0x43, 0x1e, 0xe2, 0xfb, 0x05, 0x8c, 0x2c, 0x20, 0xa4, 0x80, 0x90, 0x74, 0x47, 0x6f, 0xbb, 0xa1, - 0x1b, 0xca, 0xd3, 0x96, 0xa8, 0x32, 0xa0, 0x7e, 0xd7, 0x0d, 0x43, 0xd7, 0xa7, 0x96, 0xec, 0xfa, - 0xc9, 0xc8, 0xa2, 0x93, 0x88, 0x4f, 0xf3, 0x97, 0xdd, 0xcb, 0x2f, 0x47, 0x1e, 0xf5, 0x87, 0x6f, - 0x27, 0x0e, 0x1b, 0x67, 0x27, 0xcc, 0xaf, 0x08, 0x5a, 0x2f, 0x16, 0x34, 0x18, 0x43, 0x53, 0x70, - 0x76, 0x50, 0x17, 0x6d, 0xb5, 0x6c, 0x59, 0xe3, 0x97, 0xa0, 0xf8, 0x4e, 0x9f, 0xfa, 0xac, 0x53, - 0xef, 0x36, 0xb6, 0xd4, 0xde, 0x2e, 0xf9, 0xa3, 0x54, 0xb2, 0x9c, 0x48, 0x4e, 0x25, 0xf4, 0x28, - 0xe0, 0xf1, 0xd4, 0xce, 0xe7, 0xe8, 0x7b, 0xa0, 0xae, 0x3c, 0xc6, 0x37, 0xa1, 0x31, 0xa6, 0xd3, - 0x9c, 0x53, 0x94, 0xb8, 0x0d, 0x37, 0x52, 0xc7, 0x4f, 0x68, 0xa7, 0x2e, 0x9f, 0x65, 0xcd, 0x7e, - 0x7d, 0x17, 0x99, 0x0f, 0xe0, 0xd6, 0x09, 0xe5, 0xcb, 0xf1, 0x36, 0xfd, 0x90, 0x50, 0xc6, 0xcb, - 0x74, 0x9b, 0x67, 0xd0, 0xfe, 0xf5, 0x28, 0x8b, 0xc2, 0x80, 0x89, 0xfb, 0xb4, 0x96, 0x62, 0x25, - 0x40, 0xed, 0x6d, 0x5f, 0xe5, 0x4a, 0x87, 0xcd, 0xd9, 0x8f, 0x7b, 0x35, 0xbb, 0x18, 0x62, 0x5a, - 0x70, 0xfb, 0xd4, 0x63, 0x05, 0x15, 0x5b, 0xc8, 0xd2, 0x40, 0x19, 0x79, 0x3e, 0xa7, 0x71, 0x2e, - 0x2c, 0xef, 0x4c, 0x1f, 0xb4, 0xcb, 0x80, 0x5c, 0x9c, 0x0d, 0x50, 0xd0, 0x76, 0x90, 0x5c, 0xf8, - 0x26, 0xea, 0x56, 0xa6, 0x98, 0xef, 0x41, 0x7b, 0x12, 0x53, 0x87, 0xd3, 0xb5, 0xb5, 0xfd, 0xfb, - 0x55, 0x8c, 0xe1, 0xce, 0x1a, 0xd7, 0xb5, 0xed, 0xfd, 0x0b, 0x02, 0xed, 0x55, 0x34, 0xfc, 0x2f, - 0x37, 0xc3, 0x07, 0xa0, 0x26, 0x92, 0x4b, 0xa6, 0x47, 0x3a, 0x53, 0xed, 0xe9, 0x24, 0x0b, 0x18, - 0x59, 0x04, 0x8c, 0x1c, 0x8b, 0x80, 0x3d, 0x77, 0xd8, 0xd8, 0x86, 0xec, 0xb8, 0xa8, 0xc5, 0x5a, - 0xd6, 0x84, 0x5e, 0xdb, 0x5a, 0xb6, 0x41, 0x7b, 0x4a, 0x7d, 0x5a, 0xb2, 0x95, 0x92, 0x98, 0xf4, - 0xce, 0x9b, 0x00, 0x85, 0x11, 0x71, 0x0a, 0x8d, 0x13, 0xca, 0xf1, 0xa3, 0x0a, 0x12, 0x4a, 0x82, - 0xa8, 0x3f, 0xbe, 0x32, 0x2e, 0x5f, 0xc3, 0x47, 0x68, 0x8a, 0x48, 0xe0, 0x2a, 0x5f, 0x97, 0xd2, - 0xb0, 0xe9, 0x7b, 0x1b, 0x20, 0x73, 0xf2, 0x4f, 0xa0, 0x64, 0xae, 0xc5, 0x55, 0x86, 0x94, 0x87, - 0x49, 0xdf, 0xdf, 0x04, 0x5a, 0x08, 0xc8, 0xfc, 0x51, 0x49, 0x40, 0xb9, 0xe7, 0x2b, 0x09, 0xf8, - 0x9d, 0x0b, 0xdf, 0x80, 0x92, 0x79, 0xa6, 0x92, 0x80, 0x72, 0x7b, 0xe9, 0xda, 0x5a, 0x1a, 0x8e, - 0xc4, 0xbf, 0xe8, 0xf0, 0xdd, 0xec, 0xc2, 0xa8, 0x7d, 0xbf, 0x30, 0x6a, 0x9f, 0xe7, 0x06, 0x9a, - 0xcd, 0x0d, 0xf4, 0x6d, 0x6e, 0xa0, 0xf3, 0xb9, 0x81, 0x5e, 0x1f, 0xff, 0xc5, 0x2f, 0xf4, 0xa0, - 0xe8, 0xfa, 0x8a, 0x64, 0x7c, 0xf8, 0x33, 0x00, 0x00, 0xff, 0xff, 0xbf, 0xe8, 0x4d, 0xe1, 0x93, - 0x07, 0x00, 0x00, + // 540 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0x4d, 0x6f, 0xd3, 0x40, + 0x10, 0xed, 0x26, 0x21, 0x52, 0x26, 0x17, 0xb4, 0x04, 0x13, 0x19, 0xc9, 0x0a, 0x3e, 0x15, 0xa9, + 0x5a, 0xab, 0x41, 0x82, 0x7e, 0xdc, 0x80, 0xb6, 0x12, 0x04, 0x84, 0x2c, 0x71, 0x81, 0x03, 0xd8, + 0xc9, 0xc4, 0x58, 0x71, 0x6c, 0xe3, 0x5d, 0x5b, 0x8a, 0x38, 0xc0, 0x5f, 0xe1, 0xce, 0x0f, 0xe9, + 0x91, 0x23, 0xc7, 0x36, 0xbf, 0x04, 0x79, 0xed, 0xc4, 0xa1, 0x31, 0xc2, 0x29, 0xcd, 0x6d, 0xc6, + 0xde, 0x37, 0xef, 0xed, 0xe8, 0x3d, 0x1b, 0x5e, 0x3a, 0xae, 0xf8, 0x14, 0xdb, 0x6c, 0x18, 0x4c, + 0x8d, 0x61, 0xe0, 0x0b, 0xcb, 0xf5, 0x31, 0x1a, 0xad, 0x96, 0x56, 0xe8, 0x1a, 0x1c, 0xa3, 0xc4, + 0x1d, 0x22, 0x37, 0x7c, 0x6b, 0x8a, 0x3c, 0xb4, 0xd2, 0x32, 0xd9, 0x2f, 0x3a, 0x16, 0x46, 0x81, + 0x08, 0xe8, 0x83, 0x02, 0xc6, 0x16, 0x10, 0x56, 0x40, 0x58, 0xb2, 0xaf, 0x76, 0x9c, 0xc0, 0x09, + 0xe4, 0x69, 0x23, 0xad, 0x32, 0xa0, 0x7a, 0xdf, 0x09, 0x02, 0xc7, 0x43, 0x43, 0x76, 0x76, 0x3c, + 0x36, 0x70, 0x1a, 0x8a, 0x59, 0xfe, 0xb2, 0x77, 0xf5, 0xe5, 0xd8, 0x45, 0x6f, 0xf4, 0x61, 0x6a, + 0xf1, 0x49, 0x76, 0x42, 0xff, 0x41, 0xa0, 0xf5, 0x7a, 0x41, 0x43, 0x29, 0x34, 0x52, 0xce, 0x2e, + 0xe9, 0x91, 0xdd, 0x96, 0x29, 0x6b, 0xfa, 0x06, 0x9a, 0x9e, 0x65, 0xa3, 0xc7, 0xbb, 0xb5, 0x5e, + 0x7d, 0xb7, 0xdd, 0x3f, 0x60, 0xff, 0x94, 0xca, 0x96, 0x13, 0xd9, 0x40, 0x42, 0x4f, 0x7c, 0x11, + 0xcd, 0xcc, 0x7c, 0x8e, 0x7a, 0x08, 0xed, 0x95, 0xc7, 0xf4, 0x36, 0xd4, 0x27, 0x38, 0xcb, 0x39, + 0xd3, 0x92, 0x76, 0xe0, 0x56, 0x62, 0x79, 0x31, 0x76, 0x6b, 0xf2, 0x59, 0xd6, 0x1c, 0xd5, 0x0e, + 0x88, 0xfe, 0x10, 0xee, 0x9c, 0xa1, 0x58, 0x8e, 0x37, 0xf1, 0x73, 0x8c, 0x5c, 0x94, 0xe9, 0xd6, + 0x6d, 0xe8, 0xfc, 0x79, 0x94, 0x87, 0x81, 0xcf, 0x91, 0xbe, 0x80, 0xd6, 0x52, 0xac, 0x04, 0xb4, + 0xfb, 0x7b, 0x9b, 0x5c, 0xc9, 0x2c, 0xe0, 0xba, 0x01, 0x77, 0x07, 0x2e, 0x2f, 0x48, 0xf8, 0x42, + 0x90, 0x02, 0xcd, 0xb1, 0xeb, 0x09, 0x8c, 0x72, 0x49, 0x79, 0xa7, 0x8f, 0x41, 0xb9, 0x0a, 0xc8, + 0x65, 0x0d, 0x00, 0x0a, 0xc2, 0x2e, 0x91, 0xab, 0xde, 0x4c, 0xd7, 0x0a, 0x5e, 0x1f, 0x81, 0xf2, + 0x2c, 0x42, 0x4b, 0xe0, 0xda, 0xaa, 0x6e, 0xf2, 0xfa, 0x08, 0xf7, 0xd6, 0x58, 0xb6, 0xb0, 0xe5, + 0xef, 0x04, 0x94, 0xb7, 0xe1, 0x68, 0xcb, 0xb7, 0xa1, 0xc7, 0xd0, 0x8e, 0x25, 0x8b, 0xcc, 0x87, + 0xf4, 0x5e, 0xbb, 0xaf, 0xb2, 0x2c, 0x42, 0x6c, 0x11, 0x21, 0x76, 0x9a, 0x46, 0xe8, 0x95, 0xc5, + 0x27, 0x26, 0x64, 0xc7, 0xd3, 0x3a, 0x5d, 0xc5, 0x9a, 0xc4, 0x2d, 0xac, 0x62, 0x0f, 0x94, 0xe7, + 0xe8, 0x61, 0xc9, 0x26, 0x4a, 0x22, 0xd0, 0xbf, 0x68, 0x00, 0x14, 0x56, 0xa3, 0x09, 0xd4, 0xcf, + 0x50, 0xd0, 0xc7, 0x15, 0xc8, 0x4b, 0x42, 0xa6, 0x3e, 0xd9, 0x18, 0x97, 0x2f, 0xe0, 0x0b, 0x34, + 0x52, 0xd3, 0xd3, 0x2a, 0x5f, 0x8e, 0xd2, 0x38, 0xa9, 0x87, 0xd7, 0x40, 0xe6, 0xe4, 0x5f, 0xa1, + 0x99, 0x79, 0x94, 0x56, 0x19, 0x52, 0x1e, 0x1a, 0xf5, 0xe8, 0x3a, 0xd0, 0x42, 0x40, 0xe6, 0x8c, + 0x4a, 0x02, 0xca, 0x7d, 0x5e, 0x49, 0xc0, 0xdf, 0xfc, 0xf7, 0x1e, 0x9a, 0x99, 0x67, 0x2a, 0x09, + 0x28, 0xb7, 0x97, 0xaa, 0xac, 0xe5, 0xe0, 0x24, 0xfd, 0xcf, 0x3c, 0xfd, 0x78, 0x7e, 0xa9, 0xed, + 0xfc, 0xba, 0xd4, 0x76, 0xbe, 0xcd, 0x35, 0x72, 0x3e, 0xd7, 0xc8, 0xcf, 0xb9, 0x46, 0x2e, 0xe6, + 0x1a, 0x79, 0x77, 0xfa, 0x1f, 0xbf, 0xc7, 0xe3, 0xa2, 0xb3, 0x9b, 0x92, 0xf1, 0xd1, 0xef, 0x00, + 0x00, 0x00, 0xff, 0xff, 0xdb, 0x19, 0x13, 0x99, 0x6f, 0x07, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -835,16 +834,18 @@ func (m *GetNamespaceResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } - { - size, err := m.Namespace.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if m.Namespace != nil { + { + size, err := m.Namespace.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintNamespace(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintNamespace(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0xa } - i-- - dAtA[i] = 0xa return len(dAtA) - i, nil } @@ -947,16 +948,18 @@ func (m *CreateNamespaceRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } - { - size, err := m.Namespace.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if m.Namespace != nil { + { + size, err := m.Namespace.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintNamespace(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintNamespace(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0xa } - i-- - dAtA[i] = 0xa return len(dAtA) - i, nil } @@ -984,16 +987,18 @@ func (m *CreateNamespaceResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } - { - size, err := m.Namespace.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if m.Namespace != nil { + { + size, err := m.Namespace.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintNamespace(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintNamespace(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0xa } - i-- - dAtA[i] = 0xa return len(dAtA) - i, nil } @@ -1033,16 +1038,18 @@ func (m *UpdateNamespaceRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) i-- dAtA[i] = 0x12 } - { - size, err := m.Namespace.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if m.Namespace != nil { + { + size, err := m.Namespace.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintNamespace(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintNamespace(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0xa } - i-- - dAtA[i] = 0xa return len(dAtA) - i, nil } @@ -1070,16 +1077,18 @@ func (m *UpdateNamespaceResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } - { - size, err := m.Namespace.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if m.Namespace != nil { + { + size, err := m.Namespace.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintNamespace(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintNamespace(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0xa } - i-- - dAtA[i] = 0xa return len(dAtA) - i, nil } @@ -1174,8 +1183,10 @@ func (m *GetNamespaceResponse) Size() (n int) { } var l int _ = l - l = m.Namespace.Size() - n += 1 + l + sovNamespace(uint64(l)) + if m.Namespace != nil { + l = m.Namespace.Size() + n += 1 + l + sovNamespace(uint64(l)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -1222,8 +1233,10 @@ func (m *CreateNamespaceRequest) Size() (n int) { } var l int _ = l - l = m.Namespace.Size() - n += 1 + l + sovNamespace(uint64(l)) + if m.Namespace != nil { + l = m.Namespace.Size() + n += 1 + l + sovNamespace(uint64(l)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -1236,8 +1249,10 @@ func (m *CreateNamespaceResponse) Size() (n int) { } var l int _ = l - l = m.Namespace.Size() - n += 1 + l + sovNamespace(uint64(l)) + if m.Namespace != nil { + l = m.Namespace.Size() + n += 1 + l + sovNamespace(uint64(l)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -1250,8 +1265,10 @@ func (m *UpdateNamespaceRequest) Size() (n int) { } var l int _ = l - l = m.Namespace.Size() - n += 1 + l + sovNamespace(uint64(l)) + if m.Namespace != nil { + l = m.Namespace.Size() + n += 1 + l + sovNamespace(uint64(l)) + } if m.UpdateMask != nil { l = m.UpdateMask.Size() n += 1 + l + sovNamespace(uint64(l)) @@ -1268,8 +1285,10 @@ func (m *UpdateNamespaceResponse) Size() (n int) { } var l int _ = l - l = m.Namespace.Size() - n += 1 + l + sovNamespace(uint64(l)) + if m.Namespace != nil { + l = m.Namespace.Size() + n += 1 + l + sovNamespace(uint64(l)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -1336,7 +1355,7 @@ func (this *GetNamespaceResponse) String() string { return "nil" } s := strings.Join([]string{`&GetNamespaceResponse{`, - `Namespace:` + strings.Replace(strings.Replace(this.Namespace.String(), "Namespace", "Namespace", 1), `&`, ``, 1) + `,`, + `Namespace:` + strings.Replace(this.Namespace.String(), "Namespace", "Namespace", 1) + `,`, `XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`, `}`, }, "") @@ -1357,9 +1376,9 @@ func (this *ListNamespacesResponse) String() string { if this == nil { return "nil" } - repeatedStringForNamespaces := "[]Namespace{" + repeatedStringForNamespaces := "[]*Namespace{" for _, f := range this.Namespaces { - repeatedStringForNamespaces += strings.Replace(strings.Replace(f.String(), "Namespace", "Namespace", 1), `&`, ``, 1) + "," + repeatedStringForNamespaces += strings.Replace(f.String(), "Namespace", "Namespace", 1) + "," } repeatedStringForNamespaces += "}" s := strings.Join([]string{`&ListNamespacesResponse{`, @@ -1374,7 +1393,7 @@ func (this *CreateNamespaceRequest) String() string { return "nil" } s := strings.Join([]string{`&CreateNamespaceRequest{`, - `Namespace:` + strings.Replace(strings.Replace(this.Namespace.String(), "Namespace", "Namespace", 1), `&`, ``, 1) + `,`, + `Namespace:` + strings.Replace(this.Namespace.String(), "Namespace", "Namespace", 1) + `,`, `XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`, `}`, }, "") @@ -1385,7 +1404,7 @@ func (this *CreateNamespaceResponse) String() string { return "nil" } s := strings.Join([]string{`&CreateNamespaceResponse{`, - `Namespace:` + strings.Replace(strings.Replace(this.Namespace.String(), "Namespace", "Namespace", 1), `&`, ``, 1) + `,`, + `Namespace:` + strings.Replace(this.Namespace.String(), "Namespace", "Namespace", 1) + `,`, `XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`, `}`, }, "") @@ -1396,7 +1415,7 @@ func (this *UpdateNamespaceRequest) String() string { return "nil" } s := strings.Join([]string{`&UpdateNamespaceRequest{`, - `Namespace:` + strings.Replace(strings.Replace(this.Namespace.String(), "Namespace", "Namespace", 1), `&`, ``, 1) + `,`, + `Namespace:` + strings.Replace(this.Namespace.String(), "Namespace", "Namespace", 1) + `,`, `UpdateMask:` + strings.Replace(fmt.Sprintf("%v", this.UpdateMask), "FieldMask", "types.FieldMask", 1) + `,`, `XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`, `}`, @@ -1408,7 +1427,7 @@ func (this *UpdateNamespaceResponse) String() string { return "nil" } s := strings.Join([]string{`&UpdateNamespaceResponse{`, - `Namespace:` + strings.Replace(strings.Replace(this.Namespace.String(), "Namespace", "Namespace", 1), `&`, ``, 1) + `,`, + `Namespace:` + strings.Replace(this.Namespace.String(), "Namespace", "Namespace", 1) + `,`, `XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`, `}`, }, "") @@ -1784,6 +1803,9 @@ func (m *GetNamespaceResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } + if m.Namespace == nil { + m.Namespace = &Namespace{} + } if err := m.Namespace.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -1951,7 +1973,7 @@ func (m *ListNamespacesResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Namespaces = append(m.Namespaces, Namespace{}) + m.Namespaces = append(m.Namespaces, &Namespace{}) if err := m.Namespaces[len(m.Namespaces)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -2036,6 +2058,9 @@ func (m *CreateNamespaceRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } + if m.Namespace == nil { + m.Namespace = &Namespace{} + } if err := m.Namespace.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -2120,6 +2145,9 @@ func (m *CreateNamespaceResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } + if m.Namespace == nil { + m.Namespace = &Namespace{} + } if err := m.Namespace.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -2204,6 +2232,9 @@ func (m *UpdateNamespaceRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } + if m.Namespace == nil { + m.Namespace = &Namespace{} + } if err := m.Namespace.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -2324,6 +2355,9 @@ func (m *UpdateNamespaceResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } + if m.Namespace == nil { + m.Namespace = &Namespace{} + } if err := m.Namespace.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/api/services/namespaces/v1/namespace.proto b/api/services/namespaces/v1/namespace.proto index 405f26aad..1236eec7b 100644 --- a/api/services/namespaces/v1/namespace.proto +++ b/api/services/namespaces/v1/namespace.proto @@ -60,7 +60,7 @@ message GetNamespaceRequest { } message GetNamespaceResponse { - Namespace namespace = 1 [(gogoproto.nullable) = false]; + Namespace namespace = 1; } message ListNamespacesRequest { @@ -68,15 +68,15 @@ message ListNamespacesRequest { } message ListNamespacesResponse { - repeated Namespace namespaces = 1 [(gogoproto.nullable) = false]; + repeated Namespace namespaces = 1; } message CreateNamespaceRequest { - Namespace namespace = 1 [(gogoproto.nullable) = false]; + Namespace namespace = 1; } message CreateNamespaceResponse { - Namespace namespace = 1 [(gogoproto.nullable) = false]; + Namespace namespace = 1; } // UpdateNamespaceRequest updates the metadata for a namespace. @@ -88,7 +88,7 @@ message UpdateNamespaceRequest { // Namespace provides the target value, as declared by the mask, for the update. // // The namespace field must be set. - Namespace namespace = 1 [(gogoproto.nullable) = false]; + Namespace namespace = 1; // UpdateMask specifies which fields to perform the update on. If empty, // the operation applies to all fields. @@ -100,7 +100,7 @@ message UpdateNamespaceRequest { } message UpdateNamespaceResponse { - Namespace namespace = 1 [(gogoproto.nullable) = false]; + Namespace namespace = 1; } message DeleteNamespaceRequest { diff --git a/api/services/sandbox/v1/sandbox.pb.go b/api/services/sandbox/v1/sandbox.pb.go index 019b558a1..c5d5e8acf 100644 --- a/api/services/sandbox/v1/sandbox.pb.go +++ b/api/services/sandbox/v1/sandbox.pb.go @@ -39,10 +39,10 @@ var _ = math.Inf const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type StoreCreateRequest struct { - Sandbox types.Sandbox `protobuf:"bytes,1,opt,name=sandbox,proto3" json:"sandbox"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Sandbox *types.Sandbox `protobuf:"bytes,1,opt,name=sandbox,proto3" json:"sandbox,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *StoreCreateRequest) Reset() { *m = StoreCreateRequest{} } @@ -78,10 +78,10 @@ func (m *StoreCreateRequest) XXX_DiscardUnknown() { var xxx_messageInfo_StoreCreateRequest proto.InternalMessageInfo type StoreCreateResponse struct { - Sandbox types.Sandbox `protobuf:"bytes,1,opt,name=sandbox,proto3" json:"sandbox"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Sandbox *types.Sandbox `protobuf:"bytes,1,opt,name=sandbox,proto3" json:"sandbox,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *StoreCreateResponse) Reset() { *m = StoreCreateResponse{} } @@ -117,11 +117,11 @@ func (m *StoreCreateResponse) XXX_DiscardUnknown() { var xxx_messageInfo_StoreCreateResponse proto.InternalMessageInfo type StoreUpdateRequest struct { - Sandbox types.Sandbox `protobuf:"bytes,1,opt,name=sandbox,proto3" json:"sandbox"` - Fields []string `protobuf:"bytes,2,rep,name=fields,proto3" json:"fields,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Sandbox *types.Sandbox `protobuf:"bytes,1,opt,name=sandbox,proto3" json:"sandbox,omitempty"` + Fields []string `protobuf:"bytes,2,rep,name=fields,proto3" json:"fields,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *StoreUpdateRequest) Reset() { *m = StoreUpdateRequest{} } @@ -157,10 +157,10 @@ func (m *StoreUpdateRequest) XXX_DiscardUnknown() { var xxx_messageInfo_StoreUpdateRequest proto.InternalMessageInfo type StoreUpdateResponse struct { - Sandbox types.Sandbox `protobuf:"bytes,1,opt,name=sandbox,proto3" json:"sandbox"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Sandbox *types.Sandbox `protobuf:"bytes,1,opt,name=sandbox,proto3" json:"sandbox,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *StoreUpdateResponse) Reset() { *m = StoreUpdateResponse{} } @@ -312,10 +312,10 @@ func (m *StoreListRequest) XXX_DiscardUnknown() { var xxx_messageInfo_StoreListRequest proto.InternalMessageInfo type StoreListResponse struct { - List []types.Sandbox `protobuf:"bytes,1,rep,name=list,proto3" json:"list"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + List []*types.Sandbox `protobuf:"bytes,1,rep,name=list,proto3" json:"list,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *StoreListResponse) Reset() { *m = StoreListResponse{} } @@ -775,60 +775,59 @@ func init() { } var fileDescriptor_d6eb1ebcbc2879f1 = []byte{ - // 844 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xcb, 0x6e, 0xf3, 0x44, - 0x18, 0xad, 0x73, 0x71, 0xff, 0x7c, 0xa1, 0xe2, 0x67, 0xe8, 0xdf, 0xba, 0x16, 0x4a, 0x8a, 0x57, - 0x15, 0xaa, 0xec, 0x36, 0x15, 0xbd, 0xc0, 0x02, 0x9a, 0x16, 0x42, 0x25, 0x10, 0xc8, 0x01, 0x01, - 0xdd, 0x44, 0x4e, 0x3c, 0x49, 0x2d, 0x1c, 0x8f, 0xe3, 0x19, 0x97, 0x54, 0x6c, 0xe0, 0x69, 0x78, - 0x04, 0x5e, 0xa1, 0x4b, 0x96, 0xac, 0xaa, 0x36, 0x0f, 0x82, 0x90, 0xc7, 0xe3, 0x3a, 0x97, 0xaa, - 0xd8, 0xe9, 0xbf, 0x1b, 0x4f, 0xce, 0x39, 0xdf, 0xf9, 0xe6, 0x72, 0x26, 0xf0, 0xe5, 0xc0, 0x61, - 0x57, 0x61, 0x57, 0xef, 0x91, 0xa1, 0xd1, 0x23, 0x1e, 0xb3, 0x1c, 0x0f, 0x07, 0xf6, 0xf4, 0xd0, - 0xf2, 0x1d, 0x83, 0xe2, 0xe0, 0xda, 0xe9, 0x61, 0x6a, 0x50, 0xcb, 0xb3, 0xbb, 0x64, 0x6c, 0x5c, - 0xef, 0x27, 0x43, 0xdd, 0x0f, 0x08, 0x23, 0xa8, 0x96, 0x32, 0xf4, 0x04, 0xad, 0x27, 0x90, 0xeb, - 0x7d, 0x75, 0x6b, 0x40, 0xc8, 0xc0, 0xc5, 0x06, 0x47, 0x77, 0xc3, 0xbe, 0x61, 0x79, 0x37, 0x31, - 0x55, 0xad, 0xcf, 0xff, 0xc4, 0x9c, 0x21, 0xa6, 0xcc, 0x1a, 0xfa, 0x02, 0xb0, 0x3e, 0x20, 0x03, - 0xc2, 0x87, 0x46, 0x34, 0x12, 0xb3, 0xc7, 0x99, 0x9c, 0xb3, 0x1b, 0x3f, 0xb5, 0x2d, 0x98, 0x87, - 0x39, 0x98, 0x43, 0x12, 0x7a, 0x2c, 0xe6, 0x69, 0xdf, 0x02, 0x6a, 0x33, 0x12, 0xe0, 0xb3, 0x00, - 0x5b, 0x0c, 0x9b, 0x78, 0x14, 0x62, 0xca, 0xd0, 0x09, 0xac, 0x0a, 0x79, 0x45, 0xda, 0x96, 0x76, - 0xaa, 0x8d, 0x2d, 0x7d, 0x6a, 0x2d, 0xb8, 0x8a, 0xde, 0x8e, 0x01, 0xcd, 0xd2, 0xed, 0x5d, 0x7d, - 0xc5, 0x4c, 0xf0, 0xda, 0x77, 0xf0, 0xfe, 0x8c, 0x20, 0xf5, 0x89, 0x47, 0xf1, 0x4b, 0x14, 0x07, - 0xc2, 0xe2, 0x0f, 0xbe, 0xfd, 0x56, 0x2c, 0xa2, 0x0d, 0x90, 0xfb, 0x0e, 0x76, 0x6d, 0xaa, 0x14, - 0xb6, 0x8b, 0x3b, 0x15, 0x53, 0x7c, 0x3d, 0x5a, 0x4f, 0x0a, 0xbd, 0xdc, 0x7a, 0x53, 0x58, 0x3f, - 0xc7, 0x2e, 0x4e, 0xad, 0xef, 0x02, 0x08, 0x40, 0xc7, 0xb1, 0xb9, 0x66, 0xa5, 0xb9, 0x36, 0xb9, - 0xab, 0x57, 0x84, 0xca, 0xc5, 0xb9, 0x59, 0x11, 0x80, 0x0b, 0x5b, 0x7b, 0x23, 0x5c, 0x25, 0x1a, - 0xb1, 0x2b, 0x6d, 0x17, 0x5e, 0xf3, 0xe9, 0xaf, 0x1d, 0xca, 0x12, 0x61, 0x05, 0x56, 0xfb, 0x8e, - 0xcb, 0x70, 0x40, 0x15, 0x89, 0x77, 0x96, 0x7c, 0x6a, 0x5f, 0xc1, 0x7b, 0x53, 0x68, 0xd1, 0xd8, - 0x01, 0x94, 0x5c, 0x87, 0x32, 0x8e, 0xcd, 0xd0, 0x15, 0x07, 0x6b, 0x9f, 0xc1, 0xbb, 0x5c, 0xa9, - 0x85, 0xd9, 0x72, 0xfd, 0xb4, 0x84, 0x71, 0x2e, 0xf0, 0xe8, 0x24, 0xf3, 0x12, 0xa7, 0x8b, 0xfb, - 0xa7, 0x04, 0x1b, 0x67, 0xc4, 0x63, 0x01, 0x71, 0x5d, 0x1c, 0xb4, 0x99, 0x15, 0x2c, 0xe7, 0x08, - 0x19, 0x20, 0x07, 0x84, 0xb0, 0x7e, 0x7c, 0x1e, 0xaa, 0x8d, 0xcd, 0xc5, 0xe2, 0xdf, 0x44, 0x57, - 0xc6, 0x14, 0x30, 0xa4, 0xc3, 0x2a, 0xf1, 0x99, 0x43, 0x3c, 0xaa, 0x14, 0xb9, 0xdd, 0x75, 0x3d, - 0xbe, 0xef, 0x7a, 0x72, 0xdf, 0xf5, 0x53, 0xef, 0xc6, 0x4c, 0x40, 0xda, 0xcf, 0xb0, 0xb9, 0x60, - 0x54, 0x74, 0x9e, 0xcf, 0xe9, 0x6b, 0x28, 0xfa, 0x8e, 0xad, 0x14, 0xb6, 0xa5, 0x9d, 0x35, 0x33, - 0x1a, 0x6a, 0x2e, 0x6c, 0x4d, 0x49, 0x5f, 0x85, 0xcc, 0x26, 0xbf, 0x7a, 0xcb, 0x2d, 0xc3, 0x87, - 0xf0, 0x4e, 0x94, 0x52, 0x24, 0x64, 0x1d, 0x8a, 0x7b, 0x54, 0x54, 0xa9, 0x8a, 0xb9, 0x36, 0xee, - 0x51, 0xed, 0x03, 0x50, 0x9f, 0xaa, 0x26, 0x8e, 0xe4, 0x17, 0xf0, 0x26, 0xfd, 0xf5, 0x47, 0xcb, - 0x59, 0xf2, 0x80, 0x04, 0xd3, 0xdb, 0x1a, 0xcb, 0x88, 0xc5, 0xaa, 0x43, 0x15, 0x8f, 0x1d, 0xd6, - 0xa1, 0xcc, 0x62, 0x21, 0xe5, 0x42, 0x6b, 0x26, 0x44, 0x53, 0x6d, 0x3e, 0x83, 0x8e, 0xa0, 0x12, - 0x7d, 0x61, 0xbb, 0x63, 0x31, 0xee, 0xbf, 0xda, 0x50, 0x17, 0xb6, 0xe6, 0xfb, 0x24, 0x8a, 0xcd, - 0x57, 0x31, 0xf8, 0x94, 0x69, 0xad, 0xb9, 0x1d, 0x62, 0x21, 0x5d, 0xce, 0xfc, 0xbd, 0x04, 0xca, - 0xa2, 0x92, 0xf0, 0xbf, 0x01, 0x85, 0x47, 0x09, 0x79, 0x72, 0x57, 0x2f, 0x5c, 0x9c, 0x9b, 0x05, - 0xe7, 0x89, 0x6d, 0x45, 0xeb, 0x50, 0x8e, 0x9a, 0xc4, 0xfc, 0x7c, 0x55, 0xcc, 0xf8, 0x63, 0xbe, - 0xff, 0xd2, 0xf3, 0xfd, 0x97, 0xb3, 0xf7, 0x8f, 0x3e, 0x82, 0x32, 0x1e, 0xb3, 0xc0, 0x52, 0xe4, - 0x67, 0xce, 0x73, 0x0c, 0x69, 0xfc, 0x55, 0x82, 0x32, 0xbf, 0xc1, 0x68, 0x04, 0x72, 0x1c, 0xf3, - 0xa8, 0xa1, 0x3f, 0xff, 0x56, 0xea, 0x8b, 0x8f, 0x8c, 0x7a, 0x90, 0x8b, 0x23, 0x96, 0x70, 0x04, - 0x72, 0x1c, 0xcf, 0x19, 0x4b, 0xce, 0x3c, 0x1a, 0x19, 0x4b, 0xce, 0xe5, 0xff, 0x08, 0xe4, 0x38, - 0x7b, 0x33, 0x96, 0x9c, 0x09, 0xfb, 0x8c, 0x25, 0x67, 0xc3, 0x1d, 0xfd, 0x02, 0xa5, 0x28, 0xa9, - 0xd1, 0x5e, 0x26, 0xf2, 0xd4, 0x13, 0xa0, 0xee, 0xe7, 0x60, 0x88, 0x62, 0x57, 0x50, 0x6c, 0x61, - 0x86, 0x8c, 0x4c, 0xcc, 0x34, 0xf6, 0xd5, 0xbd, 0xec, 0x84, 0xb8, 0x52, 0xe3, 0xdf, 0x22, 0x40, - 0x7a, 0x39, 0xd0, 0x38, 0x3a, 0x47, 0x56, 0xc0, 0xd0, 0xe1, 0xff, 0x29, 0x3d, 0x1d, 0xf3, 0xea, - 0x51, 0x6e, 0x9e, 0x68, 0xf9, 0x0f, 0x09, 0x5e, 0x25, 0xf1, 0x85, 0x4e, 0x72, 0xa8, 0xcc, 0x06, - 0xac, 0xfa, 0xc9, 0x32, 0x54, 0xe1, 0x21, 0x84, 0x52, 0x14, 0x6e, 0xe8, 0xe3, 0xec, 0x1a, 0x53, - 0x99, 0xaa, 0x1e, 0xe6, 0xa5, 0x89, 0xb2, 0xbf, 0x81, 0x9c, 0x84, 0x45, 0xae, 0xd5, 0x4b, 0x13, - 0x51, 0x3d, 0xce, 0x4f, 0x8c, 0x8b, 0x37, 0x2f, 0x6f, 0x1f, 0x6a, 0x2b, 0xff, 0x3c, 0xd4, 0x56, - 0x7e, 0x9f, 0xd4, 0xa4, 0xdb, 0x49, 0x4d, 0xfa, 0x7b, 0x52, 0x93, 0xee, 0x27, 0x35, 0xe9, 0xf2, - 0xf3, 0x65, 0xff, 0xb3, 0x7f, 0x2a, 0x86, 0x3f, 0x15, 0xba, 0x32, 0x4f, 0xab, 0x83, 0xff, 0x02, - 0x00, 0x00, 0xff, 0xff, 0x49, 0x81, 0x1b, 0x40, 0x00, 0x0c, 0x00, 0x00, + // 831 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0xcd, 0x6e, 0xeb, 0x44, + 0x18, 0xbd, 0xce, 0x8f, 0x7b, 0xf3, 0x85, 0x8a, 0xcb, 0xd0, 0xdb, 0xba, 0x16, 0x4a, 0x8a, 0x57, + 0x15, 0x2a, 0x76, 0x9b, 0x8a, 0xb6, 0xc0, 0x02, 0x9a, 0x16, 0xa2, 0x20, 0xd8, 0x38, 0x20, 0xa0, + 0x9b, 0xc8, 0x89, 0x27, 0xa9, 0x85, 0xe3, 0x71, 0x3c, 0xe3, 0x92, 0x8a, 0x0d, 0x3c, 0x0d, 0x8f, + 0xc0, 0x2b, 0x74, 0xc9, 0x92, 0x55, 0xd5, 0xe6, 0x41, 0x10, 0xf2, 0x78, 0xdc, 0xfc, 0x55, 0xc1, + 0x76, 0x77, 0x33, 0x93, 0x73, 0xce, 0x77, 0xbe, 0xf9, 0x39, 0x0e, 0x7c, 0x3d, 0x74, 0xd8, 0x75, + 0xd8, 0xd3, 0xfb, 0x64, 0x64, 0xf4, 0x89, 0xc7, 0x2c, 0xc7, 0xc3, 0x81, 0x3d, 0x3f, 0xb4, 0x7c, + 0xc7, 0xa0, 0x38, 0xb8, 0x71, 0xfa, 0x98, 0x1a, 0xd4, 0xf2, 0xec, 0x1e, 0x99, 0x18, 0x37, 0x47, + 0xc9, 0x50, 0xf7, 0x03, 0xc2, 0x08, 0xaa, 0xcd, 0x18, 0x7a, 0x82, 0xd6, 0x13, 0xc8, 0xcd, 0x91, + 0xba, 0x3b, 0x24, 0x64, 0xe8, 0x62, 0x83, 0xa3, 0x7b, 0xe1, 0xc0, 0xb0, 0xbc, 0xdb, 0x98, 0xaa, + 0xd6, 0x97, 0x7f, 0x62, 0xce, 0x08, 0x53, 0x66, 0x8d, 0x7c, 0x01, 0xd8, 0x1a, 0x92, 0x21, 0xe1, + 0x43, 0x23, 0x1a, 0x89, 0xd5, 0xb3, 0x54, 0xce, 0xd9, 0xad, 0x3f, 0xb3, 0x2d, 0x98, 0x27, 0x19, + 0x98, 0x23, 0x12, 0x7a, 0x2c, 0xe6, 0x69, 0x6d, 0x40, 0x1d, 0x46, 0x02, 0x7c, 0x11, 0x60, 0x8b, + 0x61, 0x13, 0x8f, 0x43, 0x4c, 0x19, 0x3a, 0x86, 0x0d, 0x21, 0xaf, 0x48, 0x7b, 0xd2, 0x7e, 0xb5, + 0xb1, 0xab, 0xcf, 0xed, 0x05, 0x57, 0xd1, 0x3b, 0x31, 0xc0, 0x4c, 0x90, 0xda, 0x37, 0xf0, 0xfe, + 0x82, 0x14, 0xf5, 0x89, 0x47, 0x71, 0x3e, 0x2d, 0x4b, 0xd8, 0xfa, 0xc1, 0xb7, 0x5f, 0x68, 0x0b, + 0x6d, 0x83, 0x3c, 0x70, 0xb0, 0x6b, 0x53, 0xa5, 0xb0, 0x57, 0xdc, 0xaf, 0x98, 0x62, 0xf6, 0x64, + 0x37, 0x29, 0xf1, 0x12, 0xbb, 0x4d, 0x61, 0xf7, 0x12, 0xbb, 0x78, 0x66, 0xf7, 0x00, 0x40, 0x00, + 0xba, 0x8e, 0xcd, 0xd5, 0x2a, 0xcd, 0xcd, 0xe9, 0x7d, 0xbd, 0x22, 0xf8, 0xed, 0x4b, 0xb3, 0x22, + 0x00, 0x6d, 0x5b, 0x7b, 0x2b, 0xfc, 0x24, 0x1a, 0xb1, 0x1f, 0xed, 0x00, 0xde, 0xf0, 0xe5, 0x6f, + 0x1d, 0xca, 0x12, 0x61, 0x05, 0x36, 0x06, 0x8e, 0xcb, 0x70, 0x40, 0x15, 0x89, 0xf7, 0x94, 0x4c, + 0xb5, 0x26, 0xbc, 0x37, 0x87, 0x16, 0x2d, 0x7d, 0x0c, 0x25, 0xd7, 0xa1, 0x8c, 0x63, 0xd7, 0xf6, + 0xc3, 0x61, 0xda, 0x17, 0xf0, 0x2e, 0xd7, 0x68, 0x61, 0x96, 0xaf, 0x93, 0x96, 0xb0, 0xcc, 0x05, + 0x5e, 0xb2, 0xad, 0x7f, 0x4a, 0xb0, 0x7d, 0x41, 0x3c, 0x16, 0x10, 0xd7, 0xc5, 0x41, 0x87, 0x59, + 0x41, 0x3e, 0x47, 0xc8, 0x00, 0x39, 0x20, 0x84, 0x0d, 0xe2, 0x3b, 0x50, 0x6d, 0xec, 0xac, 0x16, + 0xff, 0x2e, 0x7a, 0x14, 0xa6, 0x80, 0x21, 0x1d, 0x36, 0x88, 0xcf, 0x1c, 0xe2, 0x51, 0xa5, 0xc8, + 0xed, 0x6e, 0xe9, 0xf1, 0x8b, 0xd6, 0x93, 0x17, 0xad, 0x9f, 0x7b, 0xb7, 0x66, 0x02, 0xd2, 0x7e, + 0x86, 0x9d, 0x15, 0xa3, 0xa2, 0xf3, 0x6c, 0x4e, 0xdf, 0x40, 0xd1, 0x77, 0x6c, 0xa5, 0xb0, 0x27, + 0xed, 0x6f, 0x9a, 0xd1, 0x50, 0x73, 0x61, 0x77, 0x4e, 0xfa, 0x3a, 0x64, 0x36, 0xf9, 0xd5, 0xcb, + 0xb7, 0x0d, 0x1f, 0xc2, 0x3b, 0x51, 0x0e, 0x91, 0x90, 0x75, 0x29, 0xee, 0x53, 0x51, 0xa5, 0x2a, + 0xd6, 0x3a, 0xb8, 0x4f, 0xb5, 0x0f, 0x40, 0x7d, 0xae, 0x9a, 0xb8, 0x8c, 0x5f, 0xc1, 0xdb, 0xd9, + 0xaf, 0x3f, 0x5a, 0x4e, 0xce, 0x0b, 0x12, 0xcc, 0x1f, 0x6b, 0x2c, 0x23, 0x36, 0xab, 0x0e, 0x55, + 0x3c, 0x71, 0x58, 0x97, 0x32, 0x8b, 0x85, 0x94, 0x0b, 0x6d, 0x9a, 0x10, 0x2d, 0x75, 0xf8, 0x0a, + 0x3a, 0x85, 0x4a, 0x34, 0xc3, 0x76, 0xd7, 0x62, 0xdc, 0x7f, 0xb5, 0xa1, 0xae, 0x1c, 0xcd, 0xf7, + 0x49, 0xd8, 0x9a, 0xaf, 0x63, 0xf0, 0x39, 0xd3, 0x5a, 0x4b, 0x27, 0xc4, 0x42, 0x9a, 0xcf, 0xfc, + 0x83, 0x04, 0xca, 0xaa, 0x92, 0xf0, 0xbf, 0x0d, 0x85, 0x27, 0x09, 0x79, 0x7a, 0x5f, 0x2f, 0xb4, + 0x2f, 0xcd, 0x82, 0xf3, 0xcc, 0xb1, 0xa2, 0x2d, 0x28, 0x47, 0x4d, 0x62, 0x7e, 0xbf, 0x2a, 0x66, + 0x3c, 0x59, 0xee, 0xbf, 0xb4, 0xbe, 0xff, 0x72, 0xfa, 0xfe, 0xd1, 0x47, 0x50, 0xc6, 0x13, 0x16, + 0x58, 0x8a, 0xbc, 0xe6, 0x3e, 0xc7, 0x90, 0xc6, 0x5f, 0x25, 0x28, 0xf3, 0x17, 0x8c, 0xc6, 0x20, + 0xc7, 0x71, 0x8e, 0x1a, 0xfa, 0xfa, 0xaf, 0xa1, 0xbe, 0xfa, 0x19, 0x51, 0x8f, 0x33, 0x71, 0xc4, + 0x16, 0x8e, 0x41, 0x8e, 0x23, 0x39, 0x65, 0xc9, 0x85, 0x4f, 0x44, 0xca, 0x92, 0x4b, 0x99, 0x3f, + 0x06, 0x39, 0x4e, 0xdd, 0x94, 0x25, 0x17, 0x62, 0x3e, 0x65, 0xc9, 0xc5, 0x58, 0x47, 0xbf, 0x40, + 0x29, 0xca, 0x68, 0x74, 0x98, 0x8a, 0x3c, 0x17, 0xfe, 0xea, 0x51, 0x06, 0x86, 0x28, 0x76, 0x0d, + 0xc5, 0x16, 0x66, 0xc8, 0x48, 0xc5, 0x9c, 0xc5, 0xbe, 0x7a, 0x98, 0x9e, 0x10, 0x57, 0x6a, 0xfc, + 0x5b, 0x04, 0x98, 0x3d, 0x0e, 0x34, 0x89, 0xee, 0x91, 0x15, 0x30, 0x74, 0xf2, 0x7f, 0x4a, 0xcf, + 0xc7, 0xbc, 0x7a, 0x9a, 0x99, 0x27, 0x5a, 0xfe, 0x43, 0x82, 0xd7, 0x49, 0x7c, 0xa1, 0x4f, 0x33, + 0xa8, 0x2c, 0x06, 0xac, 0xfa, 0x59, 0x1e, 0xaa, 0xf0, 0x10, 0x42, 0x29, 0x0a, 0x37, 0xf4, 0x49, + 0x7a, 0x8d, 0xb9, 0x4c, 0x55, 0x4f, 0xb2, 0xd2, 0x44, 0xd9, 0xdf, 0x40, 0x4e, 0xc2, 0x22, 0xd3, + 0xee, 0xcd, 0x12, 0x51, 0x3d, 0xcb, 0x4e, 0x8c, 0x8b, 0x37, 0xaf, 0xee, 0x1e, 0x6b, 0xaf, 0xfe, + 0x79, 0xac, 0xbd, 0xfa, 0x7d, 0x5a, 0x93, 0xee, 0xa6, 0x35, 0xe9, 0xef, 0x69, 0x4d, 0x7a, 0x98, + 0xd6, 0xa4, 0xab, 0x2f, 0xf3, 0xfe, 0x2b, 0xff, 0x5c, 0x0c, 0x7f, 0x2a, 0xf4, 0x64, 0x9e, 0x56, + 0xc7, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0xba, 0xe9, 0x09, 0xc3, 0xe2, 0x0b, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1259,16 +1258,18 @@ func (m *StoreCreateRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } - { - size, err := m.Sandbox.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if m.Sandbox != nil { + { + size, err := m.Sandbox.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintSandbox(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintSandbox(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0xa } - i-- - dAtA[i] = 0xa return len(dAtA) - i, nil } @@ -1296,16 +1297,18 @@ func (m *StoreCreateResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } - { - size, err := m.Sandbox.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if m.Sandbox != nil { + { + size, err := m.Sandbox.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintSandbox(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintSandbox(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0xa } - i-- - dAtA[i] = 0xa return len(dAtA) - i, nil } @@ -1342,16 +1345,18 @@ func (m *StoreUpdateRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0x12 } } - { - size, err := m.Sandbox.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if m.Sandbox != nil { + { + size, err := m.Sandbox.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintSandbox(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintSandbox(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0xa } - i-- - dAtA[i] = 0xa return len(dAtA) - i, nil } @@ -1379,16 +1384,18 @@ func (m *StoreUpdateResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } - { - size, err := m.Sandbox.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if m.Sandbox != nil { + { + size, err := m.Sandbox.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintSandbox(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintSandbox(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0xa } - i-- - dAtA[i] = 0xa return len(dAtA) - i, nil } @@ -1972,8 +1979,10 @@ func (m *StoreCreateRequest) Size() (n int) { } var l int _ = l - l = m.Sandbox.Size() - n += 1 + l + sovSandbox(uint64(l)) + if m.Sandbox != nil { + l = m.Sandbox.Size() + n += 1 + l + sovSandbox(uint64(l)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -1986,8 +1995,10 @@ func (m *StoreCreateResponse) Size() (n int) { } var l int _ = l - l = m.Sandbox.Size() - n += 1 + l + sovSandbox(uint64(l)) + if m.Sandbox != nil { + l = m.Sandbox.Size() + n += 1 + l + sovSandbox(uint64(l)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -2000,8 +2011,10 @@ func (m *StoreUpdateRequest) Size() (n int) { } var l int _ = l - l = m.Sandbox.Size() - n += 1 + l + sovSandbox(uint64(l)) + if m.Sandbox != nil { + l = m.Sandbox.Size() + n += 1 + l + sovSandbox(uint64(l)) + } if len(m.Fields) > 0 { for _, s := range m.Fields { l = len(s) @@ -2020,8 +2033,10 @@ func (m *StoreUpdateResponse) Size() (n int) { } var l int _ = l - l = m.Sandbox.Size() - n += 1 + l + sovSandbox(uint64(l)) + if m.Sandbox != nil { + l = m.Sandbox.Size() + n += 1 + l + sovSandbox(uint64(l)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -2296,7 +2311,7 @@ func (this *StoreCreateRequest) String() string { return "nil" } s := strings.Join([]string{`&StoreCreateRequest{`, - `Sandbox:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Sandbox), "Sandbox", "types.Sandbox", 1), `&`, ``, 1) + `,`, + `Sandbox:` + strings.Replace(fmt.Sprintf("%v", this.Sandbox), "Sandbox", "types.Sandbox", 1) + `,`, `XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`, `}`, }, "") @@ -2307,7 +2322,7 @@ func (this *StoreCreateResponse) String() string { return "nil" } s := strings.Join([]string{`&StoreCreateResponse{`, - `Sandbox:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Sandbox), "Sandbox", "types.Sandbox", 1), `&`, ``, 1) + `,`, + `Sandbox:` + strings.Replace(fmt.Sprintf("%v", this.Sandbox), "Sandbox", "types.Sandbox", 1) + `,`, `XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`, `}`, }, "") @@ -2318,7 +2333,7 @@ func (this *StoreUpdateRequest) String() string { return "nil" } s := strings.Join([]string{`&StoreUpdateRequest{`, - `Sandbox:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Sandbox), "Sandbox", "types.Sandbox", 1), `&`, ``, 1) + `,`, + `Sandbox:` + strings.Replace(fmt.Sprintf("%v", this.Sandbox), "Sandbox", "types.Sandbox", 1) + `,`, `Fields:` + fmt.Sprintf("%v", this.Fields) + `,`, `XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`, `}`, @@ -2330,7 +2345,7 @@ func (this *StoreUpdateResponse) String() string { return "nil" } s := strings.Join([]string{`&StoreUpdateResponse{`, - `Sandbox:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Sandbox), "Sandbox", "types.Sandbox", 1), `&`, ``, 1) + `,`, + `Sandbox:` + strings.Replace(fmt.Sprintf("%v", this.Sandbox), "Sandbox", "types.Sandbox", 1) + `,`, `XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`, `}`, }, "") @@ -2372,9 +2387,9 @@ func (this *StoreListResponse) String() string { if this == nil { return "nil" } - repeatedStringForList := "[]Sandbox{" + repeatedStringForList := "[]*Sandbox{" for _, f := range this.List { - repeatedStringForList += fmt.Sprintf("%v", f) + "," + repeatedStringForList += strings.Replace(fmt.Sprintf("%v", f), "Sandbox", "types.Sandbox", 1) + "," } repeatedStringForList += "}" s := strings.Join([]string{`&StoreListResponse{`, @@ -2574,6 +2589,9 @@ func (m *StoreCreateRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } + if m.Sandbox == nil { + m.Sandbox = &types.Sandbox{} + } if err := m.Sandbox.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -2658,6 +2676,9 @@ func (m *StoreCreateResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } + if m.Sandbox == nil { + m.Sandbox = &types.Sandbox{} + } if err := m.Sandbox.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -2742,6 +2763,9 @@ func (m *StoreUpdateRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } + if m.Sandbox == nil { + m.Sandbox = &types.Sandbox{} + } if err := m.Sandbox.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -2858,6 +2882,9 @@ func (m *StoreUpdateResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } + if m.Sandbox == nil { + m.Sandbox = &types.Sandbox{} + } if err := m.Sandbox.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -3159,7 +3186,7 @@ func (m *StoreListResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.List = append(m.List, types.Sandbox{}) + m.List = append(m.List, &types.Sandbox{}) if err := m.List[len(m.List)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/api/services/sandbox/v1/sandbox.proto b/api/services/sandbox/v1/sandbox.proto index 617ea6d1a..149ad7d2e 100644 --- a/api/services/sandbox/v1/sandbox.proto +++ b/api/services/sandbox/v1/sandbox.proto @@ -46,20 +46,20 @@ service Store { } message StoreCreateRequest { - containerd.types.Sandbox sandbox = 1 [(gogoproto.nullable) = false]; + containerd.types.Sandbox sandbox = 1; } message StoreCreateResponse { - containerd.types.Sandbox sandbox = 1 [(gogoproto.nullable) = false]; + containerd.types.Sandbox sandbox = 1; } message StoreUpdateRequest { - containerd.types.Sandbox sandbox = 1 [(gogoproto.nullable) = false]; + containerd.types.Sandbox sandbox = 1; repeated string fields = 2; } message StoreUpdateResponse { - containerd.types.Sandbox sandbox = 1 [(gogoproto.nullable) = false]; + containerd.types.Sandbox sandbox = 1; } message StoreDeleteRequest { @@ -73,7 +73,7 @@ message StoreListRequest { } message StoreListResponse { - repeated containerd.types.Sandbox list = 1 [(gogoproto.nullable) = false]; + repeated containerd.types.Sandbox list = 1; } message StoreGetRequest { diff --git a/api/services/snapshots/v1/snapshots.pb.go b/api/services/snapshots/v1/snapshots.pb.go index 8ca82b0e4..f64c62a31 100644 --- a/api/services/snapshots/v1/snapshots.pb.go +++ b/api/services/snapshots/v1/snapshots.pb.go @@ -485,7 +485,7 @@ func (m *Info) XXX_DiscardUnknown() { var xxx_messageInfo_Info proto.InternalMessageInfo type StatSnapshotResponse struct { - Info Info `protobuf:"bytes,1,opt,name=info,proto3" json:"info"` + Info *Info `protobuf:"bytes,1,opt,name=info,proto3" json:"info,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -525,7 +525,7 @@ var xxx_messageInfo_StatSnapshotResponse proto.InternalMessageInfo type UpdateSnapshotRequest struct { Snapshotter string `protobuf:"bytes,1,opt,name=snapshotter,proto3" json:"snapshotter,omitempty"` - Info Info `protobuf:"bytes,2,opt,name=info,proto3" json:"info"` + Info *Info `protobuf:"bytes,2,opt,name=info,proto3" json:"info,omitempty"` // UpdateMask specifies which fields to perform the update on. If empty, // the operation applies to all fields. // @@ -571,7 +571,7 @@ func (m *UpdateSnapshotRequest) XXX_DiscardUnknown() { var xxx_messageInfo_UpdateSnapshotRequest proto.InternalMessageInfo type UpdateSnapshotResponse struct { - Info Info `protobuf:"bytes,1,opt,name=info,proto3" json:"info"` + Info *Info `protobuf:"bytes,1,opt,name=info,proto3" json:"info,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -660,7 +660,7 @@ func (m *ListSnapshotsRequest) XXX_DiscardUnknown() { var xxx_messageInfo_ListSnapshotsRequest proto.InternalMessageInfo type ListSnapshotsResponse struct { - Info []Info `protobuf:"bytes,1,rep,name=info,proto3" json:"info"` + Info []*Info `protobuf:"bytes,1,rep,name=info,proto3" json:"info,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -848,68 +848,67 @@ func init() { } var fileDescriptor_cfc0ddf12791f168 = []byte{ - // 968 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0x4b, 0x6f, 0xe3, 0x44, - 0x1c, 0xaf, 0x63, 0xd7, 0xdd, 0xfc, 0x43, 0xab, 0x68, 0x36, 0xed, 0x46, 0x46, 0xca, 0x46, 0x39, - 0xa0, 0x8a, 0x83, 0xbd, 0x1b, 0xc4, 0x6e, 0xbb, 0xbd, 0x90, 0xa6, 0x01, 0xa5, 0xdd, 0x76, 0x91, - 0xfb, 0x58, 0xba, 0x20, 0x56, 0x6e, 0x33, 0x49, 0xad, 0xc4, 0x0f, 0x3c, 0xe3, 0xa0, 0x80, 0x84, - 0xf8, 0x58, 0x7c, 0x84, 0x1e, 0x91, 0xb8, 0x70, 0x42, 0x6c, 0xae, 0x7c, 0x00, 0x4e, 0x48, 0xc8, - 0xe3, 0x71, 0x5e, 0xf5, 0x2a, 0x8e, 0x9b, 0xbd, 0xcd, 0x78, 0xfe, 0x8f, 0xdf, 0xfc, 0xfe, 0xaf, - 0x31, 0x1c, 0x76, 0x4c, 0x7a, 0xe3, 0x5f, 0xa9, 0xd7, 0x8e, 0xa5, 0x5d, 0x3b, 0x36, 0x35, 0x4c, - 0x1b, 0x7b, 0xad, 0xc9, 0xa5, 0xe1, 0x9a, 0x1a, 0xc1, 0x5e, 0xdf, 0xbc, 0xc6, 0x44, 0x23, 0xb6, - 0xe1, 0x92, 0x1b, 0x87, 0x12, 0xad, 0xff, 0x74, 0xbc, 0x51, 0x5d, 0xcf, 0xa1, 0x0e, 0x2a, 0x8f, - 0xb5, 0xd4, 0x48, 0x43, 0x1d, 0x0b, 0xf5, 0x9f, 0x2a, 0x85, 0x8e, 0xd3, 0x71, 0x98, 0xb0, 0x16, - 0xac, 0x42, 0x3d, 0xe5, 0xe3, 0x8e, 0xe3, 0x74, 0x7a, 0x58, 0x63, 0xbb, 0x2b, 0xbf, 0xad, 0x61, - 0xcb, 0xa5, 0x03, 0x7e, 0x58, 0x9e, 0x3d, 0x6c, 0x9b, 0xb8, 0xd7, 0x7a, 0x6b, 0x19, 0xa4, 0xcb, - 0x25, 0x1e, 0xcf, 0x4a, 0x50, 0xd3, 0xc2, 0x84, 0x1a, 0x96, 0xcb, 0x05, 0x9e, 0x25, 0xba, 0x23, - 0x1d, 0xb8, 0x98, 0x68, 0x96, 0xe3, 0xdb, 0x34, 0xd4, 0xab, 0xfc, 0x27, 0xc0, 0xd6, 0xd7, 0x1e, - 0x76, 0x0d, 0x0f, 0x9f, 0xf2, 0x5b, 0xe8, 0xf8, 0x07, 0x1f, 0x13, 0x8a, 0xca, 0x90, 0x8b, 0x2e, - 0x46, 0xb1, 0x57, 0x14, 0xca, 0xc2, 0x76, 0x56, 0x9f, 0xfc, 0x84, 0xf2, 0x20, 0x76, 0xf1, 0xa0, - 0x98, 0x61, 0x27, 0xc1, 0x12, 0x6d, 0x81, 0x1c, 0x98, 0xb2, 0x69, 0x51, 0x64, 0x1f, 0xf9, 0x0e, - 0x7d, 0x07, 0x72, 0xcf, 0xb8, 0xc2, 0x3d, 0x52, 0x94, 0xca, 0xe2, 0x76, 0xae, 0x7a, 0xa0, 0xce, - 0xe3, 0x51, 0x8d, 0x47, 0xa5, 0xbe, 0x64, 0x66, 0x1a, 0x36, 0xf5, 0x06, 0x3a, 0xb7, 0xa9, 0xec, - 0x42, 0x6e, 0xe2, 0x73, 0x04, 0x4b, 0x18, 0xc3, 0x2a, 0xc0, 0x6a, 0xdf, 0xe8, 0xf9, 0x98, 0x43, - 0x0d, 0x37, 0x2f, 0x32, 0x3b, 0x42, 0xe5, 0x10, 0x1e, 0xdd, 0x71, 0x44, 0x5c, 0xc7, 0x26, 0x18, - 0x69, 0x20, 0x33, 0xa6, 0x48, 0x51, 0x60, 0x98, 0x1f, 0x4d, 0x62, 0x66, 0x4c, 0xaa, 0xc7, 0xc1, - 0xb9, 0xce, 0xc5, 0x2a, 0xff, 0x0a, 0xf0, 0xf0, 0xc2, 0xc4, 0x3f, 0x7e, 0x48, 0x22, 0x2f, 0x67, - 0x88, 0xac, 0xcd, 0x27, 0x32, 0x06, 0xd2, 0xb2, 0x59, 0xfc, 0x0a, 0x0a, 0xd3, 0x5e, 0xd2, 0x52, - 0x58, 0x87, 0x75, 0xf6, 0x81, 0xdc, 0x83, 0xbb, 0x4a, 0x0d, 0x36, 0x22, 0x23, 0x69, 0x71, 0x1c, - 0xc1, 0xa6, 0x8e, 0x2d, 0xa7, 0xbf, 0x8c, 0xa2, 0x08, 0xf2, 0x62, 0xb3, 0xee, 0x58, 0x96, 0x49, - 0x17, 0xb7, 0x86, 0x40, 0xb2, 0x0d, 0x2b, 0xa2, 0x9c, 0xad, 0x23, 0x0f, 0xe2, 0x38, 0x32, 0xdf, - 0xce, 0x64, 0x45, 0x7d, 0x7e, 0x56, 0xc4, 0x02, 0x5a, 0x76, 0x5e, 0x34, 0xe1, 0xe1, 0x29, 0x35, - 0xe8, 0x32, 0x48, 0xfc, 0x27, 0x03, 0x52, 0xd3, 0x6e, 0x3b, 0x23, 0x46, 0x84, 0x09, 0x46, 0xc6, - 0xd5, 0x92, 0x99, 0xaa, 0x96, 0x17, 0x20, 0x75, 0x4d, 0xbb, 0xc5, 0xa8, 0xda, 0xa8, 0x7e, 0x32, - 0x9f, 0x95, 0x23, 0xd3, 0x6e, 0xe9, 0x4c, 0x07, 0xed, 0x02, 0x5c, 0x7b, 0xd8, 0xa0, 0xb8, 0xf5, - 0xd6, 0xa0, 0x45, 0xa9, 0x2c, 0x6c, 0xe7, 0xaa, 0x8a, 0x1a, 0xf6, 0x61, 0x35, 0xea, 0xc3, 0xea, - 0x59, 0xd4, 0x87, 0xf5, 0x2c, 0x97, 0xae, 0xd1, 0x40, 0xd5, 0x77, 0x5b, 0x91, 0xea, 0xea, 0x7c, - 0x55, 0x2e, 0x5d, 0xa3, 0xe8, 0x70, 0x14, 0x49, 0x99, 0x45, 0xb2, 0x3a, 0x1f, 0x73, 0xc0, 0xca, - 0xb2, 0x03, 0xf7, 0x0d, 0x14, 0xa6, 0x03, 0xc7, 0x0b, 0xe9, 0x0b, 0x90, 0x4c, 0xbb, 0xed, 0x30, - 0x23, 0xb9, 0x24, 0x84, 0x06, 0xe0, 0xf6, 0xa5, 0xdb, 0xbf, 0x1e, 0xaf, 0xe8, 0x4c, 0xb3, 0xf2, - 0x9b, 0x00, 0x9b, 0xe7, 0xec, 0xba, 0x8b, 0x67, 0x45, 0xe4, 0x3d, 0x93, 0xd6, 0x3b, 0xda, 0x83, - 0x5c, 0xc8, 0x35, 0x1b, 0xae, 0x2c, 0x2f, 0xe2, 0x42, 0xf3, 0x65, 0x30, 0x7f, 0x8f, 0x0d, 0xd2, - 0xd5, 0x79, 0x20, 0x83, 0x75, 0xe5, 0x0d, 0x6c, 0xcd, 0x22, 0x5f, 0x1a, 0x2d, 0x3a, 0x14, 0x5e, - 0x9a, 0x64, 0x44, 0xf8, 0x02, 0xfd, 0xaf, 0x08, 0x6b, 0x6d, 0xb3, 0x47, 0xb1, 0x47, 0x8a, 0x99, - 0xb2, 0xb8, 0x9d, 0xd5, 0xa3, 0x6d, 0xe5, 0x12, 0x36, 0x67, 0x6c, 0xde, 0x81, 0x2b, 0xa6, 0x84, - 0xbb, 0x0f, 0x1f, 0x9d, 0x13, 0xa3, 0x83, 0xef, 0x53, 0xd1, 0x7b, 0xb0, 0xce, 0x6d, 0x70, 0x58, - 0x08, 0x24, 0x62, 0xfe, 0x14, 0x56, 0xb6, 0xa8, 0xb3, 0x75, 0x50, 0xd9, 0xa6, 0xed, 0xb4, 0x30, - 0x61, 0x9a, 0xa2, 0xce, 0x77, 0x95, 0x2a, 0x6c, 0xd4, 0x7b, 0xd8, 0xb0, 0x7d, 0x37, 0x31, 0x84, - 0x4f, 0x77, 0x40, 0x0a, 0xea, 0x1b, 0xe5, 0x60, 0xed, 0xfc, 0xe4, 0xe8, 0xe4, 0xd5, 0xeb, 0x93, - 0xfc, 0x0a, 0x7a, 0x00, 0xd2, 0x45, 0xb3, 0xf1, 0x3a, 0x2f, 0x20, 0x00, 0xb9, 0x56, 0x3f, 0x6b, - 0x5e, 0x34, 0xf2, 0x19, 0xb4, 0x0e, 0xd9, 0xfa, 0xab, 0xe3, 0xe3, 0xe6, 0xd9, 0x59, 0xe3, 0x20, - 0x2f, 0x56, 0xff, 0x78, 0x00, 0xd9, 0x11, 0x8d, 0xe8, 0x17, 0x58, 0xe3, 0x6f, 0x06, 0xb4, 0x93, - 0xf6, 0x1d, 0xa3, 0xec, 0xa6, 0xd0, 0xe4, 0x3c, 0xf9, 0x20, 0x05, 0xd3, 0x16, 0x7d, 0x9e, 0x6a, - 0xf6, 0x2b, 0xcf, 0x16, 0x55, 0xe3, 0x6e, 0xbb, 0x20, 0x87, 0x63, 0x15, 0x69, 0xf3, 0x2d, 0x4c, - 0x4d, 0x71, 0xe5, 0x49, 0x72, 0x05, 0xee, 0xec, 0x12, 0xe4, 0x70, 0x42, 0xa1, 0xe7, 0x29, 0x67, - 0x99, 0xb2, 0x75, 0xa7, 0xac, 0x1b, 0xc1, 0x9b, 0x3b, 0x30, 0x1d, 0xce, 0xf6, 0x24, 0xa6, 0x63, - 0x5f, 0x01, 0xef, 0x35, 0xed, 0x83, 0x14, 0xb4, 0xcd, 0x24, 0x91, 0x89, 0x99, 0x8b, 0x49, 0x22, - 0x13, 0xdb, 0x95, 0x7f, 0x06, 0x39, 0x6c, 0x4c, 0x49, 0x6e, 0x14, 0xdb, 0x7c, 0x95, 0x9d, 0xc5, - 0x15, 0xb9, 0xf3, 0x01, 0x48, 0x41, 0x97, 0x41, 0x09, 0xc0, 0xc7, 0x75, 0x38, 0xe5, 0xf9, 0xc2, - 0x7a, 0xa1, 0xe3, 0x27, 0x02, 0xba, 0x81, 0x55, 0xd6, 0x41, 0x90, 0x9a, 0x00, 0xfd, 0x44, 0xbb, - 0x52, 0xb4, 0xc4, 0xf2, 0xfc, 0x92, 0xa7, 0xb0, 0xc6, 0xdb, 0x0d, 0x4a, 0x90, 0xcb, 0xd3, 0x9d, - 0xe9, 0x7d, 0xd9, 0xb2, 0xff, 0xfd, 0xed, 0xbb, 0xd2, 0xca, 0x9f, 0xef, 0x4a, 0x2b, 0xbf, 0x0e, - 0x4b, 0xc2, 0xed, 0xb0, 0x24, 0xfc, 0x3e, 0x2c, 0x09, 0x7f, 0x0f, 0x4b, 0xc2, 0x9b, 0x83, 0xf4, - 0x7f, 0xac, 0x7b, 0xa3, 0xcd, 0x95, 0xcc, 0xfc, 0x7d, 0xf6, 0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, - 0x55, 0x78, 0x18, 0x98, 0x00, 0x0f, 0x00, 0x00, + // 958 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0xc9, 0x6e, 0xdb, 0x46, + 0x18, 0x36, 0x45, 0x9a, 0x8e, 0x7e, 0xd5, 0x86, 0x30, 0x91, 0x1d, 0x81, 0x05, 0x54, 0x41, 0x87, + 0xc2, 0xe8, 0x81, 0x4c, 0x54, 0x34, 0xf1, 0x72, 0x52, 0x64, 0xb5, 0x90, 0x1d, 0x3b, 0x05, 0x2d, + 0x3b, 0x48, 0x5b, 0x34, 0xa0, 0xad, 0x91, 0x4c, 0x48, 0x5c, 0xca, 0x19, 0xaa, 0x50, 0x0b, 0x14, + 0x7d, 0xa6, 0x3e, 0x45, 0x8e, 0x05, 0x7a, 0xe9, 0xb1, 0xd1, 0xb5, 0x0f, 0xd0, 0x53, 0x81, 0x62, + 0x86, 0x43, 0x6d, 0x66, 0x20, 0x4a, 0x51, 0x6f, 0xb3, 0xfc, 0xcb, 0x37, 0xdf, 0xbf, 0x91, 0x70, + 0xda, 0xb5, 0xe9, 0x5d, 0x78, 0xa3, 0xdf, 0x7a, 0x8e, 0x71, 0xeb, 0xb9, 0xd4, 0xb2, 0x5d, 0x1c, + 0xb4, 0xa7, 0x97, 0x96, 0x6f, 0x1b, 0x04, 0x07, 0x03, 0xfb, 0x16, 0x13, 0x83, 0xb8, 0x96, 0x4f, + 0xee, 0x3c, 0x4a, 0x8c, 0xc1, 0x93, 0xc9, 0x46, 0xf7, 0x03, 0x8f, 0x7a, 0xa8, 0x3c, 0xd1, 0xd2, + 0x63, 0x0d, 0x7d, 0x22, 0x34, 0x78, 0xa2, 0x15, 0xba, 0x5e, 0xd7, 0xe3, 0xc2, 0x06, 0x5b, 0x45, + 0x7a, 0xda, 0xc7, 0x5d, 0xcf, 0xeb, 0xf6, 0xb1, 0xc1, 0x77, 0x37, 0x61, 0xc7, 0xc0, 0x8e, 0x4f, + 0x87, 0xe2, 0xb2, 0x3c, 0x7f, 0xd9, 0xb1, 0x71, 0xbf, 0xfd, 0xc6, 0xb1, 0x48, 0x4f, 0x48, 0x7c, + 0x32, 0x2f, 0x41, 0x6d, 0x07, 0x13, 0x6a, 0x39, 0xbe, 0x10, 0x78, 0x9a, 0xea, 0x8d, 0x74, 0xe8, + 0x63, 0x62, 0x38, 0x5e, 0xe8, 0xd2, 0x48, 0xaf, 0xf2, 0xaf, 0x04, 0x7b, 0x5f, 0x07, 0xd8, 0xb7, + 0x02, 0x7c, 0x29, 0x5e, 0x61, 0xe2, 0x1f, 0x42, 0x4c, 0x28, 0x2a, 0x43, 0x2e, 0x7e, 0x18, 0xc5, + 0x41, 0x51, 0x2a, 0x4b, 0xfb, 0x59, 0x73, 0xfa, 0x08, 0xe5, 0x41, 0xee, 0xe1, 0x61, 0x31, 0xc3, + 0x6f, 0xd8, 0x12, 0xed, 0x81, 0xca, 0x4c, 0xb9, 0xb4, 0x28, 0xf3, 0x43, 0xb1, 0x43, 0xdf, 0x81, + 0xda, 0xb7, 0x6e, 0x70, 0x9f, 0x14, 0x95, 0xb2, 0xbc, 0x9f, 0xab, 0x9e, 0xe8, 0x8b, 0x78, 0xd4, + 0x93, 0x51, 0xe9, 0x2f, 0xb8, 0x99, 0x86, 0x4b, 0x83, 0xa1, 0x29, 0x6c, 0x6a, 0x87, 0x90, 0x9b, + 0x3a, 0x8e, 0x61, 0x49, 0x13, 0x58, 0x05, 0xd8, 0x1c, 0x58, 0xfd, 0x10, 0x0b, 0xa8, 0xd1, 0xe6, + 0x28, 0x73, 0x20, 0x55, 0x4e, 0xe1, 0xd1, 0x3d, 0x47, 0xc4, 0xf7, 0x5c, 0x82, 0x91, 0x01, 0x2a, + 0x67, 0x8a, 0x14, 0x25, 0x8e, 0xf9, 0xd1, 0x34, 0x66, 0xce, 0xa4, 0x7e, 0xce, 0xee, 0x4d, 0x21, + 0x56, 0xf9, 0x47, 0x82, 0x87, 0xd7, 0x36, 0xfe, 0xf1, 0xff, 0x24, 0xf2, 0xf5, 0x1c, 0x91, 0xb5, + 0xc5, 0x44, 0x26, 0x40, 0x5a, 0x37, 0x8b, 0x5f, 0x41, 0x61, 0xd6, 0xcb, 0xaa, 0x14, 0xd6, 0x61, + 0x9b, 0x1f, 0x90, 0x0f, 0xe0, 0xae, 0x52, 0x83, 0x9d, 0xd8, 0xc8, 0xaa, 0x38, 0xce, 0x60, 0xd7, + 0xc4, 0x8e, 0x37, 0x58, 0x47, 0x51, 0xb0, 0xbc, 0xd8, 0xad, 0x7b, 0x8e, 0x63, 0xd3, 0xe5, 0xad, + 0x21, 0x50, 0x5c, 0xcb, 0x89, 0x29, 0xe7, 0xeb, 0xd8, 0x83, 0x3c, 0x89, 0xcc, 0xb7, 0x73, 0x59, + 0x51, 0x5f, 0x9c, 0x15, 0x89, 0x80, 0xd6, 0x9d, 0x17, 0x4d, 0x78, 0x78, 0x49, 0x2d, 0xba, 0x0e, + 0x12, 0xff, 0xce, 0x80, 0xd2, 0x74, 0x3b, 0xde, 0x98, 0x11, 0x69, 0x8a, 0x91, 0x49, 0xb5, 0x64, + 0x66, 0xaa, 0xe5, 0x08, 0x94, 0x9e, 0xed, 0xb6, 0x39, 0x55, 0x3b, 0xd5, 0x4f, 0x17, 0xb3, 0x72, + 0x66, 0xbb, 0x6d, 0x93, 0xeb, 0xa0, 0x43, 0x80, 0xdb, 0x00, 0x5b, 0x14, 0xb7, 0xdf, 0x58, 0xb4, + 0xa8, 0x94, 0xa5, 0xfd, 0x5c, 0x55, 0xd3, 0xa3, 0x3e, 0xac, 0xc7, 0x7d, 0x58, 0x6f, 0xc5, 0x7d, + 0xd8, 0xcc, 0x0a, 0xe9, 0x1a, 0x65, 0xaa, 0xa1, 0xdf, 0x8e, 0x55, 0x37, 0x17, 0xab, 0x0a, 0xe9, + 0x1a, 0x45, 0xa7, 0xe3, 0x48, 0xaa, 0x3c, 0x92, 0xd5, 0xc5, 0x98, 0x19, 0x2b, 0xeb, 0x0e, 0x9c, + 0x09, 0x85, 0xd9, 0xc0, 0x89, 0x42, 0x3a, 0x02, 0xc5, 0x76, 0x3b, 0x1e, 0x37, 0x92, 0x4b, 0x43, + 0x28, 0x03, 0x67, 0x72, 0x9d, 0xca, 0x6f, 0x12, 0xec, 0x5e, 0xf1, 0x87, 0x2e, 0x9f, 0x0f, 0xb1, + 0xdf, 0xcc, 0xf2, 0x7e, 0xd1, 0x31, 0xe4, 0x22, 0x7e, 0xf9, 0x40, 0xe5, 0xb9, 0x90, 0x14, 0x8e, + 0x2f, 0xd9, 0xcc, 0x3d, 0xb7, 0x48, 0xcf, 0x14, 0xc1, 0x63, 0xeb, 0x4a, 0x0b, 0xf6, 0xe6, 0x31, + 0xaf, 0x81, 0x0a, 0x13, 0x0a, 0x2f, 0x6c, 0x32, 0xa6, 0x77, 0x89, 0x6e, 0x57, 0x84, 0xad, 0x8e, + 0xdd, 0xa7, 0x38, 0x20, 0xc5, 0x4c, 0x59, 0xde, 0xcf, 0x9a, 0xf1, 0xb6, 0x72, 0x09, 0xbb, 0x73, + 0x36, 0xef, 0x01, 0x95, 0x97, 0x06, 0xfa, 0x1c, 0x3e, 0xba, 0x22, 0x56, 0x17, 0x7f, 0x48, 0xe5, + 0x1e, 0xc3, 0xb6, 0xb0, 0x21, 0x00, 0x21, 0x50, 0x88, 0xfd, 0x53, 0x54, 0xc1, 0xb2, 0xc9, 0xd7, + 0xac, 0x82, 0x6d, 0xd7, 0x6b, 0x63, 0xc2, 0x35, 0x65, 0x53, 0xec, 0x2a, 0x55, 0xd8, 0xa9, 0xf7, + 0xb1, 0xe5, 0x86, 0x7e, 0x6a, 0x08, 0x9f, 0x1d, 0x80, 0xc2, 0xea, 0x18, 0xe5, 0x60, 0xeb, 0xea, + 0xe2, 0xec, 0xe2, 0xe5, 0xab, 0x8b, 0xfc, 0x06, 0x7a, 0x00, 0xca, 0x75, 0xb3, 0xf1, 0x2a, 0x2f, + 0x21, 0x00, 0xb5, 0x56, 0x6f, 0x35, 0xaf, 0x1b, 0xf9, 0x0c, 0xda, 0x86, 0x6c, 0xfd, 0xe5, 0xf9, + 0x79, 0xb3, 0xd5, 0x6a, 0x9c, 0xe4, 0xe5, 0xea, 0x1f, 0x0f, 0x20, 0x3b, 0x26, 0x10, 0xfd, 0x02, + 0x5b, 0xe2, 0xdb, 0x00, 0x1d, 0xac, 0xfa, 0xbd, 0xa2, 0x1d, 0xae, 0xa0, 0x29, 0x78, 0x0a, 0x41, + 0x61, 0x53, 0x15, 0x7d, 0xb1, 0xd2, 0x8c, 0xd7, 0x9e, 0x2e, 0xab, 0x26, 0xdc, 0xf6, 0x40, 0x8d, + 0xc6, 0x27, 0x32, 0x16, 0x5b, 0x98, 0x99, 0xd6, 0xda, 0xe3, 0xf4, 0x0a, 0xc2, 0xd9, 0x6b, 0x50, + 0xa3, 0x49, 0x84, 0x9e, 0xad, 0x38, 0xb3, 0xb4, 0xbd, 0x7b, 0xa5, 0xdc, 0x60, 0xdf, 0xd6, 0xcc, + 0x74, 0x34, 0xc3, 0xd3, 0x98, 0x4e, 0x9c, 0xf6, 0xef, 0x35, 0x1d, 0x82, 0xc2, 0xda, 0x63, 0x9a, + 0xc8, 0x24, 0xcc, 0xbf, 0x34, 0x91, 0x49, 0xec, 0xbe, 0x3f, 0x83, 0x1a, 0x35, 0xa3, 0x34, 0x2f, + 0x4a, 0x6c, 0xb5, 0xda, 0xc1, 0xf2, 0x8a, 0xc2, 0xf9, 0x10, 0x14, 0xd6, 0x5f, 0x50, 0x0a, 0xf0, + 0x49, 0xbd, 0x4d, 0x7b, 0xb6, 0xb4, 0x5e, 0xe4, 0xf8, 0xb1, 0x84, 0xee, 0x60, 0x93, 0x77, 0x10, + 0xa4, 0xa7, 0x40, 0x3f, 0xd5, 0xae, 0x34, 0x23, 0xb5, 0xbc, 0x78, 0xe4, 0x25, 0x6c, 0x89, 0x76, + 0x83, 0x52, 0xe4, 0xf2, 0x6c, 0x67, 0x7a, 0x5f, 0xb6, 0x3c, 0xff, 0xfe, 0xed, 0xbb, 0xd2, 0xc6, + 0x9f, 0xef, 0x4a, 0x1b, 0xbf, 0x8e, 0x4a, 0xd2, 0xdb, 0x51, 0x49, 0xfa, 0x7d, 0x54, 0x92, 0xfe, + 0x1a, 0x95, 0xa4, 0x6f, 0x4e, 0x56, 0xff, 0x33, 0x3d, 0x1e, 0x6f, 0x6e, 0x54, 0xee, 0xef, 0xf3, + 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x76, 0x97, 0xca, 0x3f, 0xe8, 0x0e, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1904,16 +1903,18 @@ func (m *StatSnapshotResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } - { - size, err := m.Info.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if m.Info != nil { + { + size, err := m.Info.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintSnapshots(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintSnapshots(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0xa } - i-- - dAtA[i] = 0xa return len(dAtA) - i, nil } @@ -1953,16 +1954,18 @@ func (m *UpdateSnapshotRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x1a } - { - size, err := m.Info.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if m.Info != nil { + { + size, err := m.Info.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintSnapshots(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintSnapshots(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0x12 } - i-- - dAtA[i] = 0x12 if len(m.Snapshotter) > 0 { i -= len(m.Snapshotter) copy(dAtA[i:], m.Snapshotter) @@ -1997,16 +2000,18 @@ func (m *UpdateSnapshotResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } - { - size, err := m.Info.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if m.Info != nil { + { + size, err := m.Info.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintSnapshots(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintSnapshots(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0xa } - i-- - dAtA[i] = 0xa return len(dAtA) - i, nil } @@ -2472,8 +2477,10 @@ func (m *StatSnapshotResponse) Size() (n int) { } var l int _ = l - l = m.Info.Size() - n += 1 + l + sovSnapshots(uint64(l)) + if m.Info != nil { + l = m.Info.Size() + n += 1 + l + sovSnapshots(uint64(l)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -2490,8 +2497,10 @@ func (m *UpdateSnapshotRequest) Size() (n int) { if l > 0 { n += 1 + l + sovSnapshots(uint64(l)) } - l = m.Info.Size() - n += 1 + l + sovSnapshots(uint64(l)) + if m.Info != nil { + l = m.Info.Size() + n += 1 + l + sovSnapshots(uint64(l)) + } if m.UpdateMask != nil { l = m.UpdateMask.Size() n += 1 + l + sovSnapshots(uint64(l)) @@ -2508,8 +2517,10 @@ func (m *UpdateSnapshotResponse) Size() (n int) { } var l int _ = l - l = m.Info.Size() - n += 1 + l + sovSnapshots(uint64(l)) + if m.Info != nil { + l = m.Info.Size() + n += 1 + l + sovSnapshots(uint64(l)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -2803,7 +2814,7 @@ func (this *StatSnapshotResponse) String() string { return "nil" } s := strings.Join([]string{`&StatSnapshotResponse{`, - `Info:` + strings.Replace(strings.Replace(this.Info.String(), "Info", "Info", 1), `&`, ``, 1) + `,`, + `Info:` + strings.Replace(this.Info.String(), "Info", "Info", 1) + `,`, `XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`, `}`, }, "") @@ -2815,7 +2826,7 @@ func (this *UpdateSnapshotRequest) String() string { } s := strings.Join([]string{`&UpdateSnapshotRequest{`, `Snapshotter:` + fmt.Sprintf("%v", this.Snapshotter) + `,`, - `Info:` + strings.Replace(strings.Replace(this.Info.String(), "Info", "Info", 1), `&`, ``, 1) + `,`, + `Info:` + strings.Replace(this.Info.String(), "Info", "Info", 1) + `,`, `UpdateMask:` + strings.Replace(fmt.Sprintf("%v", this.UpdateMask), "FieldMask", "types1.FieldMask", 1) + `,`, `XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`, `}`, @@ -2827,7 +2838,7 @@ func (this *UpdateSnapshotResponse) String() string { return "nil" } s := strings.Join([]string{`&UpdateSnapshotResponse{`, - `Info:` + strings.Replace(strings.Replace(this.Info.String(), "Info", "Info", 1), `&`, ``, 1) + `,`, + `Info:` + strings.Replace(this.Info.String(), "Info", "Info", 1) + `,`, `XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`, `}`, }, "") @@ -2849,9 +2860,9 @@ func (this *ListSnapshotsResponse) String() string { if this == nil { return "nil" } - repeatedStringForInfo := "[]Info{" + repeatedStringForInfo := "[]*Info{" for _, f := range this.Info { - repeatedStringForInfo += strings.Replace(strings.Replace(f.String(), "Info", "Info", 1), `&`, ``, 1) + "," + repeatedStringForInfo += strings.Replace(f.String(), "Info", "Info", 1) + "," } repeatedStringForInfo += "}" s := strings.Join([]string{`&ListSnapshotsResponse{`, @@ -4717,6 +4728,9 @@ func (m *StatSnapshotResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } + if m.Info == nil { + m.Info = &Info{} + } if err := m.Info.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -4833,6 +4847,9 @@ func (m *UpdateSnapshotRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } + if m.Info == nil { + m.Info = &Info{} + } if err := m.Info.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -4953,6 +4970,9 @@ func (m *UpdateSnapshotResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } + if m.Info == nil { + m.Info = &Info{} + } if err := m.Info.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -5152,7 +5172,7 @@ func (m *ListSnapshotsResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Info = append(m.Info, Info{}) + m.Info = append(m.Info, &Info{}) if err := m.Info[len(m.Info)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/api/services/snapshots/v1/snapshots.proto b/api/services/snapshots/v1/snapshots.proto index 1942161ac..ed4ce3187 100644 --- a/api/services/snapshots/v1/snapshots.proto +++ b/api/services/snapshots/v1/snapshots.proto @@ -125,12 +125,12 @@ message Info { } message StatSnapshotResponse { - Info info = 1 [(gogoproto.nullable) = false]; + Info info = 1; } message UpdateSnapshotRequest { string snapshotter = 1; - Info info = 2 [(gogoproto.nullable) = false]; + Info info = 2; // UpdateMask specifies which fields to perform the update on. If empty, // the operation applies to all fields. @@ -142,7 +142,7 @@ message UpdateSnapshotRequest { } message UpdateSnapshotResponse { - Info info = 1 [(gogoproto.nullable) = false]; + Info info = 1; } message ListSnapshotsRequest{ @@ -162,7 +162,7 @@ message ListSnapshotsRequest{ } message ListSnapshotsResponse { - repeated Info info = 1 [(gogoproto.nullable) = false]; + repeated Info info = 1; } message UsageRequest { diff --git a/api/types/platform.pb.go b/api/types/platform.pb.go index 29eee4a1f..55221707a 100644 --- a/api/types/platform.pb.go +++ b/api/types/platform.pb.go @@ -77,20 +77,20 @@ func init() { } var fileDescriptor_24ba7a4b83e2367e = []byte{ - // 203 bytes of a gzipped FileDescriptorProto + // 194 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xb2, 0x4c, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0xcf, 0x2b, 0x49, 0xcc, 0xcc, 0x4b, 0x2d, 0x4a, 0x41, 0x66, 0x26, 0x16, 0x64, 0xea, 0x97, 0x54, 0x16, 0xa4, 0x16, 0xeb, 0x17, 0xe4, 0x24, 0x96, 0xa4, 0xe5, 0x17, 0xe5, 0xea, 0x15, 0x14, 0xe5, 0x97, 0xe4, 0x0b, 0x09, 0x20, 0x14, 0xe9, 0x81, 0x15, 0x48, 0x89, 0xa4, 0xe7, 0xa7, 0xe7, 0x83, 0x25, 0xf5, 0x41, 0x2c, 0x88, 0x3a, 0xa5, - 0x04, 0x2e, 0x8e, 0x00, 0xa8, 0x4e, 0x21, 0x31, 0x2e, 0xa6, 0xfc, 0x62, 0x09, 0x46, 0x05, 0x46, - 0x0d, 0x4e, 0x27, 0xb6, 0x47, 0xf7, 0xe4, 0x99, 0xfc, 0x83, 0x83, 0x98, 0xf2, 0x8b, 0x85, 0x94, - 0xb8, 0x78, 0x12, 0x8b, 0x92, 0x33, 0x32, 0x4b, 0x52, 0x93, 0x4b, 0x4a, 0x8b, 0x52, 0x25, 0x98, - 0x40, 0x2a, 0x82, 0x50, 0xc4, 0x84, 0x24, 0xb8, 0xd8, 0xcb, 0x12, 0x8b, 0x32, 0x13, 0xf3, 0x4a, - 0x24, 0x98, 0xc1, 0xd2, 0x30, 0xae, 0x93, 0xd7, 0x89, 0x87, 0x72, 0x0c, 0x37, 0x1e, 0xca, 0x31, - 0x34, 0x3c, 0x92, 0x63, 0x3c, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, - 0x18, 0xa3, 0x0c, 0x88, 0xf7, 0x9e, 0x35, 0x98, 0x4c, 0x62, 0x03, 0x3b, 0xda, 0x18, 0x10, 0x00, - 0x00, 0xff, 0xff, 0x97, 0xa1, 0x99, 0x56, 0x19, 0x01, 0x00, 0x00, + 0x08, 0x2e, 0x8e, 0x00, 0xa8, 0x4e, 0x21, 0x3e, 0x2e, 0xa6, 0xfc, 0x62, 0x09, 0x46, 0x05, 0x46, + 0x0d, 0xce, 0x20, 0xa6, 0xfc, 0x62, 0x21, 0x25, 0x2e, 0x9e, 0xc4, 0xa2, 0xe4, 0x8c, 0xcc, 0x92, + 0xd4, 0xe4, 0x92, 0xd2, 0xa2, 0x54, 0x09, 0x26, 0xb0, 0x0c, 0x8a, 0x98, 0x90, 0x04, 0x17, 0x7b, + 0x59, 0x62, 0x51, 0x66, 0x62, 0x5e, 0x89, 0x04, 0x33, 0x58, 0x1a, 0xc6, 0x75, 0xf2, 0x3a, 0xf1, + 0x50, 0x8e, 0xe1, 0xc6, 0x43, 0x39, 0x86, 0x86, 0x47, 0x72, 0x8c, 0x27, 0x1e, 0xc9, 0x31, 0x5e, + 0x78, 0x24, 0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0x63, 0x94, 0x01, 0xf1, 0xde, 0xb2, 0x06, 0x93, 0x49, + 0x6c, 0x60, 0xc7, 0x1a, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x90, 0x53, 0xf1, 0x6b, 0x11, 0x01, + 0x00, 0x00, } func (m *Platform) Marshal() (dAtA []byte, err error) { @@ -187,7 +187,7 @@ func (this *Platform) String() string { return "nil" } s := strings.Join([]string{`&Platform{`, - `OS:` + fmt.Sprintf("%v", this.OS) + `,`, + `Os:` + fmt.Sprintf("%v", this.OS) + `,`, `Architecture:` + fmt.Sprintf("%v", this.Architecture) + `,`, `Variant:` + fmt.Sprintf("%v", this.Variant) + `,`, `XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`, @@ -234,7 +234,7 @@ func (m *Platform) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field OS", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Os", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { diff --git a/api/types/platform.proto b/api/types/platform.proto index bc87af172..9d48a93d2 100644 --- a/api/types/platform.proto +++ b/api/types/platform.proto @@ -25,7 +25,7 @@ option go_package = "github.com/containerd/containerd/api/types;types"; // Platform follows the structure of the OCI platform specification, from // descriptors. message Platform { - string os = 1 [(gogoproto.customname) = "OS"]; + string os = 1; string architecture = 2; string variant = 3; } diff --git a/api/types/sandbox.pb.go b/api/types/sandbox.pb.go index bf20ce509..86601172a 100644 --- a/api/types/sandbox.pb.go +++ b/api/types/sandbox.pb.go @@ -32,21 +32,21 @@ type Sandbox struct { // SandboxID is a unique instance identifier within namespace SandboxID string `protobuf:"bytes,1,opt,name=sandbox_id,json=sandboxId,proto3" json:"sandbox_id,omitempty"` // Runtime specifies which runtime to use for executing this container. - Runtime Sandbox_Runtime `protobuf:"bytes,2,opt,name=runtime,proto3" json:"runtime"` + Runtime *Sandbox_Runtime `protobuf:"bytes,2,opt,name=runtime,proto3" json:"runtime,omitempty"` // Spec is sandbox configuration (kin of OCI runtime spec), spec's data will be written to a config.json file in the // bundle directory (similary to OCI spec). Spec *types.Any `protobuf:"bytes,3,opt,name=spec,proto3" json:"spec,omitempty"` // Labels provides an area to include arbitrary data on containers. - Labels map[string]string `protobuf:"bytes,4,rep,name=labels,proto3" json:"labels" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + Labels map[string]string `protobuf:"bytes,4,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // CreatedAt is the time the container was first created. CreatedAt *types.Timestamp `protobuf:"bytes,5,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"` // UpdatedAt is the last time the container was mutated. UpdatedAt *types.Timestamp `protobuf:"bytes,6,opt,name=updated_at,json=updatedAt,proto3" json:"updated_at,omitempty"` // Extensions allow clients to provide optional blobs that can be handled by runtime. - Extensions map[string]types.Any `protobuf:"bytes,7,rep,name=extensions,proto3" json:"extensions" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Extensions map[string]*types.Any `protobuf:"bytes,7,rep,name=extensions,proto3" json:"extensions,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *Sandbox) Reset() { *m = Sandbox{} } @@ -126,7 +126,7 @@ var xxx_messageInfo_Sandbox_Runtime proto.InternalMessageInfo func init() { proto.RegisterType((*Sandbox)(nil), "containerd.types.Sandbox") - proto.RegisterMapType((map[string]types.Any)(nil), "containerd.types.Sandbox.ExtensionsEntry") + proto.RegisterMapType((map[string]*types.Any)(nil), "containerd.types.Sandbox.ExtensionsEntry") proto.RegisterMapType((map[string]string)(nil), "containerd.types.Sandbox.LabelsEntry") proto.RegisterType((*Sandbox_Runtime)(nil), "containerd.types.Sandbox.Runtime") } @@ -136,35 +136,35 @@ func init() { } var fileDescriptor_f2257af6cf851f1c = []byte{ - // 446 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0x4f, 0x8b, 0xd3, 0x40, - 0x18, 0xc6, 0x3b, 0xfd, 0x17, 0xf2, 0x16, 0x71, 0x19, 0x7a, 0x88, 0x39, 0xa4, 0x55, 0x10, 0xaa, - 0xc8, 0x44, 0xd6, 0xcb, 0xae, 0x9e, 0x5a, 0xdd, 0xc3, 0x8a, 0x22, 0x64, 0x3d, 0x88, 0x97, 0x65, - 0xd2, 0x8c, 0x31, 0xd8, 0xcc, 0x84, 0x64, 0x22, 0x9b, 0x9b, 0xdf, 0xc0, 0xaf, 0xd5, 0xa3, 0x47, - 0x4f, 0x8b, 0x9b, 0x4f, 0x22, 0x99, 0x99, 0xd8, 0x50, 0xad, 0x7a, 0x09, 0xef, 0xf0, 0xfe, 0x9e, - 0xf7, 0x79, 0xf2, 0x0e, 0x03, 0x27, 0x71, 0x22, 0x3f, 0x96, 0x21, 0x59, 0x8b, 0xd4, 0x5f, 0x0b, - 0x2e, 0x69, 0xc2, 0x59, 0x1e, 0x75, 0x4b, 0x9a, 0x25, 0xbe, 0xac, 0x32, 0x56, 0xf8, 0x05, 0xe5, - 0x51, 0x28, 0xae, 0x48, 0x96, 0x0b, 0x29, 0xf0, 0xd1, 0x8e, 0x21, 0xaa, 0xef, 0x4e, 0x63, 0x11, - 0x0b, 0xd5, 0xf4, 0x9b, 0x4a, 0x73, 0xee, 0x9d, 0x58, 0x88, 0x78, 0xc3, 0x7c, 0x75, 0x0a, 0xcb, - 0x0f, 0x3e, 0xe5, 0x95, 0x69, 0xcd, 0xf6, 0x5b, 0x32, 0x49, 0x59, 0x21, 0x69, 0x9a, 0x69, 0xe0, - 0xde, 0xd7, 0x11, 0x58, 0x17, 0xda, 0x15, 0x3f, 0x02, 0x30, 0x01, 0x2e, 0x93, 0xc8, 0x41, 0x73, - 0xb4, 0xb0, 0x57, 0xb7, 0xea, 0xeb, 0x99, 0x6d, 0x80, 0xf3, 0x17, 0x81, 0x6d, 0x80, 0xf3, 0x08, - 0x2f, 0xc1, 0xca, 0x4b, 0xde, 0xcc, 0x73, 0xfa, 0x73, 0xb4, 0x98, 0x1c, 0xdf, 0x25, 0xfb, 0x79, - 0x89, 0x11, 0x92, 0x40, 0x83, 0xab, 0xe1, 0xf6, 0x7a, 0xd6, 0x0b, 0x5a, 0x1d, 0x5e, 0xc0, 0xb0, - 0xc8, 0xd8, 0xda, 0x19, 0x28, 0xfd, 0x94, 0xe8, 0xb0, 0xa4, 0x0d, 0x4b, 0x96, 0xbc, 0x0a, 0x14, - 0x81, 0x9f, 0xc3, 0x78, 0x43, 0x43, 0xb6, 0x29, 0x9c, 0xe1, 0x7c, 0xb0, 0x98, 0x1c, 0xdf, 0x3f, - 0xec, 0xf5, 0x4a, 0x71, 0x67, 0x5c, 0xe6, 0x95, 0xf1, 0x33, 0x52, 0x7c, 0x0a, 0xb0, 0xce, 0x19, - 0x95, 0x2c, 0xba, 0xa4, 0xd2, 0x19, 0x29, 0x53, 0xf7, 0x37, 0xd3, 0xb7, 0xed, 0x86, 0x02, 0xdb, - 0xd0, 0x4b, 0xd9, 0x48, 0xcb, 0x2c, 0x6a, 0xa5, 0xe3, 0x7f, 0x4b, 0x0d, 0xbd, 0x94, 0xf8, 0x0d, - 0x00, 0xbb, 0x92, 0x8c, 0x17, 0x89, 0xe0, 0x85, 0x63, 0xa9, 0xf8, 0x0f, 0x0e, 0xc7, 0x3f, 0xfb, - 0xc5, 0x76, 0x7f, 0xa1, 0x33, 0xc2, 0x7d, 0x0d, 0x96, 0xd9, 0x27, 0xc6, 0x30, 0xe4, 0x34, 0x65, - 0xfa, 0xae, 0x02, 0x55, 0x63, 0x02, 0x96, 0xc8, 0xa4, 0x32, 0xeb, 0xff, 0x65, 0xaf, 0x2d, 0xe4, - 0x9e, 0xc2, 0xa4, 0xb3, 0x32, 0x7c, 0x04, 0x83, 0x4f, 0xac, 0x32, 0x13, 0x9b, 0x12, 0x4f, 0x61, - 0xf4, 0x99, 0x6e, 0x4a, 0x7d, 0xcd, 0x76, 0xa0, 0x0f, 0x4f, 0xfb, 0x27, 0xc8, 0xbd, 0x80, 0xdb, - 0x7b, 0x71, 0xff, 0x20, 0x7f, 0xd8, 0x95, 0x1f, 0x4a, 0xb3, 0x1b, 0xba, 0x7a, 0xb9, 0xbd, 0xf1, - 0x7a, 0xdf, 0x6f, 0xbc, 0xde, 0x97, 0xda, 0x43, 0xdb, 0xda, 0x43, 0xdf, 0x6a, 0x0f, 0xfd, 0xa8, - 0x3d, 0xf4, 0xfe, 0xf1, 0xff, 0xbf, 0xa4, 0x67, 0xea, 0xfb, 0xae, 0x17, 0x8e, 0x95, 0xcd, 0x93, - 0x9f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x59, 0xb4, 0xf4, 0x66, 0x86, 0x03, 0x00, 0x00, + // 438 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0xc1, 0x6b, 0xd4, 0x40, + 0x14, 0xc6, 0x77, 0x76, 0xb7, 0x1b, 0xf2, 0x16, 0xb1, 0x0c, 0x7b, 0x88, 0x39, 0xa4, 0xab, 0x20, + 0xac, 0x22, 0x13, 0xa9, 0x97, 0xd6, 0xe2, 0x61, 0x8b, 0x3d, 0xac, 0xe8, 0x65, 0xea, 0x41, 0xbc, + 0x94, 0xc9, 0x66, 0x8c, 0xc1, 0xcd, 0x4c, 0x48, 0x26, 0xd2, 0xdc, 0xfc, 0xf3, 0x7a, 0xf4, 0xe8, + 0x49, 0x6c, 0xfe, 0x0f, 0x41, 0x32, 0x33, 0xb1, 0x61, 0x75, 0xb5, 0x97, 0xf0, 0x86, 0xf7, 0xfb, + 0xde, 0xf7, 0xf1, 0x1e, 0x81, 0xa3, 0x24, 0x55, 0x1f, 0xab, 0x88, 0xac, 0x65, 0x16, 0xae, 0xa5, + 0x50, 0x2c, 0x15, 0xbc, 0x88, 0xfb, 0x25, 0xcb, 0xd3, 0x50, 0xd5, 0x39, 0x2f, 0xc3, 0x92, 0x89, + 0x38, 0x92, 0x97, 0x24, 0x2f, 0xa4, 0x92, 0x78, 0xff, 0x86, 0x21, 0xba, 0xef, 0xcf, 0x12, 0x99, + 0x48, 0xdd, 0x0c, 0xdb, 0xca, 0x70, 0xfe, 0xbd, 0x44, 0xca, 0x64, 0xc3, 0x43, 0xfd, 0x8a, 0xaa, + 0x0f, 0x21, 0x13, 0xb5, 0x6d, 0x1d, 0x6c, 0xb7, 0x54, 0x9a, 0xf1, 0x52, 0xb1, 0x2c, 0x37, 0xc0, + 0x83, 0x9f, 0x63, 0x70, 0xce, 0x8d, 0x2b, 0x7e, 0x02, 0x60, 0x03, 0x5c, 0xa4, 0xb1, 0x87, 0xe6, + 0x68, 0xe1, 0x9e, 0xde, 0x69, 0xbe, 0x1f, 0xb8, 0x16, 0x58, 0xbd, 0xa4, 0xae, 0x05, 0x56, 0x31, + 0x3e, 0x01, 0xa7, 0xa8, 0x44, 0x3b, 0xcf, 0x1b, 0xce, 0xd1, 0x62, 0x7a, 0x78, 0x9f, 0x6c, 0xe7, + 0x25, 0x56, 0x48, 0xa8, 0x01, 0x69, 0xa7, 0xc0, 0x0b, 0x18, 0x97, 0x39, 0x5f, 0x7b, 0x23, 0xad, + 0x9c, 0x11, 0x13, 0x93, 0x74, 0x31, 0xc9, 0x52, 0xd4, 0x54, 0x13, 0xf8, 0x05, 0x4c, 0x36, 0x2c, + 0xe2, 0x9b, 0xd2, 0x1b, 0xcf, 0x47, 0x8b, 0xe9, 0xe1, 0xc3, 0xdd, 0x2e, 0xaf, 0x35, 0x77, 0x26, + 0x54, 0x51, 0x53, 0x2b, 0xc2, 0xc7, 0x00, 0xeb, 0x82, 0x33, 0xc5, 0xe3, 0x0b, 0xa6, 0xbc, 0x3d, + 0x6d, 0xe7, 0xff, 0x61, 0xf7, 0xb6, 0xdb, 0x0a, 0x75, 0x2d, 0xbd, 0x54, 0xad, 0xb4, 0xca, 0xe3, + 0x4e, 0x3a, 0xf9, 0xbf, 0xd4, 0xd2, 0x4b, 0x85, 0x57, 0x00, 0xfc, 0x52, 0x71, 0x51, 0xa6, 0x52, + 0x94, 0x9e, 0xa3, 0x83, 0x3f, 0xda, 0x1d, 0xfc, 0xec, 0x37, 0x6b, 0xc2, 0xf7, 0xc4, 0xfe, 0x1b, + 0x70, 0xec, 0xf6, 0x30, 0x86, 0xb1, 0x60, 0x19, 0x37, 0x97, 0xa1, 0xba, 0xc6, 0x04, 0x1c, 0x99, + 0x2b, 0x6d, 0x33, 0xfc, 0xc7, 0x2e, 0x3b, 0xc8, 0x3f, 0x86, 0x69, 0x6f, 0x4d, 0x78, 0x1f, 0x46, + 0x9f, 0x78, 0x6d, 0x27, 0xb6, 0x25, 0x9e, 0xc1, 0xde, 0x67, 0xb6, 0xa9, 0xcc, 0x51, 0x5d, 0x6a, + 0x1e, 0xcf, 0x87, 0x47, 0xc8, 0x3f, 0x87, 0xbb, 0x5b, 0x41, 0xff, 0x22, 0x7f, 0xdc, 0x97, 0xef, + 0x4a, 0x73, 0x33, 0xf4, 0xf4, 0xd5, 0xd5, 0x75, 0x30, 0xf8, 0x76, 0x1d, 0x0c, 0xbe, 0x34, 0x01, + 0xba, 0x6a, 0x02, 0xf4, 0xb5, 0x09, 0xd0, 0x8f, 0x26, 0x40, 0xef, 0x9f, 0xde, 0xfe, 0xbf, 0x39, + 0xd1, 0xdf, 0x77, 0x83, 0x68, 0xa2, 0x6d, 0x9e, 0xfd, 0x0a, 0x00, 0x00, 0xff, 0xff, 0x1b, 0xa8, + 0x0f, 0x4d, 0x74, 0x03, 0x00, 0x00, } func (m *Sandbox) Marshal() (dAtA []byte, err error) { @@ -195,16 +195,18 @@ func (m *Sandbox) MarshalToSizedBuffer(dAtA []byte) (int, error) { for k := range m.Extensions { v := m.Extensions[k] baseI := i - { - size, err := (&v).MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if v != nil { + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintSandbox(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintSandbox(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0x12 } - i-- - dAtA[i] = 0x12 i -= len(k) copy(dAtA[i:], k) i = encodeVarintSandbox(dAtA, i, uint64(len(k))) @@ -270,16 +272,18 @@ func (m *Sandbox) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x1a } - { - size, err := m.Runtime.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if m.Runtime != nil { + { + size, err := m.Runtime.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintSandbox(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintSandbox(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0x12 } - i-- - dAtA[i] = 0x12 if len(m.SandboxID) > 0 { i -= len(m.SandboxID) copy(dAtA[i:], m.SandboxID) @@ -357,8 +361,10 @@ func (m *Sandbox) Size() (n int) { if l > 0 { n += 1 + l + sovSandbox(uint64(l)) } - l = m.Runtime.Size() - n += 1 + l + sovSandbox(uint64(l)) + if m.Runtime != nil { + l = m.Runtime.Size() + n += 1 + l + sovSandbox(uint64(l)) + } if m.Spec != nil { l = m.Spec.Size() n += 1 + l + sovSandbox(uint64(l)) @@ -383,8 +389,12 @@ func (m *Sandbox) Size() (n int) { for k, v := range m.Extensions { _ = k _ = v - l = v.Size() - mapEntrySize := 1 + len(k) + sovSandbox(uint64(len(k))) + 1 + l + sovSandbox(uint64(l)) + l = 0 + if v != nil { + l = v.Size() + l += 1 + sovSandbox(uint64(l)) + } + mapEntrySize := 1 + len(k) + sovSandbox(uint64(len(k))) + l n += mapEntrySize + 1 + sovSandbox(uint64(mapEntrySize)) } } @@ -439,14 +449,14 @@ func (this *Sandbox) String() string { keysForExtensions = append(keysForExtensions, k) } github_com_gogo_protobuf_sortkeys.Strings(keysForExtensions) - mapStringForExtensions := "map[string]types.Any{" + mapStringForExtensions := "map[string]*types.Any{" for _, k := range keysForExtensions { mapStringForExtensions += fmt.Sprintf("%v: %v,", k, this.Extensions[k]) } mapStringForExtensions += "}" s := strings.Join([]string{`&Sandbox{`, `SandboxID:` + fmt.Sprintf("%v", this.SandboxID) + `,`, - `Runtime:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Runtime), "Sandbox_Runtime", "Sandbox_Runtime", 1), `&`, ``, 1) + `,`, + `Runtime:` + strings.Replace(fmt.Sprintf("%v", this.Runtime), "Sandbox_Runtime", "Sandbox_Runtime", 1) + `,`, `Spec:` + strings.Replace(fmt.Sprintf("%v", this.Spec), "Any", "types.Any", 1) + `,`, `Labels:` + mapStringForLabels + `,`, `CreatedAt:` + strings.Replace(fmt.Sprintf("%v", this.CreatedAt), "Timestamp", "types.Timestamp", 1) + `,`, @@ -567,6 +577,9 @@ func (m *Sandbox) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } + if m.Runtime == nil { + m.Runtime = &Sandbox_Runtime{} + } if err := m.Runtime.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -836,10 +849,10 @@ func (m *Sandbox) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Extensions == nil { - m.Extensions = make(map[string]types.Any) + m.Extensions = make(map[string]*types.Any) } var mapkey string - mapvalue := &types.Any{} + var mapvalue *types.Any for iNdEx < postIndex { entryPreIndex := iNdEx var wire uint64 @@ -933,7 +946,7 @@ func (m *Sandbox) Unmarshal(dAtA []byte) error { iNdEx += skippy } } - m.Extensions[mapkey] = *mapvalue + m.Extensions[mapkey] = mapvalue iNdEx = postIndex default: iNdEx = preIndex diff --git a/api/types/sandbox.proto b/api/types/sandbox.proto index c572db403..27cffbf99 100644 --- a/api/types/sandbox.proto +++ b/api/types/sandbox.proto @@ -37,16 +37,16 @@ message Sandbox { google.protobuf.Any options = 2; } // Runtime specifies which runtime to use for executing this container. - Runtime runtime = 2 [(gogoproto.nullable) = false]; + Runtime runtime = 2; // Spec is sandbox configuration (kin of OCI runtime spec), spec's data will be written to a config.json file in the // bundle directory (similary to OCI spec). google.protobuf.Any spec = 3; // Labels provides an area to include arbitrary data on containers. - map labels = 4 [(gogoproto.nullable) = false]; + map labels = 4; // CreatedAt is the time the container was first created. google.protobuf.Timestamp created_at = 5; // UpdatedAt is the last time the container was mutated. google.protobuf.Timestamp updated_at = 6; // Extensions allow clients to provide optional blobs that can be handled by runtime. - map extensions = 7 [(gogoproto.nullable) = false]; + map extensions = 7; } diff --git a/client.go b/client.go index 98b65daa4..866b83db9 100644 --- a/client.go +++ b/client.go @@ -841,7 +841,7 @@ func (c *Client) GetSnapshotterSupportedPlatforms(ctx context.Context, snapshott return platforms.Any(snPlatforms...), nil } -func toPlatforms(pt []apitypes.Platform) []ocispec.Platform { +func toPlatforms(pt []*apitypes.Platform) []ocispec.Platform { platforms := make([]ocispec.Platform, len(pt)) for i, p := range pt { platforms[i] = ocispec.Platform{ diff --git a/cmd/ctr/commands/plugins/plugins.go b/cmd/ctr/commands/plugins/plugins.go index 766a50821..c67874c29 100644 --- a/cmd/ctr/commands/plugins/plugins.go +++ b/cmd/ctr/commands/plugins/plugins.go @@ -146,7 +146,7 @@ var listCommand = cli.Command{ }, } -func prettyPlatforms(pspb []types.Platform) string { +func prettyPlatforms(pspb []*types.Platform) string { psm := map[string]struct{}{} for _, p := range pspb { psm[platforms.Format(v1.Platform{ diff --git a/containerstore.go b/containerstore.go index 20238603d..e3796ad0a 100644 --- a/containerstore.go +++ b/containerstore.go @@ -52,7 +52,7 @@ func (r *remoteContainers) Get(ctx context.Context, id string) (containers.Conta return containers.Container{}, errdefs.FromGRPC(err) } - return containerFromProto(&resp.Container), nil + return containerFromProto(resp.Container), nil } func (r *remoteContainers) List(ctx context.Context, filters ...string) ([]containers.Container, error) { @@ -116,7 +116,7 @@ func (r *remoteContainers) Create(ctx context.Context, container containers.Cont return containers.Container{}, errdefs.FromGRPC(err) } - return containerFromProto(&created.Container), nil + return containerFromProto(created.Container), nil } @@ -136,7 +136,7 @@ func (r *remoteContainers) Update(ctx context.Context, container containers.Cont return containers.Container{}, errdefs.FromGRPC(err) } - return containerFromProto(&updated.Container), nil + return containerFromProto(updated.Container), nil } @@ -149,12 +149,12 @@ func (r *remoteContainers) Delete(ctx context.Context, id string) error { } -func containerToProto(container *containers.Container) containersapi.Container { - extensions := make(map[string]ptypes.Any) +func containerToProto(container *containers.Container) *containersapi.Container { + extensions := make(map[string]*ptypes.Any) for k, v := range container.Extensions { - extensions[k] = *protobuf.FromAny(v) + extensions[k] = protobuf.FromAny(v) } - return containersapi.Container{ + return &containersapi.Container{ ID: container.ID, Labels: container.Labels, Image: container.Image, @@ -181,7 +181,7 @@ func containerFromProto(containerpb *containersapi.Container) containers.Contain extensions := make(map[string]typeurl.Any) for k, v := range containerpb.Extensions { v := v - extensions[k] = &v + extensions[k] = v } return containers.Container{ ID: containerpb.ID, @@ -198,12 +198,12 @@ func containerFromProto(containerpb *containersapi.Container) containers.Contain } } -func containersFromProto(containerspb []containersapi.Container) []containers.Container { +func containersFromProto(containerspb []*containersapi.Container) []containers.Container { var containers []containers.Container for _, container := range containerspb { container := container - containers = append(containers, containerFromProto(&container)) + containers = append(containers, containerFromProto(container)) } return containers diff --git a/content/proxy/content_store.go b/content/proxy/content_store.go index 2341579ae..374e260bd 100644 --- a/content/proxy/content_store.go +++ b/content/proxy/content_store.go @@ -126,7 +126,7 @@ func (pcs *proxyContentStore) Status(ctx context.Context, ref string) (content.S func (pcs *proxyContentStore) Update(ctx context.Context, info content.Info, fieldpaths ...string) (content.Info, error) { resp, err := pcs.client.Update(ctx, &contentapi.UpdateRequest{ - Info: infoToGRPC(info), + Info: infoToGRPC(&info), UpdateMask: &protobuftypes.FieldMask{ Paths: fieldpaths, }, @@ -214,8 +214,8 @@ func (pcs *proxyContentStore) negotiate(ctx context.Context, ref string, size in return wrclient, resp.Offset, nil } -func infoToGRPC(info content.Info) contentapi.Info { - return contentapi.Info{ +func infoToGRPC(info *content.Info) *contentapi.Info { + return &contentapi.Info{ Digest: info.Digest.String(), Size_: info.Size, CreatedAt: protobuf.ToTimestamp(info.CreatedAt), @@ -224,7 +224,7 @@ func infoToGRPC(info content.Info) contentapi.Info { } } -func infoFromGRPC(info contentapi.Info) content.Info { +func infoFromGRPC(info *contentapi.Info) content.Info { return content.Info{ Digest: digest.Digest(info.Digest), Size: info.Size_, diff --git a/contrib/snapshotservice/service.go b/contrib/snapshotservice/service.go index 85cac01e2..5dd54057c 100644 --- a/contrib/snapshotservice/service.go +++ b/contrib/snapshotservice/service.go @@ -118,8 +118,8 @@ func (s service) Update(ctx context.Context, sr *snapshotsapi.UpdateSnapshotRequ func (s service) List(sr *snapshotsapi.ListSnapshotsRequest, ss snapshotsapi.Snapshots_ListServer) error { var ( - buffer []snapshotsapi.Info - sendBlock = func(block []snapshotsapi.Info) error { + buffer []*snapshotsapi.Info + sendBlock = func(block []*snapshotsapi.Info) error { return ss.Send(&snapshotsapi.ListSnapshotsResponse{ Info: block, }) @@ -187,8 +187,8 @@ func fromKind(kind snapshots.Kind) snapshotsapi.Kind { return snapshotsapi.Kind_COMMITTED } -func fromInfo(info snapshots.Info) snapshotsapi.Info { - return snapshotsapi.Info{ +func fromInfo(info snapshots.Info) *snapshotsapi.Info { + return &snapshotsapi.Info{ Name: info.Name, Parent: info.Parent, Kind: fromKind(info.Kind), @@ -210,7 +210,7 @@ func fromMounts(mounts []mount.Mount) []*types.Mount { return out } -func toInfo(info snapshotsapi.Info) snapshots.Info { +func toInfo(info *snapshotsapi.Info) snapshots.Info { return snapshots.Info{ Name: info.Name, Parent: info.Parent, diff --git a/image_store.go b/image_store.go index b04fd9d68..044a8a6b2 100644 --- a/image_store.go +++ b/image_store.go @@ -70,7 +70,7 @@ func (s *remoteImages) Create(ctx context.Context, image images.Image) (images.I return images.Image{}, errdefs.FromGRPC(err) } - return imageFromProto(&created.Image), nil + return imageFromProto(created.Image), nil } func (s *remoteImages) Update(ctx context.Context, image images.Image, fieldpaths ...string) (images.Image, error) { @@ -89,7 +89,7 @@ func (s *remoteImages) Update(ctx context.Context, image images.Image, fieldpath return images.Image{}, errdefs.FromGRPC(err) } - return imageFromProto(&updated.Image), nil + return imageFromProto(updated.Image), nil } func (s *remoteImages) Delete(ctx context.Context, name string, opts ...images.DeleteOpt) error { @@ -107,8 +107,8 @@ func (s *remoteImages) Delete(ctx context.Context, name string, opts ...images.D return errdefs.FromGRPC(err) } -func imageToProto(image *images.Image) imagesapi.Image { - return imagesapi.Image{ +func imageToProto(image *images.Image) *imagesapi.Image { + return &imagesapi.Image{ Name: image.Name, Labels: image.Labels, Target: descToProto(&image.Target), @@ -121,18 +121,18 @@ func imageFromProto(imagepb *imagesapi.Image) images.Image { return images.Image{ Name: imagepb.Name, Labels: imagepb.Labels, - Target: descFromProto(&imagepb.Target), + Target: descFromProto(imagepb.Target), CreatedAt: protobuf.FromTimestamp(imagepb.CreatedAt), UpdatedAt: protobuf.FromTimestamp(imagepb.UpdatedAt), } } -func imagesFromProto(imagespb []imagesapi.Image) []images.Image { +func imagesFromProto(imagespb []*imagesapi.Image) []images.Image { var images []images.Image for _, image := range imagespb { image := image - images = append(images, imageFromProto(&image)) + images = append(images, imageFromProto(image)) } return images @@ -147,8 +147,8 @@ func descFromProto(desc *types.Descriptor) ocispec.Descriptor { } } -func descToProto(desc *ocispec.Descriptor) types.Descriptor { - return types.Descriptor{ +func descToProto(desc *ocispec.Descriptor) *types.Descriptor { + return &types.Descriptor{ MediaType: desc.MediaType, Size_: desc.Size, Digest: desc.Digest.String(), diff --git a/leases/proxy/manager.go b/leases/proxy/manager.go index c076e7b37..ae42d8eb1 100644 --- a/leases/proxy/manager.go +++ b/leases/proxy/manager.go @@ -96,7 +96,7 @@ func (pm *proxyManager) List(ctx context.Context, filters ...string) ([]leases.L func (pm *proxyManager) AddResource(ctx context.Context, lease leases.Lease, r leases.Resource) error { _, err := pm.client.AddResource(ctx, &leasesapi.AddResourceRequest{ ID: lease.ID, - Resource: leasesapi.Resource{ + Resource: &leasesapi.Resource{ ID: r.ID, Type: r.Type, }, @@ -107,7 +107,7 @@ func (pm *proxyManager) AddResource(ctx context.Context, lease leases.Lease, r l func (pm *proxyManager) DeleteResource(ctx context.Context, lease leases.Lease, r leases.Resource) error { _, err := pm.client.DeleteResource(ctx, &leasesapi.DeleteResourceRequest{ ID: lease.ID, - Resource: leasesapi.Resource{ + Resource: &leasesapi.Resource{ ID: r.ID, Type: r.Type, }, diff --git a/namespaces.go b/namespaces.go index ca0e46818..83ee828dd 100644 --- a/namespaces.go +++ b/namespaces.go @@ -38,7 +38,7 @@ type remoteNamespaces struct { func (r *remoteNamespaces) Create(ctx context.Context, namespace string, labels map[string]string) error { var req api.CreateNamespaceRequest - req.Namespace = api.Namespace{ + req.Namespace = &api.Namespace{ Name: namespace, Labels: labels, } @@ -66,7 +66,7 @@ func (r *remoteNamespaces) Labels(ctx context.Context, namespace string) (map[st func (r *remoteNamespaces) SetLabel(ctx context.Context, namespace, key, value string) error { var req api.UpdateNamespaceRequest - req.Namespace = api.Namespace{ + req.Namespace = &api.Namespace{ Name: namespace, Labels: map[string]string{key: value}, } diff --git a/pkg/runtimeoptions/v1/api.pb.go b/pkg/runtimeoptions/v1/api.pb.go index a224dc6f2..4bc5653fc 100644 --- a/pkg/runtimeoptions/v1/api.pb.go +++ b/pkg/runtimeoptions/v1/api.pb.go @@ -32,6 +32,7 @@ type Options struct { // used by the runtime. ConfigPath string `protobuf:"bytes,2,opt,name=config_path,json=configPath,proto3" json:"config_path,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` } @@ -67,20 +68,6 @@ func (m *Options) XXX_DiscardUnknown() { var xxx_messageInfo_Options proto.InternalMessageInfo -func (m *Options) GetTypeUrl() string { - if m != nil { - return m.TypeUrl - } - return "" -} - -func (m *Options) GetConfigPath() string { - if m != nil { - return m.ConfigPath - } - return "" -} - func init() { proto.RegisterType((*Options)(nil), "runtimeoptions.v1.Options") } @@ -90,7 +77,7 @@ func init() { } var fileDescriptor_7700dd27e3487aa6 = []byte{ - // 214 bytes of a gzipped FileDescriptorProto + // 209 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x72, 0x48, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0xcf, 0x2b, 0x49, 0xcc, 0xcc, 0x4b, 0x2d, 0x4a, 0x41, 0x66, 0x16, 0x64, 0xa7, 0xeb, 0x17, 0x95, 0xe6, 0x95, 0x64, 0xe6, 0xa6, 0xe6, 0x17, @@ -100,11 +87,11 @@ var fileDescriptor_7700dd27e3487aa6 = []byte{ 0x57, 0x2e, 0x76, 0x7f, 0x88, 0x66, 0x21, 0x49, 0x2e, 0x8e, 0x92, 0xca, 0x82, 0xd4, 0xf8, 0xd2, 0xa2, 0x1c, 0x09, 0x46, 0x05, 0x46, 0x0d, 0xce, 0x20, 0x76, 0x10, 0x3f, 0xb4, 0x28, 0x47, 0x48, 0x9e, 0x8b, 0x3b, 0x39, 0x3f, 0x2f, 0x2d, 0x33, 0x3d, 0xbe, 0x20, 0xb1, 0x24, 0x43, 0x82, 0x09, - 0x2c, 0xcb, 0x05, 0x11, 0x0a, 0x48, 0x2c, 0xc9, 0x70, 0x4a, 0x3b, 0xf1, 0x50, 0x8e, 0xf1, 0xc6, + 0x2c, 0xcb, 0x05, 0x11, 0x0a, 0x48, 0x2c, 0xc9, 0x70, 0x4a, 0x3a, 0xf1, 0x50, 0x8e, 0xe1, 0xc6, 0x43, 0x39, 0x86, 0x86, 0x47, 0x72, 0x8c, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, 0x24, 0xc7, 0xf8, - 0xe0, 0x91, 0x1c, 0xe3, 0x84, 0xc7, 0x72, 0x0c, 0x51, 0x1e, 0xe4, 0x79, 0xd4, 0x1a, 0x55, 0x24, - 0xbe, 0xcc, 0x30, 0x89, 0x0d, 0xec, 0x6a, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x91, 0x3c, - 0x3e, 0x79, 0x3b, 0x01, 0x00, 0x00, + 0xe0, 0x91, 0x1c, 0x63, 0x94, 0x07, 0x79, 0x9e, 0xb4, 0x46, 0x15, 0x89, 0x2f, 0x33, 0x4c, 0x62, + 0x03, 0xbb, 0xd8, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0x94, 0x37, 0xcc, 0x49, 0x37, 0x01, 0x00, + 0x00, } func (m *Options) Marshal() (dAtA []byte, err error) { @@ -127,6 +114,10 @@ func (m *Options) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if len(m.ConfigPath) > 0 { i -= len(m.ConfigPath) copy(dAtA[i:], m.ConfigPath) @@ -169,6 +160,9 @@ func (m *Options) Size() (n int) { if l > 0 { n += 1 + l + sovApi(uint64(l)) } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } return n } @@ -185,6 +179,7 @@ func (this *Options) String() string { s := strings.Join([]string{`&Options{`, `TypeUrl:` + fmt.Sprintf("%v", this.TypeUrl) + `,`, `ConfigPath:` + fmt.Sprintf("%v", this.ConfigPath) + `,`, + `XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`, `}`, }, "") return s @@ -302,6 +297,7 @@ func (m *Options) Unmarshal(dAtA []byte) error { if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } diff --git a/pkg/runtimeoptions/v1/api.proto b/pkg/runtimeoptions/v1/api.proto index c771ea10e..da8dc92bb 100644 --- a/pkg/runtimeoptions/v1/api.proto +++ b/pkg/runtimeoptions/v1/api.proto @@ -5,15 +5,6 @@ package runtimeoptions.v1; import "github.com/gogo/protobuf/gogoproto/gogo.proto"; -option (gogoproto.goproto_stringer_all) = false; -option (gogoproto.stringer_all) = true; -option (gogoproto.goproto_getters_all) = true; -option (gogoproto.marshaler_all) = true; -option (gogoproto.sizer_all) = true; -option (gogoproto.unmarshaler_all) = true; -option (gogoproto.goproto_unrecognized_all) = false; - - option go_package = "github.com/containerd/containerd/pkg/runtimeoptions/v1;runtimeoptions_v1"; message Options { diff --git a/sandbox/helpers.go b/sandbox/helpers.go index 08e4f48b4..9f425ee17 100644 --- a/sandbox/helpers.go +++ b/sandbox/helpers.go @@ -24,14 +24,14 @@ import ( ) // ToProto will map Sandbox struct to it's protobuf definition -func ToProto(sandbox *Sandbox) types.Sandbox { - extensions := make(map[string]gogo_types.Any) +func ToProto(sandbox *Sandbox) *types.Sandbox { + extensions := make(map[string]*gogo_types.Any) for k, v := range sandbox.Extensions { - extensions[k] = *protobuf.FromAny(v) + extensions[k] = protobuf.FromAny(v) } - return types.Sandbox{ + return &types.Sandbox{ SandboxID: sandbox.ID, - Runtime: types.Sandbox_Runtime{ + Runtime: &types.Sandbox_Runtime{ Name: sandbox.Runtime.Name, Options: protobuf.FromAny(sandbox.Runtime.Options), }, @@ -53,7 +53,7 @@ func FromProto(sandboxpb *types.Sandbox) Sandbox { extensions := make(map[string]typeurl.Any) for k, v := range sandboxpb.Extensions { v := v - extensions[k] = &v + extensions[k] = v } return Sandbox{ diff --git a/sandbox_store.go b/sandbox_store.go index ee5c8cb20..83901bc06 100644 --- a/sandbox_store.go +++ b/sandbox_store.go @@ -44,7 +44,7 @@ func (s *remoteSandboxStore) Create(ctx context.Context, sandbox sb.Sandbox) (sb return sb.Sandbox{}, errdefs.FromGRPC(err) } - return sb.FromProto(&resp.Sandbox), nil + return sb.FromProto(resp.Sandbox), nil } func (s *remoteSandboxStore) Update(ctx context.Context, sandbox sb.Sandbox, fieldpaths ...string) (sb.Sandbox, error) { @@ -56,7 +56,7 @@ func (s *remoteSandboxStore) Update(ctx context.Context, sandbox sb.Sandbox, fie return sb.Sandbox{}, errdefs.FromGRPC(err) } - return sb.FromProto(&resp.Sandbox), nil + return sb.FromProto(resp.Sandbox), nil } func (s *remoteSandboxStore) Get(ctx context.Context, id string) (sb.Sandbox, error) { @@ -80,7 +80,7 @@ func (s *remoteSandboxStore) List(ctx context.Context, filters ...string) ([]sb. out := make([]sb.Sandbox, len(resp.List)) for i := range resp.List { - out[i] = sb.FromProto(&resp.List[i]) + out[i] = sb.FromProto(resp.List[i]) } return out, nil diff --git a/script/setup/install-dev-tools b/script/setup/install-dev-tools index d5e31365c..e0e238818 100755 --- a/script/setup/install-dev-tools +++ b/script/setup/install-dev-tools @@ -21,7 +21,8 @@ set -eu -o pipefail # install `protobuild` and other commands -go install github.com/containerd/protobuild@7e5ee24bc1f70e9e289fef15e2631eb3491320bf +go install github.com/containerd/protobuild@v0.2.0 +go install github.com/containerd/protobuild/cmd/go-fix-acronym@v0.2.0 go install github.com/cpuguy83/go-md2man/v2@v2.0.1 go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.42.0 diff --git a/services/containers/helpers.go b/services/containers/helpers.go index 4dc166e34..75d7794e0 100644 --- a/services/containers/helpers.go +++ b/services/containers/helpers.go @@ -24,8 +24,8 @@ import ( "github.com/containerd/typeurl" ) -func containersToProto(containers []containers.Container) []api.Container { - var containerspb []api.Container +func containersToProto(containers []containers.Container) []*api.Container { + var containerspb []*api.Container for _, image := range containers { image := image @@ -35,12 +35,12 @@ func containersToProto(containers []containers.Container) []api.Container { return containerspb } -func containerToProto(container *containers.Container) api.Container { - extensions := make(map[string]types.Any) +func containerToProto(container *containers.Container) *api.Container { + extensions := make(map[string]*types.Any) for k, v := range container.Extensions { - extensions[k] = *protobuf.FromAny(v) + extensions[k] = protobuf.FromAny(v) } - return api.Container{ + return &api.Container{ ID: container.ID, Labels: container.Labels, Image: container.Image, @@ -69,7 +69,7 @@ func containerFromProto(containerpb *api.Container) containers.Container { extensions := make(map[string]typeurl.Any) for k, v := range containerpb.Extensions { v := v - extensions[k] = &v + extensions[k] = v } return containers.Container{ ID: containerpb.ID, diff --git a/services/containers/local.go b/services/containers/local.go index a525d015d..2c85422d7 100644 --- a/services/containers/local.go +++ b/services/containers/local.go @@ -117,7 +117,7 @@ func (l *local) Create(ctx context.Context, req *api.CreateContainerRequest, _ . var resp api.CreateContainerResponse if err := l.withStoreUpdate(ctx, func(ctx context.Context) error { - container := containerFromProto(&req.Container) + container := containerFromProto(req.Container) created, err := l.Store.Create(ctx, container) if err != nil { @@ -150,7 +150,7 @@ func (l *local) Update(ctx context.Context, req *api.UpdateContainerRequest, _ . } var ( resp api.UpdateContainerResponse - container = containerFromProto(&req.Container) + container = containerFromProto(req.Container) ) if err := l.withStoreUpdate(ctx, func(ctx context.Context) error { @@ -214,7 +214,7 @@ func (l *local) withStoreUpdate(ctx context.Context, fn func(ctx context.Context type localStream struct { ctx context.Context - containers []api.Container + containers []*api.Container i int } @@ -225,7 +225,7 @@ func (s *localStream) Recv() (*api.ListContainerMessage, error) { c := s.containers[s.i] s.i++ return &api.ListContainerMessage{ - Container: &c, + Container: c, }, nil } diff --git a/services/content/contentserver/contentserver.go b/services/content/contentserver/contentserver.go index bfb57a1c6..b7fa24382 100644 --- a/services/content/contentserver/contentserver.go +++ b/services/content/contentserver/contentserver.go @@ -91,8 +91,8 @@ func (s *service) Update(ctx context.Context, req *api.UpdateRequest) (*api.Upda func (s *service) List(req *api.ListContentRequest, session api.Content_ListServer) error { var ( - buffer []api.Info - sendBlock = func(block []api.Info) error { + buffer []*api.Info + sendBlock = func(block []*api.Info) error { // send last block return session.Send(&api.ListContentResponse{ Info: block, @@ -101,7 +101,7 @@ func (s *service) List(req *api.ListContentRequest, session api.Content_ListServ ) if err := s.store.Walk(session.Context(), func(info content.Info) error { - buffer = append(buffer, api.Info{ + buffer = append(buffer, &api.Info{ Digest: info.Digest.String(), Size_: info.Size, CreatedAt: protobuf.ToTimestamp(info.CreatedAt), @@ -240,7 +240,7 @@ func (s *service) ListStatuses(ctx context.Context, req *api.ListStatusesRequest var resp api.ListStatusesResponse for _, status := range statuses { - resp.Statuses = append(resp.Statuses, api.Status{ + resp.Statuses = append(resp.Statuses, &api.Status{ StartedAt: protobuf.ToTimestamp(status.StartedAt), UpdatedAt: protobuf.ToTimestamp(status.UpdatedAt), Ref: status.Ref, @@ -452,8 +452,8 @@ func (s *service) Abort(ctx context.Context, req *api.AbortRequest) (*ptypes.Emp return &ptypes.Empty{}, nil } -func infoToGRPC(info content.Info) api.Info { - return api.Info{ +func infoToGRPC(info content.Info) *api.Info { + return &api.Info{ Digest: info.Digest.String(), Size_: info.Size, CreatedAt: protobuf.ToTimestamp(info.CreatedAt), @@ -462,7 +462,7 @@ func infoToGRPC(info content.Info) api.Info { } } -func infoFromGRPC(info api.Info) content.Info { +func infoFromGRPC(info *api.Info) content.Info { return content.Info{ Digest: digest.Digest(info.Digest), Size: info.Size_, diff --git a/services/images/helpers.go b/services/images/helpers.go index 3e9d8f7d1..d744cb7b8 100644 --- a/services/images/helpers.go +++ b/services/images/helpers.go @@ -25,8 +25,8 @@ import ( ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) -func imagesToProto(images []images.Image) []imagesapi.Image { - var imagespb []imagesapi.Image +func imagesToProto(images []images.Image) []*imagesapi.Image { + var imagespb []*imagesapi.Image for _, image := range images { image := image @@ -36,8 +36,8 @@ func imagesToProto(images []images.Image) []imagesapi.Image { return imagespb } -func imageToProto(image *images.Image) imagesapi.Image { - return imagesapi.Image{ +func imageToProto(image *images.Image) *imagesapi.Image { + return &imagesapi.Image{ Name: image.Name, Labels: image.Labels, Target: descToProto(&image.Target), @@ -50,7 +50,7 @@ func imageFromProto(imagepb *imagesapi.Image) images.Image { return images.Image{ Name: imagepb.Name, Labels: imagepb.Labels, - Target: descFromProto(&imagepb.Target), + Target: descFromProto(imagepb.Target), CreatedAt: protobuf.FromTimestamp(imagepb.CreatedAt), UpdatedAt: protobuf.FromTimestamp(imagepb.UpdatedAt), } @@ -65,8 +65,8 @@ func descFromProto(desc *types.Descriptor) ocispec.Descriptor { } } -func descToProto(desc *ocispec.Descriptor) types.Descriptor { - return types.Descriptor{ +func descToProto(desc *ocispec.Descriptor) *types.Descriptor { + return &types.Descriptor{ MediaType: desc.MediaType, Size_: desc.Size, Digest: desc.Digest.String(), diff --git a/services/images/local.go b/services/images/local.go index bed01f896..61a725ca0 100644 --- a/services/images/local.go +++ b/services/images/local.go @@ -82,7 +82,7 @@ func (l *local) Get(ctx context.Context, req *imagesapi.GetImageRequest, _ ...gr imagepb := imageToProto(&image) return &imagesapi.GetImageResponse{ - Image: &imagepb, + Image: imagepb, }, nil } @@ -104,7 +104,7 @@ func (l *local) Create(ctx context.Context, req *imagesapi.CreateImageRequest, _ } var ( - image = imageFromProto(&req.Image) + image = imageFromProto(req.Image) resp imagesapi.CreateImageResponse ) created, err := l.store.Create(ctx, image) @@ -131,7 +131,7 @@ func (l *local) Update(ctx context.Context, req *imagesapi.UpdateImageRequest, _ } var ( - image = imageFromProto(&req.Image) + image = imageFromProto(req.Image) resp imagesapi.UpdateImageResponse fieldpaths []string ) diff --git a/services/introspection/local.go b/services/introspection/local.go index e15da7f86..33f53f150 100644 --- a/services/introspection/local.go +++ b/services/introspection/local.go @@ -74,14 +74,13 @@ func (l *Local) Plugins(ctx context.Context, req *api.PluginsRequest, _ ...grpc. return nil, errdefs.ToGRPCf(errdefs.ErrInvalidArgument, err.Error()) } - var plugins []api.Plugin + var plugins []*api.Plugin allPlugins := l.getPlugins() for _, p := range allPlugins { - if !filter.Match(adaptPlugin(p)) { - continue + p := p + if filter.Match(adaptPlugin(p)) { + plugins = append(plugins, &p) } - - plugins = append(plugins, p) } return &api.PluginsResponse{ @@ -178,9 +177,9 @@ func adaptPlugin(o interface{}) filters.Adaptor { func pluginsToPB(plugins []*plugin.Plugin) []api.Plugin { var pluginsPB []api.Plugin for _, p := range plugins { - var platforms []types.Platform + var platforms []*types.Platform for _, p := range p.Meta.Platforms { - platforms = append(platforms, types.Platform{ + platforms = append(platforms, &types.Platform{ OS: p.OS, Architecture: p.Architecture, Variant: p.Variant, diff --git a/services/leases/service.go b/services/leases/service.go index 07c255d1c..8b5f76035 100644 --- a/services/leases/service.go +++ b/services/leases/service.go @@ -141,9 +141,9 @@ func (s *service) ListResources(ctx context.Context, r *api.ListResourcesRequest return nil, errdefs.ToGRPC(err) } - apiResources := make([]api.Resource, 0, len(rs)) + apiResources := make([]*api.Resource, 0, len(rs)) for _, i := range rs { - apiResources = append(apiResources, api.Resource{ + apiResources = append(apiResources, &api.Resource{ ID: i.ID, Type: i.Type, }) diff --git a/services/namespaces/local.go b/services/namespaces/local.go index 06d6d5c85..e110a83ac 100644 --- a/services/namespaces/local.go +++ b/services/namespaces/local.go @@ -79,7 +79,7 @@ func (l *local) Get(ctx context.Context, req *api.GetNamespaceRequest, _ ...grpc return errdefs.ToGRPC(err) } - resp.Namespace = api.Namespace{ + resp.Namespace = &api.Namespace{ Name: req.Name, Labels: labels, } @@ -105,7 +105,7 @@ func (l *local) List(ctx context.Context, req *api.ListNamespacesRequest, _ ...g return errdefs.ToGRPC(err) } - resp.Namespaces = append(resp.Namespaces, api.Namespace{ + resp.Namespaces = append(resp.Namespaces, &api.Namespace{ Name: namespace, Labels: labels, }) diff --git a/services/sandbox/store_local.go b/services/sandbox/store_local.go index eb4ecb4bb..553b47ebe 100644 --- a/services/sandbox/store_local.go +++ b/services/sandbox/store_local.go @@ -61,7 +61,7 @@ type sandboxLocal struct { var _ = (api.StoreClient)(&sandboxLocal{}) func (s *sandboxLocal) Create(ctx context.Context, in *api.StoreCreateRequest, _ ...grpc.CallOption) (*api.StoreCreateResponse, error) { - sb, err := s.store.Create(ctx, sandbox.FromProto(&in.Sandbox)) + sb, err := s.store.Create(ctx, sandbox.FromProto(in.Sandbox)) if err != nil { return nil, errdefs.ToGRPC(err) } @@ -70,7 +70,7 @@ func (s *sandboxLocal) Create(ctx context.Context, in *api.StoreCreateRequest, _ } func (s *sandboxLocal) Update(ctx context.Context, in *api.StoreUpdateRequest, _ ...grpc.CallOption) (*api.StoreUpdateResponse, error) { - sb, err := s.store.Update(ctx, sandbox.FromProto(&in.Sandbox), in.Fields...) + sb, err := s.store.Update(ctx, sandbox.FromProto(in.Sandbox), in.Fields...) if err != nil { return nil, errdefs.ToGRPC(err) } @@ -85,7 +85,7 @@ func (s *sandboxLocal) Get(ctx context.Context, in *api.StoreGetRequest, _ ...gr } desc := sandbox.ToProto(&resp) - return &api.StoreGetResponse{Sandbox: &desc}, nil + return &api.StoreGetResponse{Sandbox: desc}, nil } func (s *sandboxLocal) List(ctx context.Context, in *api.StoreListRequest, _ ...grpc.CallOption) (*api.StoreListResponse, error) { @@ -94,7 +94,7 @@ func (s *sandboxLocal) List(ctx context.Context, in *api.StoreListRequest, _ ... return nil, errdefs.ToGRPC(err) } - list := make([]types.Sandbox, len(resp)) + list := make([]*types.Sandbox, len(resp)) for i := range resp { list[i] = sandbox.ToProto(&resp[i]) } diff --git a/services/snapshots/service.go b/services/snapshots/service.go index 2a83d2121..2cc4d9a4e 100644 --- a/services/snapshots/service.go +++ b/services/snapshots/service.go @@ -209,8 +209,8 @@ func (s *service) List(sr *snapshotsapi.ListSnapshotsRequest, ss snapshotsapi.Sn } var ( - buffer []snapshotsapi.Info - sendBlock = func(block []snapshotsapi.Info) error { + buffer []*snapshotsapi.Info + sendBlock = func(block []*snapshotsapi.Info) error { return ss.Send(&snapshotsapi.ListSnapshotsResponse{ Info: block, }) @@ -285,8 +285,8 @@ func fromKind(kind snapshots.Kind) snapshotsapi.Kind { return snapshotsapi.Kind_COMMITTED } -func fromInfo(info snapshots.Info) snapshotsapi.Info { - return snapshotsapi.Info{ +func fromInfo(info snapshots.Info) *snapshotsapi.Info { + return &snapshotsapi.Info{ Name: info.Name, Parent: info.Parent, Kind: fromKind(info.Kind), @@ -315,7 +315,7 @@ func fromMounts(mounts []mount.Mount) []*types.Mount { return out } -func toInfo(info snapshotsapi.Info) snapshots.Info { +func toInfo(info *snapshotsapi.Info) snapshots.Info { return snapshots.Info{ Name: info.Name, Parent: info.Parent, diff --git a/snapshots/proxy/proxy.go b/snapshots/proxy/proxy.go index 3a6f113e1..a71b0856e 100644 --- a/snapshots/proxy/proxy.go +++ b/snapshots/proxy/proxy.go @@ -202,7 +202,7 @@ func toKind(kind snapshotsapi.Kind) snapshots.Kind { return snapshots.KindCommitted } -func toInfo(info snapshotsapi.Info) snapshots.Info { +func toInfo(info *snapshotsapi.Info) snapshots.Info { return snapshots.Info{ Name: info.Name, Parent: info.Parent, @@ -242,8 +242,8 @@ func fromKind(kind snapshots.Kind) snapshotsapi.Kind { return snapshotsapi.Kind_COMMITTED } -func fromInfo(info snapshots.Info) snapshotsapi.Info { - return snapshotsapi.Info{ +func fromInfo(info snapshots.Info) *snapshotsapi.Info { + return &snapshotsapi.Info{ Name: info.Name, Parent: info.Parent, Kind: fromKind(info.Kind),