From ec4a649a0bcedc5c07ae9515bab2cc4faf212750 Mon Sep 17 00:00:00 2001 From: Cyril Tovena Date: Thu, 24 Oct 2019 13:03:38 -0400 Subject: [PATCH 1/9] Update GRPC to v1.20.1 --- build/build-allocation-images/go/gen.sh | 3 +-- build/includes/sdk.mk | 18 +++++++++--------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/build/build-allocation-images/go/gen.sh b/build/build-allocation-images/go/gen.sh index 69780dedd2..b8b1d1c42d 100644 --- a/build/build-allocation-images/go/gen.sh +++ b/build/build-allocation-images/go/gen.sh @@ -27,7 +27,7 @@ go install -mod=vendor github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger outputpath=pkg/allocation/go/v1alpha1 protopath=proto/allocation/v1alpha1 -googleapis=/go/src/agones.dev/agones/vendor/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis +googleapis=/go/src/agones.dev/agones/proto/googleapis protofile=${protopath}/allocation.proto @@ -48,4 +48,3 @@ mv ./allocation.pb.gw.go ./${outputpath}/allocation.gw.pb.go rm ./${protopath}/allocation.pb.go rm ./${protopath}/allocation.pb.gw.go rm ./${protopath}/allocation.swagger.json - diff --git a/build/includes/sdk.mk b/build/includes/sdk.mk index 8677ea618c..bbcb534a5b 100644 --- a/build/includes/sdk.mk +++ b/build/includes/sdk.mk @@ -13,12 +13,12 @@ # limitations under the License. -# ____ ____ ____ _____ _ _ -# __ _| _ \| _ \ / ___| |_ _|__ ___ | (_)_ __ __ _ -# / _` | |_) | |_) | | | |/ _ \ / _ \| | | '_ \ / _` | -# | (_| | _ <| __/| |___ | | (_) | (_) | | | | | | (_| | -# \__, |_| \_\_| \____| |_|\___/ \___/|_|_|_| |_|\__, | -# |___/ |___/ +# ____ ____ ____ _____ _ _ +# __ _| _ \| _ \ / ___| |_ _|__ ___ | (_)_ __ __ _ +# / _` | |_) | |_) | | | |/ _ \ / _ \| | | '_ \ / _` | +# | (_| | _ <| __/| |___ | | (_) | (_) | | | | | | (_| | +# \__, |_| \_\_| \____| |_|\___/ \___/|_|_|_| |_|\__, | +# |___/ |___/ build_sdk_base_version = $(call sha,$(build_path)/build-sdk-images/tool/base/Dockerfile) build_sdk_base_tag = agones-build-sdk-base:$(build_sdk_base_version) @@ -27,7 +27,7 @@ build_sdk_base_tag = agones-build-sdk-base:$(build_sdk_base_version) build_sdk_version = $(call sha_dir,$(build_path)/build-sdk-images/$(SDK_FOLDER)/*) build_sdk_base_remote_tag = $(REGISTRY)/$(build_sdk_base_tag) build_sdk_prefix = agones-build-sdk- -grpc_release_tag = v1.16.1 +grpc_release_tag = v1.20.1 sdk_build_folder = build-sdk-images/ examples_folder = ../examples/ SDK_FOLDER ?= go @@ -42,7 +42,7 @@ test-sdks: run-all-sdk-command # Tests a single sdk, use SDK_FOLDER variable to specify the sdk folder. test-sdk: COMMAND := test -test-sdk: run-sdk-command +test-sdk: run-sdk-command # Builds all the sdks build-sdks: COMMAND := build @@ -93,7 +93,7 @@ run-sdk-command: # Builds the base GRPC docker image. build-build-sdk-image-base: DOCKER_BUILD_ARGS= --build-arg GRPC_RELEASE_TAG=$(grpc_release_tag) -build-build-sdk-image-base: +build-build-sdk-image-base: docker build --tag=$(build_sdk_base_tag) $(build_path)build-sdk-images/tool/base $(DOCKER_BUILD_ARGS) # Builds the docker image used by commands for a specific sdk From 74a36cc48075de4b1d179b0a987214565fb5dd93 Mon Sep 17 00:00:00 2001 From: Cyril Tovena Date: Thu, 24 Oct 2019 13:03:51 -0400 Subject: [PATCH 2/9] Update GRPC to v1.20.1 --- go.mod | 10 +- go.sum | 52 + .../go/v1alpha1/allocation.gw.pb.go | 67 +- pkg/allocation/go/v1alpha1/allocation.pb.go | 18 +- .../go/v1alpha1/allocation.swagger.json | 2 +- pkg/sdk/sdk.pb.go | 34 +- pkg/sdk/sdk.pb.gw.go | 416 +++- proto/googleapis/google/api/annotations.proto | 2 +- proto/googleapis/google/api/http.proto | 302 ++- sdk.swagger.json | 71 +- sdks/cpp/include/agones/sdk.grpc.pb.h | 459 +++++ sdks/cpp/include/agones/sdk.pb.h | 395 ++-- sdks/cpp/include/google/api/annotations.pb.h | 36 +- sdks/cpp/include/google/api/http.pb.h | 305 +-- sdks/cpp/src/agones/sdk.grpc.pb.cc | 37 + sdks/cpp/src/agones/sdk.pb.cc | 1774 +++++++++++------ sdks/cpp/src/google/annotations.pb.cc | 95 +- sdks/cpp/src/google/http.pb.cc | 728 +++++-- sdks/nodejs/lib/google/api/annotations_pb.js | 2 + sdks/nodejs/lib/google/api/http_pb.js | 124 +- sdks/nodejs/lib/sdk_pb.js | 358 ++-- sdks/rust/src/grpc/sdk.rs | 10 +- .../golang/protobuf/descriptor/descriptor.go | 93 + .../golang/protobuf/jsonpb/jsonpb.go | 23 +- .../golang/protobuf/proto/decode.go | 1 - .../golang/protobuf/proto/deprecated.go | 63 + .../github.com/golang/protobuf/proto/equal.go | 3 +- .../golang/protobuf/proto/extensions.go | 78 +- .../github.com/golang/protobuf/proto/lib.go | 38 +- .../golang/protobuf/proto/message_set.go | 137 +- .../golang/protobuf/proto/pointer_reflect.go | 5 +- .../golang/protobuf/proto/pointer_unsafe.go | 15 +- .../golang/protobuf/proto/properties.go | 36 +- .../golang/protobuf/proto/table_marshal.go | 45 +- .../golang/protobuf/proto/table_unmarshal.go | 72 +- .../protoc-gen-go/descriptor/descriptor.pb.go | 603 +++--- .../protoc-gen-go/descriptor/descriptor.proto | 11 + .../protoc-gen-go/generator/generator.go | 618 ++---- .../protobuf/protoc-gen-go/grpc/grpc.go | 77 +- .../golang/protobuf/ptypes/any/any.pb.go | 45 +- .../golang/protobuf/ptypes/any/any.proto | 21 +- .../golang/protobuf/ptypes/duration.go | 2 +- .../protobuf/ptypes/duration/duration.pb.go | 26 +- .../golang/protobuf/ptypes/empty/empty.pb.go | 24 +- .../protobuf/ptypes/struct/struct.pb.go | 178 +- .../golang/protobuf/ptypes/timestamp.go | 6 +- .../protobuf/ptypes/timestamp/timestamp.pb.go | 34 +- .../protobuf/ptypes/timestamp/timestamp.proto | 8 +- .../protobuf/ptypes/wrappers/wrappers.pb.go | 90 +- vendor/github.com/google/btree/btree_mem.go | 76 - .../grpc-gateway/codegenerator/BUILD.bazel | 8 +- .../{runtime => }/internal/BUILD.bazel | 7 +- .../{runtime => }/internal/stream_chunk.pb.go | 39 +- .../{runtime => }/internal/stream_chunk.proto | 0 .../protoc-gen-grpc-gateway/BUILD.bazel | 7 +- .../descriptor/BUILD.bazel | 14 +- .../descriptor/registry.go | 46 + .../descriptor/types.go | 13 +- .../generator/BUILD.bazel | 2 +- .../gengateway/BUILD.bazel | 7 +- .../gengateway/generator.go | 8 +- .../gengateway/template.go | 263 ++- .../protoc-gen-grpc-gateway/httprule/fuzz.go | 11 + .../protoc-gen-grpc-gateway/httprule/parse.go | 2 +- .../protoc-gen-grpc-gateway/main.go | 19 +- .../protoc-gen-swagger/BUILD.bazel | 2 +- .../grpc-gateway/protoc-gen-swagger/defs.bzl | 110 +- .../protoc-gen-swagger/genswagger/BUILD.bazel | 17 +- .../genswagger/generator.go | 127 +- .../protoc-gen-swagger/genswagger/template.go | 435 +++- .../protoc-gen-swagger/genswagger/types.go | 35 +- .../grpc-gateway/protoc-gen-swagger/main.go | 38 + .../protoc-gen-swagger/options/BUILD.bazel | 25 +- .../options/annotations.pb.go | 4 +- .../options/openapiv2.pb.go | 485 +++-- .../options/openapiv2.proto | 29 +- .../grpc-gateway/runtime/BUILD.bazel | 53 +- .../grpc-gateway/runtime/context.go | 34 +- .../grpc-gateway/runtime/convert.go | 76 +- .../grpc-gateway/runtime/errors.go | 24 +- .../grpc-gateway/runtime/fieldmask.go | 82 + .../grpc-gateway/runtime/handler.go | 83 +- .../runtime/marshal_httpbodyproto.go | 43 + .../grpc-gateway/runtime/marshal_jsonpb.go | 65 +- .../grpc-gateway/runtime/mux.go | 81 +- .../grpc-gateway/runtime/pattern.go | 51 +- .../grpc-gateway/runtime/proto_errors.go | 53 +- .../grpc-gateway/runtime/query.go | 185 +- .../googleapis/README.grpc-gateway | 23 + .../googleapis/google/api/httpbody.proto | 78 + .../grpc-gateway/utilities/BUILD.bazel | 5 +- .../grpc-gateway/utilities/readerfactory.go | 20 + vendor/golang.org/x/sys/unix/mkasm_darwin.go | 61 - vendor/golang.org/x/sys/unix/mkpost.go | 106 - .../x/sys/unix/mksyscall_aix_ppc.go | 404 ---- .../x/sys/unix/mksyscall_aix_ppc64.go | 602 ------ .../x/sys/unix/mksyscall_solaris.go | 335 ---- vendor/golang.org/x/sys/unix/mksysnum.go | 190 -- vendor/golang.org/x/sys/unix/types_aix.go | 236 --- vendor/golang.org/x/sys/unix/types_darwin.go | 277 --- .../golang.org/x/sys/unix/types_dragonfly.go | 263 --- vendor/golang.org/x/sys/unix/types_freebsd.go | 356 ---- vendor/golang.org/x/sys/unix/types_netbsd.go | 289 --- vendor/golang.org/x/sys/unix/types_openbsd.go | 276 --- vendor/golang.org/x/sys/unix/types_solaris.go | 266 --- .../x/text/unicode/bidi/gen_trieval.go | 64 - .../golang.org/x/text/unicode/norm/triegen.go | 117 -- vendor/golang.org/x/text/width/gen.go | 115 -- vendor/golang.org/x/text/width/gen_common.go | 96 - vendor/golang.org/x/text/width/gen_trieval.go | 34 - .../x/tools/go/gcexportdata/main.go | 99 - vendor/golang.org/x/tools/imports/mkindex.go | 173 -- vendor/golang.org/x/tools/imports/mkstdlib.go | 112 -- .../google.golang.org/appengine/appengine.go | 6 + .../appengine/internal/api.go | 5 +- .../appengine/internal/identity.go | 12 +- .../appengine/internal/main.go | 1 + .../appengine/internal/main_common.go | 7 + .../appengine/internal/main_vm.go | 21 + .../api/annotations/annotations.pb.go | 21 +- .../googleapis/api/annotations/client.pb.go | 79 + .../api/annotations/field_behavior.pb.go | 122 ++ .../googleapis/api/annotations/http.pb.go | 439 ++-- .../googleapis/api/annotations/resource.pb.go | 441 ++++ .../api/distribution/distribution.pb.go | 440 ++-- .../googleapis/api/httpbody/httpbody.pb.go | 146 ++ .../genproto/googleapis/api/label/label.pb.go | 30 +- .../googleapis/api/launch_stage.pb.go | 113 ++ .../googleapis/api/metric/metric.pb.go | 227 ++- .../api/monitoredres/monitored_resource.pb.go | 125 +- .../devtools/cloudtrace/v2/trace.pb.go | 291 +-- .../devtools/cloudtrace/v2/tracing.pb.go | 108 +- .../googleapis/monitoring/v3/alert.pb.go | 365 ++-- .../monitoring/v3/alert_service.pb.go | 187 +- .../googleapis/monitoring/v3/common.pb.go | 335 ++-- .../monitoring/v3/dropped_labels.pb.go | 48 +- .../googleapis/monitoring/v3/group.pb.go | 29 +- .../monitoring/v3/group_service.pb.go | 326 ++- .../googleapis/monitoring/v3/metric.pb.go | 97 +- .../monitoring/v3/metric_service.pb.go | 304 +-- .../monitoring/v3/mutation_record.pb.go | 26 +- .../monitoring/v3/notification.pb.go | 125 +- .../monitoring/v3/notification_service.pb.go | 303 +-- .../monitoring/v3/span_context.pb.go | 24 +- .../googleapis/monitoring/v3/uptime.pb.go | 629 +++--- .../monitoring/v3/uptime_service.pb.go | 279 +-- .../googleapis/rpc/status/status.pb.go | 57 +- .../protobuf/field_mask/field_mask.pb.go | 26 +- vendor/google.golang.org/grpc/CONTRIBUTING.md | 1 + vendor/google.golang.org/grpc/Makefile | 2 +- vendor/google.golang.org/grpc/README.md | 2 +- vendor/google.golang.org/grpc/backoff.go | 2 +- .../grpc/balancer/balancer.go | 66 +- .../grpc/balancer/base/balancer.go | 66 +- .../grpc/balancer/roundrobin/roundrobin.go | 12 +- .../grpc/balancer_conn_wrappers.go | 43 +- .../grpc/balancer_v1_wrapper.go | 67 +- vendor/google.golang.org/grpc/call.go | 2 +- vendor/google.golang.org/grpc/clientconn.go | 652 +++--- .../grpc/connectivity/connectivity.go | 2 +- .../grpc/credentials/credentials.go | 18 +- .../grpc/credentials/tls13.go | 30 + vendor/google.golang.org/grpc/dialoptions.go | 88 +- .../grpc/encoding/encoding.go | 6 +- vendor/google.golang.org/grpc/go.mod | 13 +- vendor/google.golang.org/grpc/go.sum | 25 +- .../google.golang.org/grpc/grpclog/grpclog.go | 2 +- .../grpc/internal/balancerload/load.go | 46 + .../grpc/internal/binarylog/env_config.go | 6 +- .../grpc/internal/binarylog/method_logger.go | 5 +- .../grpc/internal/channelz/funcs.go | 89 +- .../grpc/internal/envconfig/envconfig.go | 17 +- .../grpc/internal/internal.go | 21 +- .../grpc/internal/syscall/syscall_nonlinux.go | 14 +- .../grpc/internal/transport/handler_server.go | 29 +- .../grpc/internal/transport/http2_client.go | 66 +- .../grpc/internal/transport/http2_server.go | 136 +- .../grpc/internal/transport/http_util.go | 169 +- .../grpc/internal/transport/transport.go | 68 +- .../grpc/keepalive/keepalive.go | 4 +- .../grpc/naming/dns_resolver.go | 6 +- .../google.golang.org/grpc/naming/naming.go | 2 +- .../google.golang.org/grpc/picker_wrapper.go | 23 +- .../grpc/resolver/dns/dns_resolver.go | 8 +- .../grpc/resolver/passthrough/passthrough.go | 2 +- .../grpc/resolver/resolver.go | 15 + .../grpc/resolver_conn_wrapper.go | 96 +- vendor/google.golang.org/grpc/rpc_util.go | 68 +- vendor/google.golang.org/grpc/server.go | 44 +- .../google.golang.org/grpc/service_config.go | 21 +- vendor/google.golang.org/grpc/stats/stats.go | 5 + vendor/google.golang.org/grpc/stream.go | 53 +- vendor/google.golang.org/grpc/trace.go | 13 + vendor/google.golang.org/grpc/version.go | 2 +- vendor/google.golang.org/grpc/vet.sh | 65 +- vendor/gopkg.in/yaml.v2/decode.go | 38 + vendor/gopkg.in/yaml.v2/resolve.go | 2 +- vendor/gopkg.in/yaml.v2/scannerc.go | 16 + vendor/modules.txt | 335 +++- 199 files changed, 11754 insertions(+), 11528 deletions(-) create mode 100644 vendor/github.com/golang/protobuf/descriptor/descriptor.go create mode 100644 vendor/github.com/golang/protobuf/proto/deprecated.go delete mode 100644 vendor/github.com/google/btree/btree_mem.go rename vendor/github.com/grpc-ecosystem/grpc-gateway/{runtime => }/internal/BUILD.bazel (59%) rename vendor/github.com/grpc-ecosystem/grpc-gateway/{runtime => }/internal/stream_chunk.pb.go (64%) rename vendor/github.com/grpc-ecosystem/grpc-gateway/{runtime => }/internal/stream_chunk.proto (100%) create mode 100644 vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/httprule/fuzz.go create mode 100644 vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/fieldmask.go create mode 100644 vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/marshal_httpbodyproto.go create mode 100644 vendor/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis/README.grpc-gateway create mode 100644 vendor/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis/google/api/httpbody.proto create mode 100644 vendor/github.com/grpc-ecosystem/grpc-gateway/utilities/readerfactory.go delete mode 100644 vendor/golang.org/x/sys/unix/mkasm_darwin.go delete mode 100644 vendor/golang.org/x/sys/unix/mkpost.go delete mode 100644 vendor/golang.org/x/sys/unix/mksyscall_aix_ppc.go delete mode 100644 vendor/golang.org/x/sys/unix/mksyscall_aix_ppc64.go delete mode 100644 vendor/golang.org/x/sys/unix/mksyscall_solaris.go delete mode 100644 vendor/golang.org/x/sys/unix/mksysnum.go delete mode 100644 vendor/golang.org/x/sys/unix/types_aix.go delete mode 100644 vendor/golang.org/x/sys/unix/types_darwin.go delete mode 100644 vendor/golang.org/x/sys/unix/types_dragonfly.go delete mode 100644 vendor/golang.org/x/sys/unix/types_freebsd.go delete mode 100644 vendor/golang.org/x/sys/unix/types_netbsd.go delete mode 100644 vendor/golang.org/x/sys/unix/types_openbsd.go delete mode 100644 vendor/golang.org/x/sys/unix/types_solaris.go delete mode 100644 vendor/golang.org/x/text/unicode/bidi/gen_trieval.go delete mode 100644 vendor/golang.org/x/text/unicode/norm/triegen.go delete mode 100644 vendor/golang.org/x/text/width/gen.go delete mode 100644 vendor/golang.org/x/text/width/gen_common.go delete mode 100644 vendor/golang.org/x/text/width/gen_trieval.go delete mode 100644 vendor/golang.org/x/tools/go/gcexportdata/main.go delete mode 100644 vendor/golang.org/x/tools/imports/mkindex.go delete mode 100644 vendor/golang.org/x/tools/imports/mkstdlib.go create mode 100644 vendor/google.golang.org/appengine/internal/main_common.go create mode 100644 vendor/google.golang.org/genproto/googleapis/api/annotations/client.pb.go create mode 100644 vendor/google.golang.org/genproto/googleapis/api/annotations/field_behavior.pb.go create mode 100644 vendor/google.golang.org/genproto/googleapis/api/annotations/resource.pb.go create mode 100644 vendor/google.golang.org/genproto/googleapis/api/httpbody/httpbody.pb.go create mode 100644 vendor/google.golang.org/genproto/googleapis/api/launch_stage.pb.go create mode 100644 vendor/google.golang.org/grpc/credentials/tls13.go create mode 100644 vendor/google.golang.org/grpc/internal/balancerload/load.go diff --git a/go.mod b/go.mod index d2ef91bb75..933d430744 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,6 @@ require ( cloud.google.com/go v0.34.0 // indirect contrib.go.opencensus.io/exporter/stackdriver v0.8.0 fortio.org/fortio v1.3.1 - github.com/BurntSushi/toml v0.3.1 // indirect github.com/ahmetb/gen-crd-api-reference-docs v0.1.1 github.com/aws/aws-sdk-go v1.16.20 // indirect github.com/evanphx/json-patch v4.5.0+incompatible // indirect @@ -14,13 +13,13 @@ require ( github.com/go-openapi/spec v0.19.0 github.com/gogo/protobuf v1.2.1 // indirect github.com/golang/groupcache v0.0.0-20171101203131-84a468cf14b4 // indirect - github.com/golang/protobuf v1.2.0 + github.com/golang/protobuf v1.3.2 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c // indirect github.com/google/gofuzz v1.0.0 // indirect github.com/google/uuid v1.1.0 // indirect github.com/googleapis/gnostic v0.1.0 // indirect github.com/gregjones/httpcache v0.0.0-20181110185634-c63ab54fda8f // indirect - github.com/grpc-ecosystem/grpc-gateway v1.5.1 + github.com/grpc-ecosystem/grpc-gateway v1.11.3 github.com/hashicorp/golang-lru v0.5.1 // indirect github.com/heptiolabs/healthcheck v0.0.0-20171201210846-da5fdee475fb github.com/imdario/mergo v0.3.5 // indirect @@ -44,10 +43,9 @@ require ( golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384 google.golang.org/api v0.0.0-20190117000611-43037ff31f69 // indirect - google.golang.org/genproto v0.0.0-20190111180523-db91494dd46c - google.golang.org/grpc v1.17.0 + google.golang.org/genproto v0.0.0-20191009194640-548a555dbc03 + google.golang.org/grpc v1.20.1 gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0 // indirect - gopkg.in/fsnotify.v1 v1.4.7 gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/natefinch/lumberjack.v2 v2.0.0-20170531160350-a96e63847dc3 gopkg.in/yaml.v2 v2.2.2 diff --git a/go.sum b/go.sum index f060535ec5..713b7aff7c 100644 --- a/go.sum +++ b/go.sum @@ -65,6 +65,9 @@ github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+ github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c h1:964Od4U6p2jUkFxvCydnIczKteheJEzHRToSGK3Bnlw= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ= @@ -85,6 +88,12 @@ github.com/gregjones/httpcache v0.0.0-20181110185634-c63ab54fda8f/go.mod h1:Fecb github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw= github.com/grpc-ecosystem/grpc-gateway v1.5.1 h1:3scN4iuXkNOyP98jF55Lv8a9j1o/IwvnDIZ0LHJK1nk= github.com/grpc-ecosystem/grpc-gateway v1.5.1/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw= +<<<<<<< HEAD +======= +github.com/grpc-ecosystem/grpc-gateway v1.11.3 h1:h8+NsYENhxNTuq+dobk3+ODoJtwY4Fu0WQXsxJfL8aM= +github.com/grpc-ecosystem/grpc-gateway v1.11.3/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +>>>>>>> Update GRPC to v1.20.1 github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= @@ -107,6 +116,9 @@ github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvW github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= @@ -132,6 +144,11 @@ github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGV github.com/onsi/gomega v1.5.0 h1:izbySO9zDPmjJ8rDjLvkA2zJHIo+HkYXHnf7eN7SSyo= github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= +<<<<<<< HEAD +======= +github.com/pborman/uuid v0.0.0-20180906182336-adf5a7427709 h1:zNBQb37RGLmJybyMcs983HfUfpkw9OTFD9tbBfAViHE= +github.com/pborman/uuid v0.0.0-20180906182336-adf5a7427709/go.mod h1:VyrYX9gd7irzKovcSS6BIIEwPRkP2Wm2m9ufcdFSJ34= +>>>>>>> Update GRPC to v1.20.1 github.com/pborman/uuid v1.2.0 h1:J7Q5mO4ysT1dv8hyrUGHb9+ooztCXu1D8MY8DZYsu3g= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc= @@ -154,6 +171,7 @@ github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7q github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a h1:9a8MnZMP0X2nLJdBg+pBmGgkJlSaKC2KaQmTCk1XDtE= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo= @@ -189,8 +207,11 @@ golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9 h1:mKdxBk7AujPs8kU4m80U72 golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -200,6 +221,12 @@ golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181201002055-351d144fa1fc h1:a3CU5tJYVj92DY2LaA1kUkrsqD5/3mLDhx2NcNqyW+0= golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +<<<<<<< HEAD +======= +golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190206173232-65e2d4e15006/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +>>>>>>> Update GRPC to v1.20.1 golang.org/x/net v0.0.0-20190311183353-d8887717615a h1:oWX7TPOiFAMXLq8o0ikBYfCJVlRHBcsciT5bXOrH628= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/oauth2 v0.0.0-20180603041954-1e0a3fa8ba9a/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -214,6 +241,7 @@ golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a h1:1n5lsVfiQW3yfsRGu98756EH1YthsFqr/5mxHduZW2A= golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU= @@ -226,7 +254,10 @@ golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxb golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190213192042-740235f6c0d8/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190328211700-ab21143f2384 h1:TFlARGu6Czu1z7q93HTxcP1P+/ZFC/IKythI5RzrnRg= golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= google.golang.org/api v0.0.0-20180603000442-8e296ef26005/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= @@ -237,39 +268,60 @@ google.golang.org/appengine v1.0.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9Ywl google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.3.0 h1:FBSsiFRMz3LBeXIomRnVzrQwSDj4ibvcRexLG0LZGQk= google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180601223552-81158efcc9f2/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20181202183823-bd91e49a0898/go.mod h1:7Ep/1NZk928CDR8SjdVbjWNpdIf6nzjE3BTgJDr2Atg= google.golang.org/genproto v0.0.0-20190111180523-db91494dd46c h1:LZllHYjdJnynBfmwysp+s4yhMzfc+3BzhdqzAMvwjoc= google.golang.org/genproto v0.0.0-20190111180523-db91494dd46c/go.mod h1:7Ep/1NZk928CDR8SjdVbjWNpdIf6nzjE3BTgJDr2Atg= +google.golang.org/genproto v0.0.0-20191009194640-548a555dbc03 h1:4HYDjxeNXAOTv3o1N2tjo8UUSlhQgAD52FVkwxnWgM8= +google.golang.org/genproto v0.0.0-20191009194640-548a555dbc03/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/grpc v1.12.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio= google.golang.org/grpc v1.17.0 h1:TRJYBgMclJvGYn2rIMjj+h9KtMt5r1Ij7ODVRIZkwhk= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.20.1 h1:Hz2g2wirWK7H0qIIhGIqRGTuMwTE8HEKFnDZZ7lm9NU= +google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0 h1:FVCohIoYO7IJoDDVpV2pdq7SgrMH6wHnuTyrdrxJNoY= gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0/go.mod h1:OdE7CF6DbADk7lN8LIKRzRJTTZXIjtWgA5THM5lhBAw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/natefinch/lumberjack.v2 v2.0.0-20170531160350-a96e63847dc3 h1:AFxeG48hTWHhDTQDk/m2gorfVHUEa9vo3tp3D7TzwjI= gopkg.in/natefinch/lumberjack.v2 v2.0.0-20170531160350-a96e63847dc3/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= +gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I= +gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +<<<<<<< HEAD k8s.io/api v0.0.0-20191004102255-dacd7df5a50b h1:38Nx0U83WjBqn1hUWxlgKc7mvH7WhyHfypxeW3zWwCQ= k8s.io/api v0.0.0-20191004102255-dacd7df5a50b/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA= k8s.io/apiextensions-apiserver v0.0.0-20191004105443-a7d558db75c6 h1:4MLSmJeNPWjrmHsWnCNFTmqQx+pMiAXqkXLLCTY3SnM= k8s.io/apiextensions-apiserver v0.0.0-20191004105443-a7d558db75c6/go.mod h1:IxkesAMoaCRoLrPJdZNZUQp9NfZnzqaVzLhb2VEQzXE= k8s.io/client-go v0.0.0-20191004102537-eb5b9a8cfde7 h1:WyPHgjjXvF4zVVwKGZKKiJGBUW45AuN44uSOuH8euuE= k8s.io/client-go v0.0.0-20191004102537-eb5b9a8cfde7/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s= +======= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +k8s.io/api v0.0.0-20190708094356-59223ed9f6ce h1:5dyrqZX6sr+cG/e26KF2p6GuTIABBACjjGSOSdjS9sI= +k8s.io/api v0.0.0-20190708094356-59223ed9f6ce/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA= +k8s.io/apiextensions-apiserver v0.0.0-20190708094842-2e94e9ac9840 h1:+vX94wCTxanQ/Uea8/pQqDHQIwiw4qsQFaJ2kz/DRj8= +k8s.io/apiextensions-apiserver v0.0.0-20190708094842-2e94e9ac9840/go.mod h1:IxkesAMoaCRoLrPJdZNZUQp9NfZnzqaVzLhb2VEQzXE= +k8s.io/client-go v9.0.0+incompatible h1:2kqW3X2xQ9SbFvWZjGEHBLlWc1LG9JIJNXWkuqwdZ3A= +k8s.io/client-go v9.0.0+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s= +>>>>>>> Update GRPC to v1.20.1 k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6 h1:4s3/R4+OYYYUKptXPhZKjQ04WJ6EhQQVFdjOFvCazDk= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= diff --git a/pkg/allocation/go/v1alpha1/allocation.gw.pb.go b/pkg/allocation/go/v1alpha1/allocation.gw.pb.go index 5960e57f09..9f4238ea92 100644 --- a/pkg/allocation/go/v1alpha1/allocation.gw.pb.go +++ b/pkg/allocation/go/v1alpha1/allocation.gw.pb.go @@ -24,30 +24,37 @@ It translates gRPC into RESTful JSON APIs. package v1alpha1 import ( + "context" "io" "net/http" + "github.com/golang/protobuf/descriptor" "github.com/golang/protobuf/proto" "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/grpc-ecosystem/grpc-gateway/utilities" - "golang.org/x/net/context" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/grpclog" "google.golang.org/grpc/status" ) +// Suppress "imported and not used" errors var _ codes.Code var _ io.Reader var _ status.Status var _ = runtime.String var _ = utilities.NewDoubleArray +var _ = descriptor.ForMessage func request_AllocationService_PostAllocate_0(ctx context.Context, marshaler runtime.Marshaler, client AllocationServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq AllocationRequest var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -56,6 +63,51 @@ func request_AllocationService_PostAllocate_0(ctx context.Context, marshaler run } +func local_request_AllocationService_PostAllocate_0(ctx context.Context, marshaler runtime.Marshaler, server AllocationServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq AllocationRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := server.PostAllocate(ctx, &protoReq) + return msg, metadata, err + +} + +// RegisterAllocationServiceHandlerServer registers the http handlers for service AllocationService to "mux". +// UnaryRPC :call AllocationServiceServer directly. +// StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. +func RegisterAllocationServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux, server AllocationServiceServer) error { + + mux.Handle("POST", pattern_AllocationService_PostAllocate_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_AllocationService_PostAllocate_0(rctx, inboundMarshaler, server, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_AllocationService_PostAllocate_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + return nil +} + // RegisterAllocationServiceHandlerFromEndpoint is same as RegisterAllocationServiceHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterAllocationServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { @@ -97,15 +149,6 @@ func RegisterAllocationServiceHandlerClient(ctx context.Context, mux *runtime.Se mux.Handle("POST", pattern_AllocationService_PostAllocate_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() - if cn, ok := w.(http.CloseNotifier); ok { - go func(done <-chan struct{}, closed <-chan bool) { - select { - case <-done: - case <-closed: - cancel() - } - }(ctx.Done(), cn.CloseNotify()) - } inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) rctx, err := runtime.AnnotateContext(ctx, mux, req) if err != nil { @@ -127,7 +170,7 @@ func RegisterAllocationServiceHandlerClient(ctx context.Context, mux *runtime.Se } var ( - pattern_AllocationService_PostAllocate_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1alpha1", "gameserverallocation"}, "")) + pattern_AllocationService_PostAllocate_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1alpha1", "gameserverallocation"}, "", runtime.AssumeColonVerbOpt(true))) ) var ( diff --git a/pkg/allocation/go/v1alpha1/allocation.pb.go b/pkg/allocation/go/v1alpha1/allocation.pb.go index 4d75704307..5041495a9b 100644 --- a/pkg/allocation/go/v1alpha1/allocation.pb.go +++ b/pkg/allocation/go/v1alpha1/allocation.pb.go @@ -65,7 +65,7 @@ func (x AllocationRequest_SchedulingStrategy) String() string { return proto.EnumName(AllocationRequest_SchedulingStrategy_name, int32(x)) } func (AllocationRequest_SchedulingStrategy) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_allocation_b032d245a7ea77b4, []int{0, 0} + return fileDescriptor_allocation_89112023cf55f959, []int{0, 0} } // The allocation state @@ -98,7 +98,7 @@ func (x AllocationResponse_GameServerAllocationState) String() string { return proto.EnumName(AllocationResponse_GameServerAllocationState_name, int32(x)) } func (AllocationResponse_GameServerAllocationState) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_allocation_b032d245a7ea77b4, []int{1, 0} + return fileDescriptor_allocation_89112023cf55f959, []int{1, 0} } type AllocationRequest struct { @@ -125,7 +125,7 @@ func (m *AllocationRequest) Reset() { *m = AllocationRequest{} } func (m *AllocationRequest) String() string { return proto.CompactTextString(m) } func (*AllocationRequest) ProtoMessage() {} func (*AllocationRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_allocation_b032d245a7ea77b4, []int{0} + return fileDescriptor_allocation_89112023cf55f959, []int{0} } func (m *AllocationRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_AllocationRequest.Unmarshal(m, b) @@ -202,7 +202,7 @@ func (m *AllocationResponse) Reset() { *m = AllocationResponse{} } func (m *AllocationResponse) String() string { return proto.CompactTextString(m) } func (*AllocationResponse) ProtoMessage() {} func (*AllocationResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_allocation_b032d245a7ea77b4, []int{1} + return fileDescriptor_allocation_89112023cf55f959, []int{1} } func (m *AllocationResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_AllocationResponse.Unmarshal(m, b) @@ -272,7 +272,7 @@ func (m *AllocationResponse_GameServerStatusPort) Reset() { func (m *AllocationResponse_GameServerStatusPort) String() string { return proto.CompactTextString(m) } func (*AllocationResponse_GameServerStatusPort) ProtoMessage() {} func (*AllocationResponse_GameServerStatusPort) Descriptor() ([]byte, []int) { - return fileDescriptor_allocation_b032d245a7ea77b4, []int{1, 0} + return fileDescriptor_allocation_89112023cf55f959, []int{1, 0} } func (m *AllocationResponse_GameServerStatusPort) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_AllocationResponse_GameServerStatusPort.Unmarshal(m, b) @@ -321,7 +321,7 @@ func (m *MultiClusterSetting) Reset() { *m = MultiClusterSetting{} } func (m *MultiClusterSetting) String() string { return proto.CompactTextString(m) } func (*MultiClusterSetting) ProtoMessage() {} func (*MultiClusterSetting) Descriptor() ([]byte, []int) { - return fileDescriptor_allocation_b032d245a7ea77b4, []int{2} + return fileDescriptor_allocation_89112023cf55f959, []int{2} } func (m *MultiClusterSetting) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MultiClusterSetting.Unmarshal(m, b) @@ -368,7 +368,7 @@ func (m *MetaPatch) Reset() { *m = MetaPatch{} } func (m *MetaPatch) String() string { return proto.CompactTextString(m) } func (*MetaPatch) ProtoMessage() {} func (*MetaPatch) Descriptor() ([]byte, []int) { - return fileDescriptor_allocation_b032d245a7ea77b4, []int{3} + return fileDescriptor_allocation_89112023cf55f959, []int{3} } func (m *MetaPatch) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MetaPatch.Unmarshal(m, b) @@ -487,10 +487,10 @@ var _AllocationService_serviceDesc = grpc.ServiceDesc{ } func init() { - proto.RegisterFile("proto/allocation/v1alpha1/allocation.proto", fileDescriptor_allocation_b032d245a7ea77b4) + proto.RegisterFile("proto/allocation/v1alpha1/allocation.proto", fileDescriptor_allocation_89112023cf55f959) } -var fileDescriptor_allocation_b032d245a7ea77b4 = []byte{ +var fileDescriptor_allocation_89112023cf55f959 = []byte{ // 719 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0xc1, 0x6e, 0xdb, 0x46, 0x10, 0x35, 0x25, 0x4b, 0xb6, 0x46, 0xad, 0xaa, 0xae, 0x7d, 0x60, 0x59, 0xb5, 0x15, 0xd8, 0xa2, diff --git a/pkg/allocation/go/v1alpha1/allocation.swagger.json b/pkg/allocation/go/v1alpha1/allocation.swagger.json index 2e5b5632f2..d7b4da5bc7 100644 --- a/pkg/allocation/go/v1alpha1/allocation.swagger.json +++ b/pkg/allocation/go/v1alpha1/allocation.swagger.json @@ -19,7 +19,7 @@ "operationId": "PostAllocate", "responses": { "200": { - "description": "", + "description": "A successful response.", "schema": { "$ref": "#/definitions/v1alpha1AllocationResponse" } diff --git a/pkg/sdk/sdk.pb.go b/pkg/sdk/sdk.pb.go index adda6f400d..5b2ac72eb9 100644 --- a/pkg/sdk/sdk.pb.go +++ b/pkg/sdk/sdk.pb.go @@ -19,12 +19,16 @@ package sdk import ( - "fmt" - "math" + fmt "fmt" + + proto "github.com/golang/protobuf/proto" + + math "math" - "github.com/golang/protobuf/proto" - context "golang.org/x/net/context" _ "google.golang.org/genproto/googleapis/api/annotations" + + context "golang.org/x/net/context" + grpc "google.golang.org/grpc" ) @@ -50,7 +54,7 @@ func (m *Empty) Reset() { *m = Empty{} } func (m *Empty) String() string { return proto.CompactTextString(m) } func (*Empty) ProtoMessage() {} func (*Empty) Descriptor() ([]byte, []int) { - return fileDescriptor_sdk_a0e878ab4087e6bc, []int{0} + return fileDescriptor_sdk_74162870a323c7c1, []int{0} } func (m *Empty) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Empty.Unmarshal(m, b) @@ -83,7 +87,7 @@ func (m *KeyValue) Reset() { *m = KeyValue{} } func (m *KeyValue) String() string { return proto.CompactTextString(m) } func (*KeyValue) ProtoMessage() {} func (*KeyValue) Descriptor() ([]byte, []int) { - return fileDescriptor_sdk_a0e878ab4087e6bc, []int{1} + return fileDescriptor_sdk_74162870a323c7c1, []int{1} } func (m *KeyValue) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_KeyValue.Unmarshal(m, b) @@ -129,7 +133,7 @@ func (m *Duration) Reset() { *m = Duration{} } func (m *Duration) String() string { return proto.CompactTextString(m) } func (*Duration) ProtoMessage() {} func (*Duration) Descriptor() ([]byte, []int) { - return fileDescriptor_sdk_a0e878ab4087e6bc, []int{2} + return fileDescriptor_sdk_74162870a323c7c1, []int{2} } func (m *Duration) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Duration.Unmarshal(m, b) @@ -172,7 +176,7 @@ func (m *GameServer) Reset() { *m = GameServer{} } func (m *GameServer) String() string { return proto.CompactTextString(m) } func (*GameServer) ProtoMessage() {} func (*GameServer) Descriptor() ([]byte, []int) { - return fileDescriptor_sdk_a0e878ab4087e6bc, []int{3} + return fileDescriptor_sdk_74162870a323c7c1, []int{3} } func (m *GameServer) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GameServer.Unmarshal(m, b) @@ -235,7 +239,7 @@ func (m *GameServer_ObjectMeta) Reset() { *m = GameServer_ObjectMeta{} } func (m *GameServer_ObjectMeta) String() string { return proto.CompactTextString(m) } func (*GameServer_ObjectMeta) ProtoMessage() {} func (*GameServer_ObjectMeta) Descriptor() ([]byte, []int) { - return fileDescriptor_sdk_a0e878ab4087e6bc, []int{3, 0} + return fileDescriptor_sdk_74162870a323c7c1, []int{3, 0} } func (m *GameServer_ObjectMeta) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GameServer_ObjectMeta.Unmarshal(m, b) @@ -329,7 +333,7 @@ func (m *GameServer_Spec) Reset() { *m = GameServer_Spec{} } func (m *GameServer_Spec) String() string { return proto.CompactTextString(m) } func (*GameServer_Spec) ProtoMessage() {} func (*GameServer_Spec) Descriptor() ([]byte, []int) { - return fileDescriptor_sdk_a0e878ab4087e6bc, []int{3, 1} + return fileDescriptor_sdk_74162870a323c7c1, []int{3, 1} } func (m *GameServer_Spec) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GameServer_Spec.Unmarshal(m, b) @@ -370,7 +374,7 @@ func (m *GameServer_Spec_Health) Reset() { *m = GameServer_Spec_Health{} func (m *GameServer_Spec_Health) String() string { return proto.CompactTextString(m) } func (*GameServer_Spec_Health) ProtoMessage() {} func (*GameServer_Spec_Health) Descriptor() ([]byte, []int) { - return fileDescriptor_sdk_a0e878ab4087e6bc, []int{3, 1, 0} + return fileDescriptor_sdk_74162870a323c7c1, []int{3, 1, 0} } func (m *GameServer_Spec_Health) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GameServer_Spec_Health.Unmarshal(m, b) @@ -431,7 +435,7 @@ func (m *GameServer_Status) Reset() { *m = GameServer_Status{} } func (m *GameServer_Status) String() string { return proto.CompactTextString(m) } func (*GameServer_Status) ProtoMessage() {} func (*GameServer_Status) Descriptor() ([]byte, []int) { - return fileDescriptor_sdk_a0e878ab4087e6bc, []int{3, 2} + return fileDescriptor_sdk_74162870a323c7c1, []int{3, 2} } func (m *GameServer_Status) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GameServer_Status.Unmarshal(m, b) @@ -484,7 +488,7 @@ func (m *GameServer_Status_Port) Reset() { *m = GameServer_Status_Port{} func (m *GameServer_Status_Port) String() string { return proto.CompactTextString(m) } func (*GameServer_Status_Port) ProtoMessage() {} func (*GameServer_Status_Port) Descriptor() ([]byte, []int) { - return fileDescriptor_sdk_a0e878ab4087e6bc, []int{3, 2, 0} + return fileDescriptor_sdk_74162870a323c7c1, []int{3, 2, 0} } func (m *GameServer_Status_Port) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GameServer_Status_Port.Unmarshal(m, b) @@ -948,9 +952,9 @@ var _SDK_serviceDesc = grpc.ServiceDesc{ Metadata: "sdk.proto", } -func init() { proto.RegisterFile("sdk.proto", fileDescriptor_sdk_a0e878ab4087e6bc) } +func init() { proto.RegisterFile("sdk.proto", fileDescriptor_sdk_74162870a323c7c1) } -var fileDescriptor_sdk_a0e878ab4087e6bc = []byte{ +var fileDescriptor_sdk_74162870a323c7c1 = []byte{ // 843 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0x5f, 0x8f, 0xdb, 0x44, 0x10, 0xc0, 0xe5, 0x4b, 0xe2, 0x24, 0x13, 0xee, 0xdf, 0xde, 0x55, 0x72, 0xad, 0x8a, 0x16, 0x8b, diff --git a/pkg/sdk/sdk.pb.gw.go b/pkg/sdk/sdk.pb.gw.go index 63b2f245d4..d58dcb3f8d 100644 --- a/pkg/sdk/sdk.pb.gw.go +++ b/pkg/sdk/sdk.pb.gw.go @@ -24,30 +24,37 @@ It translates gRPC into RESTful JSON APIs. package sdk import ( + "context" "io" "net/http" + "github.com/golang/protobuf/descriptor" "github.com/golang/protobuf/proto" "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/grpc-ecosystem/grpc-gateway/utilities" - "golang.org/x/net/context" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/grpclog" "google.golang.org/grpc/status" ) +// Suppress "imported and not used" errors var _ codes.Code var _ io.Reader var _ status.Status var _ = runtime.String var _ = utilities.NewDoubleArray +var _ = descriptor.ForMessage func request_SDK_Ready_0(ctx context.Context, marshaler runtime.Marshaler, client SDKClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq Empty var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -56,11 +63,32 @@ func request_SDK_Ready_0(ctx context.Context, marshaler runtime.Marshaler, clien } +func local_request_SDK_Ready_0(ctx context.Context, marshaler runtime.Marshaler, server SDKServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq Empty + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := server.Ready(ctx, &protoReq) + return msg, metadata, err + +} + func request_SDK_Allocate_0(ctx context.Context, marshaler runtime.Marshaler, client SDKClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq Empty var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -69,11 +97,32 @@ func request_SDK_Allocate_0(ctx context.Context, marshaler runtime.Marshaler, cl } +func local_request_SDK_Allocate_0(ctx context.Context, marshaler runtime.Marshaler, server SDKServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq Empty + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := server.Allocate(ctx, &protoReq) + return msg, metadata, err + +} + func request_SDK_Shutdown_0(ctx context.Context, marshaler runtime.Marshaler, client SDKClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq Empty var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -82,6 +131,23 @@ func request_SDK_Shutdown_0(ctx context.Context, marshaler runtime.Marshaler, cl } +func local_request_SDK_Shutdown_0(ctx context.Context, marshaler runtime.Marshaler, server SDKServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq Empty + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := server.Shutdown(ctx, &protoReq) + return msg, metadata, err + +} + func request_SDK_Health_0(ctx context.Context, marshaler runtime.Marshaler, client SDKClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var metadata runtime.ServerMetadata stream, err := client.Health(ctx) @@ -101,6 +167,9 @@ func request_SDK_Health_0(ctx context.Context, marshaler runtime.Marshaler, clie return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } if err = stream.Send(&protoReq); err != nil { + if err == io.EOF { + break + } grpclog.Infof("Failed to send request: %v", err) return nil, metadata, err } @@ -132,6 +201,15 @@ func request_SDK_GetGameServer_0(ctx context.Context, marshaler runtime.Marshale } +func local_request_SDK_GetGameServer_0(ctx context.Context, marshaler runtime.Marshaler, server SDKServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq Empty + var metadata runtime.ServerMetadata + + msg, err := server.GetGameServer(ctx, &protoReq) + return msg, metadata, err + +} + func request_SDK_WatchGameServer_0(ctx context.Context, marshaler runtime.Marshaler, client SDKClient, req *http.Request, pathParams map[string]string) (SDK_WatchGameServerClient, runtime.ServerMetadata, error) { var protoReq Empty var metadata runtime.ServerMetadata @@ -153,7 +231,11 @@ func request_SDK_SetLabel_0(ctx context.Context, marshaler runtime.Marshaler, cl var protoReq KeyValue var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -162,11 +244,32 @@ func request_SDK_SetLabel_0(ctx context.Context, marshaler runtime.Marshaler, cl } +func local_request_SDK_SetLabel_0(ctx context.Context, marshaler runtime.Marshaler, server SDKServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq KeyValue + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := server.SetLabel(ctx, &protoReq) + return msg, metadata, err + +} + func request_SDK_SetAnnotation_0(ctx context.Context, marshaler runtime.Marshaler, client SDKClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq KeyValue var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -175,11 +278,32 @@ func request_SDK_SetAnnotation_0(ctx context.Context, marshaler runtime.Marshale } +func local_request_SDK_SetAnnotation_0(ctx context.Context, marshaler runtime.Marshaler, server SDKServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq KeyValue + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := server.SetAnnotation(ctx, &protoReq) + return msg, metadata, err + +} + func request_SDK_Reserve_0(ctx context.Context, marshaler runtime.Marshaler, client SDKClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq Duration var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -188,6 +312,185 @@ func request_SDK_Reserve_0(ctx context.Context, marshaler runtime.Marshaler, cli } +func local_request_SDK_Reserve_0(ctx context.Context, marshaler runtime.Marshaler, server SDKServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq Duration + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := server.Reserve(ctx, &protoReq) + return msg, metadata, err + +} + +// RegisterSDKHandlerServer registers the http handlers for service SDK to "mux". +// UnaryRPC :call SDKServer directly. +// StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. +func RegisterSDKHandlerServer(ctx context.Context, mux *runtime.ServeMux, server SDKServer) error { + + mux.Handle("POST", pattern_SDK_Ready_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_SDK_Ready_0(rctx, inboundMarshaler, server, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_SDK_Ready_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("POST", pattern_SDK_Allocate_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_SDK_Allocate_0(rctx, inboundMarshaler, server, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_SDK_Allocate_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("POST", pattern_SDK_Shutdown_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_SDK_Shutdown_0(rctx, inboundMarshaler, server, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_SDK_Shutdown_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("POST", pattern_SDK_Health_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + err := status.Error(codes.Unimplemented, "streaming calls are not yet supported in the in-process transport") + _, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + }) + + mux.Handle("GET", pattern_SDK_GetGameServer_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_SDK_GetGameServer_0(rctx, inboundMarshaler, server, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_SDK_GetGameServer_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_SDK_WatchGameServer_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + err := status.Error(codes.Unimplemented, "streaming calls are not yet supported in the in-process transport") + _, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + }) + + mux.Handle("PUT", pattern_SDK_SetLabel_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_SDK_SetLabel_0(rctx, inboundMarshaler, server, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_SDK_SetLabel_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("PUT", pattern_SDK_SetAnnotation_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_SDK_SetAnnotation_0(rctx, inboundMarshaler, server, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_SDK_SetAnnotation_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("POST", pattern_SDK_Reserve_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_SDK_Reserve_0(rctx, inboundMarshaler, server, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_SDK_Reserve_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + return nil +} + // RegisterSDKHandlerFromEndpoint is same as RegisterSDKHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterSDKHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { @@ -229,15 +532,6 @@ func RegisterSDKHandlerClient(ctx context.Context, mux *runtime.ServeMux, client mux.Handle("POST", pattern_SDK_Ready_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() - if cn, ok := w.(http.CloseNotifier); ok { - go func(done <-chan struct{}, closed <-chan bool) { - select { - case <-done: - case <-closed: - cancel() - } - }(ctx.Done(), cn.CloseNotify()) - } inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) rctx, err := runtime.AnnotateContext(ctx, mux, req) if err != nil { @@ -258,15 +552,6 @@ func RegisterSDKHandlerClient(ctx context.Context, mux *runtime.ServeMux, client mux.Handle("POST", pattern_SDK_Allocate_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() - if cn, ok := w.(http.CloseNotifier); ok { - go func(done <-chan struct{}, closed <-chan bool) { - select { - case <-done: - case <-closed: - cancel() - } - }(ctx.Done(), cn.CloseNotify()) - } inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) rctx, err := runtime.AnnotateContext(ctx, mux, req) if err != nil { @@ -287,15 +572,6 @@ func RegisterSDKHandlerClient(ctx context.Context, mux *runtime.ServeMux, client mux.Handle("POST", pattern_SDK_Shutdown_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() - if cn, ok := w.(http.CloseNotifier); ok { - go func(done <-chan struct{}, closed <-chan bool) { - select { - case <-done: - case <-closed: - cancel() - } - }(ctx.Done(), cn.CloseNotify()) - } inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) rctx, err := runtime.AnnotateContext(ctx, mux, req) if err != nil { @@ -316,15 +592,6 @@ func RegisterSDKHandlerClient(ctx context.Context, mux *runtime.ServeMux, client mux.Handle("POST", pattern_SDK_Health_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() - if cn, ok := w.(http.CloseNotifier); ok { - go func(done <-chan struct{}, closed <-chan bool) { - select { - case <-done: - case <-closed: - cancel() - } - }(ctx.Done(), cn.CloseNotify()) - } inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) rctx, err := runtime.AnnotateContext(ctx, mux, req) if err != nil { @@ -345,15 +612,6 @@ func RegisterSDKHandlerClient(ctx context.Context, mux *runtime.ServeMux, client mux.Handle("GET", pattern_SDK_GetGameServer_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() - if cn, ok := w.(http.CloseNotifier); ok { - go func(done <-chan struct{}, closed <-chan bool) { - select { - case <-done: - case <-closed: - cancel() - } - }(ctx.Done(), cn.CloseNotify()) - } inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) rctx, err := runtime.AnnotateContext(ctx, mux, req) if err != nil { @@ -374,15 +632,6 @@ func RegisterSDKHandlerClient(ctx context.Context, mux *runtime.ServeMux, client mux.Handle("GET", pattern_SDK_WatchGameServer_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() - if cn, ok := w.(http.CloseNotifier); ok { - go func(done <-chan struct{}, closed <-chan bool) { - select { - case <-done: - case <-closed: - cancel() - } - }(ctx.Done(), cn.CloseNotify()) - } inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) rctx, err := runtime.AnnotateContext(ctx, mux, req) if err != nil { @@ -403,15 +652,6 @@ func RegisterSDKHandlerClient(ctx context.Context, mux *runtime.ServeMux, client mux.Handle("PUT", pattern_SDK_SetLabel_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() - if cn, ok := w.(http.CloseNotifier); ok { - go func(done <-chan struct{}, closed <-chan bool) { - select { - case <-done: - case <-closed: - cancel() - } - }(ctx.Done(), cn.CloseNotify()) - } inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) rctx, err := runtime.AnnotateContext(ctx, mux, req) if err != nil { @@ -432,15 +672,6 @@ func RegisterSDKHandlerClient(ctx context.Context, mux *runtime.ServeMux, client mux.Handle("PUT", pattern_SDK_SetAnnotation_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() - if cn, ok := w.(http.CloseNotifier); ok { - go func(done <-chan struct{}, closed <-chan bool) { - select { - case <-done: - case <-closed: - cancel() - } - }(ctx.Done(), cn.CloseNotify()) - } inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) rctx, err := runtime.AnnotateContext(ctx, mux, req) if err != nil { @@ -461,15 +692,6 @@ func RegisterSDKHandlerClient(ctx context.Context, mux *runtime.ServeMux, client mux.Handle("POST", pattern_SDK_Reserve_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() - if cn, ok := w.(http.CloseNotifier); ok { - go func(done <-chan struct{}, closed <-chan bool) { - select { - case <-done: - case <-closed: - cancel() - } - }(ctx.Done(), cn.CloseNotify()) - } inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) rctx, err := runtime.AnnotateContext(ctx, mux, req) if err != nil { @@ -491,23 +713,23 @@ func RegisterSDKHandlerClient(ctx context.Context, mux *runtime.ServeMux, client } var ( - pattern_SDK_Ready_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0}, []string{"ready"}, "")) + pattern_SDK_Ready_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0}, []string{"ready"}, "", runtime.AssumeColonVerbOpt(true))) - pattern_SDK_Allocate_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0}, []string{"allocate"}, "")) + pattern_SDK_Allocate_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0}, []string{"allocate"}, "", runtime.AssumeColonVerbOpt(true))) - pattern_SDK_Shutdown_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0}, []string{"shutdown"}, "")) + pattern_SDK_Shutdown_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0}, []string{"shutdown"}, "", runtime.AssumeColonVerbOpt(true))) - pattern_SDK_Health_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0}, []string{"health"}, "")) + pattern_SDK_Health_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0}, []string{"health"}, "", runtime.AssumeColonVerbOpt(true))) - pattern_SDK_GetGameServer_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0}, []string{"gameserver"}, "")) + pattern_SDK_GetGameServer_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0}, []string{"gameserver"}, "", runtime.AssumeColonVerbOpt(true))) - pattern_SDK_WatchGameServer_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"watch", "gameserver"}, "")) + pattern_SDK_WatchGameServer_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"watch", "gameserver"}, "", runtime.AssumeColonVerbOpt(true))) - pattern_SDK_SetLabel_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"metadata", "label"}, "")) + pattern_SDK_SetLabel_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"metadata", "label"}, "", runtime.AssumeColonVerbOpt(true))) - pattern_SDK_SetAnnotation_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"metadata", "annotation"}, "")) + pattern_SDK_SetAnnotation_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"metadata", "annotation"}, "", runtime.AssumeColonVerbOpt(true))) - pattern_SDK_Reserve_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0}, []string{"reserve"}, "")) + pattern_SDK_Reserve_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0}, []string{"reserve"}, "", runtime.AssumeColonVerbOpt(true))) ) var ( diff --git a/proto/googleapis/google/api/annotations.proto b/proto/googleapis/google/api/annotations.proto index 18dcf20990..85c361b47f 100644 --- a/proto/googleapis/google/api/annotations.proto +++ b/proto/googleapis/google/api/annotations.proto @@ -28,4 +28,4 @@ option objc_class_prefix = "GAPI"; extend google.protobuf.MethodOptions { // See `HttpRule`. HttpRule http = 72295728; -} \ No newline at end of file +} diff --git a/proto/googleapis/google/api/http.proto b/proto/googleapis/google/api/http.proto index 6e19c75bf7..2bd3a19bfa 100644 --- a/proto/googleapis/google/api/http.proto +++ b/proto/googleapis/google/api/http.proto @@ -1,4 +1,4 @@ -// Copyright 2018 Google LLC. +// Copyright 2018 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -11,7 +11,6 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -// syntax = "proto3"; @@ -24,6 +23,7 @@ option java_outer_classname = "HttpProto"; option java_package = "com.google.api"; option objc_class_prefix = "GAPI"; + // Defines the HTTP configuration for an API service. It contains a list of // [HttpRule][google.api.HttpRule], each specifying the mapping of an RPC method // to one or more HTTP REST API methods. @@ -42,94 +42,94 @@ message Http { bool fully_decode_reserved_expansion = 2; } -// # gRPC Transcoding -// -// gRPC Transcoding is a feature for mapping between a gRPC method and one or -// more HTTP REST endpoints. It allows developers to build a single API service -// that supports both gRPC APIs and REST APIs. Many systems, including [Google -// APIs](https://github.com/googleapis/googleapis), -// [Cloud Endpoints](https://cloud.google.com/endpoints), [gRPC -// Gateway](https://github.com/grpc-ecosystem/grpc-gateway), -// and [Envoy](https://github.com/envoyproxy/envoy) proxy support this feature -// and use it for large scale production services. -// -// `HttpRule` defines the schema of the gRPC/REST mapping. The mapping specifies -// how different portions of the gRPC request message are mapped to the URL -// path, URL query parameters, and HTTP request body. It also controls how the -// gRPC response message is mapped to the HTTP response body. `HttpRule` is -// typically specified as an `google.api.http` annotation on the gRPC method. -// -// Each mapping specifies a URL path template and an HTTP method. The path -// template may refer to one or more fields in the gRPC request message, as long -// as each field is a non-repeated field with a primitive (non-message) type. -// The path template controls how fields of the request message are mapped to -// the URL path. -// -// Example: +// `HttpRule` defines the mapping of an RPC method to one or more HTTP +// REST API methods. The mapping specifies how different portions of the RPC +// request message are mapped to URL path, URL query parameters, and +// HTTP request body. The mapping is typically specified as an +// `google.api.http` annotation on the RPC method, +// see "google/api/annotations.proto" for details. +// +// The mapping consists of a field specifying the path template and +// method kind. The path template can refer to fields in the request +// message, as in the example below which describes a REST GET +// operation on a resource collection of messages: +// // // service Messaging { // rpc GetMessage(GetMessageRequest) returns (Message) { -// option (google.api.http) = { -// get: "/v1/{name=messages/*}" -// }; +// option (google.api.http).get = "/v1/messages/{message_id}/{sub.subfield}"; // } // } // message GetMessageRequest { -// string name = 1; // Mapped to URL path. +// message SubMessage { +// string subfield = 1; +// } +// string message_id = 1; // mapped to the URL +// SubMessage sub = 2; // `sub.subfield` is url-mapped // } // message Message { -// string text = 1; // The resource content. +// string text = 1; // content of the resource // } // -// This enables an HTTP REST to gRPC mapping as below: +// The same http annotation can alternatively be expressed inside the +// `GRPC API Configuration` YAML file. +// +// http: +// rules: +// - selector: .Messaging.GetMessage +// get: /v1/messages/{message_id}/{sub.subfield} // -// HTTP | gRPC +// This definition enables an automatic, bidrectional mapping of HTTP +// JSON to RPC. Example: +// +// HTTP | RPC // -----|----- -// `GET /v1/messages/123456` | `GetMessage(name: "messages/123456")` +// `GET /v1/messages/123456/foo` | `GetMessage(message_id: "123456" sub: SubMessage(subfield: "foo"))` +// +// In general, not only fields but also field paths can be referenced +// from a path pattern. Fields mapped to the path pattern cannot be +// repeated and must have a primitive (non-message) type. +// +// Any fields in the request message which are not bound by the path +// pattern automatically become (optional) HTTP query +// parameters. Assume the following definition of the request message: // -// Any fields in the request message which are not bound by the path template -// automatically become HTTP query parameters if there is no HTTP request body. -// For example: // // service Messaging { // rpc GetMessage(GetMessageRequest) returns (Message) { -// option (google.api.http) = { -// get:"/v1/messages/{message_id}" -// }; +// option (google.api.http).get = "/v1/messages/{message_id}"; // } // } // message GetMessageRequest { // message SubMessage { // string subfield = 1; // } -// string message_id = 1; // Mapped to URL path. -// int64 revision = 2; // Mapped to URL query parameter `revision`. -// SubMessage sub = 3; // Mapped to URL query parameter `sub.subfield`. +// string message_id = 1; // mapped to the URL +// int64 revision = 2; // becomes a parameter +// SubMessage sub = 3; // `sub.subfield` becomes a parameter // } // +// // This enables a HTTP JSON to RPC mapping as below: // -// HTTP | gRPC +// HTTP | RPC // -----|----- -// `GET /v1/messages/123456?revision=2&sub.subfield=foo` | -// `GetMessage(message_id: "123456" revision: 2 sub: SubMessage(subfield: -// "foo"))` -// -// Note that fields which are mapped to URL query parameters must have a -// primitive type or a repeated primitive type or a non-repeated message type. -// In the case of a repeated type, the parameter can be repeated in the URL -// as `...?param=A¶m=B`. In the case of a message type, each field of the -// message is mapped to a separate parameter, such as -// `...?foo.a=A&foo.b=B&foo.c=C`. -// -// For HTTP methods that allow a request body, the `body` field +// `GET /v1/messages/123456?revision=2&sub.subfield=foo` | `GetMessage(message_id: "123456" revision: 2 sub: SubMessage(subfield: "foo"))` +// +// Note that fields which are mapped to HTTP parameters must have a +// primitive type or a repeated primitive type. Message types are not +// allowed. In the case of a repeated type, the parameter can be +// repeated in the URL, as in `...?param=A¶m=B`. +// +// For HTTP method kinds which allow a request body, the `body` field // specifies the mapping. Consider a REST update method on the // message resource collection: // +// // service Messaging { // rpc UpdateMessage(UpdateMessageRequest) returns (Message) { // option (google.api.http) = { -// patch: "/v1/messages/{message_id}" +// put: "/v1/messages/{message_id}" // body: "message" // }; // } @@ -139,14 +139,14 @@ message Http { // Message message = 2; // mapped to the body // } // +// // The following HTTP JSON to RPC mapping is enabled, where the // representation of the JSON in the request body is determined by // protos JSON encoding: // -// HTTP | gRPC +// HTTP | RPC // -----|----- -// `PATCH /v1/messages/123456 { "text": "Hi!" }` | `UpdateMessage(message_id: -// "123456" message { text: "Hi!" })` +// `PUT /v1/messages/123456 { "text": "Hi!" }` | `UpdateMessage(message_id: "123456" message { text: "Hi!" })` // // The special name `*` can be used in the body mapping to define that // every field not bound by the path template should be mapped to the @@ -156,7 +156,7 @@ message Http { // service Messaging { // rpc UpdateMessage(Message) returns (Message) { // option (google.api.http) = { -// patch: "/v1/messages/{message_id}" +// put: "/v1/messages/{message_id}" // body: "*" // }; // } @@ -169,14 +169,13 @@ message Http { // // The following HTTP JSON to RPC mapping is enabled: // -// HTTP | gRPC +// HTTP | RPC // -----|----- -// `PATCH /v1/messages/123456 { "text": "Hi!" }` | `UpdateMessage(message_id: -// "123456" text: "Hi!")` +// `PUT /v1/messages/123456 { "text": "Hi!" }` | `UpdateMessage(message_id: "123456" text: "Hi!")` // // Note that when using `*` in the body mapping, it is not possible to // have HTTP parameters, as all fields not bound by the path end in -// the body. This makes this option more rarely used in practice when +// the body. This makes this option more rarely used in practice of // defining REST APIs. The common usage of `*` is in custom methods // which don't use the URL at all for transferring data. // @@ -198,34 +197,32 @@ message Http { // string user_id = 2; // } // -// This enables the following two alternative HTTP JSON to RPC mappings: // -// HTTP | gRPC +// This enables the following two alternative HTTP JSON to RPC +// mappings: +// +// HTTP | RPC // -----|----- // `GET /v1/messages/123456` | `GetMessage(message_id: "123456")` -// `GET /v1/users/me/messages/123456` | `GetMessage(user_id: "me" message_id: -// "123456")` -// -// ## Rules for HTTP mapping -// -// 1. Leaf request fields (recursive expansion nested messages in the request -// message) are classified into three categories: -// - Fields referred by the path template. They are passed via the URL path. -// - Fields referred by the [HttpRule.body][google.api.HttpRule.body]. They -// are passed via the HTTP -// request body. -// - All other fields are passed via the URL query parameters, and the -// parameter name is the field path in the request message. A repeated -// field can be represented as multiple query parameters under the same -// name. -// 2. If [HttpRule.body][google.api.HttpRule.body] is "*", there is no URL -// query parameter, all fields -// are passed via URL path and HTTP request body. -// 3. If [HttpRule.body][google.api.HttpRule.body] is omitted, there is no HTTP -// request body, all -// fields are passed via URL path and URL query parameters. -// -// ### Path template syntax +// `GET /v1/users/me/messages/123456` | `GetMessage(user_id: "me" message_id: "123456")` +// +// # Rules for HTTP mapping +// +// The rules for mapping HTTP path, query parameters, and body fields +// to the request message are as follows: +// +// 1. The `body` field specifies either `*` or a field path, or is +// omitted. If omitted, it indicates there is no HTTP request body. +// 2. Leaf fields (recursive expansion of nested messages in the +// request) can be classified into three types: +// (a) Matched in the URL template. +// (b) Covered by body (if body is `*`, everything except (a) fields; +// else everything under the body field) +// (c) All other fields. +// 3. URL query parameters found in the HTTP request are mapped to (c) fields. +// 4. Any body sent with an HTTP request can contain only (b) fields. +// +// The syntax of the path template is as follows: // // Template = "/" Segments [ Verb ] ; // Segments = Segment { "/" Segment } ; @@ -234,111 +231,57 @@ message Http { // FieldPath = IDENT { "." IDENT } ; // Verb = ":" LITERAL ; // -// The syntax `*` matches a single URL path segment. The syntax `**` matches -// zero or more URL path segments, which must be the last part of the URL path -// except the `Verb`. +// The syntax `*` matches a single path segment. The syntax `**` matches zero +// or more path segments, which must be the last part of the path except the +// `Verb`. The syntax `LITERAL` matches literal text in the path. // // The syntax `Variable` matches part of the URL path as specified by its // template. A variable template must not contain other variables. If a variable // matches a single path segment, its template may be omitted, e.g. `{var}` // is equivalent to `{var=*}`. // -// The syntax `LITERAL` matches literal text in the URL path. If the `LITERAL` -// contains any reserved character, such characters should be percent-encoded -// before the matching. -// // If a variable contains exactly one path segment, such as `"{var}"` or -// `"{var=*}"`, when such a variable is expanded into a URL path on the client -// side, all characters except `[-_.~0-9a-zA-Z]` are percent-encoded. The -// server side does the reverse decoding. Such variables show up in the -// [Discovery -// Document](https://developers.google.com/discovery/v1/reference/apis) as -// `{var}`. -// -// If a variable contains multiple path segments, such as `"{var=foo/*}"` -// or `"{var=**}"`, when such a variable is expanded into a URL path on the -// client side, all characters except `[-_.~/0-9a-zA-Z]` are percent-encoded. -// The server side does the reverse decoding, except "%2F" and "%2f" are left -// unchanged. Such variables show up in the -// [Discovery -// Document](https://developers.google.com/discovery/v1/reference/apis) as -// `{+var}`. -// -// ## Using gRPC API Service Configuration -// -// gRPC API Service Configuration (service config) is a configuration language -// for configuring a gRPC service to become a user-facing product. The -// service config is simply the YAML representation of the `google.api.Service` -// proto message. -// -// As an alternative to annotating your proto file, you can configure gRPC -// transcoding in your service config YAML files. You do this by specifying a -// `HttpRule` that maps the gRPC method to a REST endpoint, achieving the same -// effect as the proto annotation. This can be particularly useful if you -// have a proto that is reused in multiple services. Note that any transcoding -// specified in the service config will override any matching transcoding -// configuration in the proto. -// -// Example: -// -// http: -// rules: -// # Selects a gRPC method and applies HttpRule to it. -// - selector: example.v1.Messaging.GetMessage -// get: /v1/messages/{message_id}/{sub.subfield} -// -// ## Special notes -// -// When gRPC Transcoding is used to map a gRPC to JSON REST endpoints, the -// proto to JSON conversion must follow the [proto3 -// specification](https://developers.google.com/protocol-buffers/docs/proto3#json). -// -// While the single segment variable follows the semantics of -// [RFC 6570](https://tools.ietf.org/html/rfc6570) Section 3.2.2 Simple String -// Expansion, the multi segment variable **does not** follow RFC 6570 Section -// 3.2.3 Reserved Expansion. The reason is that the Reserved Expansion +// `"{var=*}"`, when such a variable is expanded into a URL path, all characters +// except `[-_.~0-9a-zA-Z]` are percent-encoded. Such variables show up in the +// Discovery Document as `{var}`. +// +// If a variable contains one or more path segments, such as `"{var=foo/*}"` +// or `"{var=**}"`, when such a variable is expanded into a URL path, all +// characters except `[-_.~/0-9a-zA-Z]` are percent-encoded. Such variables +// show up in the Discovery Document as `{+var}`. +// +// NOTE: While the single segment variable matches the semantics of +// [RFC 6570](https://tools.ietf.org/html/rfc6570) Section 3.2.2 +// Simple String Expansion, the multi segment variable **does not** match +// RFC 6570 Reserved Expansion. The reason is that the Reserved Expansion // does not expand special characters like `?` and `#`, which would lead -// to invalid URLs. As the result, gRPC Transcoding uses a custom encoding -// for multi segment variables. -// -// The path variables **must not** refer to any repeated or mapped field, -// because client libraries are not capable of handling such variable expansion. +// to invalid URLs. // -// The path variables **must not** capture the leading "/" character. The reason -// is that the most common use case "{var}" does not capture the leading "/" -// character. For consistency, all path variables must share the same behavior. -// -// Repeated message fields must not be mapped to URL query parameters, because -// no client library can support such complicated mapping. -// -// If an API needs to use a JSON array for request or response body, it can map -// the request or response body to a repeated field. However, some gRPC -// Transcoding implementations may not support this feature. +// NOTE: the field paths in variables and in the `body` must not refer to +// repeated fields or map fields. message HttpRule { - // Selects a method to which this rule applies. + // Selects methods to which this rule applies. // - // Refer to [selector][google.api.DocumentationRule.selector] for syntax - // details. + // Refer to [selector][google.api.DocumentationRule.selector] for syntax details. string selector = 1; // Determines the URL pattern is matched by this rules. This pattern can be // used with any of the {get|put|post|delete|patch} methods. A custom method // can be defined using the 'custom' field. oneof pattern { - // Maps to HTTP GET. Used for listing and getting information about - // resources. + // Used for listing and getting information about resources. string get = 2; - // Maps to HTTP PUT. Used for replacing a resource. + // Used for updating a resource. string put = 3; - // Maps to HTTP POST. Used for creating a resource or performing an action. + // Used for creating a resource. string post = 4; - // Maps to HTTP DELETE. Used for deleting a resource. + // Used for deleting a resource. string delete = 5; - // Maps to HTTP PATCH. Used for updating a resource. + // Used for updating a resource. string patch = 6; // The custom pattern is used for specifying an HTTP method that is not @@ -348,20 +291,15 @@ message HttpRule { CustomHttpPattern custom = 8; } - // The name of the request field whose value is mapped to the HTTP request - // body, or `*` for mapping all request fields not captured by the path - // pattern to the HTTP body, or omitted for not having any HTTP request body. - // - // NOTE: the referred field must be present at the top-level of the request - // message type. + // The name of the request field whose value is mapped to the HTTP body, or + // `*` for mapping all fields not captured by the path pattern to the HTTP + // body. NOTE: the referred field must not be a repeated field and must be + // present at the top-level of request message type. string body = 7; // Optional. The name of the response field whose value is mapped to the HTTP - // response body. When omitted, the entire response message will be used - // as the HTTP response body. - // - // NOTE: The referred field must be present at the top-level of the response - // message type. + // body of response. Other response fields are ignored. When + // not set, the response message will be used as HTTP body of response. string response_body = 12; // Additional HTTP bindings for the selector. Nested bindings must @@ -377,4 +315,4 @@ message CustomHttpPattern { // The path matched by this custom verb. string path = 2; -} \ No newline at end of file +} diff --git a/sdk.swagger.json b/sdk.swagger.json index a99de14c66..e0984f105c 100644 --- a/sdk.swagger.json +++ b/sdk.swagger.json @@ -20,7 +20,7 @@ "operationId": "Allocate", "responses": { "200": { - "description": "", + "description": "A successful response.", "schema": { "$ref": "#/definitions/sdkEmpty" } @@ -47,7 +47,7 @@ "operationId": "GetGameServer", "responses": { "200": { - "description": "", + "description": "A successful response.", "schema": { "$ref": "#/definitions/sdkGameServer" } @@ -64,7 +64,7 @@ "operationId": "Health", "responses": { "200": { - "description": "", + "description": "A successful response.", "schema": { "$ref": "#/definitions/sdkEmpty" } @@ -92,7 +92,7 @@ "operationId": "SetAnnotation", "responses": { "200": { - "description": "", + "description": "A successful response.", "schema": { "$ref": "#/definitions/sdkEmpty" } @@ -119,7 +119,7 @@ "operationId": "SetLabel", "responses": { "200": { - "description": "", + "description": "A successful response.", "schema": { "$ref": "#/definitions/sdkEmpty" } @@ -146,7 +146,7 @@ "operationId": "Ready", "responses": { "200": { - "description": "", + "description": "A successful response.", "schema": { "$ref": "#/definitions/sdkEmpty" } @@ -173,7 +173,7 @@ "operationId": "Reserve", "responses": { "200": { - "description": "", + "description": "A successful response.", "schema": { "$ref": "#/definitions/sdkEmpty" } @@ -200,7 +200,7 @@ "operationId": "Shutdown", "responses": { "200": { - "description": "", + "description": "A successful response.", "schema": { "$ref": "#/definitions/sdkEmpty" } @@ -227,9 +227,9 @@ "operationId": "WatchGameServer", "responses": { "200": { - "description": "(streaming responses)", + "description": "A successful response.(streaming responses)", "schema": { - "$ref": "#/definitions/sdkGameServer" + "$ref": "#/x-stream-definitions/sdkGameServer" } } }, @@ -342,6 +342,43 @@ } } }, + "protobufAny": { + "type": "object", + "properties": { + "type_url": { + "type": "string" + }, + "value": { + "type": "string", + "format": "byte" + } + } + }, + "runtimeStreamError": { + "type": "object", + "properties": { + "grpc_code": { + "type": "integer", + "format": "int32" + }, + "http_code": { + "type": "integer", + "format": "int32" + }, + "message": { + "type": "string" + }, + "http_status": { + "type": "string" + }, + "details": { + "type": "array", + "items": { + "$ref": "#/definitions/protobufAny" + } + } + } + }, "sdkDuration": { "type": "object", "properties": { @@ -383,5 +420,19 @@ }, "title": "Key, Value entry" } + }, + "x-stream-definitions": { + "sdkGameServer": { + "type": "object", + "properties": { + "result": { + "$ref": "#/definitions/sdkGameServer" + }, + "error": { + "$ref": "#/definitions/runtimeStreamError" + } + }, + "title": "Stream result of sdkGameServer" + } } } diff --git a/sdks/cpp/include/agones/sdk.grpc.pb.h b/sdks/cpp/include/agones/sdk.grpc.pb.h index eacdf6a812..3c4339263a 100644 --- a/sdks/cpp/include/agones/sdk.grpc.pb.h +++ b/sdks/cpp/include/agones/sdk.grpc.pb.h @@ -40,9 +40,11 @@ #include #include #include +#include #include #include #include +#include #include #include #include @@ -149,20 +151,29 @@ class SDK final { virtual ~experimental_async_interface() {} // Call when the GameServer is ready virtual void Ready(::grpc::ClientContext* context, const ::agones::dev::sdk::Empty* request, ::agones::dev::sdk::Empty* response, std::function) = 0; + virtual void Ready(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::agones::dev::sdk::Empty* response, std::function) = 0; // Call to self Allocation the GameServer virtual void Allocate(::grpc::ClientContext* context, const ::agones::dev::sdk::Empty* request, ::agones::dev::sdk::Empty* response, std::function) = 0; + virtual void Allocate(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::agones::dev::sdk::Empty* response, std::function) = 0; // Call when the GameServer is shutting down virtual void Shutdown(::grpc::ClientContext* context, const ::agones::dev::sdk::Empty* request, ::agones::dev::sdk::Empty* response, std::function) = 0; + virtual void Shutdown(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::agones::dev::sdk::Empty* response, std::function) = 0; // Send a Empty every d Duration to declare that this GameSever is healthy + virtual void Health(::grpc::ClientContext* context, ::agones::dev::sdk::Empty* response, ::grpc::experimental::ClientWriteReactor< ::agones::dev::sdk::Empty>* reactor) = 0; // Retrieve the current GameServer data virtual void GetGameServer(::grpc::ClientContext* context, const ::agones::dev::sdk::Empty* request, ::agones::dev::sdk::GameServer* response, std::function) = 0; + virtual void GetGameServer(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::agones::dev::sdk::GameServer* response, std::function) = 0; // Send GameServer details whenever the GameServer is updated + virtual void WatchGameServer(::grpc::ClientContext* context, ::agones::dev::sdk::Empty* request, ::grpc::experimental::ClientReadReactor< ::agones::dev::sdk::GameServer>* reactor) = 0; // Apply a Label to the backing GameServer metadata virtual void SetLabel(::grpc::ClientContext* context, const ::agones::dev::sdk::KeyValue* request, ::agones::dev::sdk::Empty* response, std::function) = 0; + virtual void SetLabel(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::agones::dev::sdk::Empty* response, std::function) = 0; // Apply a Annotation to the backing GameServer metadata virtual void SetAnnotation(::grpc::ClientContext* context, const ::agones::dev::sdk::KeyValue* request, ::agones::dev::sdk::Empty* response, std::function) = 0; + virtual void SetAnnotation(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::agones::dev::sdk::Empty* response, std::function) = 0; // Marks the GameServer as the Reserved state for Duration virtual void Reserve(::grpc::ClientContext* context, const ::agones::dev::sdk::Duration* request, ::agones::dev::sdk::Empty* response, std::function) = 0; + virtual void Reserve(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::agones::dev::sdk::Empty* response, std::function) = 0; }; virtual class experimental_async_interface* experimental_async() { return nullptr; } private: @@ -261,12 +272,21 @@ class SDK final { public StubInterface::experimental_async_interface { public: void Ready(::grpc::ClientContext* context, const ::agones::dev::sdk::Empty* request, ::agones::dev::sdk::Empty* response, std::function) override; + void Ready(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::agones::dev::sdk::Empty* response, std::function) override; void Allocate(::grpc::ClientContext* context, const ::agones::dev::sdk::Empty* request, ::agones::dev::sdk::Empty* response, std::function) override; + void Allocate(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::agones::dev::sdk::Empty* response, std::function) override; void Shutdown(::grpc::ClientContext* context, const ::agones::dev::sdk::Empty* request, ::agones::dev::sdk::Empty* response, std::function) override; + void Shutdown(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::agones::dev::sdk::Empty* response, std::function) override; + void Health(::grpc::ClientContext* context, ::agones::dev::sdk::Empty* response, ::grpc::experimental::ClientWriteReactor< ::agones::dev::sdk::Empty>* reactor) override; void GetGameServer(::grpc::ClientContext* context, const ::agones::dev::sdk::Empty* request, ::agones::dev::sdk::GameServer* response, std::function) override; + void GetGameServer(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::agones::dev::sdk::GameServer* response, std::function) override; + void WatchGameServer(::grpc::ClientContext* context, ::agones::dev::sdk::Empty* request, ::grpc::experimental::ClientReadReactor< ::agones::dev::sdk::GameServer>* reactor) override; void SetLabel(::grpc::ClientContext* context, const ::agones::dev::sdk::KeyValue* request, ::agones::dev::sdk::Empty* response, std::function) override; + void SetLabel(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::agones::dev::sdk::Empty* response, std::function) override; void SetAnnotation(::grpc::ClientContext* context, const ::agones::dev::sdk::KeyValue* request, ::agones::dev::sdk::Empty* response, std::function) override; + void SetAnnotation(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::agones::dev::sdk::Empty* response, std::function) override; void Reserve(::grpc::ClientContext* context, const ::agones::dev::sdk::Duration* request, ::agones::dev::sdk::Empty* response, std::function) override; + void Reserve(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::agones::dev::sdk::Empty* response, std::function) override; private: friend class Stub; explicit experimental_async(Stub* stub): stub_(stub) { } @@ -515,6 +535,226 @@ class SDK final { }; typedef WithAsyncMethod_Ready > > > > > > > > AsyncService; template + class ExperimentalWithCallbackMethod_Ready : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + ExperimentalWithCallbackMethod_Ready() { + ::grpc::Service::experimental().MarkMethodCallback(0, + new ::grpc::internal::CallbackUnaryHandler< ::agones::dev::sdk::Empty, ::agones::dev::sdk::Empty>( + [this](::grpc::ServerContext* context, + const ::agones::dev::sdk::Empty* request, + ::agones::dev::sdk::Empty* response, + ::grpc::experimental::ServerCallbackRpcController* controller) { + return this->Ready(context, request, response, controller); + })); + } + ~ExperimentalWithCallbackMethod_Ready() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status Ready(::grpc::ServerContext* context, const ::agones::dev::sdk::Empty* request, ::agones::dev::sdk::Empty* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + virtual void Ready(::grpc::ServerContext* context, const ::agones::dev::sdk::Empty* request, ::agones::dev::sdk::Empty* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } + }; + template + class ExperimentalWithCallbackMethod_Allocate : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + ExperimentalWithCallbackMethod_Allocate() { + ::grpc::Service::experimental().MarkMethodCallback(1, + new ::grpc::internal::CallbackUnaryHandler< ::agones::dev::sdk::Empty, ::agones::dev::sdk::Empty>( + [this](::grpc::ServerContext* context, + const ::agones::dev::sdk::Empty* request, + ::agones::dev::sdk::Empty* response, + ::grpc::experimental::ServerCallbackRpcController* controller) { + return this->Allocate(context, request, response, controller); + })); + } + ~ExperimentalWithCallbackMethod_Allocate() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status Allocate(::grpc::ServerContext* context, const ::agones::dev::sdk::Empty* request, ::agones::dev::sdk::Empty* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + virtual void Allocate(::grpc::ServerContext* context, const ::agones::dev::sdk::Empty* request, ::agones::dev::sdk::Empty* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } + }; + template + class ExperimentalWithCallbackMethod_Shutdown : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + ExperimentalWithCallbackMethod_Shutdown() { + ::grpc::Service::experimental().MarkMethodCallback(2, + new ::grpc::internal::CallbackUnaryHandler< ::agones::dev::sdk::Empty, ::agones::dev::sdk::Empty>( + [this](::grpc::ServerContext* context, + const ::agones::dev::sdk::Empty* request, + ::agones::dev::sdk::Empty* response, + ::grpc::experimental::ServerCallbackRpcController* controller) { + return this->Shutdown(context, request, response, controller); + })); + } + ~ExperimentalWithCallbackMethod_Shutdown() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status Shutdown(::grpc::ServerContext* context, const ::agones::dev::sdk::Empty* request, ::agones::dev::sdk::Empty* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + virtual void Shutdown(::grpc::ServerContext* context, const ::agones::dev::sdk::Empty* request, ::agones::dev::sdk::Empty* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } + }; + template + class ExperimentalWithCallbackMethod_Health : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + ExperimentalWithCallbackMethod_Health() { + ::grpc::Service::experimental().MarkMethodCallback(3, + new ::grpc::internal::CallbackClientStreamingHandler< ::agones::dev::sdk::Empty, ::agones::dev::sdk::Empty>( + [this] { return this->Health(); })); + } + ~ExperimentalWithCallbackMethod_Health() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status Health(::grpc::ServerContext* context, ::grpc::ServerReader< ::agones::dev::sdk::Empty>* reader, ::agones::dev::sdk::Empty* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + virtual ::grpc::experimental::ServerReadReactor< ::agones::dev::sdk::Empty, ::agones::dev::sdk::Empty>* Health() { + return new ::grpc::internal::UnimplementedReadReactor< + ::agones::dev::sdk::Empty, ::agones::dev::sdk::Empty>;} + }; + template + class ExperimentalWithCallbackMethod_GetGameServer : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + ExperimentalWithCallbackMethod_GetGameServer() { + ::grpc::Service::experimental().MarkMethodCallback(4, + new ::grpc::internal::CallbackUnaryHandler< ::agones::dev::sdk::Empty, ::agones::dev::sdk::GameServer>( + [this](::grpc::ServerContext* context, + const ::agones::dev::sdk::Empty* request, + ::agones::dev::sdk::GameServer* response, + ::grpc::experimental::ServerCallbackRpcController* controller) { + return this->GetGameServer(context, request, response, controller); + })); + } + ~ExperimentalWithCallbackMethod_GetGameServer() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status GetGameServer(::grpc::ServerContext* context, const ::agones::dev::sdk::Empty* request, ::agones::dev::sdk::GameServer* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + virtual void GetGameServer(::grpc::ServerContext* context, const ::agones::dev::sdk::Empty* request, ::agones::dev::sdk::GameServer* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } + }; + template + class ExperimentalWithCallbackMethod_WatchGameServer : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + ExperimentalWithCallbackMethod_WatchGameServer() { + ::grpc::Service::experimental().MarkMethodCallback(5, + new ::grpc::internal::CallbackServerStreamingHandler< ::agones::dev::sdk::Empty, ::agones::dev::sdk::GameServer>( + [this] { return this->WatchGameServer(); })); + } + ~ExperimentalWithCallbackMethod_WatchGameServer() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status WatchGameServer(::grpc::ServerContext* context, const ::agones::dev::sdk::Empty* request, ::grpc::ServerWriter< ::agones::dev::sdk::GameServer>* writer) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + virtual ::grpc::experimental::ServerWriteReactor< ::agones::dev::sdk::Empty, ::agones::dev::sdk::GameServer>* WatchGameServer() { + return new ::grpc::internal::UnimplementedWriteReactor< + ::agones::dev::sdk::Empty, ::agones::dev::sdk::GameServer>;} + }; + template + class ExperimentalWithCallbackMethod_SetLabel : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + ExperimentalWithCallbackMethod_SetLabel() { + ::grpc::Service::experimental().MarkMethodCallback(6, + new ::grpc::internal::CallbackUnaryHandler< ::agones::dev::sdk::KeyValue, ::agones::dev::sdk::Empty>( + [this](::grpc::ServerContext* context, + const ::agones::dev::sdk::KeyValue* request, + ::agones::dev::sdk::Empty* response, + ::grpc::experimental::ServerCallbackRpcController* controller) { + return this->SetLabel(context, request, response, controller); + })); + } + ~ExperimentalWithCallbackMethod_SetLabel() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status SetLabel(::grpc::ServerContext* context, const ::agones::dev::sdk::KeyValue* request, ::agones::dev::sdk::Empty* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + virtual void SetLabel(::grpc::ServerContext* context, const ::agones::dev::sdk::KeyValue* request, ::agones::dev::sdk::Empty* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } + }; + template + class ExperimentalWithCallbackMethod_SetAnnotation : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + ExperimentalWithCallbackMethod_SetAnnotation() { + ::grpc::Service::experimental().MarkMethodCallback(7, + new ::grpc::internal::CallbackUnaryHandler< ::agones::dev::sdk::KeyValue, ::agones::dev::sdk::Empty>( + [this](::grpc::ServerContext* context, + const ::agones::dev::sdk::KeyValue* request, + ::agones::dev::sdk::Empty* response, + ::grpc::experimental::ServerCallbackRpcController* controller) { + return this->SetAnnotation(context, request, response, controller); + })); + } + ~ExperimentalWithCallbackMethod_SetAnnotation() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status SetAnnotation(::grpc::ServerContext* context, const ::agones::dev::sdk::KeyValue* request, ::agones::dev::sdk::Empty* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + virtual void SetAnnotation(::grpc::ServerContext* context, const ::agones::dev::sdk::KeyValue* request, ::agones::dev::sdk::Empty* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } + }; + template + class ExperimentalWithCallbackMethod_Reserve : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + ExperimentalWithCallbackMethod_Reserve() { + ::grpc::Service::experimental().MarkMethodCallback(8, + new ::grpc::internal::CallbackUnaryHandler< ::agones::dev::sdk::Duration, ::agones::dev::sdk::Empty>( + [this](::grpc::ServerContext* context, + const ::agones::dev::sdk::Duration* request, + ::agones::dev::sdk::Empty* response, + ::grpc::experimental::ServerCallbackRpcController* controller) { + return this->Reserve(context, request, response, controller); + })); + } + ~ExperimentalWithCallbackMethod_Reserve() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status Reserve(::grpc::ServerContext* context, const ::agones::dev::sdk::Duration* request, ::agones::dev::sdk::Empty* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + virtual void Reserve(::grpc::ServerContext* context, const ::agones::dev::sdk::Duration* request, ::agones::dev::sdk::Empty* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } + }; + typedef ExperimentalWithCallbackMethod_Ready > > > > > > > > ExperimentalCallbackService; + template class WithGenericMethod_Ready : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service *service) {} @@ -848,6 +1088,225 @@ class SDK final { } }; template + class ExperimentalWithRawCallbackMethod_Ready : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + ExperimentalWithRawCallbackMethod_Ready() { + ::grpc::Service::experimental().MarkMethodRawCallback(0, + new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( + [this](::grpc::ServerContext* context, + const ::grpc::ByteBuffer* request, + ::grpc::ByteBuffer* response, + ::grpc::experimental::ServerCallbackRpcController* controller) { + this->Ready(context, request, response, controller); + })); + } + ~ExperimentalWithRawCallbackMethod_Ready() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status Ready(::grpc::ServerContext* context, const ::agones::dev::sdk::Empty* request, ::agones::dev::sdk::Empty* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + virtual void Ready(::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } + }; + template + class ExperimentalWithRawCallbackMethod_Allocate : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + ExperimentalWithRawCallbackMethod_Allocate() { + ::grpc::Service::experimental().MarkMethodRawCallback(1, + new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( + [this](::grpc::ServerContext* context, + const ::grpc::ByteBuffer* request, + ::grpc::ByteBuffer* response, + ::grpc::experimental::ServerCallbackRpcController* controller) { + this->Allocate(context, request, response, controller); + })); + } + ~ExperimentalWithRawCallbackMethod_Allocate() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status Allocate(::grpc::ServerContext* context, const ::agones::dev::sdk::Empty* request, ::agones::dev::sdk::Empty* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + virtual void Allocate(::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } + }; + template + class ExperimentalWithRawCallbackMethod_Shutdown : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + ExperimentalWithRawCallbackMethod_Shutdown() { + ::grpc::Service::experimental().MarkMethodRawCallback(2, + new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( + [this](::grpc::ServerContext* context, + const ::grpc::ByteBuffer* request, + ::grpc::ByteBuffer* response, + ::grpc::experimental::ServerCallbackRpcController* controller) { + this->Shutdown(context, request, response, controller); + })); + } + ~ExperimentalWithRawCallbackMethod_Shutdown() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status Shutdown(::grpc::ServerContext* context, const ::agones::dev::sdk::Empty* request, ::agones::dev::sdk::Empty* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + virtual void Shutdown(::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } + }; + template + class ExperimentalWithRawCallbackMethod_Health : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + ExperimentalWithRawCallbackMethod_Health() { + ::grpc::Service::experimental().MarkMethodRawCallback(3, + new ::grpc::internal::CallbackClientStreamingHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( + [this] { return this->Health(); })); + } + ~ExperimentalWithRawCallbackMethod_Health() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status Health(::grpc::ServerContext* context, ::grpc::ServerReader< ::agones::dev::sdk::Empty>* reader, ::agones::dev::sdk::Empty* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + virtual ::grpc::experimental::ServerReadReactor< ::grpc::ByteBuffer, ::grpc::ByteBuffer>* Health() { + return new ::grpc::internal::UnimplementedReadReactor< + ::grpc::ByteBuffer, ::grpc::ByteBuffer>;} + }; + template + class ExperimentalWithRawCallbackMethod_GetGameServer : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + ExperimentalWithRawCallbackMethod_GetGameServer() { + ::grpc::Service::experimental().MarkMethodRawCallback(4, + new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( + [this](::grpc::ServerContext* context, + const ::grpc::ByteBuffer* request, + ::grpc::ByteBuffer* response, + ::grpc::experimental::ServerCallbackRpcController* controller) { + this->GetGameServer(context, request, response, controller); + })); + } + ~ExperimentalWithRawCallbackMethod_GetGameServer() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status GetGameServer(::grpc::ServerContext* context, const ::agones::dev::sdk::Empty* request, ::agones::dev::sdk::GameServer* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + virtual void GetGameServer(::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } + }; + template + class ExperimentalWithRawCallbackMethod_WatchGameServer : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + ExperimentalWithRawCallbackMethod_WatchGameServer() { + ::grpc::Service::experimental().MarkMethodRawCallback(5, + new ::grpc::internal::CallbackServerStreamingHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( + [this] { return this->WatchGameServer(); })); + } + ~ExperimentalWithRawCallbackMethod_WatchGameServer() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status WatchGameServer(::grpc::ServerContext* context, const ::agones::dev::sdk::Empty* request, ::grpc::ServerWriter< ::agones::dev::sdk::GameServer>* writer) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + virtual ::grpc::experimental::ServerWriteReactor< ::grpc::ByteBuffer, ::grpc::ByteBuffer>* WatchGameServer() { + return new ::grpc::internal::UnimplementedWriteReactor< + ::grpc::ByteBuffer, ::grpc::ByteBuffer>;} + }; + template + class ExperimentalWithRawCallbackMethod_SetLabel : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + ExperimentalWithRawCallbackMethod_SetLabel() { + ::grpc::Service::experimental().MarkMethodRawCallback(6, + new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( + [this](::grpc::ServerContext* context, + const ::grpc::ByteBuffer* request, + ::grpc::ByteBuffer* response, + ::grpc::experimental::ServerCallbackRpcController* controller) { + this->SetLabel(context, request, response, controller); + })); + } + ~ExperimentalWithRawCallbackMethod_SetLabel() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status SetLabel(::grpc::ServerContext* context, const ::agones::dev::sdk::KeyValue* request, ::agones::dev::sdk::Empty* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + virtual void SetLabel(::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } + }; + template + class ExperimentalWithRawCallbackMethod_SetAnnotation : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + ExperimentalWithRawCallbackMethod_SetAnnotation() { + ::grpc::Service::experimental().MarkMethodRawCallback(7, + new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( + [this](::grpc::ServerContext* context, + const ::grpc::ByteBuffer* request, + ::grpc::ByteBuffer* response, + ::grpc::experimental::ServerCallbackRpcController* controller) { + this->SetAnnotation(context, request, response, controller); + })); + } + ~ExperimentalWithRawCallbackMethod_SetAnnotation() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status SetAnnotation(::grpc::ServerContext* context, const ::agones::dev::sdk::KeyValue* request, ::agones::dev::sdk::Empty* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + virtual void SetAnnotation(::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } + }; + template + class ExperimentalWithRawCallbackMethod_Reserve : public BaseClass { + private: + void BaseClassMustBeDerivedFromService(const Service *service) {} + public: + ExperimentalWithRawCallbackMethod_Reserve() { + ::grpc::Service::experimental().MarkMethodRawCallback(8, + new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>( + [this](::grpc::ServerContext* context, + const ::grpc::ByteBuffer* request, + ::grpc::ByteBuffer* response, + ::grpc::experimental::ServerCallbackRpcController* controller) { + this->Reserve(context, request, response, controller); + })); + } + ~ExperimentalWithRawCallbackMethod_Reserve() override { + BaseClassMustBeDerivedFromService(this); + } + // disable synchronous version of this method + ::grpc::Status Reserve(::grpc::ServerContext* context, const ::agones::dev::sdk::Duration* request, ::agones::dev::sdk::Empty* response) override { + abort(); + return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, ""); + } + virtual void Reserve(::grpc::ServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response, ::grpc::experimental::ServerCallbackRpcController* controller) { controller->Finish(::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "")); } + }; + template class WithStreamedUnaryMethod_Ready : public BaseClass { private: void BaseClassMustBeDerivedFromService(const Service *service) {} diff --git a/sdks/cpp/include/agones/sdk.pb.h b/sdks/cpp/include/agones/sdk.pb.h index c4f2a9751d..e00103961e 100644 --- a/sdks/cpp/include/agones/sdk.pb.h +++ b/sdks/cpp/include/agones/sdk.pb.h @@ -19,21 +19,22 @@ #ifndef PROTOBUF_INCLUDED_sdk_2eproto #define PROTOBUF_INCLUDED_sdk_2eproto +#include #include -#include - -#if GOOGLE_PROTOBUF_VERSION < 3006001 +#include +#if PROTOBUF_VERSION < 3007000 #error This file was generated by a newer version of protoc which is -#error incompatible with your Protocol Buffer headers. Please update +#error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3006001 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION +#if 3007000 < PROTOBUF_MIN_PROTOC_VERSION #error This file was generated by an older version of protoc which is -#error incompatible with your Protocol Buffer headers. Please +#error incompatible with your Protocol Buffer headers. Please #error regenerate this file with a newer version of protoc. #endif +#include #include #include #include @@ -50,20 +51,22 @@ #include #include "google/api/annotations.pb.h" // @@protoc_insertion_point(includes) -#define PROTOBUF_INTERNAL_EXPORT_protobuf_sdk_2eproto AGONES_EXPORT +#include +#define PROTOBUF_INTERNAL_EXPORT_sdk_2eproto AGONES_EXPORT -namespace protobuf_sdk_2eproto { // Internal implementation detail -- do not use these members. -struct AGONES_EXPORT TableStruct { - static const ::google::protobuf::internal::ParseTableField entries[]; - static const ::google::protobuf::internal::AuxillaryParseTableField aux[]; - static const ::google::protobuf::internal::ParseTable schema[11]; +struct AGONES_EXPORT TableStruct_sdk_2eproto { + static const ::google::protobuf::internal::ParseTableField entries[] + PROTOBUF_SECTION_VARIABLE(protodesc_cold); + static const ::google::protobuf::internal::AuxillaryParseTableField aux[] + PROTOBUF_SECTION_VARIABLE(protodesc_cold); + static const ::google::protobuf::internal::ParseTable schema[11] + PROTOBUF_SECTION_VARIABLE(protodesc_cold); static const ::google::protobuf::internal::FieldMetadata field_metadata[]; static const ::google::protobuf::internal::SerializationTable serialization_table[]; static const ::google::protobuf::uint32 offsets[]; }; -void AGONES_EXPORT AddDescriptors(); -} // namespace protobuf_sdk_2eproto +void AGONES_EXPORT AddDescriptors_sdk_2eproto(); namespace agones { namespace dev { namespace sdk { @@ -124,7 +127,8 @@ namespace sdk { // =================================================================== -class AGONES_EXPORT Empty : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:agones.dev.sdk.Empty) */ { +class AGONES_EXPORT Empty final : + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:agones.dev.sdk.Empty) */ { public: Empty(); virtual ~Empty(); @@ -150,7 +154,9 @@ class AGONES_EXPORT Empty : public ::google::protobuf::Message /* @@protoc_inser return *this; } #endif - static const ::google::protobuf::Descriptor* descriptor(); + static const ::google::protobuf::Descriptor* descriptor() { + return default_instance().GetDescriptor(); + } static const Empty& default_instance(); static void InitAsDefaultInstance(); // FOR INTERNAL USE ONLY @@ -169,7 +175,7 @@ class AGONES_EXPORT Empty : public ::google::protobuf::Message /* @@protoc_inser // implements Message ---------------------------------------------- inline Empty* New() const final { - return CreateMaybeMessage(NULL); + return CreateMaybeMessage(nullptr); } Empty* New(::google::protobuf::Arena* arena) const final { @@ -179,16 +185,21 @@ class AGONES_EXPORT Empty : public ::google::protobuf::Message /* @@protoc_inser void MergeFrom(const ::google::protobuf::Message& from) final; void CopyFrom(const Empty& from); void MergeFrom(const Empty& from); - void Clear() final; + PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; size_t ByteSizeLong() const final; + #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); + ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } + #else bool MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) final; + #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER void SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const final; ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( - bool deterministic, ::google::protobuf::uint8* target) const final; + ::google::protobuf::uint8* target) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -198,10 +209,10 @@ class AGONES_EXPORT Empty : public ::google::protobuf::Message /* @@protoc_inser void InternalSwap(Empty* other); private: inline ::google::protobuf::Arena* GetArenaNoVirtual() const { - return NULL; + return nullptr; } inline void* MaybeArenaPtr() const { - return NULL; + return nullptr; } public: @@ -213,14 +224,16 @@ class AGONES_EXPORT Empty : public ::google::protobuf::Message /* @@protoc_inser // @@protoc_insertion_point(class_scope:agones.dev.sdk.Empty) private: + class HasBitSetters; ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; mutable ::google::protobuf::internal::CachedSize _cached_size_; - friend struct ::protobuf_sdk_2eproto::TableStruct; + friend struct ::TableStruct_sdk_2eproto; }; // ------------------------------------------------------------------- -class AGONES_EXPORT KeyValue : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:agones.dev.sdk.KeyValue) */ { +class AGONES_EXPORT KeyValue final : + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:agones.dev.sdk.KeyValue) */ { public: KeyValue(); virtual ~KeyValue(); @@ -246,7 +259,9 @@ class AGONES_EXPORT KeyValue : public ::google::protobuf::Message /* @@protoc_in return *this; } #endif - static const ::google::protobuf::Descriptor* descriptor(); + static const ::google::protobuf::Descriptor* descriptor() { + return default_instance().GetDescriptor(); + } static const KeyValue& default_instance(); static void InitAsDefaultInstance(); // FOR INTERNAL USE ONLY @@ -265,7 +280,7 @@ class AGONES_EXPORT KeyValue : public ::google::protobuf::Message /* @@protoc_in // implements Message ---------------------------------------------- inline KeyValue* New() const final { - return CreateMaybeMessage(NULL); + return CreateMaybeMessage(nullptr); } KeyValue* New(::google::protobuf::Arena* arena) const final { @@ -275,16 +290,21 @@ class AGONES_EXPORT KeyValue : public ::google::protobuf::Message /* @@protoc_in void MergeFrom(const ::google::protobuf::Message& from) final; void CopyFrom(const KeyValue& from); void MergeFrom(const KeyValue& from); - void Clear() final; + PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; size_t ByteSizeLong() const final; + #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); + ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } + #else bool MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) final; + #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER void SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const final; ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( - bool deterministic, ::google::protobuf::uint8* target) const final; + ::google::protobuf::uint8* target) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -294,10 +314,10 @@ class AGONES_EXPORT KeyValue : public ::google::protobuf::Message /* @@protoc_in void InternalSwap(KeyValue* other); private: inline ::google::protobuf::Arena* GetArenaNoVirtual() const { - return NULL; + return nullptr; } inline void* MaybeArenaPtr() const { - return NULL; + return nullptr; } public: @@ -337,16 +357,18 @@ class AGONES_EXPORT KeyValue : public ::google::protobuf::Message /* @@protoc_in // @@protoc_insertion_point(class_scope:agones.dev.sdk.KeyValue) private: + class HasBitSetters; ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; ::google::protobuf::internal::ArenaStringPtr key_; ::google::protobuf::internal::ArenaStringPtr value_; mutable ::google::protobuf::internal::CachedSize _cached_size_; - friend struct ::protobuf_sdk_2eproto::TableStruct; + friend struct ::TableStruct_sdk_2eproto; }; // ------------------------------------------------------------------- -class AGONES_EXPORT Duration : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:agones.dev.sdk.Duration) */ { +class AGONES_EXPORT Duration final : + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:agones.dev.sdk.Duration) */ { public: Duration(); virtual ~Duration(); @@ -372,7 +394,9 @@ class AGONES_EXPORT Duration : public ::google::protobuf::Message /* @@protoc_in return *this; } #endif - static const ::google::protobuf::Descriptor* descriptor(); + static const ::google::protobuf::Descriptor* descriptor() { + return default_instance().GetDescriptor(); + } static const Duration& default_instance(); static void InitAsDefaultInstance(); // FOR INTERNAL USE ONLY @@ -391,7 +415,7 @@ class AGONES_EXPORT Duration : public ::google::protobuf::Message /* @@protoc_in // implements Message ---------------------------------------------- inline Duration* New() const final { - return CreateMaybeMessage(NULL); + return CreateMaybeMessage(nullptr); } Duration* New(::google::protobuf::Arena* arena) const final { @@ -401,16 +425,21 @@ class AGONES_EXPORT Duration : public ::google::protobuf::Message /* @@protoc_in void MergeFrom(const ::google::protobuf::Message& from) final; void CopyFrom(const Duration& from); void MergeFrom(const Duration& from); - void Clear() final; + PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; size_t ByteSizeLong() const final; + #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); + ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } + #else bool MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) final; + #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER void SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const final; ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( - bool deterministic, ::google::protobuf::uint8* target) const final; + ::google::protobuf::uint8* target) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -420,10 +449,10 @@ class AGONES_EXPORT Duration : public ::google::protobuf::Message /* @@protoc_in void InternalSwap(Duration* other); private: inline ::google::protobuf::Arena* GetArenaNoVirtual() const { - return NULL; + return nullptr; } inline void* MaybeArenaPtr() const { - return NULL; + return nullptr; } public: @@ -441,11 +470,12 @@ class AGONES_EXPORT Duration : public ::google::protobuf::Message /* @@protoc_in // @@protoc_insertion_point(class_scope:agones.dev.sdk.Duration) private: + class HasBitSetters; ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; ::google::protobuf::int64 seconds_; mutable ::google::protobuf::internal::CachedSize _cached_size_; - friend struct ::protobuf_sdk_2eproto::TableStruct; + friend struct ::TableStruct_sdk_2eproto; }; // ------------------------------------------------------------------- @@ -455,6 +485,9 @@ class GameServer_ObjectMeta_AnnotationsEntry_DoNotUse : public ::google::protobu ::google::protobuf::internal::WireFormatLite::TYPE_STRING, 0 > { public: +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +static bool _ParseMap(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER typedef ::google::protobuf::internal::MapEntry { public: +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +static bool _ParseMap(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER typedef ::google::protobuf::internal::MapEntry(NULL); + return CreateMaybeMessage(nullptr); } GameServer_ObjectMeta* New(::google::protobuf::Arena* arena) const final { @@ -546,16 +585,21 @@ class AGONES_EXPORT GameServer_ObjectMeta : public ::google::protobuf::Message / void MergeFrom(const ::google::protobuf::Message& from) final; void CopyFrom(const GameServer_ObjectMeta& from); void MergeFrom(const GameServer_ObjectMeta& from); - void Clear() final; + PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; size_t ByteSizeLong() const final; + #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); + ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } + #else bool MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) final; + #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER void SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const final; ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( - bool deterministic, ::google::protobuf::uint8* target) const final; + ::google::protobuf::uint8* target) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -565,10 +609,10 @@ class AGONES_EXPORT GameServer_ObjectMeta : public ::google::protobuf::Message / void InternalSwap(GameServer_ObjectMeta* other); private: inline ::google::protobuf::Arena* GetArenaNoVirtual() const { - return NULL; + return nullptr; } inline void* MaybeArenaPtr() const { - return NULL; + return nullptr; } public: @@ -673,6 +717,7 @@ class AGONES_EXPORT GameServer_ObjectMeta : public ::google::protobuf::Message / // @@protoc_insertion_point(class_scope:agones.dev.sdk.GameServer.ObjectMeta) private: + class HasBitSetters; ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; ::google::protobuf::internal::MapField< @@ -695,11 +740,12 @@ class AGONES_EXPORT GameServer_ObjectMeta : public ::google::protobuf::Message / ::google::protobuf::int64 creation_timestamp_; ::google::protobuf::int64 deletion_timestamp_; mutable ::google::protobuf::internal::CachedSize _cached_size_; - friend struct ::protobuf_sdk_2eproto::TableStruct; + friend struct ::TableStruct_sdk_2eproto; }; // ------------------------------------------------------------------- -class AGONES_EXPORT GameServer_Spec_Health : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:agones.dev.sdk.GameServer.Spec.Health) */ { +class AGONES_EXPORT GameServer_Spec_Health final : + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:agones.dev.sdk.GameServer.Spec.Health) */ { public: GameServer_Spec_Health(); virtual ~GameServer_Spec_Health(); @@ -725,7 +771,9 @@ class AGONES_EXPORT GameServer_Spec_Health : public ::google::protobuf::Message return *this; } #endif - static const ::google::protobuf::Descriptor* descriptor(); + static const ::google::protobuf::Descriptor* descriptor() { + return default_instance().GetDescriptor(); + } static const GameServer_Spec_Health& default_instance(); static void InitAsDefaultInstance(); // FOR INTERNAL USE ONLY @@ -744,7 +792,7 @@ class AGONES_EXPORT GameServer_Spec_Health : public ::google::protobuf::Message // implements Message ---------------------------------------------- inline GameServer_Spec_Health* New() const final { - return CreateMaybeMessage(NULL); + return CreateMaybeMessage(nullptr); } GameServer_Spec_Health* New(::google::protobuf::Arena* arena) const final { @@ -754,16 +802,21 @@ class AGONES_EXPORT GameServer_Spec_Health : public ::google::protobuf::Message void MergeFrom(const ::google::protobuf::Message& from) final; void CopyFrom(const GameServer_Spec_Health& from); void MergeFrom(const GameServer_Spec_Health& from); - void Clear() final; + PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; size_t ByteSizeLong() const final; + #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); + ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } + #else bool MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) final; + #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER void SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const final; ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( - bool deterministic, ::google::protobuf::uint8* target) const final; + ::google::protobuf::uint8* target) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -773,10 +826,10 @@ class AGONES_EXPORT GameServer_Spec_Health : public ::google::protobuf::Message void InternalSwap(GameServer_Spec_Health* other); private: inline ::google::protobuf::Arena* GetArenaNoVirtual() const { - return NULL; + return nullptr; } inline void* MaybeArenaPtr() const { - return NULL; + return nullptr; } public: @@ -812,6 +865,7 @@ class AGONES_EXPORT GameServer_Spec_Health : public ::google::protobuf::Message // @@protoc_insertion_point(class_scope:agones.dev.sdk.GameServer.Spec.Health) private: + class HasBitSetters; ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; bool disabled_; @@ -819,11 +873,12 @@ class AGONES_EXPORT GameServer_Spec_Health : public ::google::protobuf::Message ::google::protobuf::int32 failure_threshold_; ::google::protobuf::int32 initial_delay_seconds_; mutable ::google::protobuf::internal::CachedSize _cached_size_; - friend struct ::protobuf_sdk_2eproto::TableStruct; + friend struct ::TableStruct_sdk_2eproto; }; // ------------------------------------------------------------------- -class AGONES_EXPORT GameServer_Spec : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:agones.dev.sdk.GameServer.Spec) */ { +class AGONES_EXPORT GameServer_Spec final : + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:agones.dev.sdk.GameServer.Spec) */ { public: GameServer_Spec(); virtual ~GameServer_Spec(); @@ -849,7 +904,9 @@ class AGONES_EXPORT GameServer_Spec : public ::google::protobuf::Message /* @@pr return *this; } #endif - static const ::google::protobuf::Descriptor* descriptor(); + static const ::google::protobuf::Descriptor* descriptor() { + return default_instance().GetDescriptor(); + } static const GameServer_Spec& default_instance(); static void InitAsDefaultInstance(); // FOR INTERNAL USE ONLY @@ -868,7 +925,7 @@ class AGONES_EXPORT GameServer_Spec : public ::google::protobuf::Message /* @@pr // implements Message ---------------------------------------------- inline GameServer_Spec* New() const final { - return CreateMaybeMessage(NULL); + return CreateMaybeMessage(nullptr); } GameServer_Spec* New(::google::protobuf::Arena* arena) const final { @@ -878,16 +935,21 @@ class AGONES_EXPORT GameServer_Spec : public ::google::protobuf::Message /* @@pr void MergeFrom(const ::google::protobuf::Message& from) final; void CopyFrom(const GameServer_Spec& from); void MergeFrom(const GameServer_Spec& from); - void Clear() final; + PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; size_t ByteSizeLong() const final; + #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); + ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } + #else bool MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) final; + #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER void SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const final; ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( - bool deterministic, ::google::protobuf::uint8* target) const final; + ::google::protobuf::uint8* target) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -897,10 +959,10 @@ class AGONES_EXPORT GameServer_Spec : public ::google::protobuf::Message /* @@pr void InternalSwap(GameServer_Spec* other); private: inline ::google::protobuf::Arena* GetArenaNoVirtual() const { - return NULL; + return nullptr; } inline void* MaybeArenaPtr() const { - return NULL; + return nullptr; } public: @@ -916,9 +978,6 @@ class AGONES_EXPORT GameServer_Spec : public ::google::protobuf::Message /* @@pr bool has_health() const; void clear_health(); static const int kHealthFieldNumber = 1; - private: - const ::agones::dev::sdk::GameServer_Spec_Health& _internal_health() const; - public: const ::agones::dev::sdk::GameServer_Spec_Health& health() const; ::agones::dev::sdk::GameServer_Spec_Health* release_health(); ::agones::dev::sdk::GameServer_Spec_Health* mutable_health(); @@ -926,15 +985,17 @@ class AGONES_EXPORT GameServer_Spec : public ::google::protobuf::Message /* @@pr // @@protoc_insertion_point(class_scope:agones.dev.sdk.GameServer.Spec) private: + class HasBitSetters; ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; ::agones::dev::sdk::GameServer_Spec_Health* health_; mutable ::google::protobuf::internal::CachedSize _cached_size_; - friend struct ::protobuf_sdk_2eproto::TableStruct; + friend struct ::TableStruct_sdk_2eproto; }; // ------------------------------------------------------------------- -class AGONES_EXPORT GameServer_Status_Port : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:agones.dev.sdk.GameServer.Status.Port) */ { +class AGONES_EXPORT GameServer_Status_Port final : + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:agones.dev.sdk.GameServer.Status.Port) */ { public: GameServer_Status_Port(); virtual ~GameServer_Status_Port(); @@ -960,7 +1021,9 @@ class AGONES_EXPORT GameServer_Status_Port : public ::google::protobuf::Message return *this; } #endif - static const ::google::protobuf::Descriptor* descriptor(); + static const ::google::protobuf::Descriptor* descriptor() { + return default_instance().GetDescriptor(); + } static const GameServer_Status_Port& default_instance(); static void InitAsDefaultInstance(); // FOR INTERNAL USE ONLY @@ -979,7 +1042,7 @@ class AGONES_EXPORT GameServer_Status_Port : public ::google::protobuf::Message // implements Message ---------------------------------------------- inline GameServer_Status_Port* New() const final { - return CreateMaybeMessage(NULL); + return CreateMaybeMessage(nullptr); } GameServer_Status_Port* New(::google::protobuf::Arena* arena) const final { @@ -989,16 +1052,21 @@ class AGONES_EXPORT GameServer_Status_Port : public ::google::protobuf::Message void MergeFrom(const ::google::protobuf::Message& from) final; void CopyFrom(const GameServer_Status_Port& from); void MergeFrom(const GameServer_Status_Port& from); - void Clear() final; + PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; size_t ByteSizeLong() const final; + #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); + ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } + #else bool MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) final; + #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER void SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const final; ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( - bool deterministic, ::google::protobuf::uint8* target) const final; + ::google::protobuf::uint8* target) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -1008,10 +1076,10 @@ class AGONES_EXPORT GameServer_Status_Port : public ::google::protobuf::Message void InternalSwap(GameServer_Status_Port* other); private: inline ::google::protobuf::Arena* GetArenaNoVirtual() const { - return NULL; + return nullptr; } inline void* MaybeArenaPtr() const { - return NULL; + return nullptr; } public: @@ -1043,16 +1111,18 @@ class AGONES_EXPORT GameServer_Status_Port : public ::google::protobuf::Message // @@protoc_insertion_point(class_scope:agones.dev.sdk.GameServer.Status.Port) private: + class HasBitSetters; ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; ::google::protobuf::internal::ArenaStringPtr name_; ::google::protobuf::int32 port_; mutable ::google::protobuf::internal::CachedSize _cached_size_; - friend struct ::protobuf_sdk_2eproto::TableStruct; + friend struct ::TableStruct_sdk_2eproto; }; // ------------------------------------------------------------------- -class AGONES_EXPORT GameServer_Status : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:agones.dev.sdk.GameServer.Status) */ { +class AGONES_EXPORT GameServer_Status final : + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:agones.dev.sdk.GameServer.Status) */ { public: GameServer_Status(); virtual ~GameServer_Status(); @@ -1078,7 +1148,9 @@ class AGONES_EXPORT GameServer_Status : public ::google::protobuf::Message /* @@ return *this; } #endif - static const ::google::protobuf::Descriptor* descriptor(); + static const ::google::protobuf::Descriptor* descriptor() { + return default_instance().GetDescriptor(); + } static const GameServer_Status& default_instance(); static void InitAsDefaultInstance(); // FOR INTERNAL USE ONLY @@ -1097,7 +1169,7 @@ class AGONES_EXPORT GameServer_Status : public ::google::protobuf::Message /* @@ // implements Message ---------------------------------------------- inline GameServer_Status* New() const final { - return CreateMaybeMessage(NULL); + return CreateMaybeMessage(nullptr); } GameServer_Status* New(::google::protobuf::Arena* arena) const final { @@ -1107,16 +1179,21 @@ class AGONES_EXPORT GameServer_Status : public ::google::protobuf::Message /* @@ void MergeFrom(const ::google::protobuf::Message& from) final; void CopyFrom(const GameServer_Status& from); void MergeFrom(const GameServer_Status& from); - void Clear() final; + PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; size_t ByteSizeLong() const final; + #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); + ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } + #else bool MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) final; + #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER void SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const final; ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( - bool deterministic, ::google::protobuf::uint8* target) const final; + ::google::protobuf::uint8* target) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -1126,10 +1203,10 @@ class AGONES_EXPORT GameServer_Status : public ::google::protobuf::Message /* @@ void InternalSwap(GameServer_Status* other); private: inline ::google::protobuf::Arena* GetArenaNoVirtual() const { - return NULL; + return nullptr; } inline void* MaybeArenaPtr() const { - return NULL; + return nullptr; } public: @@ -1183,17 +1260,19 @@ class AGONES_EXPORT GameServer_Status : public ::google::protobuf::Message /* @@ // @@protoc_insertion_point(class_scope:agones.dev.sdk.GameServer.Status) private: + class HasBitSetters; ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; ::google::protobuf::RepeatedPtrField< ::agones::dev::sdk::GameServer_Status_Port > ports_; ::google::protobuf::internal::ArenaStringPtr state_; ::google::protobuf::internal::ArenaStringPtr address_; mutable ::google::protobuf::internal::CachedSize _cached_size_; - friend struct ::protobuf_sdk_2eproto::TableStruct; + friend struct ::TableStruct_sdk_2eproto; }; // ------------------------------------------------------------------- -class AGONES_EXPORT GameServer : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:agones.dev.sdk.GameServer) */ { +class AGONES_EXPORT GameServer final : + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:agones.dev.sdk.GameServer) */ { public: GameServer(); virtual ~GameServer(); @@ -1219,7 +1298,9 @@ class AGONES_EXPORT GameServer : public ::google::protobuf::Message /* @@protoc_ return *this; } #endif - static const ::google::protobuf::Descriptor* descriptor(); + static const ::google::protobuf::Descriptor* descriptor() { + return default_instance().GetDescriptor(); + } static const GameServer& default_instance(); static void InitAsDefaultInstance(); // FOR INTERNAL USE ONLY @@ -1238,7 +1319,7 @@ class AGONES_EXPORT GameServer : public ::google::protobuf::Message /* @@protoc_ // implements Message ---------------------------------------------- inline GameServer* New() const final { - return CreateMaybeMessage(NULL); + return CreateMaybeMessage(nullptr); } GameServer* New(::google::protobuf::Arena* arena) const final { @@ -1248,16 +1329,21 @@ class AGONES_EXPORT GameServer : public ::google::protobuf::Message /* @@protoc_ void MergeFrom(const ::google::protobuf::Message& from) final; void CopyFrom(const GameServer& from); void MergeFrom(const GameServer& from); - void Clear() final; + PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; size_t ByteSizeLong() const final; + #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); + ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } + #else bool MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) final; + #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER void SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const final; ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( - bool deterministic, ::google::protobuf::uint8* target) const final; + ::google::protobuf::uint8* target) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -1267,10 +1353,10 @@ class AGONES_EXPORT GameServer : public ::google::protobuf::Message /* @@protoc_ void InternalSwap(GameServer* other); private: inline ::google::protobuf::Arena* GetArenaNoVirtual() const { - return NULL; + return nullptr; } inline void* MaybeArenaPtr() const { - return NULL; + return nullptr; } public: @@ -1288,9 +1374,6 @@ class AGONES_EXPORT GameServer : public ::google::protobuf::Message /* @@protoc_ bool has_object_meta() const; void clear_object_meta(); static const int kObjectMetaFieldNumber = 1; - private: - const ::agones::dev::sdk::GameServer_ObjectMeta& _internal_object_meta() const; - public: const ::agones::dev::sdk::GameServer_ObjectMeta& object_meta() const; ::agones::dev::sdk::GameServer_ObjectMeta* release_object_meta(); ::agones::dev::sdk::GameServer_ObjectMeta* mutable_object_meta(); @@ -1300,9 +1383,6 @@ class AGONES_EXPORT GameServer : public ::google::protobuf::Message /* @@protoc_ bool has_spec() const; void clear_spec(); static const int kSpecFieldNumber = 2; - private: - const ::agones::dev::sdk::GameServer_Spec& _internal_spec() const; - public: const ::agones::dev::sdk::GameServer_Spec& spec() const; ::agones::dev::sdk::GameServer_Spec* release_spec(); ::agones::dev::sdk::GameServer_Spec* mutable_spec(); @@ -1312,9 +1392,6 @@ class AGONES_EXPORT GameServer : public ::google::protobuf::Message /* @@protoc_ bool has_status() const; void clear_status(); static const int kStatusFieldNumber = 3; - private: - const ::agones::dev::sdk::GameServer_Status& _internal_status() const; - public: const ::agones::dev::sdk::GameServer_Status& status() const; ::agones::dev::sdk::GameServer_Status* release_status(); ::agones::dev::sdk::GameServer_Status* mutable_status(); @@ -1322,13 +1399,14 @@ class AGONES_EXPORT GameServer : public ::google::protobuf::Message /* @@protoc_ // @@protoc_insertion_point(class_scope:agones.dev.sdk.GameServer) private: + class HasBitSetters; ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; ::agones::dev::sdk::GameServer_ObjectMeta* object_meta_; ::agones::dev::sdk::GameServer_Spec* spec_; ::agones::dev::sdk::GameServer_Status* status_; mutable ::google::protobuf::internal::CachedSize _cached_size_; - friend struct ::protobuf_sdk_2eproto::TableStruct; + friend struct ::TableStruct_sdk_2eproto; }; // =================================================================== @@ -1367,7 +1445,7 @@ inline void KeyValue::set_key(::std::string&& value) { } #endif inline void KeyValue::set_key(const char* value) { - GOOGLE_DCHECK(value != NULL); + GOOGLE_DCHECK(value != nullptr); key_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:agones.dev.sdk.KeyValue.key) @@ -1389,7 +1467,7 @@ inline ::std::string* KeyValue::release_key() { return key_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } inline void KeyValue::set_allocated_key(::std::string* key) { - if (key != NULL) { + if (key != nullptr) { } else { @@ -1420,7 +1498,7 @@ inline void KeyValue::set_value(::std::string&& value) { } #endif inline void KeyValue::set_value(const char* value) { - GOOGLE_DCHECK(value != NULL); + GOOGLE_DCHECK(value != nullptr); value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:agones.dev.sdk.KeyValue.value) @@ -1442,7 +1520,7 @@ inline ::std::string* KeyValue::release_value() { return value_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } inline void KeyValue::set_allocated_value(::std::string* value) { - if (value != NULL) { + if (value != nullptr) { } else { @@ -1457,7 +1535,7 @@ inline void KeyValue::set_allocated_value(::std::string* value) { // int64 seconds = 1; inline void Duration::clear_seconds() { - seconds_ = GOOGLE_LONGLONG(0); + seconds_ = PROTOBUF_LONGLONG(0); } inline ::google::protobuf::int64 Duration::seconds() const { // @@protoc_insertion_point(field_get:agones.dev.sdk.Duration.seconds) @@ -1499,7 +1577,7 @@ inline void GameServer_ObjectMeta::set_name(::std::string&& value) { } #endif inline void GameServer_ObjectMeta::set_name(const char* value) { - GOOGLE_DCHECK(value != NULL); + GOOGLE_DCHECK(value != nullptr); name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:agones.dev.sdk.GameServer.ObjectMeta.name) @@ -1521,7 +1599,7 @@ inline ::std::string* GameServer_ObjectMeta::release_name() { return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } inline void GameServer_ObjectMeta::set_allocated_name(::std::string* name) { - if (name != NULL) { + if (name != nullptr) { } else { @@ -1552,7 +1630,7 @@ inline void GameServer_ObjectMeta::set_namespace_(::std::string&& value) { } #endif inline void GameServer_ObjectMeta::set_namespace_(const char* value) { - GOOGLE_DCHECK(value != NULL); + GOOGLE_DCHECK(value != nullptr); namespace__.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:agones.dev.sdk.GameServer.ObjectMeta.namespace) @@ -1574,7 +1652,7 @@ inline ::std::string* GameServer_ObjectMeta::release_namespace_() { return namespace__.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } inline void GameServer_ObjectMeta::set_allocated_namespace_(::std::string* namespace_) { - if (namespace_ != NULL) { + if (namespace_ != nullptr) { } else { @@ -1605,7 +1683,7 @@ inline void GameServer_ObjectMeta::set_uid(::std::string&& value) { } #endif inline void GameServer_ObjectMeta::set_uid(const char* value) { - GOOGLE_DCHECK(value != NULL); + GOOGLE_DCHECK(value != nullptr); uid_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:agones.dev.sdk.GameServer.ObjectMeta.uid) @@ -1627,7 +1705,7 @@ inline ::std::string* GameServer_ObjectMeta::release_uid() { return uid_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } inline void GameServer_ObjectMeta::set_allocated_uid(::std::string* uid) { - if (uid != NULL) { + if (uid != nullptr) { } else { @@ -1658,7 +1736,7 @@ inline void GameServer_ObjectMeta::set_resource_version(::std::string&& value) { } #endif inline void GameServer_ObjectMeta::set_resource_version(const char* value) { - GOOGLE_DCHECK(value != NULL); + GOOGLE_DCHECK(value != nullptr); resource_version_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:agones.dev.sdk.GameServer.ObjectMeta.resource_version) @@ -1680,7 +1758,7 @@ inline ::std::string* GameServer_ObjectMeta::release_resource_version() { return resource_version_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } inline void GameServer_ObjectMeta::set_allocated_resource_version(::std::string* resource_version) { - if (resource_version != NULL) { + if (resource_version != nullptr) { } else { @@ -1691,7 +1769,7 @@ inline void GameServer_ObjectMeta::set_allocated_resource_version(::std::string* // int64 generation = 5; inline void GameServer_ObjectMeta::clear_generation() { - generation_ = GOOGLE_LONGLONG(0); + generation_ = PROTOBUF_LONGLONG(0); } inline ::google::protobuf::int64 GameServer_ObjectMeta::generation() const { // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.ObjectMeta.generation) @@ -1705,7 +1783,7 @@ inline void GameServer_ObjectMeta::set_generation(::google::protobuf::int64 valu // int64 creation_timestamp = 6; inline void GameServer_ObjectMeta::clear_creation_timestamp() { - creation_timestamp_ = GOOGLE_LONGLONG(0); + creation_timestamp_ = PROTOBUF_LONGLONG(0); } inline ::google::protobuf::int64 GameServer_ObjectMeta::creation_timestamp() const { // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.ObjectMeta.creation_timestamp) @@ -1719,7 +1797,7 @@ inline void GameServer_ObjectMeta::set_creation_timestamp(::google::protobuf::in // int64 deletion_timestamp = 7; inline void GameServer_ObjectMeta::clear_deletion_timestamp() { - deletion_timestamp_ = GOOGLE_LONGLONG(0); + deletion_timestamp_ = PROTOBUF_LONGLONG(0); } inline ::google::protobuf::int64 GameServer_ObjectMeta::deletion_timestamp() const { // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.ObjectMeta.deletion_timestamp) @@ -1833,33 +1911,30 @@ inline void GameServer_Spec_Health::set_initial_delay_seconds(::google::protobuf // .agones.dev.sdk.GameServer.Spec.Health health = 1; inline bool GameServer_Spec::has_health() const { - return this != internal_default_instance() && health_ != NULL; + return this != internal_default_instance() && health_ != nullptr; } inline void GameServer_Spec::clear_health() { - if (GetArenaNoVirtual() == NULL && health_ != NULL) { + if (GetArenaNoVirtual() == nullptr && health_ != nullptr) { delete health_; } - health_ = NULL; -} -inline const ::agones::dev::sdk::GameServer_Spec_Health& GameServer_Spec::_internal_health() const { - return *health_; + health_ = nullptr; } inline const ::agones::dev::sdk::GameServer_Spec_Health& GameServer_Spec::health() const { const ::agones::dev::sdk::GameServer_Spec_Health* p = health_; // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.Spec.health) - return p != NULL ? *p : *reinterpret_cast( + return p != nullptr ? *p : *reinterpret_cast( &::agones::dev::sdk::_GameServer_Spec_Health_default_instance_); } inline ::agones::dev::sdk::GameServer_Spec_Health* GameServer_Spec::release_health() { // @@protoc_insertion_point(field_release:agones.dev.sdk.GameServer.Spec.health) ::agones::dev::sdk::GameServer_Spec_Health* temp = health_; - health_ = NULL; + health_ = nullptr; return temp; } inline ::agones::dev::sdk::GameServer_Spec_Health* GameServer_Spec::mutable_health() { - if (health_ == NULL) { + if (health_ == nullptr) { auto* p = CreateMaybeMessage<::agones::dev::sdk::GameServer_Spec_Health>(GetArenaNoVirtual()); health_ = p; } @@ -1868,11 +1943,11 @@ inline ::agones::dev::sdk::GameServer_Spec_Health* GameServer_Spec::mutable_heal } inline void GameServer_Spec::set_allocated_health(::agones::dev::sdk::GameServer_Spec_Health* health) { ::google::protobuf::Arena* message_arena = GetArenaNoVirtual(); - if (message_arena == NULL) { + if (message_arena == nullptr) { delete health_; } if (health) { - ::google::protobuf::Arena* submessage_arena = NULL; + ::google::protobuf::Arena* submessage_arena = nullptr; if (message_arena != submessage_arena) { health = ::google::protobuf::internal::GetOwnedMessage( message_arena, health, submessage_arena); @@ -1911,7 +1986,7 @@ inline void GameServer_Status_Port::set_name(::std::string&& value) { } #endif inline void GameServer_Status_Port::set_name(const char* value) { - GOOGLE_DCHECK(value != NULL); + GOOGLE_DCHECK(value != nullptr); name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:agones.dev.sdk.GameServer.Status.Port.name) @@ -1933,7 +2008,7 @@ inline ::std::string* GameServer_Status_Port::release_name() { return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } inline void GameServer_Status_Port::set_allocated_name(::std::string* name) { - if (name != NULL) { + if (name != nullptr) { } else { @@ -1982,7 +2057,7 @@ inline void GameServer_Status::set_state(::std::string&& value) { } #endif inline void GameServer_Status::set_state(const char* value) { - GOOGLE_DCHECK(value != NULL); + GOOGLE_DCHECK(value != nullptr); state_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:agones.dev.sdk.GameServer.Status.state) @@ -2004,7 +2079,7 @@ inline ::std::string* GameServer_Status::release_state() { return state_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } inline void GameServer_Status::set_allocated_state(::std::string* state) { - if (state != NULL) { + if (state != nullptr) { } else { @@ -2035,7 +2110,7 @@ inline void GameServer_Status::set_address(::std::string&& value) { } #endif inline void GameServer_Status::set_address(const char* value) { - GOOGLE_DCHECK(value != NULL); + GOOGLE_DCHECK(value != nullptr); address_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:agones.dev.sdk.GameServer.Status.address) @@ -2057,7 +2132,7 @@ inline ::std::string* GameServer_Status::release_address() { return address_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } inline void GameServer_Status::set_allocated_address(::std::string* address) { - if (address != NULL) { + if (address != nullptr) { } else { @@ -2102,33 +2177,30 @@ GameServer_Status::ports() const { // .agones.dev.sdk.GameServer.ObjectMeta object_meta = 1; inline bool GameServer::has_object_meta() const { - return this != internal_default_instance() && object_meta_ != NULL; + return this != internal_default_instance() && object_meta_ != nullptr; } inline void GameServer::clear_object_meta() { - if (GetArenaNoVirtual() == NULL && object_meta_ != NULL) { + if (GetArenaNoVirtual() == nullptr && object_meta_ != nullptr) { delete object_meta_; } - object_meta_ = NULL; -} -inline const ::agones::dev::sdk::GameServer_ObjectMeta& GameServer::_internal_object_meta() const { - return *object_meta_; + object_meta_ = nullptr; } inline const ::agones::dev::sdk::GameServer_ObjectMeta& GameServer::object_meta() const { const ::agones::dev::sdk::GameServer_ObjectMeta* p = object_meta_; // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.object_meta) - return p != NULL ? *p : *reinterpret_cast( + return p != nullptr ? *p : *reinterpret_cast( &::agones::dev::sdk::_GameServer_ObjectMeta_default_instance_); } inline ::agones::dev::sdk::GameServer_ObjectMeta* GameServer::release_object_meta() { // @@protoc_insertion_point(field_release:agones.dev.sdk.GameServer.object_meta) ::agones::dev::sdk::GameServer_ObjectMeta* temp = object_meta_; - object_meta_ = NULL; + object_meta_ = nullptr; return temp; } inline ::agones::dev::sdk::GameServer_ObjectMeta* GameServer::mutable_object_meta() { - if (object_meta_ == NULL) { + if (object_meta_ == nullptr) { auto* p = CreateMaybeMessage<::agones::dev::sdk::GameServer_ObjectMeta>(GetArenaNoVirtual()); object_meta_ = p; } @@ -2137,11 +2209,11 @@ inline ::agones::dev::sdk::GameServer_ObjectMeta* GameServer::mutable_object_met } inline void GameServer::set_allocated_object_meta(::agones::dev::sdk::GameServer_ObjectMeta* object_meta) { ::google::protobuf::Arena* message_arena = GetArenaNoVirtual(); - if (message_arena == NULL) { + if (message_arena == nullptr) { delete object_meta_; } if (object_meta) { - ::google::protobuf::Arena* submessage_arena = NULL; + ::google::protobuf::Arena* submessage_arena = nullptr; if (message_arena != submessage_arena) { object_meta = ::google::protobuf::internal::GetOwnedMessage( message_arena, object_meta, submessage_arena); @@ -2156,33 +2228,30 @@ inline void GameServer::set_allocated_object_meta(::agones::dev::sdk::GameServer // .agones.dev.sdk.GameServer.Spec spec = 2; inline bool GameServer::has_spec() const { - return this != internal_default_instance() && spec_ != NULL; + return this != internal_default_instance() && spec_ != nullptr; } inline void GameServer::clear_spec() { - if (GetArenaNoVirtual() == NULL && spec_ != NULL) { + if (GetArenaNoVirtual() == nullptr && spec_ != nullptr) { delete spec_; } - spec_ = NULL; -} -inline const ::agones::dev::sdk::GameServer_Spec& GameServer::_internal_spec() const { - return *spec_; + spec_ = nullptr; } inline const ::agones::dev::sdk::GameServer_Spec& GameServer::spec() const { const ::agones::dev::sdk::GameServer_Spec* p = spec_; // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.spec) - return p != NULL ? *p : *reinterpret_cast( + return p != nullptr ? *p : *reinterpret_cast( &::agones::dev::sdk::_GameServer_Spec_default_instance_); } inline ::agones::dev::sdk::GameServer_Spec* GameServer::release_spec() { // @@protoc_insertion_point(field_release:agones.dev.sdk.GameServer.spec) ::agones::dev::sdk::GameServer_Spec* temp = spec_; - spec_ = NULL; + spec_ = nullptr; return temp; } inline ::agones::dev::sdk::GameServer_Spec* GameServer::mutable_spec() { - if (spec_ == NULL) { + if (spec_ == nullptr) { auto* p = CreateMaybeMessage<::agones::dev::sdk::GameServer_Spec>(GetArenaNoVirtual()); spec_ = p; } @@ -2191,11 +2260,11 @@ inline ::agones::dev::sdk::GameServer_Spec* GameServer::mutable_spec() { } inline void GameServer::set_allocated_spec(::agones::dev::sdk::GameServer_Spec* spec) { ::google::protobuf::Arena* message_arena = GetArenaNoVirtual(); - if (message_arena == NULL) { + if (message_arena == nullptr) { delete spec_; } if (spec) { - ::google::protobuf::Arena* submessage_arena = NULL; + ::google::protobuf::Arena* submessage_arena = nullptr; if (message_arena != submessage_arena) { spec = ::google::protobuf::internal::GetOwnedMessage( message_arena, spec, submessage_arena); @@ -2210,33 +2279,30 @@ inline void GameServer::set_allocated_spec(::agones::dev::sdk::GameServer_Spec* // .agones.dev.sdk.GameServer.Status status = 3; inline bool GameServer::has_status() const { - return this != internal_default_instance() && status_ != NULL; + return this != internal_default_instance() && status_ != nullptr; } inline void GameServer::clear_status() { - if (GetArenaNoVirtual() == NULL && status_ != NULL) { + if (GetArenaNoVirtual() == nullptr && status_ != nullptr) { delete status_; } - status_ = NULL; -} -inline const ::agones::dev::sdk::GameServer_Status& GameServer::_internal_status() const { - return *status_; + status_ = nullptr; } inline const ::agones::dev::sdk::GameServer_Status& GameServer::status() const { const ::agones::dev::sdk::GameServer_Status* p = status_; // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.status) - return p != NULL ? *p : *reinterpret_cast( + return p != nullptr ? *p : *reinterpret_cast( &::agones::dev::sdk::_GameServer_Status_default_instance_); } inline ::agones::dev::sdk::GameServer_Status* GameServer::release_status() { // @@protoc_insertion_point(field_release:agones.dev.sdk.GameServer.status) ::agones::dev::sdk::GameServer_Status* temp = status_; - status_ = NULL; + status_ = nullptr; return temp; } inline ::agones::dev::sdk::GameServer_Status* GameServer::mutable_status() { - if (status_ == NULL) { + if (status_ == nullptr) { auto* p = CreateMaybeMessage<::agones::dev::sdk::GameServer_Status>(GetArenaNoVirtual()); status_ = p; } @@ -2245,11 +2311,11 @@ inline ::agones::dev::sdk::GameServer_Status* GameServer::mutable_status() { } inline void GameServer::set_allocated_status(::agones::dev::sdk::GameServer_Status* status) { ::google::protobuf::Arena* message_arena = GetArenaNoVirtual(); - if (message_arena == NULL) { + if (message_arena == nullptr) { delete status_; } if (status) { - ::google::protobuf::Arena* submessage_arena = NULL; + ::google::protobuf::Arena* submessage_arena = nullptr; if (message_arena != submessage_arena) { status = ::google::protobuf::internal::GetOwnedMessage( message_arena, status, submessage_arena); @@ -2294,4 +2360,5 @@ inline void GameServer::set_allocated_status(::agones::dev::sdk::GameServer_Stat // @@protoc_insertion_point(global_scope) +#include #endif // PROTOBUF_INCLUDED_sdk_2eproto diff --git a/sdks/cpp/include/google/api/annotations.pb.h b/sdks/cpp/include/google/api/annotations.pb.h index 136e53f920..2abd934c4a 100644 --- a/sdks/cpp/include/google/api/annotations.pb.h +++ b/sdks/cpp/include/google/api/annotations.pb.h @@ -19,21 +19,22 @@ #ifndef PROTOBUF_INCLUDED_google_2fapi_2fannotations_2eproto #define PROTOBUF_INCLUDED_google_2fapi_2fannotations_2eproto +#include #include -#include - -#if GOOGLE_PROTOBUF_VERSION < 3006001 +#include +#if PROTOBUF_VERSION < 3007000 #error This file was generated by a newer version of protoc which is -#error incompatible with your Protocol Buffer headers. Please update +#error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3006001 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION +#if 3007000 < PROTOBUF_MIN_PROTOC_VERSION #error This file was generated by an older version of protoc which is -#error incompatible with your Protocol Buffer headers. Please +#error incompatible with your Protocol Buffer headers. Please #error regenerate this file with a newer version of protoc. #endif +#include #include #include #include @@ -46,23 +47,25 @@ #include "google/api/http.pb.h" #include // @@protoc_insertion_point(includes) -#define PROTOBUF_INTERNAL_EXPORT_protobuf_google_2fapi_2fannotations_2eproto AGONES_EXPORT +#include +#define PROTOBUF_INTERNAL_EXPORT_google_2fapi_2fannotations_2eproto AGONES_EXPORT -namespace protobuf_google_2fapi_2fannotations_2eproto { // Internal implementation detail -- do not use these members. -struct AGONES_EXPORT TableStruct { - static const ::google::protobuf::internal::ParseTableField entries[]; - static const ::google::protobuf::internal::AuxillaryParseTableField aux[]; - static const ::google::protobuf::internal::ParseTable schema[1]; +struct AGONES_EXPORT TableStruct_google_2fapi_2fannotations_2eproto { + static const ::google::protobuf::internal::ParseTableField entries[] + PROTOBUF_SECTION_VARIABLE(protodesc_cold); + static const ::google::protobuf::internal::AuxillaryParseTableField aux[] + PROTOBUF_SECTION_VARIABLE(protodesc_cold); + static const ::google::protobuf::internal::ParseTable schema[1] + PROTOBUF_SECTION_VARIABLE(protodesc_cold); static const ::google::protobuf::internal::FieldMetadata field_metadata[]; static const ::google::protobuf::internal::SerializationTable serialization_table[]; static const ::google::protobuf::uint32 offsets[]; }; -void AGONES_EXPORT AddDescriptors(); -} // namespace protobuf_google_2fapi_2fannotations_2eproto +void AGONES_EXPORT AddDescriptors_google_2fapi_2fannotations_2eproto(); namespace google { -namespace api { -} // namespace api +namespace protobuf { +} // namespace protobuf } // namespace google namespace google { namespace api { @@ -94,4 +97,5 @@ AGONES_EXPORT extern ::google::protobuf::internal::ExtensionIdentifier< ::google // @@protoc_insertion_point(global_scope) +#include #endif // PROTOBUF_INCLUDED_google_2fapi_2fannotations_2eproto diff --git a/sdks/cpp/include/google/api/http.pb.h b/sdks/cpp/include/google/api/http.pb.h index 3cb8cea531..96ac5f5800 100644 --- a/sdks/cpp/include/google/api/http.pb.h +++ b/sdks/cpp/include/google/api/http.pb.h @@ -19,21 +19,22 @@ #ifndef PROTOBUF_INCLUDED_google_2fapi_2fhttp_2eproto #define PROTOBUF_INCLUDED_google_2fapi_2fhttp_2eproto +#include #include -#include - -#if GOOGLE_PROTOBUF_VERSION < 3006001 +#include +#if PROTOBUF_VERSION < 3007000 #error This file was generated by a newer version of protoc which is -#error incompatible with your Protocol Buffer headers. Please update +#error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3006001 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION +#if 3007000 < PROTOBUF_MIN_PROTOC_VERSION #error This file was generated by an older version of protoc which is -#error incompatible with your Protocol Buffer headers. Please +#error incompatible with your Protocol Buffer headers. Please #error regenerate this file with a newer version of protoc. #endif +#include #include #include #include @@ -46,20 +47,22 @@ #include // IWYU pragma: export #include // @@protoc_insertion_point(includes) -#define PROTOBUF_INTERNAL_EXPORT_protobuf_google_2fapi_2fhttp_2eproto AGONES_EXPORT +#include +#define PROTOBUF_INTERNAL_EXPORT_google_2fapi_2fhttp_2eproto AGONES_EXPORT -namespace protobuf_google_2fapi_2fhttp_2eproto { // Internal implementation detail -- do not use these members. -struct AGONES_EXPORT TableStruct { - static const ::google::protobuf::internal::ParseTableField entries[]; - static const ::google::protobuf::internal::AuxillaryParseTableField aux[]; - static const ::google::protobuf::internal::ParseTable schema[3]; +struct AGONES_EXPORT TableStruct_google_2fapi_2fhttp_2eproto { + static const ::google::protobuf::internal::ParseTableField entries[] + PROTOBUF_SECTION_VARIABLE(protodesc_cold); + static const ::google::protobuf::internal::AuxillaryParseTableField aux[] + PROTOBUF_SECTION_VARIABLE(protodesc_cold); + static const ::google::protobuf::internal::ParseTable schema[3] + PROTOBUF_SECTION_VARIABLE(protodesc_cold); static const ::google::protobuf::internal::FieldMetadata field_metadata[]; static const ::google::protobuf::internal::SerializationTable serialization_table[]; static const ::google::protobuf::uint32 offsets[]; }; -void AGONES_EXPORT AddDescriptors(); -} // namespace protobuf_google_2fapi_2fhttp_2eproto +void AGONES_EXPORT AddDescriptors_google_2fapi_2fhttp_2eproto(); namespace google { namespace api { class CustomHttpPattern; @@ -72,8 +75,6 @@ class HttpRule; class HttpRuleDefaultTypeInternal; AGONES_EXPORT extern HttpRuleDefaultTypeInternal _HttpRule_default_instance_; } // namespace api -} // namespace google -namespace google { namespace protobuf { template<> AGONES_EXPORT ::google::api::CustomHttpPattern* Arena::CreateMaybeMessage<::google::api::CustomHttpPattern>(Arena*); template<> AGONES_EXPORT ::google::api::Http* Arena::CreateMaybeMessage<::google::api::Http>(Arena*); @@ -85,7 +86,8 @@ namespace api { // =================================================================== -class AGONES_EXPORT Http : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.api.Http) */ { +class AGONES_EXPORT Http final : + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.api.Http) */ { public: Http(); virtual ~Http(); @@ -117,7 +119,9 @@ class AGONES_EXPORT Http : public ::google::protobuf::Message /* @@protoc_insert inline void* GetMaybeArenaPointer() const final { return MaybeArenaPtr(); } - static const ::google::protobuf::Descriptor* descriptor(); + static const ::google::protobuf::Descriptor* descriptor() { + return default_instance().GetDescriptor(); + } static const Http& default_instance(); static void InitAsDefaultInstance(); // FOR INTERNAL USE ONLY @@ -137,7 +141,7 @@ class AGONES_EXPORT Http : public ::google::protobuf::Message /* @@protoc_insert // implements Message ---------------------------------------------- inline Http* New() const final { - return CreateMaybeMessage(NULL); + return CreateMaybeMessage(nullptr); } Http* New(::google::protobuf::Arena* arena) const final { @@ -147,16 +151,21 @@ class AGONES_EXPORT Http : public ::google::protobuf::Message /* @@protoc_insert void MergeFrom(const ::google::protobuf::Message& from) final; void CopyFrom(const Http& from); void MergeFrom(const Http& from); - void Clear() final; + PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; size_t ByteSizeLong() const final; + #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); + ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } + #else bool MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) final; + #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER void SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const final; ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( - bool deterministic, ::google::protobuf::uint8* target) const final; + ::google::protobuf::uint8* target) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -204,6 +213,7 @@ class AGONES_EXPORT Http : public ::google::protobuf::Message /* @@protoc_insert // @@protoc_insertion_point(class_scope:google.api.Http) private: + class HasBitSetters; ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; template friend class ::google::protobuf::Arena::InternalHelper; @@ -212,11 +222,12 @@ class AGONES_EXPORT Http : public ::google::protobuf::Message /* @@protoc_insert ::google::protobuf::RepeatedPtrField< ::google::api::HttpRule > rules_; bool fully_decode_reserved_expansion_; mutable ::google::protobuf::internal::CachedSize _cached_size_; - friend struct ::protobuf_google_2fapi_2fhttp_2eproto::TableStruct; + friend struct ::TableStruct_google_2fapi_2fhttp_2eproto; }; // ------------------------------------------------------------------- -class AGONES_EXPORT HttpRule : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.api.HttpRule) */ { +class AGONES_EXPORT HttpRule final : + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.api.HttpRule) */ { public: HttpRule(); virtual ~HttpRule(); @@ -248,7 +259,9 @@ class AGONES_EXPORT HttpRule : public ::google::protobuf::Message /* @@protoc_in inline void* GetMaybeArenaPointer() const final { return MaybeArenaPtr(); } - static const ::google::protobuf::Descriptor* descriptor(); + static const ::google::protobuf::Descriptor* descriptor() { + return default_instance().GetDescriptor(); + } static const HttpRule& default_instance(); enum PatternCase { @@ -278,7 +291,7 @@ class AGONES_EXPORT HttpRule : public ::google::protobuf::Message /* @@protoc_in // implements Message ---------------------------------------------- inline HttpRule* New() const final { - return CreateMaybeMessage(NULL); + return CreateMaybeMessage(nullptr); } HttpRule* New(::google::protobuf::Arena* arena) const final { @@ -288,16 +301,21 @@ class AGONES_EXPORT HttpRule : public ::google::protobuf::Message /* @@protoc_in void MergeFrom(const ::google::protobuf::Message& from) final; void CopyFrom(const HttpRule& from); void MergeFrom(const HttpRule& from); - void Clear() final; + PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; size_t ByteSizeLong() const final; + #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); + ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } + #else bool MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) final; + #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER void SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const final; ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( - bool deterministic, ::google::protobuf::uint8* target) const final; + ::google::protobuf::uint8* target) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -350,11 +368,11 @@ class AGONES_EXPORT HttpRule : public ::google::protobuf::Message /* @@protoc_in ::std::string* mutable_selector(); ::std::string* release_selector(); void set_allocated_selector(::std::string* selector); - PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" + GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") ::std::string* unsafe_arena_release_selector(); - PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" + GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") void unsafe_arena_set_allocated_selector( @@ -373,11 +391,11 @@ class AGONES_EXPORT HttpRule : public ::google::protobuf::Message /* @@protoc_in ::std::string* mutable_body(); ::std::string* release_body(); void set_allocated_body(::std::string* body); - PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" + GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") ::std::string* unsafe_arena_release_body(); - PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" + GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") void unsafe_arena_set_allocated_body( @@ -396,11 +414,11 @@ class AGONES_EXPORT HttpRule : public ::google::protobuf::Message /* @@protoc_in ::std::string* mutable_response_body(); ::std::string* release_response_body(); void set_allocated_response_body(::std::string* response_body); - PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" + GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") ::std::string* unsafe_arena_release_response_body(); - PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" + GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") void unsafe_arena_set_allocated_response_body( @@ -422,11 +440,11 @@ class AGONES_EXPORT HttpRule : public ::google::protobuf::Message /* @@protoc_in ::std::string* mutable_get(); ::std::string* release_get(); void set_allocated_get(::std::string* get); - PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" + GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") ::std::string* unsafe_arena_release_get(); - PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" + GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") void unsafe_arena_set_allocated_get( @@ -448,11 +466,11 @@ class AGONES_EXPORT HttpRule : public ::google::protobuf::Message /* @@protoc_in ::std::string* mutable_put(); ::std::string* release_put(); void set_allocated_put(::std::string* put); - PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" + GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") ::std::string* unsafe_arena_release_put(); - PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" + GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") void unsafe_arena_set_allocated_put( @@ -474,11 +492,11 @@ class AGONES_EXPORT HttpRule : public ::google::protobuf::Message /* @@protoc_in ::std::string* mutable_post(); ::std::string* release_post(); void set_allocated_post(::std::string* post); - PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" + GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") ::std::string* unsafe_arena_release_post(); - PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" + GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") void unsafe_arena_set_allocated_post( @@ -500,11 +518,11 @@ class AGONES_EXPORT HttpRule : public ::google::protobuf::Message /* @@protoc_in ::std::string* mutable_delete_(); ::std::string* release_delete_(); void set_allocated_delete_(::std::string* delete_); - PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" + GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") ::std::string* unsafe_arena_release_delete_(); - PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" + GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") void unsafe_arena_set_allocated_delete_( @@ -526,11 +544,11 @@ class AGONES_EXPORT HttpRule : public ::google::protobuf::Message /* @@protoc_in ::std::string* mutable_patch(); ::std::string* release_patch(); void set_allocated_patch(::std::string* patch); - PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" + GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") ::std::string* unsafe_arena_release_patch(); - PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" + GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") void unsafe_arena_set_allocated_patch( @@ -540,9 +558,6 @@ class AGONES_EXPORT HttpRule : public ::google::protobuf::Message /* @@protoc_in bool has_custom() const; void clear_custom(); static const int kCustomFieldNumber = 8; - private: - const ::google::api::CustomHttpPattern& _internal_custom() const; - public: const ::google::api::CustomHttpPattern& custom() const; ::google::api::CustomHttpPattern* release_custom(); ::google::api::CustomHttpPattern* mutable_custom(); @@ -555,6 +570,7 @@ class AGONES_EXPORT HttpRule : public ::google::protobuf::Message /* @@protoc_in PatternCase pattern_case() const; // @@protoc_insertion_point(class_scope:google.api.HttpRule) private: + class HasBitSetters; void set_has_get(); void set_has_put(); void set_has_post(); @@ -585,11 +601,12 @@ class AGONES_EXPORT HttpRule : public ::google::protobuf::Message /* @@protoc_in mutable ::google::protobuf::internal::CachedSize _cached_size_; ::google::protobuf::uint32 _oneof_case_[1]; - friend struct ::protobuf_google_2fapi_2fhttp_2eproto::TableStruct; + friend struct ::TableStruct_google_2fapi_2fhttp_2eproto; }; // ------------------------------------------------------------------- -class AGONES_EXPORT CustomHttpPattern : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.api.CustomHttpPattern) */ { +class AGONES_EXPORT CustomHttpPattern final : + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.api.CustomHttpPattern) */ { public: CustomHttpPattern(); virtual ~CustomHttpPattern(); @@ -621,7 +638,9 @@ class AGONES_EXPORT CustomHttpPattern : public ::google::protobuf::Message /* @@ inline void* GetMaybeArenaPointer() const final { return MaybeArenaPtr(); } - static const ::google::protobuf::Descriptor* descriptor(); + static const ::google::protobuf::Descriptor* descriptor() { + return default_instance().GetDescriptor(); + } static const CustomHttpPattern& default_instance(); static void InitAsDefaultInstance(); // FOR INTERNAL USE ONLY @@ -641,7 +660,7 @@ class AGONES_EXPORT CustomHttpPattern : public ::google::protobuf::Message /* @@ // implements Message ---------------------------------------------- inline CustomHttpPattern* New() const final { - return CreateMaybeMessage(NULL); + return CreateMaybeMessage(nullptr); } CustomHttpPattern* New(::google::protobuf::Arena* arena) const final { @@ -651,16 +670,21 @@ class AGONES_EXPORT CustomHttpPattern : public ::google::protobuf::Message /* @@ void MergeFrom(const ::google::protobuf::Message& from) final; void CopyFrom(const CustomHttpPattern& from); void MergeFrom(const CustomHttpPattern& from); - void Clear() final; + PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; size_t ByteSizeLong() const final; + #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); + ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } + #else bool MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) final; + #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER void SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const final; ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( - bool deterministic, ::google::protobuf::uint8* target) const final; + ::google::protobuf::uint8* target) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: @@ -701,11 +725,11 @@ class AGONES_EXPORT CustomHttpPattern : public ::google::protobuf::Message /* @@ ::std::string* mutable_kind(); ::std::string* release_kind(); void set_allocated_kind(::std::string* kind); - PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" + GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") ::std::string* unsafe_arena_release_kind(); - PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" + GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") void unsafe_arena_set_allocated_kind( @@ -724,11 +748,11 @@ class AGONES_EXPORT CustomHttpPattern : public ::google::protobuf::Message /* @@ ::std::string* mutable_path(); ::std::string* release_path(); void set_allocated_path(::std::string* path); - PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" + GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") ::std::string* unsafe_arena_release_path(); - PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" + GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") void unsafe_arena_set_allocated_path( @@ -736,6 +760,7 @@ class AGONES_EXPORT CustomHttpPattern : public ::google::protobuf::Message /* @@ // @@protoc_insertion_point(class_scope:google.api.CustomHttpPattern) private: + class HasBitSetters; ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; template friend class ::google::protobuf::Arena::InternalHelper; @@ -744,7 +769,7 @@ class AGONES_EXPORT CustomHttpPattern : public ::google::protobuf::Message /* @@ ::google::protobuf::internal::ArenaStringPtr kind_; ::google::protobuf::internal::ArenaStringPtr path_; mutable ::google::protobuf::internal::CachedSize _cached_size_; - friend struct ::protobuf_google_2fapi_2fhttp_2eproto::TableStruct; + friend struct ::TableStruct_google_2fapi_2fhttp_2eproto; }; // =================================================================== @@ -827,7 +852,7 @@ inline void HttpRule::set_selector(::std::string&& value) { } #endif inline void HttpRule::set_selector(const char* value) { - GOOGLE_DCHECK(value != NULL); + GOOGLE_DCHECK(value != nullptr); selector_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value), GetArenaNoVirtual()); @@ -851,7 +876,7 @@ inline ::std::string* HttpRule::release_selector() { return selector_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } inline void HttpRule::set_allocated_selector(::std::string* selector) { - if (selector != NULL) { + if (selector != nullptr) { } else { @@ -862,15 +887,15 @@ inline void HttpRule::set_allocated_selector(::std::string* selector) { } inline ::std::string* HttpRule::unsafe_arena_release_selector() { // @@protoc_insertion_point(field_unsafe_arena_release:google.api.HttpRule.selector) - GOOGLE_DCHECK(GetArenaNoVirtual() != NULL); + GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); return selector_.UnsafeArenaRelease(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } inline void HttpRule::unsafe_arena_set_allocated_selector( ::std::string* selector) { - GOOGLE_DCHECK(GetArenaNoVirtual() != NULL); - if (selector != NULL) { + GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); + if (selector != nullptr) { } else { @@ -925,7 +950,7 @@ inline void HttpRule::set_get(::std::string&& value) { } #endif inline void HttpRule::set_get(const char* value) { - GOOGLE_DCHECK(value != NULL); + GOOGLE_DCHECK(value != nullptr); if (!has_get()) { clear_pattern(); set_has_get(); @@ -965,34 +990,32 @@ inline ::std::string* HttpRule::release_get() { return pattern_.get_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } else { - return NULL; + return nullptr; } } inline void HttpRule::set_allocated_get(::std::string* get) { - if (!has_get()) { - pattern_.get_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (has_pattern()) { + clear_pattern(); } - clear_pattern(); - if (get != NULL) { + if (get != nullptr) { set_has_get(); - pattern_.get_.SetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), get, - GetArenaNoVirtual()); + pattern_.get_.UnsafeSetDefault(get); } // @@protoc_insertion_point(field_set_allocated:google.api.HttpRule.get) } inline ::std::string* HttpRule::unsafe_arena_release_get() { // @@protoc_insertion_point(field_unsafe_arena_release:google.api.HttpRule.get) - GOOGLE_DCHECK(GetArenaNoVirtual() != NULL); + GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); if (has_get()) { clear_has_pattern(); return pattern_.get_.UnsafeArenaRelease( &::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } else { - return NULL; + return nullptr; } } inline void HttpRule::unsafe_arena_set_allocated_get(::std::string* get) { - GOOGLE_DCHECK(GetArenaNoVirtual() != NULL); + GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); if (!has_get()) { pattern_.get_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } @@ -1049,7 +1072,7 @@ inline void HttpRule::set_put(::std::string&& value) { } #endif inline void HttpRule::set_put(const char* value) { - GOOGLE_DCHECK(value != NULL); + GOOGLE_DCHECK(value != nullptr); if (!has_put()) { clear_pattern(); set_has_put(); @@ -1089,34 +1112,32 @@ inline ::std::string* HttpRule::release_put() { return pattern_.put_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } else { - return NULL; + return nullptr; } } inline void HttpRule::set_allocated_put(::std::string* put) { - if (!has_put()) { - pattern_.put_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (has_pattern()) { + clear_pattern(); } - clear_pattern(); - if (put != NULL) { + if (put != nullptr) { set_has_put(); - pattern_.put_.SetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), put, - GetArenaNoVirtual()); + pattern_.put_.UnsafeSetDefault(put); } // @@protoc_insertion_point(field_set_allocated:google.api.HttpRule.put) } inline ::std::string* HttpRule::unsafe_arena_release_put() { // @@protoc_insertion_point(field_unsafe_arena_release:google.api.HttpRule.put) - GOOGLE_DCHECK(GetArenaNoVirtual() != NULL); + GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); if (has_put()) { clear_has_pattern(); return pattern_.put_.UnsafeArenaRelease( &::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } else { - return NULL; + return nullptr; } } inline void HttpRule::unsafe_arena_set_allocated_put(::std::string* put) { - GOOGLE_DCHECK(GetArenaNoVirtual() != NULL); + GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); if (!has_put()) { pattern_.put_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } @@ -1173,7 +1194,7 @@ inline void HttpRule::set_post(::std::string&& value) { } #endif inline void HttpRule::set_post(const char* value) { - GOOGLE_DCHECK(value != NULL); + GOOGLE_DCHECK(value != nullptr); if (!has_post()) { clear_pattern(); set_has_post(); @@ -1213,34 +1234,32 @@ inline ::std::string* HttpRule::release_post() { return pattern_.post_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } else { - return NULL; + return nullptr; } } inline void HttpRule::set_allocated_post(::std::string* post) { - if (!has_post()) { - pattern_.post_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (has_pattern()) { + clear_pattern(); } - clear_pattern(); - if (post != NULL) { + if (post != nullptr) { set_has_post(); - pattern_.post_.SetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), post, - GetArenaNoVirtual()); + pattern_.post_.UnsafeSetDefault(post); } // @@protoc_insertion_point(field_set_allocated:google.api.HttpRule.post) } inline ::std::string* HttpRule::unsafe_arena_release_post() { // @@protoc_insertion_point(field_unsafe_arena_release:google.api.HttpRule.post) - GOOGLE_DCHECK(GetArenaNoVirtual() != NULL); + GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); if (has_post()) { clear_has_pattern(); return pattern_.post_.UnsafeArenaRelease( &::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } else { - return NULL; + return nullptr; } } inline void HttpRule::unsafe_arena_set_allocated_post(::std::string* post) { - GOOGLE_DCHECK(GetArenaNoVirtual() != NULL); + GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); if (!has_post()) { pattern_.post_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } @@ -1297,7 +1316,7 @@ inline void HttpRule::set_delete_(::std::string&& value) { } #endif inline void HttpRule::set_delete_(const char* value) { - GOOGLE_DCHECK(value != NULL); + GOOGLE_DCHECK(value != nullptr); if (!has_delete_()) { clear_pattern(); set_has_delete_(); @@ -1337,34 +1356,32 @@ inline ::std::string* HttpRule::release_delete_() { return pattern_.delete__.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } else { - return NULL; + return nullptr; } } inline void HttpRule::set_allocated_delete_(::std::string* delete_) { - if (!has_delete_()) { - pattern_.delete__.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (has_pattern()) { + clear_pattern(); } - clear_pattern(); - if (delete_ != NULL) { + if (delete_ != nullptr) { set_has_delete_(); - pattern_.delete__.SetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), delete_, - GetArenaNoVirtual()); + pattern_.delete__.UnsafeSetDefault(delete_); } // @@protoc_insertion_point(field_set_allocated:google.api.HttpRule.delete) } inline ::std::string* HttpRule::unsafe_arena_release_delete_() { // @@protoc_insertion_point(field_unsafe_arena_release:google.api.HttpRule.delete) - GOOGLE_DCHECK(GetArenaNoVirtual() != NULL); + GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); if (has_delete_()) { clear_has_pattern(); return pattern_.delete__.UnsafeArenaRelease( &::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } else { - return NULL; + return nullptr; } } inline void HttpRule::unsafe_arena_set_allocated_delete_(::std::string* delete_) { - GOOGLE_DCHECK(GetArenaNoVirtual() != NULL); + GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); if (!has_delete_()) { pattern_.delete__.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } @@ -1421,7 +1438,7 @@ inline void HttpRule::set_patch(::std::string&& value) { } #endif inline void HttpRule::set_patch(const char* value) { - GOOGLE_DCHECK(value != NULL); + GOOGLE_DCHECK(value != nullptr); if (!has_patch()) { clear_pattern(); set_has_patch(); @@ -1461,34 +1478,32 @@ inline ::std::string* HttpRule::release_patch() { return pattern_.patch_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } else { - return NULL; + return nullptr; } } inline void HttpRule::set_allocated_patch(::std::string* patch) { - if (!has_patch()) { - pattern_.patch_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (has_pattern()) { + clear_pattern(); } - clear_pattern(); - if (patch != NULL) { + if (patch != nullptr) { set_has_patch(); - pattern_.patch_.SetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), patch, - GetArenaNoVirtual()); + pattern_.patch_.UnsafeSetDefault(patch); } // @@protoc_insertion_point(field_set_allocated:google.api.HttpRule.patch) } inline ::std::string* HttpRule::unsafe_arena_release_patch() { // @@protoc_insertion_point(field_unsafe_arena_release:google.api.HttpRule.patch) - GOOGLE_DCHECK(GetArenaNoVirtual() != NULL); + GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); if (has_patch()) { clear_has_pattern(); return pattern_.patch_.UnsafeArenaRelease( &::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } else { - return NULL; + return nullptr; } } inline void HttpRule::unsafe_arena_set_allocated_patch(::std::string* patch) { - GOOGLE_DCHECK(GetArenaNoVirtual() != NULL); + GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); if (!has_patch()) { pattern_.patch_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } @@ -1509,27 +1524,24 @@ inline void HttpRule::set_has_custom() { } inline void HttpRule::clear_custom() { if (has_custom()) { - if (GetArenaNoVirtual() == NULL) { + if (GetArenaNoVirtual() == nullptr) { delete pattern_.custom_; } clear_has_pattern(); } } -inline const ::google::api::CustomHttpPattern& HttpRule::_internal_custom() const { - return *pattern_.custom_; -} inline ::google::api::CustomHttpPattern* HttpRule::release_custom() { // @@protoc_insertion_point(field_release:google.api.HttpRule.custom) if (has_custom()) { clear_has_pattern(); ::google::api::CustomHttpPattern* temp = pattern_.custom_; - if (GetArenaNoVirtual() != NULL) { + if (GetArenaNoVirtual() != nullptr) { temp = ::google::protobuf::internal::DuplicateIfNonNull(temp); } - pattern_.custom_ = NULL; + pattern_.custom_ = nullptr; return temp; } else { - return NULL; + return nullptr; } } inline const ::google::api::CustomHttpPattern& HttpRule::custom() const { @@ -1543,10 +1555,10 @@ inline ::google::api::CustomHttpPattern* HttpRule::unsafe_arena_release_custom() if (has_custom()) { clear_has_pattern(); ::google::api::CustomHttpPattern* temp = pattern_.custom_; - pattern_.custom_ = NULL; + pattern_.custom_ = nullptr; return temp; } else { - return NULL; + return nullptr; } } inline void HttpRule::unsafe_arena_set_allocated_custom(::google::api::CustomHttpPattern* custom) { @@ -1590,7 +1602,7 @@ inline void HttpRule::set_body(::std::string&& value) { } #endif inline void HttpRule::set_body(const char* value) { - GOOGLE_DCHECK(value != NULL); + GOOGLE_DCHECK(value != nullptr); body_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value), GetArenaNoVirtual()); @@ -1614,7 +1626,7 @@ inline ::std::string* HttpRule::release_body() { return body_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } inline void HttpRule::set_allocated_body(::std::string* body) { - if (body != NULL) { + if (body != nullptr) { } else { @@ -1625,15 +1637,15 @@ inline void HttpRule::set_allocated_body(::std::string* body) { } inline ::std::string* HttpRule::unsafe_arena_release_body() { // @@protoc_insertion_point(field_unsafe_arena_release:google.api.HttpRule.body) - GOOGLE_DCHECK(GetArenaNoVirtual() != NULL); + GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); return body_.UnsafeArenaRelease(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } inline void HttpRule::unsafe_arena_set_allocated_body( ::std::string* body) { - GOOGLE_DCHECK(GetArenaNoVirtual() != NULL); - if (body != NULL) { + GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); + if (body != nullptr) { } else { @@ -1665,7 +1677,7 @@ inline void HttpRule::set_response_body(::std::string&& value) { } #endif inline void HttpRule::set_response_body(const char* value) { - GOOGLE_DCHECK(value != NULL); + GOOGLE_DCHECK(value != nullptr); response_body_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value), GetArenaNoVirtual()); @@ -1689,7 +1701,7 @@ inline ::std::string* HttpRule::release_response_body() { return response_body_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } inline void HttpRule::set_allocated_response_body(::std::string* response_body) { - if (response_body != NULL) { + if (response_body != nullptr) { } else { @@ -1700,15 +1712,15 @@ inline void HttpRule::set_allocated_response_body(::std::string* response_body) } inline ::std::string* HttpRule::unsafe_arena_release_response_body() { // @@protoc_insertion_point(field_unsafe_arena_release:google.api.HttpRule.response_body) - GOOGLE_DCHECK(GetArenaNoVirtual() != NULL); + GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); return response_body_.UnsafeArenaRelease(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } inline void HttpRule::unsafe_arena_set_allocated_response_body( ::std::string* response_body) { - GOOGLE_DCHECK(GetArenaNoVirtual() != NULL); - if (response_body != NULL) { + GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); + if (response_body != nullptr) { } else { @@ -1783,7 +1795,7 @@ inline void CustomHttpPattern::set_kind(::std::string&& value) { } #endif inline void CustomHttpPattern::set_kind(const char* value) { - GOOGLE_DCHECK(value != NULL); + GOOGLE_DCHECK(value != nullptr); kind_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value), GetArenaNoVirtual()); @@ -1807,7 +1819,7 @@ inline ::std::string* CustomHttpPattern::release_kind() { return kind_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } inline void CustomHttpPattern::set_allocated_kind(::std::string* kind) { - if (kind != NULL) { + if (kind != nullptr) { } else { @@ -1818,15 +1830,15 @@ inline void CustomHttpPattern::set_allocated_kind(::std::string* kind) { } inline ::std::string* CustomHttpPattern::unsafe_arena_release_kind() { // @@protoc_insertion_point(field_unsafe_arena_release:google.api.CustomHttpPattern.kind) - GOOGLE_DCHECK(GetArenaNoVirtual() != NULL); + GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); return kind_.UnsafeArenaRelease(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } inline void CustomHttpPattern::unsafe_arena_set_allocated_kind( ::std::string* kind) { - GOOGLE_DCHECK(GetArenaNoVirtual() != NULL); - if (kind != NULL) { + GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); + if (kind != nullptr) { } else { @@ -1858,7 +1870,7 @@ inline void CustomHttpPattern::set_path(::std::string&& value) { } #endif inline void CustomHttpPattern::set_path(const char* value) { - GOOGLE_DCHECK(value != NULL); + GOOGLE_DCHECK(value != nullptr); path_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value), GetArenaNoVirtual()); @@ -1882,7 +1894,7 @@ inline ::std::string* CustomHttpPattern::release_path() { return path_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } inline void CustomHttpPattern::set_allocated_path(::std::string* path) { - if (path != NULL) { + if (path != nullptr) { } else { @@ -1893,15 +1905,15 @@ inline void CustomHttpPattern::set_allocated_path(::std::string* path) { } inline ::std::string* CustomHttpPattern::unsafe_arena_release_path() { // @@protoc_insertion_point(field_unsafe_arena_release:google.api.CustomHttpPattern.path) - GOOGLE_DCHECK(GetArenaNoVirtual() != NULL); + GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); return path_.UnsafeArenaRelease(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } inline void CustomHttpPattern::unsafe_arena_set_allocated_path( ::std::string* path) { - GOOGLE_DCHECK(GetArenaNoVirtual() != NULL); - if (path != NULL) { + GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); + if (path != nullptr) { } else { @@ -1926,4 +1938,5 @@ inline void CustomHttpPattern::unsafe_arena_set_allocated_path( // @@protoc_insertion_point(global_scope) +#include #endif // PROTOBUF_INCLUDED_google_2fapi_2fhttp_2eproto diff --git a/sdks/cpp/src/agones/sdk.grpc.pb.cc b/sdks/cpp/src/agones/sdk.grpc.pb.cc index fe7405e76a..7d687ff3a1 100644 --- a/sdks/cpp/src/agones/sdk.grpc.pb.cc +++ b/sdks/cpp/src/agones/sdk.grpc.pb.cc @@ -28,6 +28,7 @@ #include #include #include +#include #include #include namespace agones { @@ -72,6 +73,10 @@ void SDK::Stub::experimental_async::Ready(::grpc::ClientContext* context, const return ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_Ready_, context, request, response, std::move(f)); } +void SDK::Stub::experimental_async::Ready(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::agones::dev::sdk::Empty* response, std::function f) { + return ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_Ready_, context, request, response, std::move(f)); +} + ::grpc::ClientAsyncResponseReader< ::agones::dev::sdk::Empty>* SDK::Stub::AsyncReadyRaw(::grpc::ClientContext* context, const ::agones::dev::sdk::Empty& request, ::grpc::CompletionQueue* cq) { return ::grpc::internal::ClientAsyncResponseReaderFactory< ::agones::dev::sdk::Empty>::Create(channel_.get(), cq, rpcmethod_Ready_, context, request, true); } @@ -88,6 +93,10 @@ void SDK::Stub::experimental_async::Allocate(::grpc::ClientContext* context, con return ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_Allocate_, context, request, response, std::move(f)); } +void SDK::Stub::experimental_async::Allocate(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::agones::dev::sdk::Empty* response, std::function f) { + return ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_Allocate_, context, request, response, std::move(f)); +} + ::grpc::ClientAsyncResponseReader< ::agones::dev::sdk::Empty>* SDK::Stub::AsyncAllocateRaw(::grpc::ClientContext* context, const ::agones::dev::sdk::Empty& request, ::grpc::CompletionQueue* cq) { return ::grpc::internal::ClientAsyncResponseReaderFactory< ::agones::dev::sdk::Empty>::Create(channel_.get(), cq, rpcmethod_Allocate_, context, request, true); } @@ -104,6 +113,10 @@ void SDK::Stub::experimental_async::Shutdown(::grpc::ClientContext* context, con return ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_Shutdown_, context, request, response, std::move(f)); } +void SDK::Stub::experimental_async::Shutdown(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::agones::dev::sdk::Empty* response, std::function f) { + return ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_Shutdown_, context, request, response, std::move(f)); +} + ::grpc::ClientAsyncResponseReader< ::agones::dev::sdk::Empty>* SDK::Stub::AsyncShutdownRaw(::grpc::ClientContext* context, const ::agones::dev::sdk::Empty& request, ::grpc::CompletionQueue* cq) { return ::grpc::internal::ClientAsyncResponseReaderFactory< ::agones::dev::sdk::Empty>::Create(channel_.get(), cq, rpcmethod_Shutdown_, context, request, true); } @@ -116,6 +129,10 @@ ::grpc::ClientWriter< ::agones::dev::sdk::Empty>* SDK::Stub::HealthRaw(::grpc::C return ::grpc::internal::ClientWriterFactory< ::agones::dev::sdk::Empty>::Create(channel_.get(), rpcmethod_Health_, context, response); } +void SDK::Stub::experimental_async::Health(::grpc::ClientContext* context, ::agones::dev::sdk::Empty* response, ::grpc::experimental::ClientWriteReactor< ::agones::dev::sdk::Empty>* reactor) { + ::grpc::internal::ClientCallbackWriterFactory< ::agones::dev::sdk::Empty>::Create(stub_->channel_.get(), stub_->rpcmethod_Health_, context, response, reactor); +} + ::grpc::ClientAsyncWriter< ::agones::dev::sdk::Empty>* SDK::Stub::AsyncHealthRaw(::grpc::ClientContext* context, ::agones::dev::sdk::Empty* response, ::grpc::CompletionQueue* cq, void* tag) { return ::grpc::internal::ClientAsyncWriterFactory< ::agones::dev::sdk::Empty>::Create(channel_.get(), cq, rpcmethod_Health_, context, response, true, tag); } @@ -132,6 +149,10 @@ void SDK::Stub::experimental_async::GetGameServer(::grpc::ClientContext* context return ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_GetGameServer_, context, request, response, std::move(f)); } +void SDK::Stub::experimental_async::GetGameServer(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::agones::dev::sdk::GameServer* response, std::function f) { + return ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_GetGameServer_, context, request, response, std::move(f)); +} + ::grpc::ClientAsyncResponseReader< ::agones::dev::sdk::GameServer>* SDK::Stub::AsyncGetGameServerRaw(::grpc::ClientContext* context, const ::agones::dev::sdk::Empty& request, ::grpc::CompletionQueue* cq) { return ::grpc::internal::ClientAsyncResponseReaderFactory< ::agones::dev::sdk::GameServer>::Create(channel_.get(), cq, rpcmethod_GetGameServer_, context, request, true); } @@ -144,6 +165,10 @@ ::grpc::ClientReader< ::agones::dev::sdk::GameServer>* SDK::Stub::WatchGameServe return ::grpc::internal::ClientReaderFactory< ::agones::dev::sdk::GameServer>::Create(channel_.get(), rpcmethod_WatchGameServer_, context, request); } +void SDK::Stub::experimental_async::WatchGameServer(::grpc::ClientContext* context, ::agones::dev::sdk::Empty* request, ::grpc::experimental::ClientReadReactor< ::agones::dev::sdk::GameServer>* reactor) { + ::grpc::internal::ClientCallbackReaderFactory< ::agones::dev::sdk::GameServer>::Create(stub_->channel_.get(), stub_->rpcmethod_WatchGameServer_, context, request, reactor); +} + ::grpc::ClientAsyncReader< ::agones::dev::sdk::GameServer>* SDK::Stub::AsyncWatchGameServerRaw(::grpc::ClientContext* context, const ::agones::dev::sdk::Empty& request, ::grpc::CompletionQueue* cq, void* tag) { return ::grpc::internal::ClientAsyncReaderFactory< ::agones::dev::sdk::GameServer>::Create(channel_.get(), cq, rpcmethod_WatchGameServer_, context, request, true, tag); } @@ -160,6 +185,10 @@ void SDK::Stub::experimental_async::SetLabel(::grpc::ClientContext* context, con return ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_SetLabel_, context, request, response, std::move(f)); } +void SDK::Stub::experimental_async::SetLabel(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::agones::dev::sdk::Empty* response, std::function f) { + return ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_SetLabel_, context, request, response, std::move(f)); +} + ::grpc::ClientAsyncResponseReader< ::agones::dev::sdk::Empty>* SDK::Stub::AsyncSetLabelRaw(::grpc::ClientContext* context, const ::agones::dev::sdk::KeyValue& request, ::grpc::CompletionQueue* cq) { return ::grpc::internal::ClientAsyncResponseReaderFactory< ::agones::dev::sdk::Empty>::Create(channel_.get(), cq, rpcmethod_SetLabel_, context, request, true); } @@ -176,6 +205,10 @@ void SDK::Stub::experimental_async::SetAnnotation(::grpc::ClientContext* context return ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_SetAnnotation_, context, request, response, std::move(f)); } +void SDK::Stub::experimental_async::SetAnnotation(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::agones::dev::sdk::Empty* response, std::function f) { + return ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_SetAnnotation_, context, request, response, std::move(f)); +} + ::grpc::ClientAsyncResponseReader< ::agones::dev::sdk::Empty>* SDK::Stub::AsyncSetAnnotationRaw(::grpc::ClientContext* context, const ::agones::dev::sdk::KeyValue& request, ::grpc::CompletionQueue* cq) { return ::grpc::internal::ClientAsyncResponseReaderFactory< ::agones::dev::sdk::Empty>::Create(channel_.get(), cq, rpcmethod_SetAnnotation_, context, request, true); } @@ -192,6 +225,10 @@ void SDK::Stub::experimental_async::Reserve(::grpc::ClientContext* context, cons return ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_Reserve_, context, request, response, std::move(f)); } +void SDK::Stub::experimental_async::Reserve(::grpc::ClientContext* context, const ::grpc::ByteBuffer* request, ::agones::dev::sdk::Empty* response, std::function f) { + return ::grpc::internal::CallbackUnaryCall(stub_->channel_.get(), stub_->rpcmethod_Reserve_, context, request, response, std::move(f)); +} + ::grpc::ClientAsyncResponseReader< ::agones::dev::sdk::Empty>* SDK::Stub::AsyncReserveRaw(::grpc::ClientContext* context, const ::agones::dev::sdk::Duration& request, ::grpc::CompletionQueue* cq) { return ::grpc::internal::ClientAsyncResponseReaderFactory< ::agones::dev::sdk::Empty>::Create(channel_.get(), cq, rpcmethod_Reserve_, context, request, true); } diff --git a/sdks/cpp/src/agones/sdk.pb.cc b/sdks/cpp/src/agones/sdk.pb.cc index 74f6ad3a79..f4dff61be6 100644 --- a/sdks/cpp/src/agones/sdk.pb.cc +++ b/sdks/cpp/src/agones/sdk.pb.cc @@ -21,91 +21,74 @@ #include #include -#include #include +#include #include #include #include #include #include -// This is a temporary google only hack -#ifdef GOOGLE_PROTOBUF_ENFORCE_UNIQUENESS -#include "third_party/protobuf/version.h" -#endif // @@protoc_insertion_point(includes) - -namespace protobuf_sdk_2eproto { -extern PROTOBUF_INTERNAL_EXPORT_protobuf_sdk_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_GameServer_ObjectMeta_AnnotationsEntry_DoNotUse; -extern PROTOBUF_INTERNAL_EXPORT_protobuf_sdk_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_GameServer_ObjectMeta_LabelsEntry_DoNotUse; -extern PROTOBUF_INTERNAL_EXPORT_protobuf_sdk_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_GameServer_Spec_Health; -extern PROTOBUF_INTERNAL_EXPORT_protobuf_sdk_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_GameServer_Status_Port; -extern PROTOBUF_INTERNAL_EXPORT_protobuf_sdk_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_GameServer_Spec; -extern PROTOBUF_INTERNAL_EXPORT_protobuf_sdk_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_GameServer_Status; -extern PROTOBUF_INTERNAL_EXPORT_protobuf_sdk_2eproto ::google::protobuf::internal::SCCInfo<2> scc_info_GameServer_ObjectMeta; -} // namespace protobuf_sdk_2eproto +#include + +extern PROTOBUF_INTERNAL_EXPORT_sdk_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_GameServer_ObjectMeta_AnnotationsEntry_DoNotUse_sdk_2eproto; +extern PROTOBUF_INTERNAL_EXPORT_sdk_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_GameServer_ObjectMeta_LabelsEntry_DoNotUse_sdk_2eproto; +extern PROTOBUF_INTERNAL_EXPORT_sdk_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_GameServer_Spec_Health_sdk_2eproto; +extern PROTOBUF_INTERNAL_EXPORT_sdk_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_GameServer_Status_Port_sdk_2eproto; +extern PROTOBUF_INTERNAL_EXPORT_sdk_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_GameServer_Spec_sdk_2eproto; +extern PROTOBUF_INTERNAL_EXPORT_sdk_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_GameServer_Status_sdk_2eproto; +extern PROTOBUF_INTERNAL_EXPORT_sdk_2eproto ::google::protobuf::internal::SCCInfo<2> scc_info_GameServer_ObjectMeta_sdk_2eproto; namespace agones { namespace dev { namespace sdk { class EmptyDefaultTypeInternal { public: - ::google::protobuf::internal::ExplicitlyConstructed - _instance; + ::google::protobuf::internal::ExplicitlyConstructed _instance; } _Empty_default_instance_; class KeyValueDefaultTypeInternal { public: - ::google::protobuf::internal::ExplicitlyConstructed - _instance; + ::google::protobuf::internal::ExplicitlyConstructed _instance; } _KeyValue_default_instance_; class DurationDefaultTypeInternal { public: - ::google::protobuf::internal::ExplicitlyConstructed - _instance; + ::google::protobuf::internal::ExplicitlyConstructed _instance; } _Duration_default_instance_; class GameServer_ObjectMeta_AnnotationsEntry_DoNotUseDefaultTypeInternal { public: - ::google::protobuf::internal::ExplicitlyConstructed - _instance; + ::google::protobuf::internal::ExplicitlyConstructed _instance; } _GameServer_ObjectMeta_AnnotationsEntry_DoNotUse_default_instance_; class GameServer_ObjectMeta_LabelsEntry_DoNotUseDefaultTypeInternal { public: - ::google::protobuf::internal::ExplicitlyConstructed - _instance; + ::google::protobuf::internal::ExplicitlyConstructed _instance; } _GameServer_ObjectMeta_LabelsEntry_DoNotUse_default_instance_; class GameServer_ObjectMetaDefaultTypeInternal { public: - ::google::protobuf::internal::ExplicitlyConstructed - _instance; + ::google::protobuf::internal::ExplicitlyConstructed _instance; } _GameServer_ObjectMeta_default_instance_; class GameServer_Spec_HealthDefaultTypeInternal { public: - ::google::protobuf::internal::ExplicitlyConstructed - _instance; + ::google::protobuf::internal::ExplicitlyConstructed _instance; } _GameServer_Spec_Health_default_instance_; class GameServer_SpecDefaultTypeInternal { public: - ::google::protobuf::internal::ExplicitlyConstructed - _instance; + ::google::protobuf::internal::ExplicitlyConstructed _instance; } _GameServer_Spec_default_instance_; class GameServer_Status_PortDefaultTypeInternal { public: - ::google::protobuf::internal::ExplicitlyConstructed - _instance; + ::google::protobuf::internal::ExplicitlyConstructed _instance; } _GameServer_Status_Port_default_instance_; class GameServer_StatusDefaultTypeInternal { public: - ::google::protobuf::internal::ExplicitlyConstructed - _instance; + ::google::protobuf::internal::ExplicitlyConstructed _instance; } _GameServer_Status_default_instance_; class GameServerDefaultTypeInternal { public: - ::google::protobuf::internal::ExplicitlyConstructed - _instance; + ::google::protobuf::internal::ExplicitlyConstructed _instance; } _GameServer_default_instance_; } // namespace sdk } // namespace dev } // namespace agones -namespace protobuf_sdk_2eproto { -static void InitDefaultsEmpty() { +static void InitDefaultsEmpty_sdk_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; { @@ -116,10 +99,10 @@ static void InitDefaultsEmpty() { ::agones::dev::sdk::Empty::InitAsDefaultInstance(); } -AGONES_EXPORT ::google::protobuf::internal::SCCInfo<0> scc_info_Empty = - {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsEmpty}, {}}; +AGONES_EXPORT ::google::protobuf::internal::SCCInfo<0> scc_info_Empty_sdk_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsEmpty_sdk_2eproto}, {}}; -static void InitDefaultsKeyValue() { +static void InitDefaultsKeyValue_sdk_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; { @@ -130,10 +113,10 @@ static void InitDefaultsKeyValue() { ::agones::dev::sdk::KeyValue::InitAsDefaultInstance(); } -AGONES_EXPORT ::google::protobuf::internal::SCCInfo<0> scc_info_KeyValue = - {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsKeyValue}, {}}; +AGONES_EXPORT ::google::protobuf::internal::SCCInfo<0> scc_info_KeyValue_sdk_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsKeyValue_sdk_2eproto}, {}}; -static void InitDefaultsDuration() { +static void InitDefaultsDuration_sdk_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; { @@ -144,10 +127,10 @@ static void InitDefaultsDuration() { ::agones::dev::sdk::Duration::InitAsDefaultInstance(); } -AGONES_EXPORT ::google::protobuf::internal::SCCInfo<0> scc_info_Duration = - {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsDuration}, {}}; +AGONES_EXPORT ::google::protobuf::internal::SCCInfo<0> scc_info_Duration_sdk_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsDuration_sdk_2eproto}, {}}; -static void InitDefaultsGameServer_ObjectMeta_AnnotationsEntry_DoNotUse() { +static void InitDefaultsGameServer_ObjectMeta_AnnotationsEntry_DoNotUse_sdk_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; { @@ -157,10 +140,10 @@ static void InitDefaultsGameServer_ObjectMeta_AnnotationsEntry_DoNotUse() { ::agones::dev::sdk::GameServer_ObjectMeta_AnnotationsEntry_DoNotUse::InitAsDefaultInstance(); } -AGONES_EXPORT ::google::protobuf::internal::SCCInfo<0> scc_info_GameServer_ObjectMeta_AnnotationsEntry_DoNotUse = - {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsGameServer_ObjectMeta_AnnotationsEntry_DoNotUse}, {}}; +AGONES_EXPORT ::google::protobuf::internal::SCCInfo<0> scc_info_GameServer_ObjectMeta_AnnotationsEntry_DoNotUse_sdk_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsGameServer_ObjectMeta_AnnotationsEntry_DoNotUse_sdk_2eproto}, {}}; -static void InitDefaultsGameServer_ObjectMeta_LabelsEntry_DoNotUse() { +static void InitDefaultsGameServer_ObjectMeta_LabelsEntry_DoNotUse_sdk_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; { @@ -170,10 +153,10 @@ static void InitDefaultsGameServer_ObjectMeta_LabelsEntry_DoNotUse() { ::agones::dev::sdk::GameServer_ObjectMeta_LabelsEntry_DoNotUse::InitAsDefaultInstance(); } -AGONES_EXPORT ::google::protobuf::internal::SCCInfo<0> scc_info_GameServer_ObjectMeta_LabelsEntry_DoNotUse = - {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsGameServer_ObjectMeta_LabelsEntry_DoNotUse}, {}}; +AGONES_EXPORT ::google::protobuf::internal::SCCInfo<0> scc_info_GameServer_ObjectMeta_LabelsEntry_DoNotUse_sdk_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsGameServer_ObjectMeta_LabelsEntry_DoNotUse_sdk_2eproto}, {}}; -static void InitDefaultsGameServer_ObjectMeta() { +static void InitDefaultsGameServer_ObjectMeta_sdk_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; { @@ -184,12 +167,12 @@ static void InitDefaultsGameServer_ObjectMeta() { ::agones::dev::sdk::GameServer_ObjectMeta::InitAsDefaultInstance(); } -AGONES_EXPORT ::google::protobuf::internal::SCCInfo<2> scc_info_GameServer_ObjectMeta = - {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 2, InitDefaultsGameServer_ObjectMeta}, { - &protobuf_sdk_2eproto::scc_info_GameServer_ObjectMeta_AnnotationsEntry_DoNotUse.base, - &protobuf_sdk_2eproto::scc_info_GameServer_ObjectMeta_LabelsEntry_DoNotUse.base,}}; +AGONES_EXPORT ::google::protobuf::internal::SCCInfo<2> scc_info_GameServer_ObjectMeta_sdk_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 2, InitDefaultsGameServer_ObjectMeta_sdk_2eproto}, { + &scc_info_GameServer_ObjectMeta_AnnotationsEntry_DoNotUse_sdk_2eproto.base, + &scc_info_GameServer_ObjectMeta_LabelsEntry_DoNotUse_sdk_2eproto.base,}}; -static void InitDefaultsGameServer_Spec_Health() { +static void InitDefaultsGameServer_Spec_Health_sdk_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; { @@ -200,10 +183,10 @@ static void InitDefaultsGameServer_Spec_Health() { ::agones::dev::sdk::GameServer_Spec_Health::InitAsDefaultInstance(); } -AGONES_EXPORT ::google::protobuf::internal::SCCInfo<0> scc_info_GameServer_Spec_Health = - {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsGameServer_Spec_Health}, {}}; +AGONES_EXPORT ::google::protobuf::internal::SCCInfo<0> scc_info_GameServer_Spec_Health_sdk_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsGameServer_Spec_Health_sdk_2eproto}, {}}; -static void InitDefaultsGameServer_Spec() { +static void InitDefaultsGameServer_Spec_sdk_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; { @@ -214,11 +197,11 @@ static void InitDefaultsGameServer_Spec() { ::agones::dev::sdk::GameServer_Spec::InitAsDefaultInstance(); } -AGONES_EXPORT ::google::protobuf::internal::SCCInfo<1> scc_info_GameServer_Spec = - {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsGameServer_Spec}, { - &protobuf_sdk_2eproto::scc_info_GameServer_Spec_Health.base,}}; +AGONES_EXPORT ::google::protobuf::internal::SCCInfo<1> scc_info_GameServer_Spec_sdk_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsGameServer_Spec_sdk_2eproto}, { + &scc_info_GameServer_Spec_Health_sdk_2eproto.base,}}; -static void InitDefaultsGameServer_Status_Port() { +static void InitDefaultsGameServer_Status_Port_sdk_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; { @@ -229,10 +212,10 @@ static void InitDefaultsGameServer_Status_Port() { ::agones::dev::sdk::GameServer_Status_Port::InitAsDefaultInstance(); } -AGONES_EXPORT ::google::protobuf::internal::SCCInfo<0> scc_info_GameServer_Status_Port = - {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsGameServer_Status_Port}, {}}; +AGONES_EXPORT ::google::protobuf::internal::SCCInfo<0> scc_info_GameServer_Status_Port_sdk_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsGameServer_Status_Port_sdk_2eproto}, {}}; -static void InitDefaultsGameServer_Status() { +static void InitDefaultsGameServer_Status_sdk_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; { @@ -243,11 +226,11 @@ static void InitDefaultsGameServer_Status() { ::agones::dev::sdk::GameServer_Status::InitAsDefaultInstance(); } -AGONES_EXPORT ::google::protobuf::internal::SCCInfo<1> scc_info_GameServer_Status = - {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsGameServer_Status}, { - &protobuf_sdk_2eproto::scc_info_GameServer_Status_Port.base,}}; +AGONES_EXPORT ::google::protobuf::internal::SCCInfo<1> scc_info_GameServer_Status_sdk_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsGameServer_Status_sdk_2eproto}, { + &scc_info_GameServer_Status_Port_sdk_2eproto.base,}}; -static void InitDefaultsGameServer() { +static void InitDefaultsGameServer_sdk_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; { @@ -258,119 +241,121 @@ static void InitDefaultsGameServer() { ::agones::dev::sdk::GameServer::InitAsDefaultInstance(); } -AGONES_EXPORT ::google::protobuf::internal::SCCInfo<3> scc_info_GameServer = - {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 3, InitDefaultsGameServer}, { - &protobuf_sdk_2eproto::scc_info_GameServer_ObjectMeta.base, - &protobuf_sdk_2eproto::scc_info_GameServer_Spec.base, - &protobuf_sdk_2eproto::scc_info_GameServer_Status.base,}}; +AGONES_EXPORT ::google::protobuf::internal::SCCInfo<3> scc_info_GameServer_sdk_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 3, InitDefaultsGameServer_sdk_2eproto}, { + &scc_info_GameServer_ObjectMeta_sdk_2eproto.base, + &scc_info_GameServer_Spec_sdk_2eproto.base, + &scc_info_GameServer_Status_sdk_2eproto.base,}}; -void InitDefaults() { - ::google::protobuf::internal::InitSCC(&scc_info_Empty.base); - ::google::protobuf::internal::InitSCC(&scc_info_KeyValue.base); - ::google::protobuf::internal::InitSCC(&scc_info_Duration.base); - ::google::protobuf::internal::InitSCC(&scc_info_GameServer_ObjectMeta_AnnotationsEntry_DoNotUse.base); - ::google::protobuf::internal::InitSCC(&scc_info_GameServer_ObjectMeta_LabelsEntry_DoNotUse.base); - ::google::protobuf::internal::InitSCC(&scc_info_GameServer_ObjectMeta.base); - ::google::protobuf::internal::InitSCC(&scc_info_GameServer_Spec_Health.base); - ::google::protobuf::internal::InitSCC(&scc_info_GameServer_Spec.base); - ::google::protobuf::internal::InitSCC(&scc_info_GameServer_Status_Port.base); - ::google::protobuf::internal::InitSCC(&scc_info_GameServer_Status.base); - ::google::protobuf::internal::InitSCC(&scc_info_GameServer.base); +void InitDefaults_sdk_2eproto() { + ::google::protobuf::internal::InitSCC(&scc_info_Empty_sdk_2eproto.base); + ::google::protobuf::internal::InitSCC(&scc_info_KeyValue_sdk_2eproto.base); + ::google::protobuf::internal::InitSCC(&scc_info_Duration_sdk_2eproto.base); + ::google::protobuf::internal::InitSCC(&scc_info_GameServer_ObjectMeta_AnnotationsEntry_DoNotUse_sdk_2eproto.base); + ::google::protobuf::internal::InitSCC(&scc_info_GameServer_ObjectMeta_LabelsEntry_DoNotUse_sdk_2eproto.base); + ::google::protobuf::internal::InitSCC(&scc_info_GameServer_ObjectMeta_sdk_2eproto.base); + ::google::protobuf::internal::InitSCC(&scc_info_GameServer_Spec_Health_sdk_2eproto.base); + ::google::protobuf::internal::InitSCC(&scc_info_GameServer_Spec_sdk_2eproto.base); + ::google::protobuf::internal::InitSCC(&scc_info_GameServer_Status_Port_sdk_2eproto.base); + ::google::protobuf::internal::InitSCC(&scc_info_GameServer_Status_sdk_2eproto.base); + ::google::protobuf::internal::InitSCC(&scc_info_GameServer_sdk_2eproto.base); } -::google::protobuf::Metadata file_level_metadata[11]; +::google::protobuf::Metadata file_level_metadata_sdk_2eproto[11]; +constexpr ::google::protobuf::EnumDescriptor const** file_level_enum_descriptors_sdk_2eproto = nullptr; +constexpr ::google::protobuf::ServiceDescriptor const** file_level_service_descriptors_sdk_2eproto = nullptr; -const ::google::protobuf::uint32 TableStruct::offsets[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = { +const ::google::protobuf::uint32 TableStruct_sdk_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { ~0u, // no _has_bits_ - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::agones::dev::sdk::Empty, _internal_metadata_), + PROTOBUF_FIELD_OFFSET(::agones::dev::sdk::Empty, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ ~0u, // no _has_bits_ - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::agones::dev::sdk::KeyValue, _internal_metadata_), + PROTOBUF_FIELD_OFFSET(::agones::dev::sdk::KeyValue, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::agones::dev::sdk::KeyValue, key_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::agones::dev::sdk::KeyValue, value_), + PROTOBUF_FIELD_OFFSET(::agones::dev::sdk::KeyValue, key_), + PROTOBUF_FIELD_OFFSET(::agones::dev::sdk::KeyValue, value_), ~0u, // no _has_bits_ - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::agones::dev::sdk::Duration, _internal_metadata_), + PROTOBUF_FIELD_OFFSET(::agones::dev::sdk::Duration, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::agones::dev::sdk::Duration, seconds_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::agones::dev::sdk::GameServer_ObjectMeta_AnnotationsEntry_DoNotUse, _has_bits_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::agones::dev::sdk::GameServer_ObjectMeta_AnnotationsEntry_DoNotUse, _internal_metadata_), + PROTOBUF_FIELD_OFFSET(::agones::dev::sdk::Duration, seconds_), + PROTOBUF_FIELD_OFFSET(::agones::dev::sdk::GameServer_ObjectMeta_AnnotationsEntry_DoNotUse, _has_bits_), + PROTOBUF_FIELD_OFFSET(::agones::dev::sdk::GameServer_ObjectMeta_AnnotationsEntry_DoNotUse, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::agones::dev::sdk::GameServer_ObjectMeta_AnnotationsEntry_DoNotUse, key_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::agones::dev::sdk::GameServer_ObjectMeta_AnnotationsEntry_DoNotUse, value_), + PROTOBUF_FIELD_OFFSET(::agones::dev::sdk::GameServer_ObjectMeta_AnnotationsEntry_DoNotUse, key_), + PROTOBUF_FIELD_OFFSET(::agones::dev::sdk::GameServer_ObjectMeta_AnnotationsEntry_DoNotUse, value_), 0, 1, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::agones::dev::sdk::GameServer_ObjectMeta_LabelsEntry_DoNotUse, _has_bits_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::agones::dev::sdk::GameServer_ObjectMeta_LabelsEntry_DoNotUse, _internal_metadata_), + PROTOBUF_FIELD_OFFSET(::agones::dev::sdk::GameServer_ObjectMeta_LabelsEntry_DoNotUse, _has_bits_), + PROTOBUF_FIELD_OFFSET(::agones::dev::sdk::GameServer_ObjectMeta_LabelsEntry_DoNotUse, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::agones::dev::sdk::GameServer_ObjectMeta_LabelsEntry_DoNotUse, key_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::agones::dev::sdk::GameServer_ObjectMeta_LabelsEntry_DoNotUse, value_), + PROTOBUF_FIELD_OFFSET(::agones::dev::sdk::GameServer_ObjectMeta_LabelsEntry_DoNotUse, key_), + PROTOBUF_FIELD_OFFSET(::agones::dev::sdk::GameServer_ObjectMeta_LabelsEntry_DoNotUse, value_), 0, 1, ~0u, // no _has_bits_ - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::agones::dev::sdk::GameServer_ObjectMeta, _internal_metadata_), + PROTOBUF_FIELD_OFFSET(::agones::dev::sdk::GameServer_ObjectMeta, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::agones::dev::sdk::GameServer_ObjectMeta, name_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::agones::dev::sdk::GameServer_ObjectMeta, namespace__), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::agones::dev::sdk::GameServer_ObjectMeta, uid_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::agones::dev::sdk::GameServer_ObjectMeta, resource_version_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::agones::dev::sdk::GameServer_ObjectMeta, generation_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::agones::dev::sdk::GameServer_ObjectMeta, creation_timestamp_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::agones::dev::sdk::GameServer_ObjectMeta, deletion_timestamp_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::agones::dev::sdk::GameServer_ObjectMeta, annotations_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::agones::dev::sdk::GameServer_ObjectMeta, labels_), + PROTOBUF_FIELD_OFFSET(::agones::dev::sdk::GameServer_ObjectMeta, name_), + PROTOBUF_FIELD_OFFSET(::agones::dev::sdk::GameServer_ObjectMeta, namespace__), + PROTOBUF_FIELD_OFFSET(::agones::dev::sdk::GameServer_ObjectMeta, uid_), + PROTOBUF_FIELD_OFFSET(::agones::dev::sdk::GameServer_ObjectMeta, resource_version_), + PROTOBUF_FIELD_OFFSET(::agones::dev::sdk::GameServer_ObjectMeta, generation_), + PROTOBUF_FIELD_OFFSET(::agones::dev::sdk::GameServer_ObjectMeta, creation_timestamp_), + PROTOBUF_FIELD_OFFSET(::agones::dev::sdk::GameServer_ObjectMeta, deletion_timestamp_), + PROTOBUF_FIELD_OFFSET(::agones::dev::sdk::GameServer_ObjectMeta, annotations_), + PROTOBUF_FIELD_OFFSET(::agones::dev::sdk::GameServer_ObjectMeta, labels_), ~0u, // no _has_bits_ - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::agones::dev::sdk::GameServer_Spec_Health, _internal_metadata_), + PROTOBUF_FIELD_OFFSET(::agones::dev::sdk::GameServer_Spec_Health, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::agones::dev::sdk::GameServer_Spec_Health, disabled_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::agones::dev::sdk::GameServer_Spec_Health, period_seconds_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::agones::dev::sdk::GameServer_Spec_Health, failure_threshold_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::agones::dev::sdk::GameServer_Spec_Health, initial_delay_seconds_), + PROTOBUF_FIELD_OFFSET(::agones::dev::sdk::GameServer_Spec_Health, disabled_), + PROTOBUF_FIELD_OFFSET(::agones::dev::sdk::GameServer_Spec_Health, period_seconds_), + PROTOBUF_FIELD_OFFSET(::agones::dev::sdk::GameServer_Spec_Health, failure_threshold_), + PROTOBUF_FIELD_OFFSET(::agones::dev::sdk::GameServer_Spec_Health, initial_delay_seconds_), ~0u, // no _has_bits_ - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::agones::dev::sdk::GameServer_Spec, _internal_metadata_), + PROTOBUF_FIELD_OFFSET(::agones::dev::sdk::GameServer_Spec, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::agones::dev::sdk::GameServer_Spec, health_), + PROTOBUF_FIELD_OFFSET(::agones::dev::sdk::GameServer_Spec, health_), ~0u, // no _has_bits_ - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::agones::dev::sdk::GameServer_Status_Port, _internal_metadata_), + PROTOBUF_FIELD_OFFSET(::agones::dev::sdk::GameServer_Status_Port, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::agones::dev::sdk::GameServer_Status_Port, name_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::agones::dev::sdk::GameServer_Status_Port, port_), + PROTOBUF_FIELD_OFFSET(::agones::dev::sdk::GameServer_Status_Port, name_), + PROTOBUF_FIELD_OFFSET(::agones::dev::sdk::GameServer_Status_Port, port_), ~0u, // no _has_bits_ - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::agones::dev::sdk::GameServer_Status, _internal_metadata_), + PROTOBUF_FIELD_OFFSET(::agones::dev::sdk::GameServer_Status, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::agones::dev::sdk::GameServer_Status, state_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::agones::dev::sdk::GameServer_Status, address_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::agones::dev::sdk::GameServer_Status, ports_), + PROTOBUF_FIELD_OFFSET(::agones::dev::sdk::GameServer_Status, state_), + PROTOBUF_FIELD_OFFSET(::agones::dev::sdk::GameServer_Status, address_), + PROTOBUF_FIELD_OFFSET(::agones::dev::sdk::GameServer_Status, ports_), ~0u, // no _has_bits_ - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::agones::dev::sdk::GameServer, _internal_metadata_), + PROTOBUF_FIELD_OFFSET(::agones::dev::sdk::GameServer, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::agones::dev::sdk::GameServer, object_meta_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::agones::dev::sdk::GameServer, spec_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::agones::dev::sdk::GameServer, status_), + PROTOBUF_FIELD_OFFSET(::agones::dev::sdk::GameServer, object_meta_), + PROTOBUF_FIELD_OFFSET(::agones::dev::sdk::GameServer, spec_), + PROTOBUF_FIELD_OFFSET(::agones::dev::sdk::GameServer, status_), }; -static const ::google::protobuf::internal::MigrationSchema schemas[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = { +static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { { 0, -1, sizeof(::agones::dev::sdk::Empty)}, { 5, -1, sizeof(::agones::dev::sdk::KeyValue)}, { 12, -1, sizeof(::agones::dev::sdk::Duration)}, @@ -398,92 +383,76 @@ static ::google::protobuf::Message const * const file_default_instances[] = { reinterpret_cast(&::agones::dev::sdk::_GameServer_default_instance_), }; -void protobuf_AssignDescriptors() { - AddDescriptors(); - AssignDescriptors( - "sdk.proto", schemas, file_default_instances, TableStruct::offsets, - file_level_metadata, NULL, NULL); -} - -void protobuf_AssignDescriptorsOnce() { - static ::google::protobuf::internal::once_flag once; - ::google::protobuf::internal::call_once(once, protobuf_AssignDescriptors); -} - -void protobuf_RegisterTypes(const ::std::string&) GOOGLE_PROTOBUF_ATTRIBUTE_COLD; -void protobuf_RegisterTypes(const ::std::string&) { - protobuf_AssignDescriptorsOnce(); - ::google::protobuf::internal::RegisterAllTypes(file_level_metadata, 11); -} - -void AddDescriptorsImpl() { - InitDefaults(); - static const char descriptor[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = { - "\n\tsdk.proto\022\016agones.dev.sdk\032\034google/api/" - "annotations.proto\"\007\n\005Empty\"&\n\010KeyValue\022\013" - "\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t\"\033\n\010Duration\022\017" - "\n\007seconds\030\001 \001(\003\"\365\006\n\nGameServer\022:\n\013object" - "_meta\030\001 \001(\0132%.agones.dev.sdk.GameServer." - "ObjectMeta\022-\n\004spec\030\002 \001(\0132\037.agones.dev.sd" - "k.GameServer.Spec\0221\n\006status\030\003 \001(\0132!.agon" - "es.dev.sdk.GameServer.Status\032\223\003\n\nObjectM" - "eta\022\014\n\004name\030\001 \001(\t\022\021\n\tnamespace\030\002 \001(\t\022\013\n\003" - "uid\030\003 \001(\t\022\030\n\020resource_version\030\004 \001(\t\022\022\n\ng" - "eneration\030\005 \001(\003\022\032\n\022creation_timestamp\030\006 " - "\001(\003\022\032\n\022deletion_timestamp\030\007 \001(\003\022K\n\013annot" - "ations\030\010 \003(\01326.agones.dev.sdk.GameServer" - ".ObjectMeta.AnnotationsEntry\022A\n\006labels\030\t" - " \003(\01321.agones.dev.sdk.GameServer.ObjectM" - "eta.LabelsEntry\0322\n\020AnnotationsEntry\022\013\n\003k" - "ey\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\032-\n\013LabelsEnt" - "ry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\032\254\001\n\004S" - "pec\0226\n\006health\030\001 \001(\0132&.agones.dev.sdk.Gam" - "eServer.Spec.Health\032l\n\006Health\022\020\n\010disable" - "d\030\001 \001(\010\022\026\n\016period_seconds\030\002 \001(\005\022\031\n\021failu" - "re_threshold\030\003 \001(\005\022\035\n\025initial_delay_seco" - "nds\030\004 \001(\005\032\203\001\n\006Status\022\r\n\005state\030\001 \001(\t\022\017\n\007a" - "ddress\030\002 \001(\t\0225\n\005ports\030\003 \003(\0132&.agones.dev" - ".sdk.GameServer.Status.Port\032\"\n\004Port\022\014\n\004n" - "ame\030\001 \001(\t\022\014\n\004port\030\002 \001(\0052\206\006\n\003SDK\022H\n\005Ready" - "\022\025.agones.dev.sdk.Empty\032\025.agones.dev.sdk" - ".Empty\"\021\202\323\344\223\002\013\"\006/ready:\001*\022N\n\010Allocate\022\025." - "agones.dev.sdk.Empty\032\025.agones.dev.sdk.Em" - "pty\"\024\202\323\344\223\002\016\"\t/allocate:\001*\022N\n\010Shutdown\022\025." - "agones.dev.sdk.Empty\032\025.agones.dev.sdk.Em" - "pty\"\024\202\323\344\223\002\016\"\t/shutdown:\001*\022L\n\006Health\022\025.ag" - "ones.dev.sdk.Empty\032\025.agones.dev.sdk.Empt" - "y\"\022\202\323\344\223\002\014\"\007/health:\001*(\001\022W\n\rGetGameServer" - "\022\025.agones.dev.sdk.Empty\032\032.agones.dev.sdk" - ".GameServer\"\023\202\323\344\223\002\r\022\013/gameserver\022a\n\017Watc" - "hGameServer\022\025.agones.dev.sdk.Empty\032\032.ago" - "nes.dev.sdk.GameServer\"\031\202\323\344\223\002\023\022\021/watch/g" - "ameserver0\001\022W\n\010SetLabel\022\030.agones.dev.sdk" - ".KeyValue\032\025.agones.dev.sdk.Empty\"\032\202\323\344\223\002\024" - "\032\017/metadata/label:\001*\022a\n\rSetAnnotation\022\030." - "agones.dev.sdk.KeyValue\032\025.agones.dev.sdk" - ".Empty\"\037\202\323\344\223\002\031\032\024/metadata/annotation:\001*\022" - "O\n\007Reserve\022\030.agones.dev.sdk.Duration\032\025.a" - "gones.dev.sdk.Empty\"\023\202\323\344\223\002\r\"\010/reserve:\001*" - "B\005Z\003sdkb\006proto3" +::google::protobuf::internal::AssignDescriptorsTable assign_descriptors_table_sdk_2eproto = { + {}, AddDescriptors_sdk_2eproto, "sdk.proto", schemas, + file_default_instances, TableStruct_sdk_2eproto::offsets, + file_level_metadata_sdk_2eproto, 11, file_level_enum_descriptors_sdk_2eproto, file_level_service_descriptors_sdk_2eproto, +}; + +const char descriptor_table_protodef_sdk_2eproto[] = + "\n\tsdk.proto\022\016agones.dev.sdk\032\034google/api/" + "annotations.proto\"\007\n\005Empty\"&\n\010KeyValue\022\013" + "\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t\"\033\n\010Duration\022\017" + "\n\007seconds\030\001 \001(\003\"\365\006\n\nGameServer\022:\n\013object" + "_meta\030\001 \001(\0132%.agones.dev.sdk.GameServer." + "ObjectMeta\022-\n\004spec\030\002 \001(\0132\037.agones.dev.sd" + "k.GameServer.Spec\0221\n\006status\030\003 \001(\0132!.agon" + "es.dev.sdk.GameServer.Status\032\223\003\n\nObjectM" + "eta\022\014\n\004name\030\001 \001(\t\022\021\n\tnamespace\030\002 \001(\t\022\013\n\003" + "uid\030\003 \001(\t\022\030\n\020resource_version\030\004 \001(\t\022\022\n\ng" + "eneration\030\005 \001(\003\022\032\n\022creation_timestamp\030\006 " + "\001(\003\022\032\n\022deletion_timestamp\030\007 \001(\003\022K\n\013annot" + "ations\030\010 \003(\01326.agones.dev.sdk.GameServer" + ".ObjectMeta.AnnotationsEntry\022A\n\006labels\030\t" + " \003(\01321.agones.dev.sdk.GameServer.ObjectM" + "eta.LabelsEntry\0322\n\020AnnotationsEntry\022\013\n\003k" + "ey\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\032-\n\013LabelsEnt" + "ry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\032\254\001\n\004S" + "pec\0226\n\006health\030\001 \001(\0132&.agones.dev.sdk.Gam" + "eServer.Spec.Health\032l\n\006Health\022\020\n\010disable" + "d\030\001 \001(\010\022\026\n\016period_seconds\030\002 \001(\005\022\031\n\021failu" + "re_threshold\030\003 \001(\005\022\035\n\025initial_delay_seco" + "nds\030\004 \001(\005\032\203\001\n\006Status\022\r\n\005state\030\001 \001(\t\022\017\n\007a" + "ddress\030\002 \001(\t\0225\n\005ports\030\003 \003(\0132&.agones.dev" + ".sdk.GameServer.Status.Port\032\"\n\004Port\022\014\n\004n" + "ame\030\001 \001(\t\022\014\n\004port\030\002 \001(\0052\206\006\n\003SDK\022H\n\005Ready" + "\022\025.agones.dev.sdk.Empty\032\025.agones.dev.sdk" + ".Empty\"\021\202\323\344\223\002\013\"\006/ready:\001*\022N\n\010Allocate\022\025." + "agones.dev.sdk.Empty\032\025.agones.dev.sdk.Em" + "pty\"\024\202\323\344\223\002\016\"\t/allocate:\001*\022N\n\010Shutdown\022\025." + "agones.dev.sdk.Empty\032\025.agones.dev.sdk.Em" + "pty\"\024\202\323\344\223\002\016\"\t/shutdown:\001*\022L\n\006Health\022\025.ag" + "ones.dev.sdk.Empty\032\025.agones.dev.sdk.Empt" + "y\"\022\202\323\344\223\002\014\"\007/health:\001*(\001\022W\n\rGetGameServer" + "\022\025.agones.dev.sdk.Empty\032\032.agones.dev.sdk" + ".GameServer\"\023\202\323\344\223\002\r\022\013/gameserver\022a\n\017Watc" + "hGameServer\022\025.agones.dev.sdk.Empty\032\032.ago" + "nes.dev.sdk.GameServer\"\031\202\323\344\223\002\023\022\021/watch/g" + "ameserver0\001\022W\n\010SetLabel\022\030.agones.dev.sdk" + ".KeyValue\032\025.agones.dev.sdk.Empty\"\032\202\323\344\223\002\024" + "\032\017/metadata/label:\001*\022a\n\rSetAnnotation\022\030." + "agones.dev.sdk.KeyValue\032\025.agones.dev.sdk" + ".Empty\"\037\202\323\344\223\002\031\032\024/metadata/annotation:\001*\022" + "O\n\007Reserve\022\030.agones.dev.sdk.Duration\032\025.a" + "gones.dev.sdk.Empty\"\023\202\323\344\223\002\r\"\010/reserve:\001*" + "B\005Z\003sdkb\006proto3" + ; +::google::protobuf::internal::DescriptorTable descriptor_table_sdk_2eproto = { + false, InitDefaults_sdk_2eproto, + descriptor_table_protodef_sdk_2eproto, + "sdk.proto", &assign_descriptors_table_sdk_2eproto, 1815, +}; + +void AddDescriptors_sdk_2eproto() { + static constexpr ::google::protobuf::internal::InitFunc deps[1] = + { + ::AddDescriptors_google_2fapi_2fannotations_2eproto, }; - ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( - descriptor, 1815); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( - "sdk.proto", &protobuf_RegisterTypes); - ::protobuf_google_2fapi_2fannotations_2eproto::AddDescriptors(); + ::google::protobuf::internal::AddDescriptors(&descriptor_table_sdk_2eproto, deps, 1); } -void AddDescriptors() { - static ::google::protobuf::internal::once_flag once; - ::google::protobuf::internal::call_once(once, AddDescriptorsImpl); -} -// Force AddDescriptors() to be called at dynamic initialization time. -struct StaticDescriptorInitializer { - StaticDescriptorInitializer() { - AddDescriptors(); - } -} static_descriptor_initializer; -} // namespace protobuf_sdk_2eproto +// Force running AddDescriptors() at dynamic initialization time. +static bool dynamic_init_dummy_sdk_2eproto = []() { AddDescriptors_sdk_2eproto(); return true; }(); namespace agones { namespace dev { namespace sdk { @@ -492,19 +461,21 @@ namespace sdk { void Empty::InitAsDefaultInstance() { } +class Empty::HasBitSetters { + public: +}; + #if !defined(_MSC_VER) || _MSC_VER >= 1900 #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 Empty::Empty() - : ::google::protobuf::Message(), _internal_metadata_(NULL) { - ::google::protobuf::internal::InitSCC( - &protobuf_sdk_2eproto::scc_info_Empty.base); + : ::google::protobuf::Message(), _internal_metadata_(nullptr) { SharedCtor(); // @@protoc_insertion_point(constructor:agones.dev.sdk.Empty) } Empty::Empty(const Empty& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL) { + _internal_metadata_(nullptr) { _internal_metadata_.MergeFrom(from._internal_metadata_); // @@protoc_insertion_point(copy_constructor:agones.dev.sdk.Empty) } @@ -523,13 +494,8 @@ void Empty::SharedDtor() { void Empty::SetCachedSize(int size) const { _cached_size_.Set(size); } -const ::google::protobuf::Descriptor* Empty::descriptor() { - ::protobuf_sdk_2eproto::protobuf_AssignDescriptorsOnce(); - return ::protobuf_sdk_2eproto::file_level_metadata[kIndexInFileMessages].descriptor; -} - const Empty& Empty::default_instance() { - ::google::protobuf::internal::InitSCC(&protobuf_sdk_2eproto::scc_info_Empty.base); + ::google::protobuf::internal::InitSCC(&::scc_info_Empty_sdk_2eproto.base); return *internal_default_instance(); } @@ -543,9 +509,38 @@ void Empty::Clear() { _internal_metadata_.Clear(); } +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +const char* Empty::_InternalParse(const char* begin, const char* end, void* object, + ::google::protobuf::internal::ParseContext* ctx) { + auto msg = static_cast(object); + ::google::protobuf::int32 size; (void)size; + int depth; (void)depth; + ::google::protobuf::uint32 tag; + ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; + auto ptr = begin; + while (ptr < end) { + ptr = ::google::protobuf::io::Parse32(ptr, &tag); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + switch (tag >> 3) { + default: { + if ((tag & 7) == 4 || tag == 0) { + ctx->EndGroup(tag); + return ptr; + } + auto res = UnknownFieldParse(tag, {_InternalParse, msg}, + ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); + ptr = res.first; + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); + if (res.second) return ptr; + } + } // switch + } // while + return ptr; +} +#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER bool Empty::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { -#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure +#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; // @@protoc_insertion_point(parse_start:agones.dev.sdk.Empty) for (;;) { @@ -567,6 +562,7 @@ bool Empty::MergePartialFromCodedStream( return false; #undef DO_ } +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER void Empty::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { @@ -574,23 +570,22 @@ void Empty::SerializeWithCachedSizes( ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; - if ((_internal_metadata_.have_unknown_fields() && ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) { + if (_internal_metadata_.have_unknown_fields()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( - (::google::protobuf::internal::GetProto3PreserveUnknownsDefault() ? _internal_metadata_.unknown_fields() : _internal_metadata_.default_instance()), output); + _internal_metadata_.unknown_fields(), output); } // @@protoc_insertion_point(serialize_end:agones.dev.sdk.Empty) } ::google::protobuf::uint8* Empty::InternalSerializeWithCachedSizesToArray( - bool deterministic, ::google::protobuf::uint8* target) const { - (void)deterministic; // Unused + ::google::protobuf::uint8* target) const { // @@protoc_insertion_point(serialize_to_array_start:agones.dev.sdk.Empty) ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; - if ((_internal_metadata_.have_unknown_fields() && ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) { + if (_internal_metadata_.have_unknown_fields()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( - (::google::protobuf::internal::GetProto3PreserveUnknownsDefault() ? _internal_metadata_.unknown_fields() : _internal_metadata_.default_instance()), target); + _internal_metadata_.unknown_fields(), target); } // @@protoc_insertion_point(serialize_to_array_end:agones.dev.sdk.Empty) return target; @@ -600,11 +595,15 @@ size_t Empty::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:agones.dev.sdk.Empty) size_t total_size = 0; - if ((_internal_metadata_.have_unknown_fields() && ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) { + if (_internal_metadata_.have_unknown_fields()) { total_size += ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - (::google::protobuf::internal::GetProto3PreserveUnknownsDefault() ? _internal_metadata_.unknown_fields() : _internal_metadata_.default_instance())); + _internal_metadata_.unknown_fields()); } + ::google::protobuf::uint32 cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); SetCachedSize(cached_size); return total_size; @@ -614,9 +613,9 @@ void Empty::MergeFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:agones.dev.sdk.Empty) GOOGLE_DCHECK_NE(&from, this); const Empty* source = - ::google::protobuf::internal::DynamicCastToGenerated( + ::google::protobuf::DynamicCastToGenerated( &from); - if (source == NULL) { + if (source == nullptr) { // @@protoc_insertion_point(generalized_merge_from_cast_fail:agones.dev.sdk.Empty) ::google::protobuf::internal::ReflectionOps::Merge(from, this); } else { @@ -662,8 +661,8 @@ void Empty::InternalSwap(Empty* other) { } ::google::protobuf::Metadata Empty::GetMetadata() const { - protobuf_sdk_2eproto::protobuf_AssignDescriptorsOnce(); - return ::protobuf_sdk_2eproto::file_level_metadata[kIndexInFileMessages]; + ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_sdk_2eproto); + return ::file_level_metadata_sdk_2eproto[kIndexInFileMessages]; } @@ -671,21 +670,23 @@ ::google::protobuf::Metadata Empty::GetMetadata() const { void KeyValue::InitAsDefaultInstance() { } +class KeyValue::HasBitSetters { + public: +}; + #if !defined(_MSC_VER) || _MSC_VER >= 1900 const int KeyValue::kKeyFieldNumber; const int KeyValue::kValueFieldNumber; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 KeyValue::KeyValue() - : ::google::protobuf::Message(), _internal_metadata_(NULL) { - ::google::protobuf::internal::InitSCC( - &protobuf_sdk_2eproto::scc_info_KeyValue.base); + : ::google::protobuf::Message(), _internal_metadata_(nullptr) { SharedCtor(); // @@protoc_insertion_point(constructor:agones.dev.sdk.KeyValue) } KeyValue::KeyValue(const KeyValue& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL) { + _internal_metadata_(nullptr) { _internal_metadata_.MergeFrom(from._internal_metadata_); key_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); if (from.key().size() > 0) { @@ -699,6 +700,8 @@ KeyValue::KeyValue(const KeyValue& from) } void KeyValue::SharedCtor() { + ::google::protobuf::internal::InitSCC( + &scc_info_KeyValue_sdk_2eproto.base); key_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); value_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } @@ -716,13 +719,8 @@ void KeyValue::SharedDtor() { void KeyValue::SetCachedSize(int size) const { _cached_size_.Set(size); } -const ::google::protobuf::Descriptor* KeyValue::descriptor() { - ::protobuf_sdk_2eproto::protobuf_AssignDescriptorsOnce(); - return ::protobuf_sdk_2eproto::file_level_metadata[kIndexInFileMessages].descriptor; -} - const KeyValue& KeyValue::default_instance() { - ::google::protobuf::internal::InitSCC(&protobuf_sdk_2eproto::scc_info_KeyValue.base); + ::google::protobuf::internal::InitSCC(&::scc_info_KeyValue_sdk_2eproto.base); return *internal_default_instance(); } @@ -738,9 +736,78 @@ void KeyValue::Clear() { _internal_metadata_.Clear(); } +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +const char* KeyValue::_InternalParse(const char* begin, const char* end, void* object, + ::google::protobuf::internal::ParseContext* ctx) { + auto msg = static_cast(object); + ::google::protobuf::int32 size; (void)size; + int depth; (void)depth; + ::google::protobuf::uint32 tag; + ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; + auto ptr = begin; + while (ptr < end) { + ptr = ::google::protobuf::io::Parse32(ptr, &tag); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + switch (tag >> 3) { + // string key = 1; + case 1: { + if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + ctx->extra_parse_data().SetFieldName("agones.dev.sdk.KeyValue.key"); + object = msg->mutable_key(); + if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { + parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; + goto string_till_end; + } + GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); + ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); + ptr += size; + break; + } + // string value = 2; + case 2: { + if (static_cast<::google::protobuf::uint8>(tag) != 18) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + ctx->extra_parse_data().SetFieldName("agones.dev.sdk.KeyValue.value"); + object = msg->mutable_value(); + if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { + parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; + goto string_till_end; + } + GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); + ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); + ptr += size; + break; + } + default: { + handle_unusual: + if ((tag & 7) == 4 || tag == 0) { + ctx->EndGroup(tag); + return ptr; + } + auto res = UnknownFieldParse(tag, {_InternalParse, msg}, + ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); + ptr = res.first; + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); + if (res.second) return ptr; + } + } // switch + } // while + return ptr; +string_till_end: + static_cast<::std::string*>(object)->clear(); + static_cast<::std::string*>(object)->reserve(size); + goto len_delim_till_end; +len_delim_till_end: + return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg}, + {parser_till_end, object}, size); +} +#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER bool KeyValue::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { -#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure +#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; // @@protoc_insertion_point(parse_start:agones.dev.sdk.KeyValue) for (;;) { @@ -750,8 +817,7 @@ bool KeyValue::MergePartialFromCodedStream( switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { // string key = 1; case 1: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(10u /* 10 & 0xFF */)) { + if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_key())); DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( @@ -766,8 +832,7 @@ bool KeyValue::MergePartialFromCodedStream( // string value = 2; case 2: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(18u /* 18 & 0xFF */)) { + if (static_cast< ::google::protobuf::uint8>(tag) == (18 & 0xFF)) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_value())); DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( @@ -799,6 +864,7 @@ bool KeyValue::MergePartialFromCodedStream( return false; #undef DO_ } +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER void KeyValue::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { @@ -826,16 +892,15 @@ void KeyValue::SerializeWithCachedSizes( 2, this->value(), output); } - if ((_internal_metadata_.have_unknown_fields() && ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) { + if (_internal_metadata_.have_unknown_fields()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( - (::google::protobuf::internal::GetProto3PreserveUnknownsDefault() ? _internal_metadata_.unknown_fields() : _internal_metadata_.default_instance()), output); + _internal_metadata_.unknown_fields(), output); } // @@protoc_insertion_point(serialize_end:agones.dev.sdk.KeyValue) } ::google::protobuf::uint8* KeyValue::InternalSerializeWithCachedSizesToArray( - bool deterministic, ::google::protobuf::uint8* target) const { - (void)deterministic; // Unused + ::google::protobuf::uint8* target) const { // @@protoc_insertion_point(serialize_to_array_start:agones.dev.sdk.KeyValue) ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; @@ -862,9 +927,9 @@ ::google::protobuf::uint8* KeyValue::InternalSerializeWithCachedSizesToArray( 2, this->value(), target); } - if ((_internal_metadata_.have_unknown_fields() && ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) { + if (_internal_metadata_.have_unknown_fields()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( - (::google::protobuf::internal::GetProto3PreserveUnknownsDefault() ? _internal_metadata_.unknown_fields() : _internal_metadata_.default_instance()), target); + _internal_metadata_.unknown_fields(), target); } // @@protoc_insertion_point(serialize_to_array_end:agones.dev.sdk.KeyValue) return target; @@ -874,11 +939,15 @@ size_t KeyValue::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:agones.dev.sdk.KeyValue) size_t total_size = 0; - if ((_internal_metadata_.have_unknown_fields() && ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) { + if (_internal_metadata_.have_unknown_fields()) { total_size += ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - (::google::protobuf::internal::GetProto3PreserveUnknownsDefault() ? _internal_metadata_.unknown_fields() : _internal_metadata_.default_instance())); + _internal_metadata_.unknown_fields()); } + ::google::protobuf::uint32 cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + // string key = 1; if (this->key().size() > 0) { total_size += 1 + @@ -902,9 +971,9 @@ void KeyValue::MergeFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:agones.dev.sdk.KeyValue) GOOGLE_DCHECK_NE(&from, this); const KeyValue* source = - ::google::protobuf::internal::DynamicCastToGenerated( + ::google::protobuf::DynamicCastToGenerated( &from); - if (source == NULL) { + if (source == nullptr) { // @@protoc_insertion_point(generalized_merge_from_cast_fail:agones.dev.sdk.KeyValue) ::google::protobuf::internal::ReflectionOps::Merge(from, this); } else { @@ -954,16 +1023,16 @@ void KeyValue::Swap(KeyValue* other) { } void KeyValue::InternalSwap(KeyValue* other) { using std::swap; + _internal_metadata_.Swap(&other->_internal_metadata_); key_.Swap(&other->key_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); value_.Swap(&other->value_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); - _internal_metadata_.Swap(&other->_internal_metadata_); } ::google::protobuf::Metadata KeyValue::GetMetadata() const { - protobuf_sdk_2eproto::protobuf_AssignDescriptorsOnce(); - return ::protobuf_sdk_2eproto::file_level_metadata[kIndexInFileMessages]; + ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_sdk_2eproto); + return ::file_level_metadata_sdk_2eproto[kIndexInFileMessages]; } @@ -971,27 +1040,29 @@ ::google::protobuf::Metadata KeyValue::GetMetadata() const { void Duration::InitAsDefaultInstance() { } +class Duration::HasBitSetters { + public: +}; + #if !defined(_MSC_VER) || _MSC_VER >= 1900 const int Duration::kSecondsFieldNumber; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 Duration::Duration() - : ::google::protobuf::Message(), _internal_metadata_(NULL) { - ::google::protobuf::internal::InitSCC( - &protobuf_sdk_2eproto::scc_info_Duration.base); + : ::google::protobuf::Message(), _internal_metadata_(nullptr) { SharedCtor(); // @@protoc_insertion_point(constructor:agones.dev.sdk.Duration) } Duration::Duration(const Duration& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL) { + _internal_metadata_(nullptr) { _internal_metadata_.MergeFrom(from._internal_metadata_); seconds_ = from.seconds_; // @@protoc_insertion_point(copy_constructor:agones.dev.sdk.Duration) } void Duration::SharedCtor() { - seconds_ = GOOGLE_LONGLONG(0); + seconds_ = PROTOBUF_LONGLONG(0); } Duration::~Duration() { @@ -1005,13 +1076,8 @@ void Duration::SharedDtor() { void Duration::SetCachedSize(int size) const { _cached_size_.Set(size); } -const ::google::protobuf::Descriptor* Duration::descriptor() { - ::protobuf_sdk_2eproto::protobuf_AssignDescriptorsOnce(); - return ::protobuf_sdk_2eproto::file_level_metadata[kIndexInFileMessages].descriptor; -} - const Duration& Duration::default_instance() { - ::google::protobuf::internal::InitSCC(&protobuf_sdk_2eproto::scc_info_Duration.base); + ::google::protobuf::internal::InitSCC(&::scc_info_Duration_sdk_2eproto.base); return *internal_default_instance(); } @@ -1022,13 +1088,50 @@ void Duration::Clear() { // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - seconds_ = GOOGLE_LONGLONG(0); + seconds_ = PROTOBUF_LONGLONG(0); _internal_metadata_.Clear(); } +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +const char* Duration::_InternalParse(const char* begin, const char* end, void* object, + ::google::protobuf::internal::ParseContext* ctx) { + auto msg = static_cast(object); + ::google::protobuf::int32 size; (void)size; + int depth; (void)depth; + ::google::protobuf::uint32 tag; + ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; + auto ptr = begin; + while (ptr < end) { + ptr = ::google::protobuf::io::Parse32(ptr, &tag); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + switch (tag >> 3) { + // int64 seconds = 1; + case 1: { + if (static_cast<::google::protobuf::uint8>(tag) != 8) goto handle_unusual; + msg->set_seconds(::google::protobuf::internal::ReadVarint(&ptr)); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + break; + } + default: { + handle_unusual: + if ((tag & 7) == 4 || tag == 0) { + ctx->EndGroup(tag); + return ptr; + } + auto res = UnknownFieldParse(tag, {_InternalParse, msg}, + ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); + ptr = res.first; + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); + if (res.second) return ptr; + } + } // switch + } // while + return ptr; +} +#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER bool Duration::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { -#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure +#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; // @@protoc_insertion_point(parse_start:agones.dev.sdk.Duration) for (;;) { @@ -1038,8 +1141,7 @@ bool Duration::MergePartialFromCodedStream( switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { // int64 seconds = 1; case 1: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(8u /* 8 & 0xFF */)) { + if (static_cast< ::google::protobuf::uint8>(tag) == (8 & 0xFF)) { DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< ::google::protobuf::int64, ::google::protobuf::internal::WireFormatLite::TYPE_INT64>( @@ -1069,6 +1171,7 @@ bool Duration::MergePartialFromCodedStream( return false; #undef DO_ } +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER void Duration::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { @@ -1081,16 +1184,15 @@ void Duration::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteInt64(1, this->seconds(), output); } - if ((_internal_metadata_.have_unknown_fields() && ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) { + if (_internal_metadata_.have_unknown_fields()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( - (::google::protobuf::internal::GetProto3PreserveUnknownsDefault() ? _internal_metadata_.unknown_fields() : _internal_metadata_.default_instance()), output); + _internal_metadata_.unknown_fields(), output); } // @@protoc_insertion_point(serialize_end:agones.dev.sdk.Duration) } ::google::protobuf::uint8* Duration::InternalSerializeWithCachedSizesToArray( - bool deterministic, ::google::protobuf::uint8* target) const { - (void)deterministic; // Unused + ::google::protobuf::uint8* target) const { // @@protoc_insertion_point(serialize_to_array_start:agones.dev.sdk.Duration) ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; @@ -1100,9 +1202,9 @@ ::google::protobuf::uint8* Duration::InternalSerializeWithCachedSizesToArray( target = ::google::protobuf::internal::WireFormatLite::WriteInt64ToArray(1, this->seconds(), target); } - if ((_internal_metadata_.have_unknown_fields() && ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) { + if (_internal_metadata_.have_unknown_fields()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( - (::google::protobuf::internal::GetProto3PreserveUnknownsDefault() ? _internal_metadata_.unknown_fields() : _internal_metadata_.default_instance()), target); + _internal_metadata_.unknown_fields(), target); } // @@protoc_insertion_point(serialize_to_array_end:agones.dev.sdk.Duration) return target; @@ -1112,11 +1214,15 @@ size_t Duration::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:agones.dev.sdk.Duration) size_t total_size = 0; - if ((_internal_metadata_.have_unknown_fields() && ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) { + if (_internal_metadata_.have_unknown_fields()) { total_size += ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - (::google::protobuf::internal::GetProto3PreserveUnknownsDefault() ? _internal_metadata_.unknown_fields() : _internal_metadata_.default_instance())); + _internal_metadata_.unknown_fields()); } + ::google::protobuf::uint32 cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + // int64 seconds = 1; if (this->seconds() != 0) { total_size += 1 + @@ -1133,9 +1239,9 @@ void Duration::MergeFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:agones.dev.sdk.Duration) GOOGLE_DCHECK_NE(&from, this); const Duration* source = - ::google::protobuf::internal::DynamicCastToGenerated( + ::google::protobuf::DynamicCastToGenerated( &from); - if (source == NULL) { + if (source == nullptr) { // @@protoc_insertion_point(generalized_merge_from_cast_fail:agones.dev.sdk.Duration) ::google::protobuf::internal::ReflectionOps::Merge(from, this); } else { @@ -1180,54 +1286,106 @@ void Duration::Swap(Duration* other) { } void Duration::InternalSwap(Duration* other) { using std::swap; - swap(seconds_, other->seconds_); _internal_metadata_.Swap(&other->_internal_metadata_); + swap(seconds_, other->seconds_); } ::google::protobuf::Metadata Duration::GetMetadata() const { - protobuf_sdk_2eproto::protobuf_AssignDescriptorsOnce(); - return ::protobuf_sdk_2eproto::file_level_metadata[kIndexInFileMessages]; + ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_sdk_2eproto); + return ::file_level_metadata_sdk_2eproto[kIndexInFileMessages]; } // =================================================================== GameServer_ObjectMeta_AnnotationsEntry_DoNotUse::GameServer_ObjectMeta_AnnotationsEntry_DoNotUse() {} -GameServer_ObjectMeta_AnnotationsEntry_DoNotUse::GameServer_ObjectMeta_AnnotationsEntry_DoNotUse(::google::protobuf::Arena* arena) : SuperType(arena) {} +GameServer_ObjectMeta_AnnotationsEntry_DoNotUse::GameServer_ObjectMeta_AnnotationsEntry_DoNotUse(::google::protobuf::Arena* arena) + : SuperType(arena) {} void GameServer_ObjectMeta_AnnotationsEntry_DoNotUse::MergeFrom(const GameServer_ObjectMeta_AnnotationsEntry_DoNotUse& other) { MergeFromInternal(other); } ::google::protobuf::Metadata GameServer_ObjectMeta_AnnotationsEntry_DoNotUse::GetMetadata() const { - ::protobuf_sdk_2eproto::protobuf_AssignDescriptorsOnce(); - return ::protobuf_sdk_2eproto::file_level_metadata[3]; + ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_sdk_2eproto); + return ::file_level_metadata_sdk_2eproto[3]; } void GameServer_ObjectMeta_AnnotationsEntry_DoNotUse::MergeFrom( const ::google::protobuf::Message& other) { ::google::protobuf::Message::MergeFrom(other); } +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +bool GameServer_ObjectMeta_AnnotationsEntry_DoNotUse::_ParseMap(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx) { + using MF = ::google::protobuf::internal::MapField< + GameServer_ObjectMeta_AnnotationsEntry_DoNotUse, EntryKeyType, EntryValueType, + kEntryKeyFieldType, kEntryValueFieldType, + kEntryDefaultEnumValue>; + auto mf = static_cast(object); + Parser> parser(mf); +#define DO_(x) if (!(x)) return false + DO_(parser.ParseMap(begin, end)); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + parser.key().data(), static_cast(parser.key().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "agones.dev.sdk.GameServer.ObjectMeta.AnnotationsEntry.key")); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + parser.value().data(), static_cast(parser.value().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "agones.dev.sdk.GameServer.ObjectMeta.AnnotationsEntry.value")); +#undef DO_ + return true; +} +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + // =================================================================== GameServer_ObjectMeta_LabelsEntry_DoNotUse::GameServer_ObjectMeta_LabelsEntry_DoNotUse() {} -GameServer_ObjectMeta_LabelsEntry_DoNotUse::GameServer_ObjectMeta_LabelsEntry_DoNotUse(::google::protobuf::Arena* arena) : SuperType(arena) {} +GameServer_ObjectMeta_LabelsEntry_DoNotUse::GameServer_ObjectMeta_LabelsEntry_DoNotUse(::google::protobuf::Arena* arena) + : SuperType(arena) {} void GameServer_ObjectMeta_LabelsEntry_DoNotUse::MergeFrom(const GameServer_ObjectMeta_LabelsEntry_DoNotUse& other) { MergeFromInternal(other); } ::google::protobuf::Metadata GameServer_ObjectMeta_LabelsEntry_DoNotUse::GetMetadata() const { - ::protobuf_sdk_2eproto::protobuf_AssignDescriptorsOnce(); - return ::protobuf_sdk_2eproto::file_level_metadata[4]; + ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_sdk_2eproto); + return ::file_level_metadata_sdk_2eproto[4]; } void GameServer_ObjectMeta_LabelsEntry_DoNotUse::MergeFrom( const ::google::protobuf::Message& other) { ::google::protobuf::Message::MergeFrom(other); } +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +bool GameServer_ObjectMeta_LabelsEntry_DoNotUse::_ParseMap(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx) { + using MF = ::google::protobuf::internal::MapField< + GameServer_ObjectMeta_LabelsEntry_DoNotUse, EntryKeyType, EntryValueType, + kEntryKeyFieldType, kEntryValueFieldType, + kEntryDefaultEnumValue>; + auto mf = static_cast(object); + Parser> parser(mf); +#define DO_(x) if (!(x)) return false + DO_(parser.ParseMap(begin, end)); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + parser.key().data(), static_cast(parser.key().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "agones.dev.sdk.GameServer.ObjectMeta.LabelsEntry.key")); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + parser.value().data(), static_cast(parser.value().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "agones.dev.sdk.GameServer.ObjectMeta.LabelsEntry.value")); +#undef DO_ + return true; +} +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + // =================================================================== void GameServer_ObjectMeta::InitAsDefaultInstance() { } +class GameServer_ObjectMeta::HasBitSetters { + public: +}; + #if !defined(_MSC_VER) || _MSC_VER >= 1900 const int GameServer_ObjectMeta::kNameFieldNumber; const int GameServer_ObjectMeta::kNamespaceFieldNumber; @@ -1241,15 +1399,13 @@ const int GameServer_ObjectMeta::kLabelsFieldNumber; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 GameServer_ObjectMeta::GameServer_ObjectMeta() - : ::google::protobuf::Message(), _internal_metadata_(NULL) { - ::google::protobuf::internal::InitSCC( - &protobuf_sdk_2eproto::scc_info_GameServer_ObjectMeta.base); + : ::google::protobuf::Message(), _internal_metadata_(nullptr) { SharedCtor(); // @@protoc_insertion_point(constructor:agones.dev.sdk.GameServer.ObjectMeta) } GameServer_ObjectMeta::GameServer_ObjectMeta(const GameServer_ObjectMeta& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL) { + _internal_metadata_(nullptr) { _internal_metadata_.MergeFrom(from._internal_metadata_); annotations_.MergeFrom(from.annotations_); labels_.MergeFrom(from.labels_); @@ -1276,6 +1432,8 @@ GameServer_ObjectMeta::GameServer_ObjectMeta(const GameServer_ObjectMeta& from) } void GameServer_ObjectMeta::SharedCtor() { + ::google::protobuf::internal::InitSCC( + &scc_info_GameServer_ObjectMeta_sdk_2eproto.base); name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); namespace__.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); uid_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); @@ -1300,13 +1458,8 @@ void GameServer_ObjectMeta::SharedDtor() { void GameServer_ObjectMeta::SetCachedSize(int size) const { _cached_size_.Set(size); } -const ::google::protobuf::Descriptor* GameServer_ObjectMeta::descriptor() { - ::protobuf_sdk_2eproto::protobuf_AssignDescriptorsOnce(); - return ::protobuf_sdk_2eproto::file_level_metadata[kIndexInFileMessages].descriptor; -} - const GameServer_ObjectMeta& GameServer_ObjectMeta::default_instance() { - ::google::protobuf::internal::InitSCC(&protobuf_sdk_2eproto::scc_info_GameServer_ObjectMeta.base); + ::google::protobuf::internal::InitSCC(&::scc_info_GameServer_ObjectMeta_sdk_2eproto.base); return *internal_default_instance(); } @@ -1329,9 +1482,169 @@ void GameServer_ObjectMeta::Clear() { _internal_metadata_.Clear(); } +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +const char* GameServer_ObjectMeta::_InternalParse(const char* begin, const char* end, void* object, + ::google::protobuf::internal::ParseContext* ctx) { + auto msg = static_cast(object); + ::google::protobuf::int32 size; (void)size; + int depth; (void)depth; + ::google::protobuf::uint32 tag; + ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; + auto ptr = begin; + while (ptr < end) { + ptr = ::google::protobuf::io::Parse32(ptr, &tag); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + switch (tag >> 3) { + // string name = 1; + case 1: { + if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + ctx->extra_parse_data().SetFieldName("agones.dev.sdk.GameServer.ObjectMeta.name"); + object = msg->mutable_name(); + if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { + parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; + goto string_till_end; + } + GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); + ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); + ptr += size; + break; + } + // string namespace = 2; + case 2: { + if (static_cast<::google::protobuf::uint8>(tag) != 18) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + ctx->extra_parse_data().SetFieldName("agones.dev.sdk.GameServer.ObjectMeta.namespace"); + object = msg->mutable_namespace_(); + if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { + parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; + goto string_till_end; + } + GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); + ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); + ptr += size; + break; + } + // string uid = 3; + case 3: { + if (static_cast<::google::protobuf::uint8>(tag) != 26) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + ctx->extra_parse_data().SetFieldName("agones.dev.sdk.GameServer.ObjectMeta.uid"); + object = msg->mutable_uid(); + if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { + parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; + goto string_till_end; + } + GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); + ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); + ptr += size; + break; + } + // string resource_version = 4; + case 4: { + if (static_cast<::google::protobuf::uint8>(tag) != 34) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + ctx->extra_parse_data().SetFieldName("agones.dev.sdk.GameServer.ObjectMeta.resource_version"); + object = msg->mutable_resource_version(); + if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { + parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; + goto string_till_end; + } + GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); + ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); + ptr += size; + break; + } + // int64 generation = 5; + case 5: { + if (static_cast<::google::protobuf::uint8>(tag) != 40) goto handle_unusual; + msg->set_generation(::google::protobuf::internal::ReadVarint(&ptr)); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + break; + } + // int64 creation_timestamp = 6; + case 6: { + if (static_cast<::google::protobuf::uint8>(tag) != 48) goto handle_unusual; + msg->set_creation_timestamp(::google::protobuf::internal::ReadVarint(&ptr)); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + break; + } + // int64 deletion_timestamp = 7; + case 7: { + if (static_cast<::google::protobuf::uint8>(tag) != 56) goto handle_unusual; + msg->set_deletion_timestamp(::google::protobuf::internal::ReadVarint(&ptr)); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + break; + } + // map annotations = 8; + case 8: { + if (static_cast<::google::protobuf::uint8>(tag) != 66) goto handle_unusual; + do { + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + parser_till_end = ::google::protobuf::internal::SlowMapEntryParser; + auto parse_map = ::agones::dev::sdk::GameServer_ObjectMeta_AnnotationsEntry_DoNotUse::_ParseMap; + ctx->extra_parse_data().payload.clear(); + ctx->extra_parse_data().parse_map = parse_map; + object = &msg->annotations_; + if (size > end - ptr) goto len_delim_till_end; + auto newend = ptr + size; + GOOGLE_PROTOBUF_PARSER_ASSERT(parse_map(ptr, newend, object, ctx)); + ptr = newend; + if (ptr >= end) break; + } while ((::google::protobuf::io::UnalignedLoad<::google::protobuf::uint64>(ptr) & 255) == 66 && (ptr += 1)); + break; + } + // map labels = 9; + case 9: { + if (static_cast<::google::protobuf::uint8>(tag) != 74) goto handle_unusual; + do { + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + parser_till_end = ::google::protobuf::internal::SlowMapEntryParser; + auto parse_map = ::agones::dev::sdk::GameServer_ObjectMeta_LabelsEntry_DoNotUse::_ParseMap; + ctx->extra_parse_data().payload.clear(); + ctx->extra_parse_data().parse_map = parse_map; + object = &msg->labels_; + if (size > end - ptr) goto len_delim_till_end; + auto newend = ptr + size; + GOOGLE_PROTOBUF_PARSER_ASSERT(parse_map(ptr, newend, object, ctx)); + ptr = newend; + if (ptr >= end) break; + } while ((::google::protobuf::io::UnalignedLoad<::google::protobuf::uint64>(ptr) & 255) == 74 && (ptr += 1)); + break; + } + default: { + handle_unusual: + if ((tag & 7) == 4 || tag == 0) { + ctx->EndGroup(tag); + return ptr; + } + auto res = UnknownFieldParse(tag, {_InternalParse, msg}, + ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); + ptr = res.first; + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); + if (res.second) return ptr; + } + } // switch + } // while + return ptr; +string_till_end: + static_cast<::std::string*>(object)->clear(); + static_cast<::std::string*>(object)->reserve(size); + goto len_delim_till_end; +len_delim_till_end: + return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg}, + {parser_till_end, object}, size); +} +#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER bool GameServer_ObjectMeta::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { -#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure +#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; // @@protoc_insertion_point(parse_start:agones.dev.sdk.GameServer.ObjectMeta) for (;;) { @@ -1341,8 +1654,7 @@ bool GameServer_ObjectMeta::MergePartialFromCodedStream( switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { // string name = 1; case 1: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(10u /* 10 & 0xFF */)) { + if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_name())); DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( @@ -1357,8 +1669,7 @@ bool GameServer_ObjectMeta::MergePartialFromCodedStream( // string namespace = 2; case 2: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(18u /* 18 & 0xFF */)) { + if (static_cast< ::google::protobuf::uint8>(tag) == (18 & 0xFF)) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_namespace_())); DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( @@ -1373,8 +1684,7 @@ bool GameServer_ObjectMeta::MergePartialFromCodedStream( // string uid = 3; case 3: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(26u /* 26 & 0xFF */)) { + if (static_cast< ::google::protobuf::uint8>(tag) == (26 & 0xFF)) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_uid())); DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( @@ -1389,8 +1699,7 @@ bool GameServer_ObjectMeta::MergePartialFromCodedStream( // string resource_version = 4; case 4: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(34u /* 34 & 0xFF */)) { + if (static_cast< ::google::protobuf::uint8>(tag) == (34 & 0xFF)) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_resource_version())); DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( @@ -1405,8 +1714,7 @@ bool GameServer_ObjectMeta::MergePartialFromCodedStream( // int64 generation = 5; case 5: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(40u /* 40 & 0xFF */)) { + if (static_cast< ::google::protobuf::uint8>(tag) == (40 & 0xFF)) { DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< ::google::protobuf::int64, ::google::protobuf::internal::WireFormatLite::TYPE_INT64>( @@ -1419,8 +1727,7 @@ bool GameServer_ObjectMeta::MergePartialFromCodedStream( // int64 creation_timestamp = 6; case 6: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(48u /* 48 & 0xFF */)) { + if (static_cast< ::google::protobuf::uint8>(tag) == (48 & 0xFF)) { DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< ::google::protobuf::int64, ::google::protobuf::internal::WireFormatLite::TYPE_INT64>( @@ -1433,8 +1740,7 @@ bool GameServer_ObjectMeta::MergePartialFromCodedStream( // int64 deletion_timestamp = 7; case 7: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(56u /* 56 & 0xFF */)) { + if (static_cast< ::google::protobuf::uint8>(tag) == (56 & 0xFF)) { DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< ::google::protobuf::int64, ::google::protobuf::internal::WireFormatLite::TYPE_INT64>( @@ -1447,8 +1753,7 @@ bool GameServer_ObjectMeta::MergePartialFromCodedStream( // map annotations = 8; case 8: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(66u /* 66 & 0xFF */)) { + if (static_cast< ::google::protobuf::uint8>(tag) == (66 & 0xFF)) { GameServer_ObjectMeta_AnnotationsEntry_DoNotUse::Parser< ::google::protobuf::internal::MapField< GameServer_ObjectMeta_AnnotationsEntry_DoNotUse, ::std::string, ::std::string, @@ -1474,8 +1779,7 @@ bool GameServer_ObjectMeta::MergePartialFromCodedStream( // map labels = 9; case 9: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(74u /* 74 & 0xFF */)) { + if (static_cast< ::google::protobuf::uint8>(tag) == (74 & 0xFF)) { GameServer_ObjectMeta_LabelsEntry_DoNotUse::Parser< ::google::protobuf::internal::MapField< GameServer_ObjectMeta_LabelsEntry_DoNotUse, ::std::string, ::std::string, @@ -1518,6 +1822,7 @@ bool GameServer_ObjectMeta::MergePartialFromCodedStream( return false; #undef DO_ } +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER void GameServer_ObjectMeta::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { @@ -1613,22 +1918,18 @@ void GameServer_ObjectMeta::SerializeWithCachedSizes( ::std::sort(&items[0], &items[static_cast(n)], Less()); ::std::unique_ptr entry; for (size_type i = 0; i < n; i++) { - entry.reset(annotations_.NewEntryWrapper( - items[static_cast(i)]->first, items[static_cast(i)]->second)); - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 8, *entry, output); - Utf8Check::Check(items[static_cast(i)]); + entry.reset(annotations_.NewEntryWrapper(items[static_cast(i)]->first, items[static_cast(i)]->second)); + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(8, *entry, output); + Utf8Check::Check(&(*items[static_cast(i)])); } } else { ::std::unique_ptr entry; for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator it = this->annotations().begin(); it != this->annotations().end(); ++it) { - entry.reset(annotations_.NewEntryWrapper( - it->first, it->second)); - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 8, *entry, output); - Utf8Check::Check(&*it); + entry.reset(annotations_.NewEntryWrapper(it->first, it->second)); + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(8, *entry, output); + Utf8Check::Check(&(*it)); } } } @@ -1666,36 +1967,31 @@ void GameServer_ObjectMeta::SerializeWithCachedSizes( ::std::sort(&items[0], &items[static_cast(n)], Less()); ::std::unique_ptr entry; for (size_type i = 0; i < n; i++) { - entry.reset(labels_.NewEntryWrapper( - items[static_cast(i)]->first, items[static_cast(i)]->second)); - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 9, *entry, output); - Utf8Check::Check(items[static_cast(i)]); + entry.reset(labels_.NewEntryWrapper(items[static_cast(i)]->first, items[static_cast(i)]->second)); + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(9, *entry, output); + Utf8Check::Check(&(*items[static_cast(i)])); } } else { ::std::unique_ptr entry; for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator it = this->labels().begin(); it != this->labels().end(); ++it) { - entry.reset(labels_.NewEntryWrapper( - it->first, it->second)); - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 9, *entry, output); - Utf8Check::Check(&*it); + entry.reset(labels_.NewEntryWrapper(it->first, it->second)); + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(9, *entry, output); + Utf8Check::Check(&(*it)); } } } - if ((_internal_metadata_.have_unknown_fields() && ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) { + if (_internal_metadata_.have_unknown_fields()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( - (::google::protobuf::internal::GetProto3PreserveUnknownsDefault() ? _internal_metadata_.unknown_fields() : _internal_metadata_.default_instance()), output); + _internal_metadata_.unknown_fields(), output); } // @@protoc_insertion_point(serialize_end:agones.dev.sdk.GameServer.ObjectMeta) } ::google::protobuf::uint8* GameServer_ObjectMeta::InternalSerializeWithCachedSizesToArray( - bool deterministic, ::google::protobuf::uint8* target) const { - (void)deterministic; // Unused + ::google::protobuf::uint8* target) const { // @@protoc_insertion_point(serialize_to_array_start:agones.dev.sdk.GameServer.ObjectMeta) ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; @@ -1778,7 +2074,7 @@ ::google::protobuf::uint8* GameServer_ObjectMeta::InternalSerializeWithCachedSiz } }; - if (deterministic && + if (false && this->annotations().size() > 1) { ::std::unique_ptr items( new SortItem[this->annotations().size()]); @@ -1792,26 +2088,18 @@ ::google::protobuf::uint8* GameServer_ObjectMeta::InternalSerializeWithCachedSiz ::std::sort(&items[0], &items[static_cast(n)], Less()); ::std::unique_ptr entry; for (size_type i = 0; i < n; i++) { - entry.reset(annotations_.NewEntryWrapper( - items[static_cast(i)]->first, items[static_cast(i)]->second)); - target = ::google::protobuf::internal::WireFormatLite:: - InternalWriteMessageNoVirtualToArray( - 8, *entry, deterministic, target); -; - Utf8Check::Check(items[static_cast(i)]); + entry.reset(annotations_.NewEntryWrapper(items[static_cast(i)]->first, items[static_cast(i)]->second)); + target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessageNoVirtualToArray(8, *entry, target); + Utf8Check::Check(&(*items[static_cast(i)])); } } else { ::std::unique_ptr entry; for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator it = this->annotations().begin(); it != this->annotations().end(); ++it) { - entry.reset(annotations_.NewEntryWrapper( - it->first, it->second)); - target = ::google::protobuf::internal::WireFormatLite:: - InternalWriteMessageNoVirtualToArray( - 8, *entry, deterministic, target); -; - Utf8Check::Check(&*it); + entry.reset(annotations_.NewEntryWrapper(it->first, it->second)); + target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessageNoVirtualToArray(8, *entry, target); + Utf8Check::Check(&(*it)); } } } @@ -1835,7 +2123,7 @@ ::google::protobuf::uint8* GameServer_ObjectMeta::InternalSerializeWithCachedSiz } }; - if (deterministic && + if (false && this->labels().size() > 1) { ::std::unique_ptr items( new SortItem[this->labels().size()]); @@ -1849,33 +2137,25 @@ ::google::protobuf::uint8* GameServer_ObjectMeta::InternalSerializeWithCachedSiz ::std::sort(&items[0], &items[static_cast(n)], Less()); ::std::unique_ptr entry; for (size_type i = 0; i < n; i++) { - entry.reset(labels_.NewEntryWrapper( - items[static_cast(i)]->first, items[static_cast(i)]->second)); - target = ::google::protobuf::internal::WireFormatLite:: - InternalWriteMessageNoVirtualToArray( - 9, *entry, deterministic, target); -; - Utf8Check::Check(items[static_cast(i)]); + entry.reset(labels_.NewEntryWrapper(items[static_cast(i)]->first, items[static_cast(i)]->second)); + target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessageNoVirtualToArray(9, *entry, target); + Utf8Check::Check(&(*items[static_cast(i)])); } } else { ::std::unique_ptr entry; for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator it = this->labels().begin(); it != this->labels().end(); ++it) { - entry.reset(labels_.NewEntryWrapper( - it->first, it->second)); - target = ::google::protobuf::internal::WireFormatLite:: - InternalWriteMessageNoVirtualToArray( - 9, *entry, deterministic, target); -; - Utf8Check::Check(&*it); + entry.reset(labels_.NewEntryWrapper(it->first, it->second)); + target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessageNoVirtualToArray(9, *entry, target); + Utf8Check::Check(&(*it)); } } } - if ((_internal_metadata_.have_unknown_fields() && ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) { + if (_internal_metadata_.have_unknown_fields()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( - (::google::protobuf::internal::GetProto3PreserveUnknownsDefault() ? _internal_metadata_.unknown_fields() : _internal_metadata_.default_instance()), target); + _internal_metadata_.unknown_fields(), target); } // @@protoc_insertion_point(serialize_to_array_end:agones.dev.sdk.GameServer.ObjectMeta) return target; @@ -1885,11 +2165,15 @@ size_t GameServer_ObjectMeta::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:agones.dev.sdk.GameServer.ObjectMeta) size_t total_size = 0; - if ((_internal_metadata_.have_unknown_fields() && ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) { + if (_internal_metadata_.have_unknown_fields()) { total_size += ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - (::google::protobuf::internal::GetProto3PreserveUnknownsDefault() ? _internal_metadata_.unknown_fields() : _internal_metadata_.default_instance())); + _internal_metadata_.unknown_fields()); } + ::google::protobuf::uint32 cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + // map annotations = 8; total_size += 1 * ::google::protobuf::internal::FromIntSize(this->annotations_size()); @@ -1976,9 +2260,9 @@ void GameServer_ObjectMeta::MergeFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:agones.dev.sdk.GameServer.ObjectMeta) GOOGLE_DCHECK_NE(&from, this); const GameServer_ObjectMeta* source = - ::google::protobuf::internal::DynamicCastToGenerated( + ::google::protobuf::DynamicCastToGenerated( &from); - if (source == NULL) { + if (source == nullptr) { // @@protoc_insertion_point(generalized_merge_from_cast_fail:agones.dev.sdk.GameServer.ObjectMeta) ::google::protobuf::internal::ReflectionOps::Merge(from, this); } else { @@ -2047,6 +2331,7 @@ void GameServer_ObjectMeta::Swap(GameServer_ObjectMeta* other) { } void GameServer_ObjectMeta::InternalSwap(GameServer_ObjectMeta* other) { using std::swap; + _internal_metadata_.Swap(&other->_internal_metadata_); annotations_.Swap(&other->annotations_); labels_.Swap(&other->labels_); name_.Swap(&other->name_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), @@ -2060,12 +2345,11 @@ void GameServer_ObjectMeta::InternalSwap(GameServer_ObjectMeta* other) { swap(generation_, other->generation_); swap(creation_timestamp_, other->creation_timestamp_); swap(deletion_timestamp_, other->deletion_timestamp_); - _internal_metadata_.Swap(&other->_internal_metadata_); } ::google::protobuf::Metadata GameServer_ObjectMeta::GetMetadata() const { - protobuf_sdk_2eproto::protobuf_AssignDescriptorsOnce(); - return ::protobuf_sdk_2eproto::file_level_metadata[kIndexInFileMessages]; + ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_sdk_2eproto); + return ::file_level_metadata_sdk_2eproto[kIndexInFileMessages]; } @@ -2073,6 +2357,10 @@ ::google::protobuf::Metadata GameServer_ObjectMeta::GetMetadata() const { void GameServer_Spec_Health::InitAsDefaultInstance() { } +class GameServer_Spec_Health::HasBitSetters { + public: +}; + #if !defined(_MSC_VER) || _MSC_VER >= 1900 const int GameServer_Spec_Health::kDisabledFieldNumber; const int GameServer_Spec_Health::kPeriodSecondsFieldNumber; @@ -2081,15 +2369,13 @@ const int GameServer_Spec_Health::kInitialDelaySecondsFieldNumber; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 GameServer_Spec_Health::GameServer_Spec_Health() - : ::google::protobuf::Message(), _internal_metadata_(NULL) { - ::google::protobuf::internal::InitSCC( - &protobuf_sdk_2eproto::scc_info_GameServer_Spec_Health.base); + : ::google::protobuf::Message(), _internal_metadata_(nullptr) { SharedCtor(); // @@protoc_insertion_point(constructor:agones.dev.sdk.GameServer.Spec.Health) } GameServer_Spec_Health::GameServer_Spec_Health(const GameServer_Spec_Health& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL) { + _internal_metadata_(nullptr) { _internal_metadata_.MergeFrom(from._internal_metadata_); ::memcpy(&disabled_, &from.disabled_, static_cast(reinterpret_cast(&initial_delay_seconds_) - @@ -2114,13 +2400,8 @@ void GameServer_Spec_Health::SharedDtor() { void GameServer_Spec_Health::SetCachedSize(int size) const { _cached_size_.Set(size); } -const ::google::protobuf::Descriptor* GameServer_Spec_Health::descriptor() { - ::protobuf_sdk_2eproto::protobuf_AssignDescriptorsOnce(); - return ::protobuf_sdk_2eproto::file_level_metadata[kIndexInFileMessages].descriptor; -} - const GameServer_Spec_Health& GameServer_Spec_Health::default_instance() { - ::google::protobuf::internal::InitSCC(&protobuf_sdk_2eproto::scc_info_GameServer_Spec_Health.base); + ::google::protobuf::internal::InitSCC(&::scc_info_GameServer_Spec_Health_sdk_2eproto.base); return *internal_default_instance(); } @@ -2137,9 +2418,67 @@ void GameServer_Spec_Health::Clear() { _internal_metadata_.Clear(); } +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +const char* GameServer_Spec_Health::_InternalParse(const char* begin, const char* end, void* object, + ::google::protobuf::internal::ParseContext* ctx) { + auto msg = static_cast(object); + ::google::protobuf::int32 size; (void)size; + int depth; (void)depth; + ::google::protobuf::uint32 tag; + ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; + auto ptr = begin; + while (ptr < end) { + ptr = ::google::protobuf::io::Parse32(ptr, &tag); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + switch (tag >> 3) { + // bool disabled = 1; + case 1: { + if (static_cast<::google::protobuf::uint8>(tag) != 8) goto handle_unusual; + msg->set_disabled(::google::protobuf::internal::ReadVarint(&ptr)); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + break; + } + // int32 period_seconds = 2; + case 2: { + if (static_cast<::google::protobuf::uint8>(tag) != 16) goto handle_unusual; + msg->set_period_seconds(::google::protobuf::internal::ReadVarint(&ptr)); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + break; + } + // int32 failure_threshold = 3; + case 3: { + if (static_cast<::google::protobuf::uint8>(tag) != 24) goto handle_unusual; + msg->set_failure_threshold(::google::protobuf::internal::ReadVarint(&ptr)); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + break; + } + // int32 initial_delay_seconds = 4; + case 4: { + if (static_cast<::google::protobuf::uint8>(tag) != 32) goto handle_unusual; + msg->set_initial_delay_seconds(::google::protobuf::internal::ReadVarint(&ptr)); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + break; + } + default: { + handle_unusual: + if ((tag & 7) == 4 || tag == 0) { + ctx->EndGroup(tag); + return ptr; + } + auto res = UnknownFieldParse(tag, {_InternalParse, msg}, + ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); + ptr = res.first; + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); + if (res.second) return ptr; + } + } // switch + } // while + return ptr; +} +#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER bool GameServer_Spec_Health::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { -#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure +#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; // @@protoc_insertion_point(parse_start:agones.dev.sdk.GameServer.Spec.Health) for (;;) { @@ -2149,8 +2488,7 @@ bool GameServer_Spec_Health::MergePartialFromCodedStream( switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { // bool disabled = 1; case 1: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(8u /* 8 & 0xFF */)) { + if (static_cast< ::google::protobuf::uint8>(tag) == (8 & 0xFF)) { DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( @@ -2163,8 +2501,7 @@ bool GameServer_Spec_Health::MergePartialFromCodedStream( // int32 period_seconds = 2; case 2: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(16u /* 16 & 0xFF */)) { + if (static_cast< ::google::protobuf::uint8>(tag) == (16 & 0xFF)) { DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( @@ -2177,8 +2514,7 @@ bool GameServer_Spec_Health::MergePartialFromCodedStream( // int32 failure_threshold = 3; case 3: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(24u /* 24 & 0xFF */)) { + if (static_cast< ::google::protobuf::uint8>(tag) == (24 & 0xFF)) { DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( @@ -2191,8 +2527,7 @@ bool GameServer_Spec_Health::MergePartialFromCodedStream( // int32 initial_delay_seconds = 4; case 4: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(32u /* 32 & 0xFF */)) { + if (static_cast< ::google::protobuf::uint8>(tag) == (32 & 0xFF)) { DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( @@ -2222,6 +2557,7 @@ bool GameServer_Spec_Health::MergePartialFromCodedStream( return false; #undef DO_ } +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER void GameServer_Spec_Health::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { @@ -2249,16 +2585,15 @@ void GameServer_Spec_Health::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteInt32(4, this->initial_delay_seconds(), output); } - if ((_internal_metadata_.have_unknown_fields() && ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) { + if (_internal_metadata_.have_unknown_fields()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( - (::google::protobuf::internal::GetProto3PreserveUnknownsDefault() ? _internal_metadata_.unknown_fields() : _internal_metadata_.default_instance()), output); + _internal_metadata_.unknown_fields(), output); } // @@protoc_insertion_point(serialize_end:agones.dev.sdk.GameServer.Spec.Health) } ::google::protobuf::uint8* GameServer_Spec_Health::InternalSerializeWithCachedSizesToArray( - bool deterministic, ::google::protobuf::uint8* target) const { - (void)deterministic; // Unused + ::google::protobuf::uint8* target) const { // @@protoc_insertion_point(serialize_to_array_start:agones.dev.sdk.GameServer.Spec.Health) ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; @@ -2283,9 +2618,9 @@ ::google::protobuf::uint8* GameServer_Spec_Health::InternalSerializeWithCachedSi target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(4, this->initial_delay_seconds(), target); } - if ((_internal_metadata_.have_unknown_fields() && ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) { + if (_internal_metadata_.have_unknown_fields()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( - (::google::protobuf::internal::GetProto3PreserveUnknownsDefault() ? _internal_metadata_.unknown_fields() : _internal_metadata_.default_instance()), target); + _internal_metadata_.unknown_fields(), target); } // @@protoc_insertion_point(serialize_to_array_end:agones.dev.sdk.GameServer.Spec.Health) return target; @@ -2295,11 +2630,15 @@ size_t GameServer_Spec_Health::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:agones.dev.sdk.GameServer.Spec.Health) size_t total_size = 0; - if ((_internal_metadata_.have_unknown_fields() && ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) { + if (_internal_metadata_.have_unknown_fields()) { total_size += ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - (::google::protobuf::internal::GetProto3PreserveUnknownsDefault() ? _internal_metadata_.unknown_fields() : _internal_metadata_.default_instance())); + _internal_metadata_.unknown_fields()); } + ::google::protobuf::uint32 cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + // bool disabled = 1; if (this->disabled() != 0) { total_size += 1 + 1; @@ -2335,9 +2674,9 @@ void GameServer_Spec_Health::MergeFrom(const ::google::protobuf::Message& from) // @@protoc_insertion_point(generalized_merge_from_start:agones.dev.sdk.GameServer.Spec.Health) GOOGLE_DCHECK_NE(&from, this); const GameServer_Spec_Health* source = - ::google::protobuf::internal::DynamicCastToGenerated( + ::google::protobuf::DynamicCastToGenerated( &from); - if (source == NULL) { + if (source == nullptr) { // @@protoc_insertion_point(generalized_merge_from_cast_fail:agones.dev.sdk.GameServer.Spec.Health) ::google::protobuf::internal::ReflectionOps::Merge(from, this); } else { @@ -2391,16 +2730,16 @@ void GameServer_Spec_Health::Swap(GameServer_Spec_Health* other) { } void GameServer_Spec_Health::InternalSwap(GameServer_Spec_Health* other) { using std::swap; + _internal_metadata_.Swap(&other->_internal_metadata_); swap(disabled_, other->disabled_); swap(period_seconds_, other->period_seconds_); swap(failure_threshold_, other->failure_threshold_); swap(initial_delay_seconds_, other->initial_delay_seconds_); - _internal_metadata_.Swap(&other->_internal_metadata_); } ::google::protobuf::Metadata GameServer_Spec_Health::GetMetadata() const { - protobuf_sdk_2eproto::protobuf_AssignDescriptorsOnce(); - return ::protobuf_sdk_2eproto::file_level_metadata[kIndexInFileMessages]; + ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_sdk_2eproto); + return ::file_level_metadata_sdk_2eproto[kIndexInFileMessages]; } @@ -2410,31 +2749,40 @@ void GameServer_Spec::InitAsDefaultInstance() { ::agones::dev::sdk::_GameServer_Spec_default_instance_._instance.get_mutable()->health_ = const_cast< ::agones::dev::sdk::GameServer_Spec_Health*>( ::agones::dev::sdk::GameServer_Spec_Health::internal_default_instance()); } +class GameServer_Spec::HasBitSetters { + public: + static const ::agones::dev::sdk::GameServer_Spec_Health& health(const GameServer_Spec* msg); +}; + +const ::agones::dev::sdk::GameServer_Spec_Health& +GameServer_Spec::HasBitSetters::health(const GameServer_Spec* msg) { + return *msg->health_; +} #if !defined(_MSC_VER) || _MSC_VER >= 1900 const int GameServer_Spec::kHealthFieldNumber; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 GameServer_Spec::GameServer_Spec() - : ::google::protobuf::Message(), _internal_metadata_(NULL) { - ::google::protobuf::internal::InitSCC( - &protobuf_sdk_2eproto::scc_info_GameServer_Spec.base); + : ::google::protobuf::Message(), _internal_metadata_(nullptr) { SharedCtor(); // @@protoc_insertion_point(constructor:agones.dev.sdk.GameServer.Spec) } GameServer_Spec::GameServer_Spec(const GameServer_Spec& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL) { + _internal_metadata_(nullptr) { _internal_metadata_.MergeFrom(from._internal_metadata_); if (from.has_health()) { health_ = new ::agones::dev::sdk::GameServer_Spec_Health(*from.health_); } else { - health_ = NULL; + health_ = nullptr; } // @@protoc_insertion_point(copy_constructor:agones.dev.sdk.GameServer.Spec) } void GameServer_Spec::SharedCtor() { - health_ = NULL; + ::google::protobuf::internal::InitSCC( + &scc_info_GameServer_Spec_sdk_2eproto.base); + health_ = nullptr; } GameServer_Spec::~GameServer_Spec() { @@ -2449,13 +2797,8 @@ void GameServer_Spec::SharedDtor() { void GameServer_Spec::SetCachedSize(int size) const { _cached_size_.Set(size); } -const ::google::protobuf::Descriptor* GameServer_Spec::descriptor() { - ::protobuf_sdk_2eproto::protobuf_AssignDescriptorsOnce(); - return ::protobuf_sdk_2eproto::file_level_metadata[kIndexInFileMessages].descriptor; -} - const GameServer_Spec& GameServer_Spec::default_instance() { - ::google::protobuf::internal::InitSCC(&protobuf_sdk_2eproto::scc_info_GameServer_Spec.base); + ::google::protobuf::internal::InitSCC(&::scc_info_GameServer_Spec_sdk_2eproto.base); return *internal_default_instance(); } @@ -2466,16 +2809,62 @@ void GameServer_Spec::Clear() { // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - if (GetArenaNoVirtual() == NULL && health_ != NULL) { + if (GetArenaNoVirtual() == nullptr && health_ != nullptr) { delete health_; } - health_ = NULL; + health_ = nullptr; _internal_metadata_.Clear(); } +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +const char* GameServer_Spec::_InternalParse(const char* begin, const char* end, void* object, + ::google::protobuf::internal::ParseContext* ctx) { + auto msg = static_cast(object); + ::google::protobuf::int32 size; (void)size; + int depth; (void)depth; + ::google::protobuf::uint32 tag; + ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; + auto ptr = begin; + while (ptr < end) { + ptr = ::google::protobuf::io::Parse32(ptr, &tag); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + switch (tag >> 3) { + // .agones.dev.sdk.GameServer.Spec.Health health = 1; + case 1: { + if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + parser_till_end = ::agones::dev::sdk::GameServer_Spec_Health::_InternalParse; + object = msg->mutable_health(); + if (size > end - ptr) goto len_delim_till_end; + ptr += size; + GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange( + {parser_till_end, object}, ptr - size, ptr)); + break; + } + default: { + handle_unusual: + if ((tag & 7) == 4 || tag == 0) { + ctx->EndGroup(tag); + return ptr; + } + auto res = UnknownFieldParse(tag, {_InternalParse, msg}, + ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); + ptr = res.first; + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); + if (res.second) return ptr; + } + } // switch + } // while + return ptr; +len_delim_till_end: + return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg}, + {parser_till_end, object}, size); +} +#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER bool GameServer_Spec::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { -#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure +#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; // @@protoc_insertion_point(parse_start:agones.dev.sdk.GameServer.Spec) for (;;) { @@ -2485,8 +2874,7 @@ bool GameServer_Spec::MergePartialFromCodedStream( switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { // .agones.dev.sdk.GameServer.Spec.Health health = 1; case 1: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(10u /* 10 & 0xFF */)) { + if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( input, mutable_health())); } else { @@ -2514,6 +2902,7 @@ bool GameServer_Spec::MergePartialFromCodedStream( return false; #undef DO_ } +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER void GameServer_Spec::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { @@ -2524,19 +2913,18 @@ void GameServer_Spec::SerializeWithCachedSizes( // .agones.dev.sdk.GameServer.Spec.Health health = 1; if (this->has_health()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 1, this->_internal_health(), output); + 1, HasBitSetters::health(this), output); } - if ((_internal_metadata_.have_unknown_fields() && ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) { + if (_internal_metadata_.have_unknown_fields()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( - (::google::protobuf::internal::GetProto3PreserveUnknownsDefault() ? _internal_metadata_.unknown_fields() : _internal_metadata_.default_instance()), output); + _internal_metadata_.unknown_fields(), output); } // @@protoc_insertion_point(serialize_end:agones.dev.sdk.GameServer.Spec) } ::google::protobuf::uint8* GameServer_Spec::InternalSerializeWithCachedSizesToArray( - bool deterministic, ::google::protobuf::uint8* target) const { - (void)deterministic; // Unused + ::google::protobuf::uint8* target) const { // @@protoc_insertion_point(serialize_to_array_start:agones.dev.sdk.GameServer.Spec) ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; @@ -2545,12 +2933,12 @@ ::google::protobuf::uint8* GameServer_Spec::InternalSerializeWithCachedSizesToAr if (this->has_health()) { target = ::google::protobuf::internal::WireFormatLite:: InternalWriteMessageToArray( - 1, this->_internal_health(), deterministic, target); + 1, HasBitSetters::health(this), target); } - if ((_internal_metadata_.have_unknown_fields() && ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) { + if (_internal_metadata_.have_unknown_fields()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( - (::google::protobuf::internal::GetProto3PreserveUnknownsDefault() ? _internal_metadata_.unknown_fields() : _internal_metadata_.default_instance()), target); + _internal_metadata_.unknown_fields(), target); } // @@protoc_insertion_point(serialize_to_array_end:agones.dev.sdk.GameServer.Spec) return target; @@ -2560,11 +2948,15 @@ size_t GameServer_Spec::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:agones.dev.sdk.GameServer.Spec) size_t total_size = 0; - if ((_internal_metadata_.have_unknown_fields() && ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) { + if (_internal_metadata_.have_unknown_fields()) { total_size += ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - (::google::protobuf::internal::GetProto3PreserveUnknownsDefault() ? _internal_metadata_.unknown_fields() : _internal_metadata_.default_instance())); + _internal_metadata_.unknown_fields()); } + ::google::protobuf::uint32 cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + // .agones.dev.sdk.GameServer.Spec.Health health = 1; if (this->has_health()) { total_size += 1 + @@ -2581,9 +2973,9 @@ void GameServer_Spec::MergeFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:agones.dev.sdk.GameServer.Spec) GOOGLE_DCHECK_NE(&from, this); const GameServer_Spec* source = - ::google::protobuf::internal::DynamicCastToGenerated( + ::google::protobuf::DynamicCastToGenerated( &from); - if (source == NULL) { + if (source == nullptr) { // @@protoc_insertion_point(generalized_merge_from_cast_fail:agones.dev.sdk.GameServer.Spec) ::google::protobuf::internal::ReflectionOps::Merge(from, this); } else { @@ -2628,13 +3020,13 @@ void GameServer_Spec::Swap(GameServer_Spec* other) { } void GameServer_Spec::InternalSwap(GameServer_Spec* other) { using std::swap; - swap(health_, other->health_); _internal_metadata_.Swap(&other->_internal_metadata_); + swap(health_, other->health_); } ::google::protobuf::Metadata GameServer_Spec::GetMetadata() const { - protobuf_sdk_2eproto::protobuf_AssignDescriptorsOnce(); - return ::protobuf_sdk_2eproto::file_level_metadata[kIndexInFileMessages]; + ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_sdk_2eproto); + return ::file_level_metadata_sdk_2eproto[kIndexInFileMessages]; } @@ -2642,21 +3034,23 @@ ::google::protobuf::Metadata GameServer_Spec::GetMetadata() const { void GameServer_Status_Port::InitAsDefaultInstance() { } +class GameServer_Status_Port::HasBitSetters { + public: +}; + #if !defined(_MSC_VER) || _MSC_VER >= 1900 const int GameServer_Status_Port::kNameFieldNumber; const int GameServer_Status_Port::kPortFieldNumber; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 GameServer_Status_Port::GameServer_Status_Port() - : ::google::protobuf::Message(), _internal_metadata_(NULL) { - ::google::protobuf::internal::InitSCC( - &protobuf_sdk_2eproto::scc_info_GameServer_Status_Port.base); + : ::google::protobuf::Message(), _internal_metadata_(nullptr) { SharedCtor(); // @@protoc_insertion_point(constructor:agones.dev.sdk.GameServer.Status.Port) } GameServer_Status_Port::GameServer_Status_Port(const GameServer_Status_Port& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL) { + _internal_metadata_(nullptr) { _internal_metadata_.MergeFrom(from._internal_metadata_); name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); if (from.name().size() > 0) { @@ -2667,6 +3061,8 @@ GameServer_Status_Port::GameServer_Status_Port(const GameServer_Status_Port& fro } void GameServer_Status_Port::SharedCtor() { + ::google::protobuf::internal::InitSCC( + &scc_info_GameServer_Status_Port_sdk_2eproto.base); name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); port_ = 0; } @@ -2683,13 +3079,8 @@ void GameServer_Status_Port::SharedDtor() { void GameServer_Status_Port::SetCachedSize(int size) const { _cached_size_.Set(size); } -const ::google::protobuf::Descriptor* GameServer_Status_Port::descriptor() { - ::protobuf_sdk_2eproto::protobuf_AssignDescriptorsOnce(); - return ::protobuf_sdk_2eproto::file_level_metadata[kIndexInFileMessages].descriptor; -} - const GameServer_Status_Port& GameServer_Status_Port::default_instance() { - ::google::protobuf::internal::InitSCC(&protobuf_sdk_2eproto::scc_info_GameServer_Status_Port.base); + ::google::protobuf::internal::InitSCC(&::scc_info_GameServer_Status_Port_sdk_2eproto.base); return *internal_default_instance(); } @@ -2705,9 +3096,69 @@ void GameServer_Status_Port::Clear() { _internal_metadata_.Clear(); } +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +const char* GameServer_Status_Port::_InternalParse(const char* begin, const char* end, void* object, + ::google::protobuf::internal::ParseContext* ctx) { + auto msg = static_cast(object); + ::google::protobuf::int32 size; (void)size; + int depth; (void)depth; + ::google::protobuf::uint32 tag; + ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; + auto ptr = begin; + while (ptr < end) { + ptr = ::google::protobuf::io::Parse32(ptr, &tag); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + switch (tag >> 3) { + // string name = 1; + case 1: { + if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + ctx->extra_parse_data().SetFieldName("agones.dev.sdk.GameServer.Status.Port.name"); + object = msg->mutable_name(); + if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { + parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; + goto string_till_end; + } + GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); + ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); + ptr += size; + break; + } + // int32 port = 2; + case 2: { + if (static_cast<::google::protobuf::uint8>(tag) != 16) goto handle_unusual; + msg->set_port(::google::protobuf::internal::ReadVarint(&ptr)); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + break; + } + default: { + handle_unusual: + if ((tag & 7) == 4 || tag == 0) { + ctx->EndGroup(tag); + return ptr; + } + auto res = UnknownFieldParse(tag, {_InternalParse, msg}, + ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); + ptr = res.first; + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); + if (res.second) return ptr; + } + } // switch + } // while + return ptr; +string_till_end: + static_cast<::std::string*>(object)->clear(); + static_cast<::std::string*>(object)->reserve(size); + goto len_delim_till_end; +len_delim_till_end: + return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg}, + {parser_till_end, object}, size); +} +#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER bool GameServer_Status_Port::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { -#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure +#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; // @@protoc_insertion_point(parse_start:agones.dev.sdk.GameServer.Status.Port) for (;;) { @@ -2717,8 +3168,7 @@ bool GameServer_Status_Port::MergePartialFromCodedStream( switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { // string name = 1; case 1: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(10u /* 10 & 0xFF */)) { + if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_name())); DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( @@ -2733,8 +3183,7 @@ bool GameServer_Status_Port::MergePartialFromCodedStream( // int32 port = 2; case 2: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(16u /* 16 & 0xFF */)) { + if (static_cast< ::google::protobuf::uint8>(tag) == (16 & 0xFF)) { DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( @@ -2764,6 +3213,7 @@ bool GameServer_Status_Port::MergePartialFromCodedStream( return false; #undef DO_ } +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER void GameServer_Status_Port::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { @@ -2786,16 +3236,15 @@ void GameServer_Status_Port::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteInt32(2, this->port(), output); } - if ((_internal_metadata_.have_unknown_fields() && ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) { + if (_internal_metadata_.have_unknown_fields()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( - (::google::protobuf::internal::GetProto3PreserveUnknownsDefault() ? _internal_metadata_.unknown_fields() : _internal_metadata_.default_instance()), output); + _internal_metadata_.unknown_fields(), output); } // @@protoc_insertion_point(serialize_end:agones.dev.sdk.GameServer.Status.Port) } ::google::protobuf::uint8* GameServer_Status_Port::InternalSerializeWithCachedSizesToArray( - bool deterministic, ::google::protobuf::uint8* target) const { - (void)deterministic; // Unused + ::google::protobuf::uint8* target) const { // @@protoc_insertion_point(serialize_to_array_start:agones.dev.sdk.GameServer.Status.Port) ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; @@ -2816,9 +3265,9 @@ ::google::protobuf::uint8* GameServer_Status_Port::InternalSerializeWithCachedSi target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(2, this->port(), target); } - if ((_internal_metadata_.have_unknown_fields() && ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) { + if (_internal_metadata_.have_unknown_fields()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( - (::google::protobuf::internal::GetProto3PreserveUnknownsDefault() ? _internal_metadata_.unknown_fields() : _internal_metadata_.default_instance()), target); + _internal_metadata_.unknown_fields(), target); } // @@protoc_insertion_point(serialize_to_array_end:agones.dev.sdk.GameServer.Status.Port) return target; @@ -2828,11 +3277,15 @@ size_t GameServer_Status_Port::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:agones.dev.sdk.GameServer.Status.Port) size_t total_size = 0; - if ((_internal_metadata_.have_unknown_fields() && ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) { + if (_internal_metadata_.have_unknown_fields()) { total_size += ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - (::google::protobuf::internal::GetProto3PreserveUnknownsDefault() ? _internal_metadata_.unknown_fields() : _internal_metadata_.default_instance())); + _internal_metadata_.unknown_fields()); } + ::google::protobuf::uint32 cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + // string name = 1; if (this->name().size() > 0) { total_size += 1 + @@ -2856,9 +3309,9 @@ void GameServer_Status_Port::MergeFrom(const ::google::protobuf::Message& from) // @@protoc_insertion_point(generalized_merge_from_start:agones.dev.sdk.GameServer.Status.Port) GOOGLE_DCHECK_NE(&from, this); const GameServer_Status_Port* source = - ::google::protobuf::internal::DynamicCastToGenerated( + ::google::protobuf::DynamicCastToGenerated( &from); - if (source == NULL) { + if (source == nullptr) { // @@protoc_insertion_point(generalized_merge_from_cast_fail:agones.dev.sdk.GameServer.Status.Port) ::google::protobuf::internal::ReflectionOps::Merge(from, this); } else { @@ -2907,15 +3360,15 @@ void GameServer_Status_Port::Swap(GameServer_Status_Port* other) { } void GameServer_Status_Port::InternalSwap(GameServer_Status_Port* other) { using std::swap; + _internal_metadata_.Swap(&other->_internal_metadata_); name_.Swap(&other->name_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); swap(port_, other->port_); - _internal_metadata_.Swap(&other->_internal_metadata_); } ::google::protobuf::Metadata GameServer_Status_Port::GetMetadata() const { - protobuf_sdk_2eproto::protobuf_AssignDescriptorsOnce(); - return ::protobuf_sdk_2eproto::file_level_metadata[kIndexInFileMessages]; + ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_sdk_2eproto); + return ::file_level_metadata_sdk_2eproto[kIndexInFileMessages]; } @@ -2923,6 +3376,10 @@ ::google::protobuf::Metadata GameServer_Status_Port::GetMetadata() const { void GameServer_Status::InitAsDefaultInstance() { } +class GameServer_Status::HasBitSetters { + public: +}; + #if !defined(_MSC_VER) || _MSC_VER >= 1900 const int GameServer_Status::kStateFieldNumber; const int GameServer_Status::kAddressFieldNumber; @@ -2930,15 +3387,13 @@ const int GameServer_Status::kPortsFieldNumber; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 GameServer_Status::GameServer_Status() - : ::google::protobuf::Message(), _internal_metadata_(NULL) { - ::google::protobuf::internal::InitSCC( - &protobuf_sdk_2eproto::scc_info_GameServer_Status.base); + : ::google::protobuf::Message(), _internal_metadata_(nullptr) { SharedCtor(); // @@protoc_insertion_point(constructor:agones.dev.sdk.GameServer.Status) } GameServer_Status::GameServer_Status(const GameServer_Status& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL), + _internal_metadata_(nullptr), ports_(from.ports_) { _internal_metadata_.MergeFrom(from._internal_metadata_); state_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); @@ -2953,6 +3408,8 @@ GameServer_Status::GameServer_Status(const GameServer_Status& from) } void GameServer_Status::SharedCtor() { + ::google::protobuf::internal::InitSCC( + &scc_info_GameServer_Status_sdk_2eproto.base); state_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); address_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } @@ -2970,13 +3427,8 @@ void GameServer_Status::SharedDtor() { void GameServer_Status::SetCachedSize(int size) const { _cached_size_.Set(size); } -const ::google::protobuf::Descriptor* GameServer_Status::descriptor() { - ::protobuf_sdk_2eproto::protobuf_AssignDescriptorsOnce(); - return ::protobuf_sdk_2eproto::file_level_metadata[kIndexInFileMessages].descriptor; -} - const GameServer_Status& GameServer_Status::default_instance() { - ::google::protobuf::internal::InitSCC(&protobuf_sdk_2eproto::scc_info_GameServer_Status.base); + ::google::protobuf::internal::InitSCC(&::scc_info_GameServer_Status_sdk_2eproto.base); return *internal_default_instance(); } @@ -2993,9 +3445,94 @@ void GameServer_Status::Clear() { _internal_metadata_.Clear(); } +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +const char* GameServer_Status::_InternalParse(const char* begin, const char* end, void* object, + ::google::protobuf::internal::ParseContext* ctx) { + auto msg = static_cast(object); + ::google::protobuf::int32 size; (void)size; + int depth; (void)depth; + ::google::protobuf::uint32 tag; + ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; + auto ptr = begin; + while (ptr < end) { + ptr = ::google::protobuf::io::Parse32(ptr, &tag); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + switch (tag >> 3) { + // string state = 1; + case 1: { + if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + ctx->extra_parse_data().SetFieldName("agones.dev.sdk.GameServer.Status.state"); + object = msg->mutable_state(); + if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { + parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; + goto string_till_end; + } + GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); + ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); + ptr += size; + break; + } + // string address = 2; + case 2: { + if (static_cast<::google::protobuf::uint8>(tag) != 18) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + ctx->extra_parse_data().SetFieldName("agones.dev.sdk.GameServer.Status.address"); + object = msg->mutable_address(); + if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { + parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; + goto string_till_end; + } + GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); + ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); + ptr += size; + break; + } + // repeated .agones.dev.sdk.GameServer.Status.Port ports = 3; + case 3: { + if (static_cast<::google::protobuf::uint8>(tag) != 26) goto handle_unusual; + do { + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + parser_till_end = ::agones::dev::sdk::GameServer_Status_Port::_InternalParse; + object = msg->add_ports(); + if (size > end - ptr) goto len_delim_till_end; + ptr += size; + GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange( + {parser_till_end, object}, ptr - size, ptr)); + if (ptr >= end) break; + } while ((::google::protobuf::io::UnalignedLoad<::google::protobuf::uint64>(ptr) & 255) == 26 && (ptr += 1)); + break; + } + default: { + handle_unusual: + if ((tag & 7) == 4 || tag == 0) { + ctx->EndGroup(tag); + return ptr; + } + auto res = UnknownFieldParse(tag, {_InternalParse, msg}, + ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); + ptr = res.first; + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); + if (res.second) return ptr; + } + } // switch + } // while + return ptr; +string_till_end: + static_cast<::std::string*>(object)->clear(); + static_cast<::std::string*>(object)->reserve(size); + goto len_delim_till_end; +len_delim_till_end: + return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg}, + {parser_till_end, object}, size); +} +#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER bool GameServer_Status::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { -#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure +#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; // @@protoc_insertion_point(parse_start:agones.dev.sdk.GameServer.Status) for (;;) { @@ -3005,8 +3542,7 @@ bool GameServer_Status::MergePartialFromCodedStream( switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { // string state = 1; case 1: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(10u /* 10 & 0xFF */)) { + if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_state())); DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( @@ -3021,8 +3557,7 @@ bool GameServer_Status::MergePartialFromCodedStream( // string address = 2; case 2: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(18u /* 18 & 0xFF */)) { + if (static_cast< ::google::protobuf::uint8>(tag) == (18 & 0xFF)) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_address())); DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( @@ -3037,8 +3572,7 @@ bool GameServer_Status::MergePartialFromCodedStream( // repeated .agones.dev.sdk.GameServer.Status.Port ports = 3; case 3: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(26u /* 26 & 0xFF */)) { + if (static_cast< ::google::protobuf::uint8>(tag) == (26 & 0xFF)) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( input, add_ports())); } else { @@ -3066,6 +3600,7 @@ bool GameServer_Status::MergePartialFromCodedStream( return false; #undef DO_ } +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER void GameServer_Status::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { @@ -3102,16 +3637,15 @@ void GameServer_Status::SerializeWithCachedSizes( output); } - if ((_internal_metadata_.have_unknown_fields() && ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) { + if (_internal_metadata_.have_unknown_fields()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( - (::google::protobuf::internal::GetProto3PreserveUnknownsDefault() ? _internal_metadata_.unknown_fields() : _internal_metadata_.default_instance()), output); + _internal_metadata_.unknown_fields(), output); } // @@protoc_insertion_point(serialize_end:agones.dev.sdk.GameServer.Status) } ::google::protobuf::uint8* GameServer_Status::InternalSerializeWithCachedSizesToArray( - bool deterministic, ::google::protobuf::uint8* target) const { - (void)deterministic; // Unused + ::google::protobuf::uint8* target) const { // @@protoc_insertion_point(serialize_to_array_start:agones.dev.sdk.GameServer.Status) ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; @@ -3143,12 +3677,12 @@ ::google::protobuf::uint8* GameServer_Status::InternalSerializeWithCachedSizesTo n = static_cast(this->ports_size()); i < n; i++) { target = ::google::protobuf::internal::WireFormatLite:: InternalWriteMessageToArray( - 3, this->ports(static_cast(i)), deterministic, target); + 3, this->ports(static_cast(i)), target); } - if ((_internal_metadata_.have_unknown_fields() && ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) { + if (_internal_metadata_.have_unknown_fields()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( - (::google::protobuf::internal::GetProto3PreserveUnknownsDefault() ? _internal_metadata_.unknown_fields() : _internal_metadata_.default_instance()), target); + _internal_metadata_.unknown_fields(), target); } // @@protoc_insertion_point(serialize_to_array_end:agones.dev.sdk.GameServer.Status) return target; @@ -3158,11 +3692,15 @@ size_t GameServer_Status::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:agones.dev.sdk.GameServer.Status) size_t total_size = 0; - if ((_internal_metadata_.have_unknown_fields() && ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) { + if (_internal_metadata_.have_unknown_fields()) { total_size += ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - (::google::protobuf::internal::GetProto3PreserveUnknownsDefault() ? _internal_metadata_.unknown_fields() : _internal_metadata_.default_instance())); + _internal_metadata_.unknown_fields()); } + ::google::protobuf::uint32 cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + // repeated .agones.dev.sdk.GameServer.Status.Port ports = 3; { unsigned int count = static_cast(this->ports_size()); @@ -3197,9 +3735,9 @@ void GameServer_Status::MergeFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:agones.dev.sdk.GameServer.Status) GOOGLE_DCHECK_NE(&from, this); const GameServer_Status* source = - ::google::protobuf::internal::DynamicCastToGenerated( + ::google::protobuf::DynamicCastToGenerated( &from); - if (source == NULL) { + if (source == nullptr) { // @@protoc_insertion_point(generalized_merge_from_cast_fail:agones.dev.sdk.GameServer.Status) ::google::protobuf::internal::ReflectionOps::Merge(from, this); } else { @@ -3250,17 +3788,17 @@ void GameServer_Status::Swap(GameServer_Status* other) { } void GameServer_Status::InternalSwap(GameServer_Status* other) { using std::swap; + _internal_metadata_.Swap(&other->_internal_metadata_); CastToBase(&ports_)->InternalSwap(CastToBase(&other->ports_)); state_.Swap(&other->state_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); address_.Swap(&other->address_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); - _internal_metadata_.Swap(&other->_internal_metadata_); } ::google::protobuf::Metadata GameServer_Status::GetMetadata() const { - protobuf_sdk_2eproto::protobuf_AssignDescriptorsOnce(); - return ::protobuf_sdk_2eproto::file_level_metadata[kIndexInFileMessages]; + ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_sdk_2eproto); + return ::file_level_metadata_sdk_2eproto[kIndexInFileMessages]; } @@ -3274,6 +3812,25 @@ void GameServer::InitAsDefaultInstance() { ::agones::dev::sdk::_GameServer_default_instance_._instance.get_mutable()->status_ = const_cast< ::agones::dev::sdk::GameServer_Status*>( ::agones::dev::sdk::GameServer_Status::internal_default_instance()); } +class GameServer::HasBitSetters { + public: + static const ::agones::dev::sdk::GameServer_ObjectMeta& object_meta(const GameServer* msg); + static const ::agones::dev::sdk::GameServer_Spec& spec(const GameServer* msg); + static const ::agones::dev::sdk::GameServer_Status& status(const GameServer* msg); +}; + +const ::agones::dev::sdk::GameServer_ObjectMeta& +GameServer::HasBitSetters::object_meta(const GameServer* msg) { + return *msg->object_meta_; +} +const ::agones::dev::sdk::GameServer_Spec& +GameServer::HasBitSetters::spec(const GameServer* msg) { + return *msg->spec_; +} +const ::agones::dev::sdk::GameServer_Status& +GameServer::HasBitSetters::status(const GameServer* msg) { + return *msg->status_; +} #if !defined(_MSC_VER) || _MSC_VER >= 1900 const int GameServer::kObjectMetaFieldNumber; const int GameServer::kSpecFieldNumber; @@ -3281,35 +3838,35 @@ const int GameServer::kStatusFieldNumber; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 GameServer::GameServer() - : ::google::protobuf::Message(), _internal_metadata_(NULL) { - ::google::protobuf::internal::InitSCC( - &protobuf_sdk_2eproto::scc_info_GameServer.base); + : ::google::protobuf::Message(), _internal_metadata_(nullptr) { SharedCtor(); // @@protoc_insertion_point(constructor:agones.dev.sdk.GameServer) } GameServer::GameServer(const GameServer& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL) { + _internal_metadata_(nullptr) { _internal_metadata_.MergeFrom(from._internal_metadata_); if (from.has_object_meta()) { object_meta_ = new ::agones::dev::sdk::GameServer_ObjectMeta(*from.object_meta_); } else { - object_meta_ = NULL; + object_meta_ = nullptr; } if (from.has_spec()) { spec_ = new ::agones::dev::sdk::GameServer_Spec(*from.spec_); } else { - spec_ = NULL; + spec_ = nullptr; } if (from.has_status()) { status_ = new ::agones::dev::sdk::GameServer_Status(*from.status_); } else { - status_ = NULL; + status_ = nullptr; } // @@protoc_insertion_point(copy_constructor:agones.dev.sdk.GameServer) } void GameServer::SharedCtor() { + ::google::protobuf::internal::InitSCC( + &scc_info_GameServer_sdk_2eproto.base); ::memset(&object_meta_, 0, static_cast( reinterpret_cast(&status_) - reinterpret_cast(&object_meta_)) + sizeof(status_)); @@ -3329,13 +3886,8 @@ void GameServer::SharedDtor() { void GameServer::SetCachedSize(int size) const { _cached_size_.Set(size); } -const ::google::protobuf::Descriptor* GameServer::descriptor() { - ::protobuf_sdk_2eproto::protobuf_AssignDescriptorsOnce(); - return ::protobuf_sdk_2eproto::file_level_metadata[kIndexInFileMessages].descriptor; -} - const GameServer& GameServer::default_instance() { - ::google::protobuf::internal::InitSCC(&protobuf_sdk_2eproto::scc_info_GameServer.base); + ::google::protobuf::internal::InitSCC(&::scc_info_GameServer_sdk_2eproto.base); return *internal_default_instance(); } @@ -3346,24 +3898,96 @@ void GameServer::Clear() { // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - if (GetArenaNoVirtual() == NULL && object_meta_ != NULL) { + if (GetArenaNoVirtual() == nullptr && object_meta_ != nullptr) { delete object_meta_; } - object_meta_ = NULL; - if (GetArenaNoVirtual() == NULL && spec_ != NULL) { + object_meta_ = nullptr; + if (GetArenaNoVirtual() == nullptr && spec_ != nullptr) { delete spec_; } - spec_ = NULL; - if (GetArenaNoVirtual() == NULL && status_ != NULL) { + spec_ = nullptr; + if (GetArenaNoVirtual() == nullptr && status_ != nullptr) { delete status_; } - status_ = NULL; + status_ = nullptr; _internal_metadata_.Clear(); } +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +const char* GameServer::_InternalParse(const char* begin, const char* end, void* object, + ::google::protobuf::internal::ParseContext* ctx) { + auto msg = static_cast(object); + ::google::protobuf::int32 size; (void)size; + int depth; (void)depth; + ::google::protobuf::uint32 tag; + ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; + auto ptr = begin; + while (ptr < end) { + ptr = ::google::protobuf::io::Parse32(ptr, &tag); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + switch (tag >> 3) { + // .agones.dev.sdk.GameServer.ObjectMeta object_meta = 1; + case 1: { + if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + parser_till_end = ::agones::dev::sdk::GameServer_ObjectMeta::_InternalParse; + object = msg->mutable_object_meta(); + if (size > end - ptr) goto len_delim_till_end; + ptr += size; + GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange( + {parser_till_end, object}, ptr - size, ptr)); + break; + } + // .agones.dev.sdk.GameServer.Spec spec = 2; + case 2: { + if (static_cast<::google::protobuf::uint8>(tag) != 18) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + parser_till_end = ::agones::dev::sdk::GameServer_Spec::_InternalParse; + object = msg->mutable_spec(); + if (size > end - ptr) goto len_delim_till_end; + ptr += size; + GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange( + {parser_till_end, object}, ptr - size, ptr)); + break; + } + // .agones.dev.sdk.GameServer.Status status = 3; + case 3: { + if (static_cast<::google::protobuf::uint8>(tag) != 26) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + parser_till_end = ::agones::dev::sdk::GameServer_Status::_InternalParse; + object = msg->mutable_status(); + if (size > end - ptr) goto len_delim_till_end; + ptr += size; + GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange( + {parser_till_end, object}, ptr - size, ptr)); + break; + } + default: { + handle_unusual: + if ((tag & 7) == 4 || tag == 0) { + ctx->EndGroup(tag); + return ptr; + } + auto res = UnknownFieldParse(tag, {_InternalParse, msg}, + ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); + ptr = res.first; + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); + if (res.second) return ptr; + } + } // switch + } // while + return ptr; +len_delim_till_end: + return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg}, + {parser_till_end, object}, size); +} +#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER bool GameServer::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { -#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure +#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; // @@protoc_insertion_point(parse_start:agones.dev.sdk.GameServer) for (;;) { @@ -3373,8 +3997,7 @@ bool GameServer::MergePartialFromCodedStream( switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { // .agones.dev.sdk.GameServer.ObjectMeta object_meta = 1; case 1: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(10u /* 10 & 0xFF */)) { + if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( input, mutable_object_meta())); } else { @@ -3385,8 +4008,7 @@ bool GameServer::MergePartialFromCodedStream( // .agones.dev.sdk.GameServer.Spec spec = 2; case 2: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(18u /* 18 & 0xFF */)) { + if (static_cast< ::google::protobuf::uint8>(tag) == (18 & 0xFF)) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( input, mutable_spec())); } else { @@ -3397,8 +4019,7 @@ bool GameServer::MergePartialFromCodedStream( // .agones.dev.sdk.GameServer.Status status = 3; case 3: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(26u /* 26 & 0xFF */)) { + if (static_cast< ::google::protobuf::uint8>(tag) == (26 & 0xFF)) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( input, mutable_status())); } else { @@ -3426,6 +4047,7 @@ bool GameServer::MergePartialFromCodedStream( return false; #undef DO_ } +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER void GameServer::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { @@ -3436,31 +4058,30 @@ void GameServer::SerializeWithCachedSizes( // .agones.dev.sdk.GameServer.ObjectMeta object_meta = 1; if (this->has_object_meta()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 1, this->_internal_object_meta(), output); + 1, HasBitSetters::object_meta(this), output); } // .agones.dev.sdk.GameServer.Spec spec = 2; if (this->has_spec()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 2, this->_internal_spec(), output); + 2, HasBitSetters::spec(this), output); } // .agones.dev.sdk.GameServer.Status status = 3; if (this->has_status()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 3, this->_internal_status(), output); + 3, HasBitSetters::status(this), output); } - if ((_internal_metadata_.have_unknown_fields() && ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) { + if (_internal_metadata_.have_unknown_fields()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( - (::google::protobuf::internal::GetProto3PreserveUnknownsDefault() ? _internal_metadata_.unknown_fields() : _internal_metadata_.default_instance()), output); + _internal_metadata_.unknown_fields(), output); } // @@protoc_insertion_point(serialize_end:agones.dev.sdk.GameServer) } ::google::protobuf::uint8* GameServer::InternalSerializeWithCachedSizesToArray( - bool deterministic, ::google::protobuf::uint8* target) const { - (void)deterministic; // Unused + ::google::protobuf::uint8* target) const { // @@protoc_insertion_point(serialize_to_array_start:agones.dev.sdk.GameServer) ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; @@ -3469,26 +4090,26 @@ ::google::protobuf::uint8* GameServer::InternalSerializeWithCachedSizesToArray( if (this->has_object_meta()) { target = ::google::protobuf::internal::WireFormatLite:: InternalWriteMessageToArray( - 1, this->_internal_object_meta(), deterministic, target); + 1, HasBitSetters::object_meta(this), target); } // .agones.dev.sdk.GameServer.Spec spec = 2; if (this->has_spec()) { target = ::google::protobuf::internal::WireFormatLite:: InternalWriteMessageToArray( - 2, this->_internal_spec(), deterministic, target); + 2, HasBitSetters::spec(this), target); } // .agones.dev.sdk.GameServer.Status status = 3; if (this->has_status()) { target = ::google::protobuf::internal::WireFormatLite:: InternalWriteMessageToArray( - 3, this->_internal_status(), deterministic, target); + 3, HasBitSetters::status(this), target); } - if ((_internal_metadata_.have_unknown_fields() && ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) { + if (_internal_metadata_.have_unknown_fields()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( - (::google::protobuf::internal::GetProto3PreserveUnknownsDefault() ? _internal_metadata_.unknown_fields() : _internal_metadata_.default_instance()), target); + _internal_metadata_.unknown_fields(), target); } // @@protoc_insertion_point(serialize_to_array_end:agones.dev.sdk.GameServer) return target; @@ -3498,11 +4119,15 @@ size_t GameServer::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:agones.dev.sdk.GameServer) size_t total_size = 0; - if ((_internal_metadata_.have_unknown_fields() && ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) { + if (_internal_metadata_.have_unknown_fields()) { total_size += ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - (::google::protobuf::internal::GetProto3PreserveUnknownsDefault() ? _internal_metadata_.unknown_fields() : _internal_metadata_.default_instance())); + _internal_metadata_.unknown_fields()); } + ::google::protobuf::uint32 cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + // .agones.dev.sdk.GameServer.ObjectMeta object_meta = 1; if (this->has_object_meta()) { total_size += 1 + @@ -3533,9 +4158,9 @@ void GameServer::MergeFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:agones.dev.sdk.GameServer) GOOGLE_DCHECK_NE(&from, this); const GameServer* source = - ::google::protobuf::internal::DynamicCastToGenerated( + ::google::protobuf::DynamicCastToGenerated( &from); - if (source == NULL) { + if (source == nullptr) { // @@protoc_insertion_point(generalized_merge_from_cast_fail:agones.dev.sdk.GameServer) ::google::protobuf::internal::ReflectionOps::Merge(from, this); } else { @@ -3586,15 +4211,15 @@ void GameServer::Swap(GameServer* other) { } void GameServer::InternalSwap(GameServer* other) { using std::swap; + _internal_metadata_.Swap(&other->_internal_metadata_); swap(object_meta_, other->object_meta_); swap(spec_, other->spec_); swap(status_, other->status_); - _internal_metadata_.Swap(&other->_internal_metadata_); } ::google::protobuf::Metadata GameServer::GetMetadata() const { - protobuf_sdk_2eproto::protobuf_AssignDescriptorsOnce(); - return ::protobuf_sdk_2eproto::file_level_metadata[kIndexInFileMessages]; + ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_sdk_2eproto); + return ::file_level_metadata_sdk_2eproto[kIndexInFileMessages]; } @@ -3604,40 +4229,41 @@ ::google::protobuf::Metadata GameServer::GetMetadata() const { } // namespace agones namespace google { namespace protobuf { -template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::agones::dev::sdk::Empty* Arena::CreateMaybeMessage< ::agones::dev::sdk::Empty >(Arena* arena) { +template<> PROTOBUF_NOINLINE ::agones::dev::sdk::Empty* Arena::CreateMaybeMessage< ::agones::dev::sdk::Empty >(Arena* arena) { return Arena::CreateInternal< ::agones::dev::sdk::Empty >(arena); } -template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::agones::dev::sdk::KeyValue* Arena::CreateMaybeMessage< ::agones::dev::sdk::KeyValue >(Arena* arena) { +template<> PROTOBUF_NOINLINE ::agones::dev::sdk::KeyValue* Arena::CreateMaybeMessage< ::agones::dev::sdk::KeyValue >(Arena* arena) { return Arena::CreateInternal< ::agones::dev::sdk::KeyValue >(arena); } -template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::agones::dev::sdk::Duration* Arena::CreateMaybeMessage< ::agones::dev::sdk::Duration >(Arena* arena) { +template<> PROTOBUF_NOINLINE ::agones::dev::sdk::Duration* Arena::CreateMaybeMessage< ::agones::dev::sdk::Duration >(Arena* arena) { return Arena::CreateInternal< ::agones::dev::sdk::Duration >(arena); } -template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::agones::dev::sdk::GameServer_ObjectMeta_AnnotationsEntry_DoNotUse* Arena::CreateMaybeMessage< ::agones::dev::sdk::GameServer_ObjectMeta_AnnotationsEntry_DoNotUse >(Arena* arena) { +template<> PROTOBUF_NOINLINE ::agones::dev::sdk::GameServer_ObjectMeta_AnnotationsEntry_DoNotUse* Arena::CreateMaybeMessage< ::agones::dev::sdk::GameServer_ObjectMeta_AnnotationsEntry_DoNotUse >(Arena* arena) { return Arena::CreateInternal< ::agones::dev::sdk::GameServer_ObjectMeta_AnnotationsEntry_DoNotUse >(arena); } -template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::agones::dev::sdk::GameServer_ObjectMeta_LabelsEntry_DoNotUse* Arena::CreateMaybeMessage< ::agones::dev::sdk::GameServer_ObjectMeta_LabelsEntry_DoNotUse >(Arena* arena) { +template<> PROTOBUF_NOINLINE ::agones::dev::sdk::GameServer_ObjectMeta_LabelsEntry_DoNotUse* Arena::CreateMaybeMessage< ::agones::dev::sdk::GameServer_ObjectMeta_LabelsEntry_DoNotUse >(Arena* arena) { return Arena::CreateInternal< ::agones::dev::sdk::GameServer_ObjectMeta_LabelsEntry_DoNotUse >(arena); } -template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::agones::dev::sdk::GameServer_ObjectMeta* Arena::CreateMaybeMessage< ::agones::dev::sdk::GameServer_ObjectMeta >(Arena* arena) { +template<> PROTOBUF_NOINLINE ::agones::dev::sdk::GameServer_ObjectMeta* Arena::CreateMaybeMessage< ::agones::dev::sdk::GameServer_ObjectMeta >(Arena* arena) { return Arena::CreateInternal< ::agones::dev::sdk::GameServer_ObjectMeta >(arena); } -template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::agones::dev::sdk::GameServer_Spec_Health* Arena::CreateMaybeMessage< ::agones::dev::sdk::GameServer_Spec_Health >(Arena* arena) { +template<> PROTOBUF_NOINLINE ::agones::dev::sdk::GameServer_Spec_Health* Arena::CreateMaybeMessage< ::agones::dev::sdk::GameServer_Spec_Health >(Arena* arena) { return Arena::CreateInternal< ::agones::dev::sdk::GameServer_Spec_Health >(arena); } -template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::agones::dev::sdk::GameServer_Spec* Arena::CreateMaybeMessage< ::agones::dev::sdk::GameServer_Spec >(Arena* arena) { +template<> PROTOBUF_NOINLINE ::agones::dev::sdk::GameServer_Spec* Arena::CreateMaybeMessage< ::agones::dev::sdk::GameServer_Spec >(Arena* arena) { return Arena::CreateInternal< ::agones::dev::sdk::GameServer_Spec >(arena); } -template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::agones::dev::sdk::GameServer_Status_Port* Arena::CreateMaybeMessage< ::agones::dev::sdk::GameServer_Status_Port >(Arena* arena) { +template<> PROTOBUF_NOINLINE ::agones::dev::sdk::GameServer_Status_Port* Arena::CreateMaybeMessage< ::agones::dev::sdk::GameServer_Status_Port >(Arena* arena) { return Arena::CreateInternal< ::agones::dev::sdk::GameServer_Status_Port >(arena); } -template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::agones::dev::sdk::GameServer_Status* Arena::CreateMaybeMessage< ::agones::dev::sdk::GameServer_Status >(Arena* arena) { +template<> PROTOBUF_NOINLINE ::agones::dev::sdk::GameServer_Status* Arena::CreateMaybeMessage< ::agones::dev::sdk::GameServer_Status >(Arena* arena) { return Arena::CreateInternal< ::agones::dev::sdk::GameServer_Status >(arena); } -template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::agones::dev::sdk::GameServer* Arena::CreateMaybeMessage< ::agones::dev::sdk::GameServer >(Arena* arena) { +template<> PROTOBUF_NOINLINE ::agones::dev::sdk::GameServer* Arena::CreateMaybeMessage< ::agones::dev::sdk::GameServer >(Arena* arena) { return Arena::CreateInternal< ::agones::dev::sdk::GameServer >(arena); } } // namespace protobuf } // namespace google // @@protoc_insertion_point(global_scope) +#include diff --git a/sdks/cpp/src/google/annotations.pb.cc b/sdks/cpp/src/google/annotations.pb.cc index 6b876c585f..fbd5deced2 100644 --- a/sdks/cpp/src/google/annotations.pb.cc +++ b/sdks/cpp/src/google/annotations.pb.cc @@ -21,82 +21,64 @@ #include #include -#include #include +#include #include #include #include #include #include -// This is a temporary google only hack -#ifdef GOOGLE_PROTOBUF_ENFORCE_UNIQUENESS -#include "third_party/protobuf/version.h" -#endif // @@protoc_insertion_point(includes) +#include -namespace protobuf_google_2fapi_2fhttp_2eproto { -extern PROTOBUF_INTERNAL_EXPORT_protobuf_google_2fapi_2fhttp_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_HttpRule; -} // namespace protobuf_google_2fapi_2fhttp_2eproto +extern PROTOBUF_INTERNAL_EXPORT_google_2fapi_2fhttp_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_HttpRule_google_2fapi_2fhttp_2eproto; namespace google { namespace api { } // namespace api } // namespace google -namespace protobuf_google_2fapi_2fannotations_2eproto { -void InitDefaults() { +void InitDefaults_google_2fapi_2fannotations_2eproto() { } -const ::google::protobuf::uint32 TableStruct::offsets[1] = {}; -static const ::google::protobuf::internal::MigrationSchema* schemas = NULL; -static const ::google::protobuf::Message* const* file_default_instances = NULL; +constexpr ::google::protobuf::Metadata* file_level_metadata_google_2fapi_2fannotations_2eproto = nullptr; +constexpr ::google::protobuf::EnumDescriptor const** file_level_enum_descriptors_google_2fapi_2fannotations_2eproto = nullptr; +constexpr ::google::protobuf::ServiceDescriptor const** file_level_service_descriptors_google_2fapi_2fannotations_2eproto = nullptr; +const ::google::protobuf::uint32 TableStruct_google_2fapi_2fannotations_2eproto::offsets[1] = {}; +static constexpr ::google::protobuf::internal::MigrationSchema* schemas = nullptr; +static constexpr ::google::protobuf::Message* const* file_default_instances = nullptr; -void protobuf_AssignDescriptors() { - AddDescriptors(); - AssignDescriptors( - "google/api/annotations.proto", schemas, file_default_instances, TableStruct::offsets, - NULL, NULL, NULL); -} +::google::protobuf::internal::AssignDescriptorsTable assign_descriptors_table_google_2fapi_2fannotations_2eproto = { + {}, AddDescriptors_google_2fapi_2fannotations_2eproto, "google/api/annotations.proto", schemas, + file_default_instances, TableStruct_google_2fapi_2fannotations_2eproto::offsets, + file_level_metadata_google_2fapi_2fannotations_2eproto, 0, file_level_enum_descriptors_google_2fapi_2fannotations_2eproto, file_level_service_descriptors_google_2fapi_2fannotations_2eproto, +}; -void protobuf_AssignDescriptorsOnce() { - static ::google::protobuf::internal::once_flag once; - ::google::protobuf::internal::call_once(once, protobuf_AssignDescriptors); -} +const char descriptor_table_protodef_google_2fapi_2fannotations_2eproto[] = + "\n\034google/api/annotations.proto\022\ngoogle.a" + "pi\032\025google/api/http.proto\032 google/protob" + "uf/descriptor.proto:E\n\004http\022\036.google.pro" + "tobuf.MethodOptions\030\260\312\274\" \001(\0132\024.google.ap" + "i.HttpRuleBn\n\016com.google.apiB\020Annotation" + "sProtoP\001ZAgoogle.golang.org/genproto/goo" + "gleapis/api/annotations;annotations\242\002\004GA" + "PIb\006proto3" + ; +::google::protobuf::internal::DescriptorTable descriptor_table_google_2fapi_2fannotations_2eproto = { + false, InitDefaults_google_2fapi_2fannotations_2eproto, + descriptor_table_protodef_google_2fapi_2fannotations_2eproto, + "google/api/annotations.proto", &assign_descriptors_table_google_2fapi_2fannotations_2eproto, 290, +}; -void protobuf_RegisterTypes(const ::std::string&) GOOGLE_PROTOBUF_ATTRIBUTE_COLD; -void protobuf_RegisterTypes(const ::std::string&) { - protobuf_AssignDescriptorsOnce(); -} - -void AddDescriptorsImpl() { - InitDefaults(); - static const char descriptor[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = { - "\n\034google/api/annotations.proto\022\ngoogle.a" - "pi\032\025google/api/http.proto\032 google/protob" - "uf/descriptor.proto:E\n\004http\022\036.google.pro" - "tobuf.MethodOptions\030\260\312\274\" \001(\0132\024.google.ap" - "i.HttpRuleBn\n\016com.google.apiB\020Annotation" - "sProtoP\001ZAgoogle.golang.org/genproto/goo" - "gleapis/api/annotations;annotations\242\002\004GA" - "PIb\006proto3" +void AddDescriptors_google_2fapi_2fannotations_2eproto() { + static constexpr ::google::protobuf::internal::InitFunc deps[2] = + { + ::AddDescriptors_google_2fapi_2fhttp_2eproto, + ::AddDescriptors_google_2fprotobuf_2fdescriptor_2eproto, }; - ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( - descriptor, 290); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( - "google/api/annotations.proto", &protobuf_RegisterTypes); - ::protobuf_google_2fapi_2fhttp_2eproto::AddDescriptors(); - ::protobuf_google_2fprotobuf_2fdescriptor_2eproto::AddDescriptors(); + ::google::protobuf::internal::AddDescriptors(&descriptor_table_google_2fapi_2fannotations_2eproto, deps, 2); } -void AddDescriptors() { - static ::google::protobuf::internal::once_flag once; - ::google::protobuf::internal::call_once(once, AddDescriptorsImpl); -} -// Force AddDescriptors() to be called at dynamic initialization time. -struct StaticDescriptorInitializer { - StaticDescriptorInitializer() { - AddDescriptors(); - } -} static_descriptor_initializer; -} // namespace protobuf_google_2fapi_2fannotations_2eproto +// Force running AddDescriptors() at dynamic initialization time. +static bool dynamic_init_dummy_google_2fapi_2fannotations_2eproto = []() { AddDescriptors_google_2fapi_2fannotations_2eproto(); return true; }(); namespace google { namespace api { ::google::protobuf::internal::ExtensionIdentifier< ::google::protobuf::MethodOptions, @@ -112,3 +94,4 @@ namespace protobuf { } // namespace google // @@protoc_insertion_point(global_scope) +#include diff --git a/sdks/cpp/src/google/http.pb.cc b/sdks/cpp/src/google/http.pb.cc index 269184e644..d34aa7252a 100644 --- a/sdks/cpp/src/google/http.pb.cc +++ b/sdks/cpp/src/google/http.pb.cc @@ -21,34 +21,27 @@ #include #include -#include #include +#include #include #include #include #include #include -// This is a temporary google only hack -#ifdef GOOGLE_PROTOBUF_ENFORCE_UNIQUENESS -#include "third_party/protobuf/version.h" -#endif // @@protoc_insertion_point(includes) +#include -namespace protobuf_google_2fapi_2fhttp_2eproto { -extern PROTOBUF_INTERNAL_EXPORT_protobuf_google_2fapi_2fhttp_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_CustomHttpPattern; -extern PROTOBUF_INTERNAL_EXPORT_protobuf_google_2fapi_2fhttp_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_HttpRule; -} // namespace protobuf_google_2fapi_2fhttp_2eproto +extern PROTOBUF_INTERNAL_EXPORT_google_2fapi_2fhttp_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_CustomHttpPattern_google_2fapi_2fhttp_2eproto; +extern PROTOBUF_INTERNAL_EXPORT_google_2fapi_2fhttp_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_HttpRule_google_2fapi_2fhttp_2eproto; namespace google { namespace api { class HttpDefaultTypeInternal { public: - ::google::protobuf::internal::ExplicitlyConstructed - _instance; + ::google::protobuf::internal::ExplicitlyConstructed _instance; } _Http_default_instance_; class HttpRuleDefaultTypeInternal { public: - ::google::protobuf::internal::ExplicitlyConstructed - _instance; + ::google::protobuf::internal::ExplicitlyConstructed _instance; ::google::protobuf::internal::ArenaStringPtr get_; ::google::protobuf::internal::ArenaStringPtr put_; ::google::protobuf::internal::ArenaStringPtr post_; @@ -58,13 +51,11 @@ class HttpRuleDefaultTypeInternal { } _HttpRule_default_instance_; class CustomHttpPatternDefaultTypeInternal { public: - ::google::protobuf::internal::ExplicitlyConstructed - _instance; + ::google::protobuf::internal::ExplicitlyConstructed _instance; } _CustomHttpPattern_default_instance_; } // namespace api } // namespace google -namespace protobuf_google_2fapi_2fhttp_2eproto { -static void InitDefaultsHttp() { +static void InitDefaultsHttp_google_2fapi_2fhttp_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; { @@ -75,11 +66,11 @@ static void InitDefaultsHttp() { ::google::api::Http::InitAsDefaultInstance(); } -AGONES_EXPORT ::google::protobuf::internal::SCCInfo<1> scc_info_Http = - {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsHttp}, { - &protobuf_google_2fapi_2fhttp_2eproto::scc_info_HttpRule.base,}}; +AGONES_EXPORT ::google::protobuf::internal::SCCInfo<1> scc_info_Http_google_2fapi_2fhttp_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsHttp_google_2fapi_2fhttp_2eproto}, { + &scc_info_HttpRule_google_2fapi_2fhttp_2eproto.base,}}; -static void InitDefaultsHttpRule() { +static void InitDefaultsHttpRule_google_2fapi_2fhttp_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; { @@ -90,11 +81,11 @@ static void InitDefaultsHttpRule() { ::google::api::HttpRule::InitAsDefaultInstance(); } -AGONES_EXPORT ::google::protobuf::internal::SCCInfo<1> scc_info_HttpRule = - {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsHttpRule}, { - &protobuf_google_2fapi_2fhttp_2eproto::scc_info_CustomHttpPattern.base,}}; +AGONES_EXPORT ::google::protobuf::internal::SCCInfo<1> scc_info_HttpRule_google_2fapi_2fhttp_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsHttpRule_google_2fapi_2fhttp_2eproto}, { + &scc_info_CustomHttpPattern_google_2fapi_2fhttp_2eproto.base,}}; -static void InitDefaultsCustomHttpPattern() { +static void InitDefaultsCustomHttpPattern_google_2fapi_2fhttp_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; { @@ -105,50 +96,52 @@ static void InitDefaultsCustomHttpPattern() { ::google::api::CustomHttpPattern::InitAsDefaultInstance(); } -AGONES_EXPORT ::google::protobuf::internal::SCCInfo<0> scc_info_CustomHttpPattern = - {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsCustomHttpPattern}, {}}; +AGONES_EXPORT ::google::protobuf::internal::SCCInfo<0> scc_info_CustomHttpPattern_google_2fapi_2fhttp_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsCustomHttpPattern_google_2fapi_2fhttp_2eproto}, {}}; -void InitDefaults() { - ::google::protobuf::internal::InitSCC(&scc_info_Http.base); - ::google::protobuf::internal::InitSCC(&scc_info_HttpRule.base); - ::google::protobuf::internal::InitSCC(&scc_info_CustomHttpPattern.base); +void InitDefaults_google_2fapi_2fhttp_2eproto() { + ::google::protobuf::internal::InitSCC(&scc_info_Http_google_2fapi_2fhttp_2eproto.base); + ::google::protobuf::internal::InitSCC(&scc_info_HttpRule_google_2fapi_2fhttp_2eproto.base); + ::google::protobuf::internal::InitSCC(&scc_info_CustomHttpPattern_google_2fapi_2fhttp_2eproto.base); } -::google::protobuf::Metadata file_level_metadata[3]; +::google::protobuf::Metadata file_level_metadata_google_2fapi_2fhttp_2eproto[3]; +constexpr ::google::protobuf::EnumDescriptor const** file_level_enum_descriptors_google_2fapi_2fhttp_2eproto = nullptr; +constexpr ::google::protobuf::ServiceDescriptor const** file_level_service_descriptors_google_2fapi_2fhttp_2eproto = nullptr; -const ::google::protobuf::uint32 TableStruct::offsets[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = { +const ::google::protobuf::uint32 TableStruct_google_2fapi_2fhttp_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { ~0u, // no _has_bits_ - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::google::api::Http, _internal_metadata_), + PROTOBUF_FIELD_OFFSET(::google::api::Http, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::google::api::Http, rules_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::google::api::Http, fully_decode_reserved_expansion_), + PROTOBUF_FIELD_OFFSET(::google::api::Http, rules_), + PROTOBUF_FIELD_OFFSET(::google::api::Http, fully_decode_reserved_expansion_), ~0u, // no _has_bits_ - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::google::api::HttpRule, _internal_metadata_), + PROTOBUF_FIELD_OFFSET(::google::api::HttpRule, _internal_metadata_), ~0u, // no _extensions_ - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::google::api::HttpRule, _oneof_case_[0]), + PROTOBUF_FIELD_OFFSET(::google::api::HttpRule, _oneof_case_[0]), ~0u, // no _weak_field_map_ - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::google::api::HttpRule, selector_), + PROTOBUF_FIELD_OFFSET(::google::api::HttpRule, selector_), offsetof(::google::api::HttpRuleDefaultTypeInternal, get_), offsetof(::google::api::HttpRuleDefaultTypeInternal, put_), offsetof(::google::api::HttpRuleDefaultTypeInternal, post_), offsetof(::google::api::HttpRuleDefaultTypeInternal, delete__), offsetof(::google::api::HttpRuleDefaultTypeInternal, patch_), offsetof(::google::api::HttpRuleDefaultTypeInternal, custom_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::google::api::HttpRule, body_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::google::api::HttpRule, response_body_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::google::api::HttpRule, additional_bindings_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::google::api::HttpRule, pattern_), + PROTOBUF_FIELD_OFFSET(::google::api::HttpRule, body_), + PROTOBUF_FIELD_OFFSET(::google::api::HttpRule, response_body_), + PROTOBUF_FIELD_OFFSET(::google::api::HttpRule, additional_bindings_), + PROTOBUF_FIELD_OFFSET(::google::api::HttpRule, pattern_), ~0u, // no _has_bits_ - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::google::api::CustomHttpPattern, _internal_metadata_), + PROTOBUF_FIELD_OFFSET(::google::api::CustomHttpPattern, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::google::api::CustomHttpPattern, kind_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::google::api::CustomHttpPattern, path_), + PROTOBUF_FIELD_OFFSET(::google::api::CustomHttpPattern, kind_), + PROTOBUF_FIELD_OFFSET(::google::api::CustomHttpPattern, path_), }; -static const ::google::protobuf::internal::MigrationSchema schemas[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = { +static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { { 0, -1, sizeof(::google::api::Http)}, { 7, -1, sizeof(::google::api::HttpRule)}, { 23, -1, sizeof(::google::api::CustomHttpPattern)}, @@ -160,59 +153,43 @@ static ::google::protobuf::Message const * const file_default_instances[] = { reinterpret_cast(&::google::api::_CustomHttpPattern_default_instance_), }; -void protobuf_AssignDescriptors() { - AddDescriptors(); - AssignDescriptors( - "google/api/http.proto", schemas, file_default_instances, TableStruct::offsets, - file_level_metadata, NULL, NULL); -} - -void protobuf_AssignDescriptorsOnce() { - static ::google::protobuf::internal::once_flag once; - ::google::protobuf::internal::call_once(once, protobuf_AssignDescriptors); -} - -void protobuf_RegisterTypes(const ::std::string&) GOOGLE_PROTOBUF_ATTRIBUTE_COLD; -void protobuf_RegisterTypes(const ::std::string&) { - protobuf_AssignDescriptorsOnce(); - ::google::protobuf::internal::RegisterAllTypes(file_level_metadata, 3); -} - -void AddDescriptorsImpl() { - InitDefaults(); - static const char descriptor[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = { - "\n\025google/api/http.proto\022\ngoogle.api\"T\n\004H" - "ttp\022#\n\005rules\030\001 \003(\0132\024.google.api.HttpRule" - "\022\'\n\037fully_decode_reserved_expansion\030\002 \001(" - "\010\"\201\002\n\010HttpRule\022\020\n\010selector\030\001 \001(\t\022\r\n\003get\030" - "\002 \001(\tH\000\022\r\n\003put\030\003 \001(\tH\000\022\016\n\004post\030\004 \001(\tH\000\022\020" - "\n\006delete\030\005 \001(\tH\000\022\017\n\005patch\030\006 \001(\tH\000\022/\n\006cus" - "tom\030\010 \001(\0132\035.google.api.CustomHttpPattern" - "H\000\022\014\n\004body\030\007 \001(\t\022\025\n\rresponse_body\030\014 \001(\t\022" - "1\n\023additional_bindings\030\013 \003(\0132\024.google.ap" - "i.HttpRuleB\t\n\007pattern\"/\n\021CustomHttpPatte" - "rn\022\014\n\004kind\030\001 \001(\t\022\014\n\004path\030\002 \001(\tBj\n\016com.go" - "ogle.apiB\tHttpProtoP\001ZAgoogle.golang.org" - "/genproto/googleapis/api/annotations;ann" - "otations\370\001\001\242\002\004GAPIb\006proto3" +::google::protobuf::internal::AssignDescriptorsTable assign_descriptors_table_google_2fapi_2fhttp_2eproto = { + {}, AddDescriptors_google_2fapi_2fhttp_2eproto, "google/api/http.proto", schemas, + file_default_instances, TableStruct_google_2fapi_2fhttp_2eproto::offsets, + file_level_metadata_google_2fapi_2fhttp_2eproto, 3, file_level_enum_descriptors_google_2fapi_2fhttp_2eproto, file_level_service_descriptors_google_2fapi_2fhttp_2eproto, +}; + +const char descriptor_table_protodef_google_2fapi_2fhttp_2eproto[] = + "\n\025google/api/http.proto\022\ngoogle.api\"T\n\004H" + "ttp\022#\n\005rules\030\001 \003(\0132\024.google.api.HttpRule" + "\022\'\n\037fully_decode_reserved_expansion\030\002 \001(" + "\010\"\201\002\n\010HttpRule\022\020\n\010selector\030\001 \001(\t\022\r\n\003get\030" + "\002 \001(\tH\000\022\r\n\003put\030\003 \001(\tH\000\022\016\n\004post\030\004 \001(\tH\000\022\020" + "\n\006delete\030\005 \001(\tH\000\022\017\n\005patch\030\006 \001(\tH\000\022/\n\006cus" + "tom\030\010 \001(\0132\035.google.api.CustomHttpPattern" + "H\000\022\014\n\004body\030\007 \001(\t\022\025\n\rresponse_body\030\014 \001(\t\022" + "1\n\023additional_bindings\030\013 \003(\0132\024.google.ap" + "i.HttpRuleB\t\n\007pattern\"/\n\021CustomHttpPatte" + "rn\022\014\n\004kind\030\001 \001(\t\022\014\n\004path\030\002 \001(\tBj\n\016com.go" + "ogle.apiB\tHttpProtoP\001ZAgoogle.golang.org" + "/genproto/googleapis/api/annotations;ann" + "otations\370\001\001\242\002\004GAPIb\006proto3" + ; +::google::protobuf::internal::DescriptorTable descriptor_table_google_2fapi_2fhttp_2eproto = { + false, InitDefaults_google_2fapi_2fhttp_2eproto, + descriptor_table_protodef_google_2fapi_2fhttp_2eproto, + "google/api/http.proto", &assign_descriptors_table_google_2fapi_2fhttp_2eproto, 546, +}; + +void AddDescriptors_google_2fapi_2fhttp_2eproto() { + static constexpr ::google::protobuf::internal::InitFunc deps[1] = + { }; - ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( - descriptor, 546); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( - "google/api/http.proto", &protobuf_RegisterTypes); + ::google::protobuf::internal::AddDescriptors(&descriptor_table_google_2fapi_2fhttp_2eproto, deps, 0); } -void AddDescriptors() { - static ::google::protobuf::internal::once_flag once; - ::google::protobuf::internal::call_once(once, AddDescriptorsImpl); -} -// Force AddDescriptors() to be called at dynamic initialization time. -struct StaticDescriptorInitializer { - StaticDescriptorInitializer() { - AddDescriptors(); - } -} static_descriptor_initializer; -} // namespace protobuf_google_2fapi_2fhttp_2eproto +// Force running AddDescriptors() at dynamic initialization time. +static bool dynamic_init_dummy_google_2fapi_2fhttp_2eproto = []() { AddDescriptors_google_2fapi_2fhttp_2eproto(); return true; }(); namespace google { namespace api { @@ -220,15 +197,17 @@ namespace api { void Http::InitAsDefaultInstance() { } +class Http::HasBitSetters { + public: +}; + #if !defined(_MSC_VER) || _MSC_VER >= 1900 const int Http::kRulesFieldNumber; const int Http::kFullyDecodeReservedExpansionFieldNumber; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 Http::Http() - : ::google::protobuf::Message(), _internal_metadata_(NULL) { - ::google::protobuf::internal::InitSCC( - &protobuf_google_2fapi_2fhttp_2eproto::scc_info_Http.base); + : ::google::protobuf::Message(), _internal_metadata_(nullptr) { SharedCtor(); // @@protoc_insertion_point(constructor:google.api.Http) } @@ -236,14 +215,13 @@ Http::Http(::google::protobuf::Arena* arena) : ::google::protobuf::Message(), _internal_metadata_(arena), rules_(arena) { - ::google::protobuf::internal::InitSCC(&protobuf_google_2fapi_2fhttp_2eproto::scc_info_Http.base); SharedCtor(); RegisterArenaDtor(arena); // @@protoc_insertion_point(arena_constructor:google.api.Http) } Http::Http(const Http& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL), + _internal_metadata_(nullptr), rules_(from.rules_) { _internal_metadata_.MergeFrom(from._internal_metadata_); fully_decode_reserved_expansion_ = from.fully_decode_reserved_expansion_; @@ -251,6 +229,8 @@ Http::Http(const Http& from) } void Http::SharedCtor() { + ::google::protobuf::internal::InitSCC( + &scc_info_Http_google_2fapi_2fhttp_2eproto.base); fully_decode_reserved_expansion_ = false; } @@ -260,25 +240,20 @@ Http::~Http() { } void Http::SharedDtor() { - GOOGLE_DCHECK(GetArenaNoVirtual() == NULL); + GOOGLE_DCHECK(GetArenaNoVirtual() == nullptr); } void Http::ArenaDtor(void* object) { Http* _this = reinterpret_cast< Http* >(object); (void)_this; } -void Http::RegisterArenaDtor(::google::protobuf::Arena* arena) { +void Http::RegisterArenaDtor(::google::protobuf::Arena*) { } void Http::SetCachedSize(int size) const { _cached_size_.Set(size); } -const ::google::protobuf::Descriptor* Http::descriptor() { - ::protobuf_google_2fapi_2fhttp_2eproto::protobuf_AssignDescriptorsOnce(); - return ::protobuf_google_2fapi_2fhttp_2eproto::file_level_metadata[kIndexInFileMessages].descriptor; -} - const Http& Http::default_instance() { - ::google::protobuf::internal::InitSCC(&protobuf_google_2fapi_2fhttp_2eproto::scc_info_Http.base); + ::google::protobuf::internal::InitSCC(&::scc_info_Http_google_2fapi_2fhttp_2eproto.base); return *internal_default_instance(); } @@ -294,9 +269,65 @@ void Http::Clear() { _internal_metadata_.Clear(); } +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +const char* Http::_InternalParse(const char* begin, const char* end, void* object, + ::google::protobuf::internal::ParseContext* ctx) { + auto msg = static_cast(object); + ::google::protobuf::int32 size; (void)size; + int depth; (void)depth; + ::google::protobuf::uint32 tag; + ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; + auto ptr = begin; + while (ptr < end) { + ptr = ::google::protobuf::io::Parse32(ptr, &tag); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + switch (tag >> 3) { + // repeated .google.api.HttpRule rules = 1; + case 1: { + if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual; + do { + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + parser_till_end = ::google::api::HttpRule::_InternalParse; + object = msg->add_rules(); + if (size > end - ptr) goto len_delim_till_end; + ptr += size; + GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange( + {parser_till_end, object}, ptr - size, ptr)); + if (ptr >= end) break; + } while ((::google::protobuf::io::UnalignedLoad<::google::protobuf::uint64>(ptr) & 255) == 10 && (ptr += 1)); + break; + } + // bool fully_decode_reserved_expansion = 2; + case 2: { + if (static_cast<::google::protobuf::uint8>(tag) != 16) goto handle_unusual; + msg->set_fully_decode_reserved_expansion(::google::protobuf::internal::ReadVarint(&ptr)); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + break; + } + default: { + handle_unusual: + if ((tag & 7) == 4 || tag == 0) { + ctx->EndGroup(tag); + return ptr; + } + auto res = UnknownFieldParse(tag, {_InternalParse, msg}, + ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); + ptr = res.first; + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); + if (res.second) return ptr; + } + } // switch + } // while + return ptr; +len_delim_till_end: + return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg}, + {parser_till_end, object}, size); +} +#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER bool Http::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { -#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure +#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; // @@protoc_insertion_point(parse_start:google.api.Http) for (;;) { @@ -306,8 +337,7 @@ bool Http::MergePartialFromCodedStream( switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { // repeated .google.api.HttpRule rules = 1; case 1: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(10u /* 10 & 0xFF */)) { + if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( input, add_rules())); } else { @@ -318,8 +348,7 @@ bool Http::MergePartialFromCodedStream( // bool fully_decode_reserved_expansion = 2; case 2: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(16u /* 16 & 0xFF */)) { + if (static_cast< ::google::protobuf::uint8>(tag) == (16 & 0xFF)) { DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( @@ -349,6 +378,7 @@ bool Http::MergePartialFromCodedStream( return false; #undef DO_ } +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER void Http::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { @@ -370,16 +400,15 @@ void Http::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteBool(2, this->fully_decode_reserved_expansion(), output); } - if ((_internal_metadata_.have_unknown_fields() && ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) { + if (_internal_metadata_.have_unknown_fields()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( - (::google::protobuf::internal::GetProto3PreserveUnknownsDefault() ? _internal_metadata_.unknown_fields() : _internal_metadata_.default_instance()), output); + _internal_metadata_.unknown_fields(), output); } // @@protoc_insertion_point(serialize_end:google.api.Http) } ::google::protobuf::uint8* Http::InternalSerializeWithCachedSizesToArray( - bool deterministic, ::google::protobuf::uint8* target) const { - (void)deterministic; // Unused + ::google::protobuf::uint8* target) const { // @@protoc_insertion_point(serialize_to_array_start:google.api.Http) ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; @@ -389,7 +418,7 @@ ::google::protobuf::uint8* Http::InternalSerializeWithCachedSizesToArray( n = static_cast(this->rules_size()); i < n; i++) { target = ::google::protobuf::internal::WireFormatLite:: InternalWriteMessageToArray( - 1, this->rules(static_cast(i)), deterministic, target); + 1, this->rules(static_cast(i)), target); } // bool fully_decode_reserved_expansion = 2; @@ -397,9 +426,9 @@ ::google::protobuf::uint8* Http::InternalSerializeWithCachedSizesToArray( target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(2, this->fully_decode_reserved_expansion(), target); } - if ((_internal_metadata_.have_unknown_fields() && ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) { + if (_internal_metadata_.have_unknown_fields()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( - (::google::protobuf::internal::GetProto3PreserveUnknownsDefault() ? _internal_metadata_.unknown_fields() : _internal_metadata_.default_instance()), target); + _internal_metadata_.unknown_fields(), target); } // @@protoc_insertion_point(serialize_to_array_end:google.api.Http) return target; @@ -409,11 +438,15 @@ size_t Http::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:google.api.Http) size_t total_size = 0; - if ((_internal_metadata_.have_unknown_fields() && ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) { + if (_internal_metadata_.have_unknown_fields()) { total_size += ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - (::google::protobuf::internal::GetProto3PreserveUnknownsDefault() ? _internal_metadata_.unknown_fields() : _internal_metadata_.default_instance())); + _internal_metadata_.unknown_fields()); } + ::google::protobuf::uint32 cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + // repeated .google.api.HttpRule rules = 1; { unsigned int count = static_cast(this->rules_size()); @@ -439,9 +472,9 @@ void Http::MergeFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:google.api.Http) GOOGLE_DCHECK_NE(&from, this); const Http* source = - ::google::protobuf::internal::DynamicCastToGenerated( + ::google::protobuf::DynamicCastToGenerated( &from); - if (source == NULL) { + if (source == nullptr) { // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.api.Http) ::google::protobuf::internal::ReflectionOps::Merge(from, this); } else { @@ -490,7 +523,7 @@ void Http::Swap(Http* other) { temp->MergeFrom(*other); other->CopyFrom(*this); InternalSwap(temp); - if (GetArenaNoVirtual() == NULL) { + if (GetArenaNoVirtual() == nullptr) { delete temp; } } @@ -502,14 +535,14 @@ void Http::UnsafeArenaSwap(Http* other) { } void Http::InternalSwap(Http* other) { using std::swap; + _internal_metadata_.Swap(&other->_internal_metadata_); CastToBase(&rules_)->InternalSwap(CastToBase(&other->rules_)); swap(fully_decode_reserved_expansion_, other->fully_decode_reserved_expansion_); - _internal_metadata_.Swap(&other->_internal_metadata_); } ::google::protobuf::Metadata Http::GetMetadata() const { - protobuf_google_2fapi_2fhttp_2eproto::protobuf_AssignDescriptorsOnce(); - return ::protobuf_google_2fapi_2fhttp_2eproto::file_level_metadata[kIndexInFileMessages]; + ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_google_2fapi_2fhttp_2eproto); + return ::file_level_metadata_google_2fapi_2fhttp_2eproto[kIndexInFileMessages]; } @@ -529,6 +562,15 @@ void HttpRule::InitAsDefaultInstance() { ::google::api::_HttpRule_default_instance_.custom_ = const_cast< ::google::api::CustomHttpPattern*>( ::google::api::CustomHttpPattern::internal_default_instance()); } +class HttpRule::HasBitSetters { + public: + static const ::google::api::CustomHttpPattern& custom(const HttpRule* msg); +}; + +const ::google::api::CustomHttpPattern& +HttpRule::HasBitSetters::custom(const HttpRule* msg) { + return *msg->pattern_.custom_; +} void HttpRule::set_allocated_custom(::google::api::CustomHttpPattern* custom) { ::google::protobuf::Arena* message_arena = GetArenaNoVirtual(); clear_pattern(); @@ -558,9 +600,7 @@ const int HttpRule::kAdditionalBindingsFieldNumber; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 HttpRule::HttpRule() - : ::google::protobuf::Message(), _internal_metadata_(NULL) { - ::google::protobuf::internal::InitSCC( - &protobuf_google_2fapi_2fhttp_2eproto::scc_info_HttpRule.base); + : ::google::protobuf::Message(), _internal_metadata_(nullptr) { SharedCtor(); // @@protoc_insertion_point(constructor:google.api.HttpRule) } @@ -568,14 +608,13 @@ HttpRule::HttpRule(::google::protobuf::Arena* arena) : ::google::protobuf::Message(), _internal_metadata_(arena), additional_bindings_(arena) { - ::google::protobuf::internal::InitSCC(&protobuf_google_2fapi_2fhttp_2eproto::scc_info_HttpRule.base); SharedCtor(); RegisterArenaDtor(arena); // @@protoc_insertion_point(arena_constructor:google.api.HttpRule) } HttpRule::HttpRule(const HttpRule& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL), + _internal_metadata_(nullptr), additional_bindings_(from.additional_bindings_) { _internal_metadata_.MergeFrom(from._internal_metadata_); selector_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); @@ -627,6 +666,8 @@ HttpRule::HttpRule(const HttpRule& from) } void HttpRule::SharedCtor() { + ::google::protobuf::internal::InitSCC( + &scc_info_HttpRule_google_2fapi_2fhttp_2eproto.base); selector_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); body_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); response_body_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); @@ -639,7 +680,7 @@ HttpRule::~HttpRule() { } void HttpRule::SharedDtor() { - GOOGLE_DCHECK(GetArenaNoVirtual() == NULL); + GOOGLE_DCHECK(GetArenaNoVirtual() == nullptr); selector_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); body_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); response_body_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); @@ -652,18 +693,13 @@ void HttpRule::ArenaDtor(void* object) { HttpRule* _this = reinterpret_cast< HttpRule* >(object); (void)_this; } -void HttpRule::RegisterArenaDtor(::google::protobuf::Arena* arena) { +void HttpRule::RegisterArenaDtor(::google::protobuf::Arena*) { } void HttpRule::SetCachedSize(int size) const { _cached_size_.Set(size); } -const ::google::protobuf::Descriptor* HttpRule::descriptor() { - ::protobuf_google_2fapi_2fhttp_2eproto::protobuf_AssignDescriptorsOnce(); - return ::protobuf_google_2fapi_2fhttp_2eproto::file_level_metadata[kIndexInFileMessages].descriptor; -} - const HttpRule& HttpRule::default_instance() { - ::google::protobuf::internal::InitSCC(&protobuf_google_2fapi_2fhttp_2eproto::scc_info_HttpRule.base); + ::google::protobuf::internal::InitSCC(&::scc_info_HttpRule_google_2fapi_2fhttp_2eproto.base); return *internal_default_instance(); } @@ -697,7 +733,7 @@ void HttpRule::clear_pattern() { break; } case kCustom: { - if (GetArenaNoVirtual() == NULL) { + if (GetArenaNoVirtual() == nullptr) { delete pattern_.custom_; } break; @@ -724,9 +760,203 @@ void HttpRule::Clear() { _internal_metadata_.Clear(); } +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +const char* HttpRule::_InternalParse(const char* begin, const char* end, void* object, + ::google::protobuf::internal::ParseContext* ctx) { + auto msg = static_cast(object); + ::google::protobuf::int32 size; (void)size; + int depth; (void)depth; + ::google::protobuf::uint32 tag; + ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; + auto ptr = begin; + while (ptr < end) { + ptr = ::google::protobuf::io::Parse32(ptr, &tag); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + switch (tag >> 3) { + // string selector = 1; + case 1: { + if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + ctx->extra_parse_data().SetFieldName("google.api.HttpRule.selector"); + object = msg->mutable_selector(); + if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { + parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; + goto string_till_end; + } + GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); + ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); + ptr += size; + break; + } + // string get = 2; + case 2: { + if (static_cast<::google::protobuf::uint8>(tag) != 18) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + ctx->extra_parse_data().SetFieldName("google.api.HttpRule.get"); + object = msg->mutable_get(); + if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { + parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; + goto string_till_end; + } + GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); + ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); + ptr += size; + break; + } + // string put = 3; + case 3: { + if (static_cast<::google::protobuf::uint8>(tag) != 26) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + ctx->extra_parse_data().SetFieldName("google.api.HttpRule.put"); + object = msg->mutable_put(); + if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { + parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; + goto string_till_end; + } + GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); + ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); + ptr += size; + break; + } + // string post = 4; + case 4: { + if (static_cast<::google::protobuf::uint8>(tag) != 34) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + ctx->extra_parse_data().SetFieldName("google.api.HttpRule.post"); + object = msg->mutable_post(); + if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { + parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; + goto string_till_end; + } + GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); + ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); + ptr += size; + break; + } + // string delete = 5; + case 5: { + if (static_cast<::google::protobuf::uint8>(tag) != 42) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + ctx->extra_parse_data().SetFieldName("google.api.HttpRule.delete"); + object = msg->mutable_delete_(); + if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { + parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; + goto string_till_end; + } + GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); + ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); + ptr += size; + break; + } + // string patch = 6; + case 6: { + if (static_cast<::google::protobuf::uint8>(tag) != 50) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + ctx->extra_parse_data().SetFieldName("google.api.HttpRule.patch"); + object = msg->mutable_patch(); + if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { + parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; + goto string_till_end; + } + GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); + ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); + ptr += size; + break; + } + // string body = 7; + case 7: { + if (static_cast<::google::protobuf::uint8>(tag) != 58) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + ctx->extra_parse_data().SetFieldName("google.api.HttpRule.body"); + object = msg->mutable_body(); + if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { + parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; + goto string_till_end; + } + GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); + ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); + ptr += size; + break; + } + // .google.api.CustomHttpPattern custom = 8; + case 8: { + if (static_cast<::google::protobuf::uint8>(tag) != 66) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + parser_till_end = ::google::api::CustomHttpPattern::_InternalParse; + object = msg->mutable_custom(); + if (size > end - ptr) goto len_delim_till_end; + ptr += size; + GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange( + {parser_till_end, object}, ptr - size, ptr)); + break; + } + // repeated .google.api.HttpRule additional_bindings = 11; + case 11: { + if (static_cast<::google::protobuf::uint8>(tag) != 90) goto handle_unusual; + do { + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + parser_till_end = ::google::api::HttpRule::_InternalParse; + object = msg->add_additional_bindings(); + if (size > end - ptr) goto len_delim_till_end; + ptr += size; + GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange( + {parser_till_end, object}, ptr - size, ptr)); + if (ptr >= end) break; + } while ((::google::protobuf::io::UnalignedLoad<::google::protobuf::uint64>(ptr) & 255) == 90 && (ptr += 1)); + break; + } + // string response_body = 12; + case 12: { + if (static_cast<::google::protobuf::uint8>(tag) != 98) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + ctx->extra_parse_data().SetFieldName("google.api.HttpRule.response_body"); + object = msg->mutable_response_body(); + if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { + parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; + goto string_till_end; + } + GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); + ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); + ptr += size; + break; + } + default: { + handle_unusual: + if ((tag & 7) == 4 || tag == 0) { + ctx->EndGroup(tag); + return ptr; + } + auto res = UnknownFieldParse(tag, {_InternalParse, msg}, + ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); + ptr = res.first; + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); + if (res.second) return ptr; + } + } // switch + } // while + return ptr; +string_till_end: + static_cast<::std::string*>(object)->clear(); + static_cast<::std::string*>(object)->reserve(size); + goto len_delim_till_end; +len_delim_till_end: + return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg}, + {parser_till_end, object}, size); +} +#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER bool HttpRule::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { -#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure +#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; // @@protoc_insertion_point(parse_start:google.api.HttpRule) for (;;) { @@ -736,8 +966,7 @@ bool HttpRule::MergePartialFromCodedStream( switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { // string selector = 1; case 1: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(10u /* 10 & 0xFF */)) { + if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_selector())); DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( @@ -752,8 +981,7 @@ bool HttpRule::MergePartialFromCodedStream( // string get = 2; case 2: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(18u /* 18 & 0xFF */)) { + if (static_cast< ::google::protobuf::uint8>(tag) == (18 & 0xFF)) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_get())); DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( @@ -768,8 +996,7 @@ bool HttpRule::MergePartialFromCodedStream( // string put = 3; case 3: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(26u /* 26 & 0xFF */)) { + if (static_cast< ::google::protobuf::uint8>(tag) == (26 & 0xFF)) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_put())); DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( @@ -784,8 +1011,7 @@ bool HttpRule::MergePartialFromCodedStream( // string post = 4; case 4: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(34u /* 34 & 0xFF */)) { + if (static_cast< ::google::protobuf::uint8>(tag) == (34 & 0xFF)) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_post())); DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( @@ -800,8 +1026,7 @@ bool HttpRule::MergePartialFromCodedStream( // string delete = 5; case 5: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(42u /* 42 & 0xFF */)) { + if (static_cast< ::google::protobuf::uint8>(tag) == (42 & 0xFF)) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_delete_())); DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( @@ -816,8 +1041,7 @@ bool HttpRule::MergePartialFromCodedStream( // string patch = 6; case 6: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(50u /* 50 & 0xFF */)) { + if (static_cast< ::google::protobuf::uint8>(tag) == (50 & 0xFF)) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_patch())); DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( @@ -832,8 +1056,7 @@ bool HttpRule::MergePartialFromCodedStream( // string body = 7; case 7: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(58u /* 58 & 0xFF */)) { + if (static_cast< ::google::protobuf::uint8>(tag) == (58 & 0xFF)) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_body())); DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( @@ -848,8 +1071,7 @@ bool HttpRule::MergePartialFromCodedStream( // .google.api.CustomHttpPattern custom = 8; case 8: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(66u /* 66 & 0xFF */)) { + if (static_cast< ::google::protobuf::uint8>(tag) == (66 & 0xFF)) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( input, mutable_custom())); } else { @@ -860,8 +1082,7 @@ bool HttpRule::MergePartialFromCodedStream( // repeated .google.api.HttpRule additional_bindings = 11; case 11: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(90u /* 90 & 0xFF */)) { + if (static_cast< ::google::protobuf::uint8>(tag) == (90 & 0xFF)) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( input, add_additional_bindings())); } else { @@ -872,8 +1093,7 @@ bool HttpRule::MergePartialFromCodedStream( // string response_body = 12; case 12: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(98u /* 98 & 0xFF */)) { + if (static_cast< ::google::protobuf::uint8>(tag) == (98 & 0xFF)) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_response_body())); DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( @@ -905,6 +1125,7 @@ bool HttpRule::MergePartialFromCodedStream( return false; #undef DO_ } +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER void HttpRule::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { @@ -985,7 +1206,7 @@ void HttpRule::SerializeWithCachedSizes( // .google.api.CustomHttpPattern custom = 8; if (has_custom()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 8, this->_internal_custom(), output); + 8, HasBitSetters::custom(this), output); } // repeated .google.api.HttpRule additional_bindings = 11; @@ -1007,16 +1228,15 @@ void HttpRule::SerializeWithCachedSizes( 12, this->response_body(), output); } - if ((_internal_metadata_.have_unknown_fields() && ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) { + if (_internal_metadata_.have_unknown_fields()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( - (::google::protobuf::internal::GetProto3PreserveUnknownsDefault() ? _internal_metadata_.unknown_fields() : _internal_metadata_.default_instance()), output); + _internal_metadata_.unknown_fields(), output); } // @@protoc_insertion_point(serialize_end:google.api.HttpRule) } ::google::protobuf::uint8* HttpRule::InternalSerializeWithCachedSizesToArray( - bool deterministic, ::google::protobuf::uint8* target) const { - (void)deterministic; // Unused + ::google::protobuf::uint8* target) const { // @@protoc_insertion_point(serialize_to_array_start:google.api.HttpRule) ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; @@ -1102,7 +1322,7 @@ ::google::protobuf::uint8* HttpRule::InternalSerializeWithCachedSizesToArray( if (has_custom()) { target = ::google::protobuf::internal::WireFormatLite:: InternalWriteMessageToArray( - 8, this->_internal_custom(), deterministic, target); + 8, HasBitSetters::custom(this), target); } // repeated .google.api.HttpRule additional_bindings = 11; @@ -1110,7 +1330,7 @@ ::google::protobuf::uint8* HttpRule::InternalSerializeWithCachedSizesToArray( n = static_cast(this->additional_bindings_size()); i < n; i++) { target = ::google::protobuf::internal::WireFormatLite:: InternalWriteMessageToArray( - 11, this->additional_bindings(static_cast(i)), deterministic, target); + 11, this->additional_bindings(static_cast(i)), target); } // string response_body = 12; @@ -1124,9 +1344,9 @@ ::google::protobuf::uint8* HttpRule::InternalSerializeWithCachedSizesToArray( 12, this->response_body(), target); } - if ((_internal_metadata_.have_unknown_fields() && ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) { + if (_internal_metadata_.have_unknown_fields()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( - (::google::protobuf::internal::GetProto3PreserveUnknownsDefault() ? _internal_metadata_.unknown_fields() : _internal_metadata_.default_instance()), target); + _internal_metadata_.unknown_fields(), target); } // @@protoc_insertion_point(serialize_to_array_end:google.api.HttpRule) return target; @@ -1136,11 +1356,15 @@ size_t HttpRule::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:google.api.HttpRule) size_t total_size = 0; - if ((_internal_metadata_.have_unknown_fields() && ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) { + if (_internal_metadata_.have_unknown_fields()) { total_size += ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - (::google::protobuf::internal::GetProto3PreserveUnknownsDefault() ? _internal_metadata_.unknown_fields() : _internal_metadata_.default_instance())); + _internal_metadata_.unknown_fields()); } + ::google::protobuf::uint32 cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + // repeated .google.api.HttpRule additional_bindings = 11; { unsigned int count = static_cast(this->additional_bindings_size()); @@ -1229,9 +1453,9 @@ void HttpRule::MergeFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:google.api.HttpRule) GOOGLE_DCHECK_NE(&from, this); const HttpRule* source = - ::google::protobuf::internal::DynamicCastToGenerated( + ::google::protobuf::DynamicCastToGenerated( &from); - if (source == NULL) { + if (source == nullptr) { // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.api.HttpRule) ::google::protobuf::internal::ReflectionOps::Merge(from, this); } else { @@ -1315,7 +1539,7 @@ void HttpRule::Swap(HttpRule* other) { temp->MergeFrom(*other); other->CopyFrom(*this); InternalSwap(temp); - if (GetArenaNoVirtual() == NULL) { + if (GetArenaNoVirtual() == nullptr) { delete temp; } } @@ -1327,6 +1551,7 @@ void HttpRule::UnsafeArenaSwap(HttpRule* other) { } void HttpRule::InternalSwap(HttpRule* other) { using std::swap; + _internal_metadata_.Swap(&other->_internal_metadata_); CastToBase(&additional_bindings_)->InternalSwap(CastToBase(&other->additional_bindings_)); selector_.Swap(&other->selector_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); @@ -1336,12 +1561,11 @@ void HttpRule::InternalSwap(HttpRule* other) { GetArenaNoVirtual()); swap(pattern_, other->pattern_); swap(_oneof_case_[0], other->_oneof_case_[0]); - _internal_metadata_.Swap(&other->_internal_metadata_); } ::google::protobuf::Metadata HttpRule::GetMetadata() const { - protobuf_google_2fapi_2fhttp_2eproto::protobuf_AssignDescriptorsOnce(); - return ::protobuf_google_2fapi_2fhttp_2eproto::file_level_metadata[kIndexInFileMessages]; + ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_google_2fapi_2fhttp_2eproto); + return ::file_level_metadata_google_2fapi_2fhttp_2eproto[kIndexInFileMessages]; } @@ -1349,29 +1573,30 @@ ::google::protobuf::Metadata HttpRule::GetMetadata() const { void CustomHttpPattern::InitAsDefaultInstance() { } +class CustomHttpPattern::HasBitSetters { + public: +}; + #if !defined(_MSC_VER) || _MSC_VER >= 1900 const int CustomHttpPattern::kKindFieldNumber; const int CustomHttpPattern::kPathFieldNumber; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 CustomHttpPattern::CustomHttpPattern() - : ::google::protobuf::Message(), _internal_metadata_(NULL) { - ::google::protobuf::internal::InitSCC( - &protobuf_google_2fapi_2fhttp_2eproto::scc_info_CustomHttpPattern.base); + : ::google::protobuf::Message(), _internal_metadata_(nullptr) { SharedCtor(); // @@protoc_insertion_point(constructor:google.api.CustomHttpPattern) } CustomHttpPattern::CustomHttpPattern(::google::protobuf::Arena* arena) : ::google::protobuf::Message(), _internal_metadata_(arena) { - ::google::protobuf::internal::InitSCC(&protobuf_google_2fapi_2fhttp_2eproto::scc_info_CustomHttpPattern.base); SharedCtor(); RegisterArenaDtor(arena); // @@protoc_insertion_point(arena_constructor:google.api.CustomHttpPattern) } CustomHttpPattern::CustomHttpPattern(const CustomHttpPattern& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL) { + _internal_metadata_(nullptr) { _internal_metadata_.MergeFrom(from._internal_metadata_); kind_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); if (from.kind().size() > 0) { @@ -1387,6 +1612,8 @@ CustomHttpPattern::CustomHttpPattern(const CustomHttpPattern& from) } void CustomHttpPattern::SharedCtor() { + ::google::protobuf::internal::InitSCC( + &scc_info_CustomHttpPattern_google_2fapi_2fhttp_2eproto.base); kind_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); path_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } @@ -1397,7 +1624,7 @@ CustomHttpPattern::~CustomHttpPattern() { } void CustomHttpPattern::SharedDtor() { - GOOGLE_DCHECK(GetArenaNoVirtual() == NULL); + GOOGLE_DCHECK(GetArenaNoVirtual() == nullptr); kind_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); path_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } @@ -1406,18 +1633,13 @@ void CustomHttpPattern::ArenaDtor(void* object) { CustomHttpPattern* _this = reinterpret_cast< CustomHttpPattern* >(object); (void)_this; } -void CustomHttpPattern::RegisterArenaDtor(::google::protobuf::Arena* arena) { +void CustomHttpPattern::RegisterArenaDtor(::google::protobuf::Arena*) { } void CustomHttpPattern::SetCachedSize(int size) const { _cached_size_.Set(size); } -const ::google::protobuf::Descriptor* CustomHttpPattern::descriptor() { - ::protobuf_google_2fapi_2fhttp_2eproto::protobuf_AssignDescriptorsOnce(); - return ::protobuf_google_2fapi_2fhttp_2eproto::file_level_metadata[kIndexInFileMessages].descriptor; -} - const CustomHttpPattern& CustomHttpPattern::default_instance() { - ::google::protobuf::internal::InitSCC(&protobuf_google_2fapi_2fhttp_2eproto::scc_info_CustomHttpPattern.base); + ::google::protobuf::internal::InitSCC(&::scc_info_CustomHttpPattern_google_2fapi_2fhttp_2eproto.base); return *internal_default_instance(); } @@ -1433,9 +1655,78 @@ void CustomHttpPattern::Clear() { _internal_metadata_.Clear(); } +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +const char* CustomHttpPattern::_InternalParse(const char* begin, const char* end, void* object, + ::google::protobuf::internal::ParseContext* ctx) { + auto msg = static_cast(object); + ::google::protobuf::int32 size; (void)size; + int depth; (void)depth; + ::google::protobuf::uint32 tag; + ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; + auto ptr = begin; + while (ptr < end) { + ptr = ::google::protobuf::io::Parse32(ptr, &tag); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + switch (tag >> 3) { + // string kind = 1; + case 1: { + if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + ctx->extra_parse_data().SetFieldName("google.api.CustomHttpPattern.kind"); + object = msg->mutable_kind(); + if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { + parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; + goto string_till_end; + } + GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); + ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); + ptr += size; + break; + } + // string path = 2; + case 2: { + if (static_cast<::google::protobuf::uint8>(tag) != 18) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + ctx->extra_parse_data().SetFieldName("google.api.CustomHttpPattern.path"); + object = msg->mutable_path(); + if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { + parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; + goto string_till_end; + } + GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); + ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); + ptr += size; + break; + } + default: { + handle_unusual: + if ((tag & 7) == 4 || tag == 0) { + ctx->EndGroup(tag); + return ptr; + } + auto res = UnknownFieldParse(tag, {_InternalParse, msg}, + ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); + ptr = res.first; + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); + if (res.second) return ptr; + } + } // switch + } // while + return ptr; +string_till_end: + static_cast<::std::string*>(object)->clear(); + static_cast<::std::string*>(object)->reserve(size); + goto len_delim_till_end; +len_delim_till_end: + return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg}, + {parser_till_end, object}, size); +} +#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER bool CustomHttpPattern::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { -#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure +#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; // @@protoc_insertion_point(parse_start:google.api.CustomHttpPattern) for (;;) { @@ -1445,8 +1736,7 @@ bool CustomHttpPattern::MergePartialFromCodedStream( switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { // string kind = 1; case 1: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(10u /* 10 & 0xFF */)) { + if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_kind())); DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( @@ -1461,8 +1751,7 @@ bool CustomHttpPattern::MergePartialFromCodedStream( // string path = 2; case 2: { - if (static_cast< ::google::protobuf::uint8>(tag) == - static_cast< ::google::protobuf::uint8>(18u /* 18 & 0xFF */)) { + if (static_cast< ::google::protobuf::uint8>(tag) == (18 & 0xFF)) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_path())); DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( @@ -1494,6 +1783,7 @@ bool CustomHttpPattern::MergePartialFromCodedStream( return false; #undef DO_ } +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER void CustomHttpPattern::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { @@ -1521,16 +1811,15 @@ void CustomHttpPattern::SerializeWithCachedSizes( 2, this->path(), output); } - if ((_internal_metadata_.have_unknown_fields() && ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) { + if (_internal_metadata_.have_unknown_fields()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( - (::google::protobuf::internal::GetProto3PreserveUnknownsDefault() ? _internal_metadata_.unknown_fields() : _internal_metadata_.default_instance()), output); + _internal_metadata_.unknown_fields(), output); } // @@protoc_insertion_point(serialize_end:google.api.CustomHttpPattern) } ::google::protobuf::uint8* CustomHttpPattern::InternalSerializeWithCachedSizesToArray( - bool deterministic, ::google::protobuf::uint8* target) const { - (void)deterministic; // Unused + ::google::protobuf::uint8* target) const { // @@protoc_insertion_point(serialize_to_array_start:google.api.CustomHttpPattern) ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; @@ -1557,9 +1846,9 @@ ::google::protobuf::uint8* CustomHttpPattern::InternalSerializeWithCachedSizesTo 2, this->path(), target); } - if ((_internal_metadata_.have_unknown_fields() && ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) { + if (_internal_metadata_.have_unknown_fields()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( - (::google::protobuf::internal::GetProto3PreserveUnknownsDefault() ? _internal_metadata_.unknown_fields() : _internal_metadata_.default_instance()), target); + _internal_metadata_.unknown_fields(), target); } // @@protoc_insertion_point(serialize_to_array_end:google.api.CustomHttpPattern) return target; @@ -1569,11 +1858,15 @@ size_t CustomHttpPattern::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:google.api.CustomHttpPattern) size_t total_size = 0; - if ((_internal_metadata_.have_unknown_fields() && ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) { + if (_internal_metadata_.have_unknown_fields()) { total_size += ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - (::google::protobuf::internal::GetProto3PreserveUnknownsDefault() ? _internal_metadata_.unknown_fields() : _internal_metadata_.default_instance())); + _internal_metadata_.unknown_fields()); } + ::google::protobuf::uint32 cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + // string kind = 1; if (this->kind().size() > 0) { total_size += 1 + @@ -1597,9 +1890,9 @@ void CustomHttpPattern::MergeFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:google.api.CustomHttpPattern) GOOGLE_DCHECK_NE(&from, this); const CustomHttpPattern* source = - ::google::protobuf::internal::DynamicCastToGenerated( + ::google::protobuf::DynamicCastToGenerated( &from); - if (source == NULL) { + if (source == nullptr) { // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.api.CustomHttpPattern) ::google::protobuf::internal::ReflectionOps::Merge(from, this); } else { @@ -1650,7 +1943,7 @@ void CustomHttpPattern::Swap(CustomHttpPattern* other) { temp->MergeFrom(*other); other->CopyFrom(*this); InternalSwap(temp); - if (GetArenaNoVirtual() == NULL) { + if (GetArenaNoVirtual() == nullptr) { delete temp; } } @@ -1662,16 +1955,16 @@ void CustomHttpPattern::UnsafeArenaSwap(CustomHttpPattern* other) { } void CustomHttpPattern::InternalSwap(CustomHttpPattern* other) { using std::swap; + _internal_metadata_.Swap(&other->_internal_metadata_); kind_.Swap(&other->kind_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); path_.Swap(&other->path_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); - _internal_metadata_.Swap(&other->_internal_metadata_); } ::google::protobuf::Metadata CustomHttpPattern::GetMetadata() const { - protobuf_google_2fapi_2fhttp_2eproto::protobuf_AssignDescriptorsOnce(); - return ::protobuf_google_2fapi_2fhttp_2eproto::file_level_metadata[kIndexInFileMessages]; + ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_google_2fapi_2fhttp_2eproto); + return ::file_level_metadata_google_2fapi_2fhttp_2eproto[kIndexInFileMessages]; } @@ -1680,16 +1973,17 @@ ::google::protobuf::Metadata CustomHttpPattern::GetMetadata() const { } // namespace google namespace google { namespace protobuf { -template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::google::api::Http* Arena::CreateMaybeMessage< ::google::api::Http >(Arena* arena) { +template<> PROTOBUF_NOINLINE ::google::api::Http* Arena::CreateMaybeMessage< ::google::api::Http >(Arena* arena) { return Arena::CreateMessageInternal< ::google::api::Http >(arena); } -template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::google::api::HttpRule* Arena::CreateMaybeMessage< ::google::api::HttpRule >(Arena* arena) { +template<> PROTOBUF_NOINLINE ::google::api::HttpRule* Arena::CreateMaybeMessage< ::google::api::HttpRule >(Arena* arena) { return Arena::CreateMessageInternal< ::google::api::HttpRule >(arena); } -template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::google::api::CustomHttpPattern* Arena::CreateMaybeMessage< ::google::api::CustomHttpPattern >(Arena* arena) { +template<> PROTOBUF_NOINLINE ::google::api::CustomHttpPattern* Arena::CreateMaybeMessage< ::google::api::CustomHttpPattern >(Arena* arena) { return Arena::CreateMessageInternal< ::google::api::CustomHttpPattern >(arena); } } // namespace protobuf } // namespace google // @@protoc_insertion_point(global_scope) +#include diff --git a/sdks/nodejs/lib/google/api/annotations_pb.js b/sdks/nodejs/lib/google/api/annotations_pb.js index 38da1442c0..c61ca0bc86 100644 --- a/sdks/nodejs/lib/google/api/annotations_pb.js +++ b/sdks/nodejs/lib/google/api/annotations_pb.js @@ -27,7 +27,9 @@ var goog = jspb; var global = Function('return this')(); var google_api_http_pb = require('../../google/api/http_pb.js'); +goog.object.extend(proto, google_api_http_pb); var google_protobuf_descriptor_pb = require('google-protobuf/google/protobuf/descriptor_pb.js'); +goog.object.extend(proto, google_protobuf_descriptor_pb); goog.exportSymbol('proto.google.api.http', null, global); /** diff --git a/sdks/nodejs/lib/google/api/http_pb.js b/sdks/nodejs/lib/google/api/http_pb.js index 3b024fd685..f678c5b5c4 100644 --- a/sdks/nodejs/lib/google/api/http_pb.js +++ b/sdks/nodejs/lib/google/api/http_pb.js @@ -29,7 +29,6 @@ var global = Function('return this')(); goog.exportSymbol('proto.google.api.CustomHttpPattern', null, global); goog.exportSymbol('proto.google.api.Http', null, global); goog.exportSymbol('proto.google.api.HttpRule', null, global); - /** * Generated by JsPbCodeGenerator. * @param {Array=} opt_data Optional initial data array, typically from a @@ -45,8 +44,55 @@ proto.google.api.Http = function(opt_data) { }; goog.inherits(proto.google.api.Http, jspb.Message); if (goog.DEBUG && !COMPILED) { + /** + * @public + * @override + */ proto.google.api.Http.displayName = 'proto.google.api.Http'; } +/** + * Generated by JsPbCodeGenerator. + * @param {Array=} opt_data Optional initial data array, typically from a + * server response, or constructed directly in Javascript. The array is used + * in place and becomes part of the constructed object. It is not cloned. + * If no data is provided, the constructed object will be empty, but still + * valid. + * @extends {jspb.Message} + * @constructor + */ +proto.google.api.HttpRule = function(opt_data) { + jspb.Message.initialize(this, opt_data, 0, -1, proto.google.api.HttpRule.repeatedFields_, proto.google.api.HttpRule.oneofGroups_); +}; +goog.inherits(proto.google.api.HttpRule, jspb.Message); +if (goog.DEBUG && !COMPILED) { + /** + * @public + * @override + */ + proto.google.api.HttpRule.displayName = 'proto.google.api.HttpRule'; +} +/** + * Generated by JsPbCodeGenerator. + * @param {Array=} opt_data Optional initial data array, typically from a + * server response, or constructed directly in Javascript. The array is used + * in place and becomes part of the constructed object. It is not cloned. + * If no data is provided, the constructed object will be empty, but still + * valid. + * @extends {jspb.Message} + * @constructor + */ +proto.google.api.CustomHttpPattern = function(opt_data) { + jspb.Message.initialize(this, opt_data, 0, -1, null, null); +}; +goog.inherits(proto.google.api.CustomHttpPattern, jspb.Message); +if (goog.DEBUG && !COMPILED) { + /** + * @public + * @override + */ + proto.google.api.CustomHttpPattern.displayName = 'proto.google.api.CustomHttpPattern'; +} + /** * List of repeated fields within this message type. * @private {!Array} @@ -82,7 +128,7 @@ proto.google.api.Http.prototype.toObject = function(opt_includeInstance) { * @suppress {unusedLocalVariables} f is only used for nested messages */ proto.google.api.Http.toObject = function(includeInstance, msg) { - var f, obj = { + var obj = { rulesList: jspb.Message.toObjectList(msg.getRulesList(), proto.google.api.HttpRule.toObject, includeInstance), fullyDecodeReservedExpansion: jspb.Message.getFieldWithDefault(msg, 2, false) @@ -204,6 +250,9 @@ proto.google.api.Http.prototype.addRules = function(opt_value, opt_index) { }; +/** + * Clears the list making it empty but non-null. + */ proto.google.api.Http.prototype.clearRulesList = function() { this.setRulesList([]); }; @@ -227,23 +276,6 @@ proto.google.api.Http.prototype.setFullyDecodeReservedExpansion = function(value -/** - * Generated by JsPbCodeGenerator. - * @param {Array=} opt_data Optional initial data array, typically from a - * server response, or constructed directly in Javascript. The array is used - * in place and becomes part of the constructed object. It is not cloned. - * If no data is provided, the constructed object will be empty, but still - * valid. - * @extends {jspb.Message} - * @constructor - */ -proto.google.api.HttpRule = function(opt_data) { - jspb.Message.initialize(this, opt_data, 0, -1, proto.google.api.HttpRule.repeatedFields_, proto.google.api.HttpRule.oneofGroups_); -}; -goog.inherits(proto.google.api.HttpRule, jspb.Message); -if (goog.DEBUG && !COMPILED) { - proto.google.api.HttpRule.displayName = 'proto.google.api.HttpRule'; -} /** * List of repeated fields within this message type. * @private {!Array} @@ -309,7 +341,7 @@ proto.google.api.HttpRule.prototype.toObject = function(opt_includeInstance) { * @suppress {unusedLocalVariables} f is only used for nested messages */ proto.google.api.HttpRule.toObject = function(includeInstance, msg) { - var f, obj = { + var obj = { selector: jspb.Message.getFieldWithDefault(msg, 1, ""), get: jspb.Message.getFieldWithDefault(msg, 2, ""), put: jspb.Message.getFieldWithDefault(msg, 3, ""), @@ -533,6 +565,9 @@ proto.google.api.HttpRule.prototype.setGet = function(value) { }; +/** + * Clears the field making it undefined. + */ proto.google.api.HttpRule.prototype.clearGet = function() { jspb.Message.setOneofField(this, 2, proto.google.api.HttpRule.oneofGroups_[0], undefined); }; @@ -540,7 +575,7 @@ proto.google.api.HttpRule.prototype.clearGet = function() { /** * Returns whether this field is set. - * @return {!boolean} + * @return {boolean} */ proto.google.api.HttpRule.prototype.hasGet = function() { return jspb.Message.getField(this, 2) != null; @@ -562,6 +597,9 @@ proto.google.api.HttpRule.prototype.setPut = function(value) { }; +/** + * Clears the field making it undefined. + */ proto.google.api.HttpRule.prototype.clearPut = function() { jspb.Message.setOneofField(this, 3, proto.google.api.HttpRule.oneofGroups_[0], undefined); }; @@ -569,7 +607,7 @@ proto.google.api.HttpRule.prototype.clearPut = function() { /** * Returns whether this field is set. - * @return {!boolean} + * @return {boolean} */ proto.google.api.HttpRule.prototype.hasPut = function() { return jspb.Message.getField(this, 3) != null; @@ -591,6 +629,9 @@ proto.google.api.HttpRule.prototype.setPost = function(value) { }; +/** + * Clears the field making it undefined. + */ proto.google.api.HttpRule.prototype.clearPost = function() { jspb.Message.setOneofField(this, 4, proto.google.api.HttpRule.oneofGroups_[0], undefined); }; @@ -598,7 +639,7 @@ proto.google.api.HttpRule.prototype.clearPost = function() { /** * Returns whether this field is set. - * @return {!boolean} + * @return {boolean} */ proto.google.api.HttpRule.prototype.hasPost = function() { return jspb.Message.getField(this, 4) != null; @@ -620,6 +661,9 @@ proto.google.api.HttpRule.prototype.setDelete = function(value) { }; +/** + * Clears the field making it undefined. + */ proto.google.api.HttpRule.prototype.clearDelete = function() { jspb.Message.setOneofField(this, 5, proto.google.api.HttpRule.oneofGroups_[0], undefined); }; @@ -627,7 +671,7 @@ proto.google.api.HttpRule.prototype.clearDelete = function() { /** * Returns whether this field is set. - * @return {!boolean} + * @return {boolean} */ proto.google.api.HttpRule.prototype.hasDelete = function() { return jspb.Message.getField(this, 5) != null; @@ -649,6 +693,9 @@ proto.google.api.HttpRule.prototype.setPatch = function(value) { }; +/** + * Clears the field making it undefined. + */ proto.google.api.HttpRule.prototype.clearPatch = function() { jspb.Message.setOneofField(this, 6, proto.google.api.HttpRule.oneofGroups_[0], undefined); }; @@ -656,7 +703,7 @@ proto.google.api.HttpRule.prototype.clearPatch = function() { /** * Returns whether this field is set. - * @return {!boolean} + * @return {boolean} */ proto.google.api.HttpRule.prototype.hasPatch = function() { return jspb.Message.getField(this, 6) != null; @@ -679,6 +726,9 @@ proto.google.api.HttpRule.prototype.setCustom = function(value) { }; +/** + * Clears the message field making it undefined. + */ proto.google.api.HttpRule.prototype.clearCustom = function() { this.setCustom(undefined); }; @@ -686,7 +736,7 @@ proto.google.api.HttpRule.prototype.clearCustom = function() { /** * Returns whether this field is set. - * @return {!boolean} + * @return {boolean} */ proto.google.api.HttpRule.prototype.hasCustom = function() { return jspb.Message.getField(this, 8) != null; @@ -749,29 +799,15 @@ proto.google.api.HttpRule.prototype.addAdditionalBindings = function(opt_value, }; +/** + * Clears the list making it empty but non-null. + */ proto.google.api.HttpRule.prototype.clearAdditionalBindingsList = function() { this.setAdditionalBindingsList([]); }; -/** - * Generated by JsPbCodeGenerator. - * @param {Array=} opt_data Optional initial data array, typically from a - * server response, or constructed directly in Javascript. The array is used - * in place and becomes part of the constructed object. It is not cloned. - * If no data is provided, the constructed object will be empty, but still - * valid. - * @extends {jspb.Message} - * @constructor - */ -proto.google.api.CustomHttpPattern = function(opt_data) { - jspb.Message.initialize(this, opt_data, 0, -1, null, null); -}; -goog.inherits(proto.google.api.CustomHttpPattern, jspb.Message); -if (goog.DEBUG && !COMPILED) { - proto.google.api.CustomHttpPattern.displayName = 'proto.google.api.CustomHttpPattern'; -} if (jspb.Message.GENERATE_TO_OBJECT) { @@ -800,7 +836,7 @@ proto.google.api.CustomHttpPattern.prototype.toObject = function(opt_includeInst * @suppress {unusedLocalVariables} f is only used for nested messages */ proto.google.api.CustomHttpPattern.toObject = function(includeInstance, msg) { - var f, obj = { + var obj = { kind: jspb.Message.getFieldWithDefault(msg, 1, ""), path: jspb.Message.getFieldWithDefault(msg, 2, "") }; diff --git a/sdks/nodejs/lib/sdk_pb.js b/sdks/nodejs/lib/sdk_pb.js index 896ad27711..f221e0e577 100644 --- a/sdks/nodejs/lib/sdk_pb.js +++ b/sdks/nodejs/lib/sdk_pb.js @@ -27,6 +27,7 @@ var goog = jspb; var global = Function('return this')(); var google_api_annotations_pb = require('./google/api/annotations_pb.js'); +goog.object.extend(proto, google_api_annotations_pb); goog.exportSymbol('proto.agones.dev.sdk.Duration', null, global); goog.exportSymbol('proto.agones.dev.sdk.Empty', null, global); goog.exportSymbol('proto.agones.dev.sdk.GameServer', null, global); @@ -36,7 +37,6 @@ goog.exportSymbol('proto.agones.dev.sdk.GameServer.Spec.Health', null, global); goog.exportSymbol('proto.agones.dev.sdk.GameServer.Status', null, global); goog.exportSymbol('proto.agones.dev.sdk.GameServer.Status.Port', null, global); goog.exportSymbol('proto.agones.dev.sdk.KeyValue', null, global); - /** * Generated by JsPbCodeGenerator. * @param {Array=} opt_data Optional initial data array, typically from a @@ -52,8 +52,181 @@ proto.agones.dev.sdk.Empty = function(opt_data) { }; goog.inherits(proto.agones.dev.sdk.Empty, jspb.Message); if (goog.DEBUG && !COMPILED) { + /** + * @public + * @override + */ proto.agones.dev.sdk.Empty.displayName = 'proto.agones.dev.sdk.Empty'; } +/** + * Generated by JsPbCodeGenerator. + * @param {Array=} opt_data Optional initial data array, typically from a + * server response, or constructed directly in Javascript. The array is used + * in place and becomes part of the constructed object. It is not cloned. + * If no data is provided, the constructed object will be empty, but still + * valid. + * @extends {jspb.Message} + * @constructor + */ +proto.agones.dev.sdk.KeyValue = function(opt_data) { + jspb.Message.initialize(this, opt_data, 0, -1, null, null); +}; +goog.inherits(proto.agones.dev.sdk.KeyValue, jspb.Message); +if (goog.DEBUG && !COMPILED) { + /** + * @public + * @override + */ + proto.agones.dev.sdk.KeyValue.displayName = 'proto.agones.dev.sdk.KeyValue'; +} +/** + * Generated by JsPbCodeGenerator. + * @param {Array=} opt_data Optional initial data array, typically from a + * server response, or constructed directly in Javascript. The array is used + * in place and becomes part of the constructed object. It is not cloned. + * If no data is provided, the constructed object will be empty, but still + * valid. + * @extends {jspb.Message} + * @constructor + */ +proto.agones.dev.sdk.Duration = function(opt_data) { + jspb.Message.initialize(this, opt_data, 0, -1, null, null); +}; +goog.inherits(proto.agones.dev.sdk.Duration, jspb.Message); +if (goog.DEBUG && !COMPILED) { + /** + * @public + * @override + */ + proto.agones.dev.sdk.Duration.displayName = 'proto.agones.dev.sdk.Duration'; +} +/** + * Generated by JsPbCodeGenerator. + * @param {Array=} opt_data Optional initial data array, typically from a + * server response, or constructed directly in Javascript. The array is used + * in place and becomes part of the constructed object. It is not cloned. + * If no data is provided, the constructed object will be empty, but still + * valid. + * @extends {jspb.Message} + * @constructor + */ +proto.agones.dev.sdk.GameServer = function(opt_data) { + jspb.Message.initialize(this, opt_data, 0, -1, null, null); +}; +goog.inherits(proto.agones.dev.sdk.GameServer, jspb.Message); +if (goog.DEBUG && !COMPILED) { + /** + * @public + * @override + */ + proto.agones.dev.sdk.GameServer.displayName = 'proto.agones.dev.sdk.GameServer'; +} +/** + * Generated by JsPbCodeGenerator. + * @param {Array=} opt_data Optional initial data array, typically from a + * server response, or constructed directly in Javascript. The array is used + * in place and becomes part of the constructed object. It is not cloned. + * If no data is provided, the constructed object will be empty, but still + * valid. + * @extends {jspb.Message} + * @constructor + */ +proto.agones.dev.sdk.GameServer.ObjectMeta = function(opt_data) { + jspb.Message.initialize(this, opt_data, 0, -1, null, null); +}; +goog.inherits(proto.agones.dev.sdk.GameServer.ObjectMeta, jspb.Message); +if (goog.DEBUG && !COMPILED) { + /** + * @public + * @override + */ + proto.agones.dev.sdk.GameServer.ObjectMeta.displayName = 'proto.agones.dev.sdk.GameServer.ObjectMeta'; +} +/** + * Generated by JsPbCodeGenerator. + * @param {Array=} opt_data Optional initial data array, typically from a + * server response, or constructed directly in Javascript. The array is used + * in place and becomes part of the constructed object. It is not cloned. + * If no data is provided, the constructed object will be empty, but still + * valid. + * @extends {jspb.Message} + * @constructor + */ +proto.agones.dev.sdk.GameServer.Spec = function(opt_data) { + jspb.Message.initialize(this, opt_data, 0, -1, null, null); +}; +goog.inherits(proto.agones.dev.sdk.GameServer.Spec, jspb.Message); +if (goog.DEBUG && !COMPILED) { + /** + * @public + * @override + */ + proto.agones.dev.sdk.GameServer.Spec.displayName = 'proto.agones.dev.sdk.GameServer.Spec'; +} +/** + * Generated by JsPbCodeGenerator. + * @param {Array=} opt_data Optional initial data array, typically from a + * server response, or constructed directly in Javascript. The array is used + * in place and becomes part of the constructed object. It is not cloned. + * If no data is provided, the constructed object will be empty, but still + * valid. + * @extends {jspb.Message} + * @constructor + */ +proto.agones.dev.sdk.GameServer.Spec.Health = function(opt_data) { + jspb.Message.initialize(this, opt_data, 0, -1, null, null); +}; +goog.inherits(proto.agones.dev.sdk.GameServer.Spec.Health, jspb.Message); +if (goog.DEBUG && !COMPILED) { + /** + * @public + * @override + */ + proto.agones.dev.sdk.GameServer.Spec.Health.displayName = 'proto.agones.dev.sdk.GameServer.Spec.Health'; +} +/** + * Generated by JsPbCodeGenerator. + * @param {Array=} opt_data Optional initial data array, typically from a + * server response, or constructed directly in Javascript. The array is used + * in place and becomes part of the constructed object. It is not cloned. + * If no data is provided, the constructed object will be empty, but still + * valid. + * @extends {jspb.Message} + * @constructor + */ +proto.agones.dev.sdk.GameServer.Status = function(opt_data) { + jspb.Message.initialize(this, opt_data, 0, -1, proto.agones.dev.sdk.GameServer.Status.repeatedFields_, null); +}; +goog.inherits(proto.agones.dev.sdk.GameServer.Status, jspb.Message); +if (goog.DEBUG && !COMPILED) { + /** + * @public + * @override + */ + proto.agones.dev.sdk.GameServer.Status.displayName = 'proto.agones.dev.sdk.GameServer.Status'; +} +/** + * Generated by JsPbCodeGenerator. + * @param {Array=} opt_data Optional initial data array, typically from a + * server response, or constructed directly in Javascript. The array is used + * in place and becomes part of the constructed object. It is not cloned. + * If no data is provided, the constructed object will be empty, but still + * valid. + * @extends {jspb.Message} + * @constructor + */ +proto.agones.dev.sdk.GameServer.Status.Port = function(opt_data) { + jspb.Message.initialize(this, opt_data, 0, -1, null, null); +}; +goog.inherits(proto.agones.dev.sdk.GameServer.Status.Port, jspb.Message); +if (goog.DEBUG && !COMPILED) { + /** + * @public + * @override + */ + proto.agones.dev.sdk.GameServer.Status.Port.displayName = 'proto.agones.dev.sdk.GameServer.Status.Port'; +} + if (jspb.Message.GENERATE_TO_OBJECT) { @@ -82,7 +255,7 @@ proto.agones.dev.sdk.Empty.prototype.toObject = function(opt_includeInstance) { * @suppress {unusedLocalVariables} f is only used for nested messages */ proto.agones.dev.sdk.Empty.toObject = function(includeInstance, msg) { - var f, obj = { + var obj = { }; @@ -153,23 +326,6 @@ proto.agones.dev.sdk.Empty.serializeBinaryToWriter = function(message, writer) { -/** - * Generated by JsPbCodeGenerator. - * @param {Array=} opt_data Optional initial data array, typically from a - * server response, or constructed directly in Javascript. The array is used - * in place and becomes part of the constructed object. It is not cloned. - * If no data is provided, the constructed object will be empty, but still - * valid. - * @extends {jspb.Message} - * @constructor - */ -proto.agones.dev.sdk.KeyValue = function(opt_data) { - jspb.Message.initialize(this, opt_data, 0, -1, null, null); -}; -goog.inherits(proto.agones.dev.sdk.KeyValue, jspb.Message); -if (goog.DEBUG && !COMPILED) { - proto.agones.dev.sdk.KeyValue.displayName = 'proto.agones.dev.sdk.KeyValue'; -} if (jspb.Message.GENERATE_TO_OBJECT) { @@ -198,7 +354,7 @@ proto.agones.dev.sdk.KeyValue.prototype.toObject = function(opt_includeInstance) * @suppress {unusedLocalVariables} f is only used for nested messages */ proto.agones.dev.sdk.KeyValue.toObject = function(includeInstance, msg) { - var f, obj = { + var obj = { key: jspb.Message.getFieldWithDefault(msg, 1, ""), value: jspb.Message.getFieldWithDefault(msg, 2, "") }; @@ -322,23 +478,6 @@ proto.agones.dev.sdk.KeyValue.prototype.setValue = function(value) { -/** - * Generated by JsPbCodeGenerator. - * @param {Array=} opt_data Optional initial data array, typically from a - * server response, or constructed directly in Javascript. The array is used - * in place and becomes part of the constructed object. It is not cloned. - * If no data is provided, the constructed object will be empty, but still - * valid. - * @extends {jspb.Message} - * @constructor - */ -proto.agones.dev.sdk.Duration = function(opt_data) { - jspb.Message.initialize(this, opt_data, 0, -1, null, null); -}; -goog.inherits(proto.agones.dev.sdk.Duration, jspb.Message); -if (goog.DEBUG && !COMPILED) { - proto.agones.dev.sdk.Duration.displayName = 'proto.agones.dev.sdk.Duration'; -} if (jspb.Message.GENERATE_TO_OBJECT) { @@ -367,7 +506,7 @@ proto.agones.dev.sdk.Duration.prototype.toObject = function(opt_includeInstance) * @suppress {unusedLocalVariables} f is only used for nested messages */ proto.agones.dev.sdk.Duration.toObject = function(includeInstance, msg) { - var f, obj = { + var obj = { seconds: jspb.Message.getFieldWithDefault(msg, 1, 0) }; @@ -464,23 +603,6 @@ proto.agones.dev.sdk.Duration.prototype.setSeconds = function(value) { -/** - * Generated by JsPbCodeGenerator. - * @param {Array=} opt_data Optional initial data array, typically from a - * server response, or constructed directly in Javascript. The array is used - * in place and becomes part of the constructed object. It is not cloned. - * If no data is provided, the constructed object will be empty, but still - * valid. - * @extends {jspb.Message} - * @constructor - */ -proto.agones.dev.sdk.GameServer = function(opt_data) { - jspb.Message.initialize(this, opt_data, 0, -1, null, null); -}; -goog.inherits(proto.agones.dev.sdk.GameServer, jspb.Message); -if (goog.DEBUG && !COMPILED) { - proto.agones.dev.sdk.GameServer.displayName = 'proto.agones.dev.sdk.GameServer'; -} if (jspb.Message.GENERATE_TO_OBJECT) { @@ -509,7 +631,7 @@ proto.agones.dev.sdk.GameServer.prototype.toObject = function(opt_includeInstanc * @suppress {unusedLocalVariables} f is only used for nested messages */ proto.agones.dev.sdk.GameServer.toObject = function(includeInstance, msg) { - var f, obj = { + var obj = { objectMeta: (f = msg.getObjectMeta()) && proto.agones.dev.sdk.GameServer.ObjectMeta.toObject(includeInstance, f), spec: (f = msg.getSpec()) && proto.agones.dev.sdk.GameServer.Spec.toObject(includeInstance, f), status: (f = msg.getStatus()) && proto.agones.dev.sdk.GameServer.Status.toObject(includeInstance, f) @@ -621,23 +743,6 @@ proto.agones.dev.sdk.GameServer.serializeBinaryToWriter = function(message, writ -/** - * Generated by JsPbCodeGenerator. - * @param {Array=} opt_data Optional initial data array, typically from a - * server response, or constructed directly in Javascript. The array is used - * in place and becomes part of the constructed object. It is not cloned. - * If no data is provided, the constructed object will be empty, but still - * valid. - * @extends {jspb.Message} - * @constructor - */ -proto.agones.dev.sdk.GameServer.ObjectMeta = function(opt_data) { - jspb.Message.initialize(this, opt_data, 0, -1, null, null); -}; -goog.inherits(proto.agones.dev.sdk.GameServer.ObjectMeta, jspb.Message); -if (goog.DEBUG && !COMPILED) { - proto.agones.dev.sdk.GameServer.ObjectMeta.displayName = 'proto.agones.dev.sdk.GameServer.ObjectMeta'; -} if (jspb.Message.GENERATE_TO_OBJECT) { @@ -666,7 +771,7 @@ proto.agones.dev.sdk.GameServer.ObjectMeta.prototype.toObject = function(opt_inc * @suppress {unusedLocalVariables} f is only used for nested messages */ proto.agones.dev.sdk.GameServer.ObjectMeta.toObject = function(includeInstance, msg) { - var f, obj = { + var obj = { name: jspb.Message.getFieldWithDefault(msg, 1, ""), namespace: jspb.Message.getFieldWithDefault(msg, 2, ""), uid: jspb.Message.getFieldWithDefault(msg, 3, ""), @@ -959,6 +1064,9 @@ proto.agones.dev.sdk.GameServer.ObjectMeta.prototype.getAnnotationsMap = functio }; +/** + * Clears values from the map. The map will be non-null. + */ proto.agones.dev.sdk.GameServer.ObjectMeta.prototype.clearAnnotationsMap = function() { this.getAnnotationsMap().clear(); }; @@ -977,29 +1085,15 @@ proto.agones.dev.sdk.GameServer.ObjectMeta.prototype.getLabelsMap = function(opt }; +/** + * Clears values from the map. The map will be non-null. + */ proto.agones.dev.sdk.GameServer.ObjectMeta.prototype.clearLabelsMap = function() { this.getLabelsMap().clear(); }; -/** - * Generated by JsPbCodeGenerator. - * @param {Array=} opt_data Optional initial data array, typically from a - * server response, or constructed directly in Javascript. The array is used - * in place and becomes part of the constructed object. It is not cloned. - * If no data is provided, the constructed object will be empty, but still - * valid. - * @extends {jspb.Message} - * @constructor - */ -proto.agones.dev.sdk.GameServer.Spec = function(opt_data) { - jspb.Message.initialize(this, opt_data, 0, -1, null, null); -}; -goog.inherits(proto.agones.dev.sdk.GameServer.Spec, jspb.Message); -if (goog.DEBUG && !COMPILED) { - proto.agones.dev.sdk.GameServer.Spec.displayName = 'proto.agones.dev.sdk.GameServer.Spec'; -} if (jspb.Message.GENERATE_TO_OBJECT) { @@ -1028,7 +1122,7 @@ proto.agones.dev.sdk.GameServer.Spec.prototype.toObject = function(opt_includeIn * @suppress {unusedLocalVariables} f is only used for nested messages */ proto.agones.dev.sdk.GameServer.Spec.toObject = function(includeInstance, msg) { - var f, obj = { + var obj = { health: (f = msg.getHealth()) && proto.agones.dev.sdk.GameServer.Spec.Health.toObject(includeInstance, f) }; @@ -1112,23 +1206,6 @@ proto.agones.dev.sdk.GameServer.Spec.serializeBinaryToWriter = function(message, -/** - * Generated by JsPbCodeGenerator. - * @param {Array=} opt_data Optional initial data array, typically from a - * server response, or constructed directly in Javascript. The array is used - * in place and becomes part of the constructed object. It is not cloned. - * If no data is provided, the constructed object will be empty, but still - * valid. - * @extends {jspb.Message} - * @constructor - */ -proto.agones.dev.sdk.GameServer.Spec.Health = function(opt_data) { - jspb.Message.initialize(this, opt_data, 0, -1, null, null); -}; -goog.inherits(proto.agones.dev.sdk.GameServer.Spec.Health, jspb.Message); -if (goog.DEBUG && !COMPILED) { - proto.agones.dev.sdk.GameServer.Spec.Health.displayName = 'proto.agones.dev.sdk.GameServer.Spec.Health'; -} if (jspb.Message.GENERATE_TO_OBJECT) { @@ -1157,7 +1234,7 @@ proto.agones.dev.sdk.GameServer.Spec.Health.prototype.toObject = function(opt_in * @suppress {unusedLocalVariables} f is only used for nested messages */ proto.agones.dev.sdk.GameServer.Spec.Health.toObject = function(includeInstance, msg) { - var f, obj = { + var obj = { disabled: jspb.Message.getFieldWithDefault(msg, 1, false), periodSeconds: jspb.Message.getFieldWithDefault(msg, 2, 0), failureThreshold: jspb.Message.getFieldWithDefault(msg, 3, 0), @@ -1352,6 +1429,9 @@ proto.agones.dev.sdk.GameServer.Spec.prototype.setHealth = function(value) { }; +/** + * Clears the message field making it undefined. + */ proto.agones.dev.sdk.GameServer.Spec.prototype.clearHealth = function() { this.setHealth(undefined); }; @@ -1359,7 +1439,7 @@ proto.agones.dev.sdk.GameServer.Spec.prototype.clearHealth = function() { /** * Returns whether this field is set. - * @return {!boolean} + * @return {boolean} */ proto.agones.dev.sdk.GameServer.Spec.prototype.hasHealth = function() { return jspb.Message.getField(this, 1) != null; @@ -1367,23 +1447,6 @@ proto.agones.dev.sdk.GameServer.Spec.prototype.hasHealth = function() { -/** - * Generated by JsPbCodeGenerator. - * @param {Array=} opt_data Optional initial data array, typically from a - * server response, or constructed directly in Javascript. The array is used - * in place and becomes part of the constructed object. It is not cloned. - * If no data is provided, the constructed object will be empty, but still - * valid. - * @extends {jspb.Message} - * @constructor - */ -proto.agones.dev.sdk.GameServer.Status = function(opt_data) { - jspb.Message.initialize(this, opt_data, 0, -1, proto.agones.dev.sdk.GameServer.Status.repeatedFields_, null); -}; -goog.inherits(proto.agones.dev.sdk.GameServer.Status, jspb.Message); -if (goog.DEBUG && !COMPILED) { - proto.agones.dev.sdk.GameServer.Status.displayName = 'proto.agones.dev.sdk.GameServer.Status'; -} /** * List of repeated fields within this message type. * @private {!Array} @@ -1419,7 +1482,7 @@ proto.agones.dev.sdk.GameServer.Status.prototype.toObject = function(opt_include * @suppress {unusedLocalVariables} f is only used for nested messages */ proto.agones.dev.sdk.GameServer.Status.toObject = function(includeInstance, msg) { - var f, obj = { + var obj = { state: jspb.Message.getFieldWithDefault(msg, 1, ""), address: jspb.Message.getFieldWithDefault(msg, 2, ""), portsList: jspb.Message.toObjectList(msg.getPortsList(), @@ -1528,23 +1591,6 @@ proto.agones.dev.sdk.GameServer.Status.serializeBinaryToWriter = function(messag -/** - * Generated by JsPbCodeGenerator. - * @param {Array=} opt_data Optional initial data array, typically from a - * server response, or constructed directly in Javascript. The array is used - * in place and becomes part of the constructed object. It is not cloned. - * If no data is provided, the constructed object will be empty, but still - * valid. - * @extends {jspb.Message} - * @constructor - */ -proto.agones.dev.sdk.GameServer.Status.Port = function(opt_data) { - jspb.Message.initialize(this, opt_data, 0, -1, null, null); -}; -goog.inherits(proto.agones.dev.sdk.GameServer.Status.Port, jspb.Message); -if (goog.DEBUG && !COMPILED) { - proto.agones.dev.sdk.GameServer.Status.Port.displayName = 'proto.agones.dev.sdk.GameServer.Status.Port'; -} if (jspb.Message.GENERATE_TO_OBJECT) { @@ -1573,7 +1619,7 @@ proto.agones.dev.sdk.GameServer.Status.Port.prototype.toObject = function(opt_in * @suppress {unusedLocalVariables} f is only used for nested messages */ proto.agones.dev.sdk.GameServer.Status.Port.toObject = function(includeInstance, msg) { - var f, obj = { + var obj = { name: jspb.Message.getFieldWithDefault(msg, 1, ""), port: jspb.Message.getFieldWithDefault(msg, 2, 0) }; @@ -1752,6 +1798,9 @@ proto.agones.dev.sdk.GameServer.Status.prototype.addPorts = function(opt_value, }; +/** + * Clears the list making it empty but non-null. + */ proto.agones.dev.sdk.GameServer.Status.prototype.clearPortsList = function() { this.setPortsList([]); }; @@ -1773,6 +1822,9 @@ proto.agones.dev.sdk.GameServer.prototype.setObjectMeta = function(value) { }; +/** + * Clears the message field making it undefined. + */ proto.agones.dev.sdk.GameServer.prototype.clearObjectMeta = function() { this.setObjectMeta(undefined); }; @@ -1780,7 +1832,7 @@ proto.agones.dev.sdk.GameServer.prototype.clearObjectMeta = function() { /** * Returns whether this field is set. - * @return {!boolean} + * @return {boolean} */ proto.agones.dev.sdk.GameServer.prototype.hasObjectMeta = function() { return jspb.Message.getField(this, 1) != null; @@ -1803,6 +1855,9 @@ proto.agones.dev.sdk.GameServer.prototype.setSpec = function(value) { }; +/** + * Clears the message field making it undefined. + */ proto.agones.dev.sdk.GameServer.prototype.clearSpec = function() { this.setSpec(undefined); }; @@ -1810,7 +1865,7 @@ proto.agones.dev.sdk.GameServer.prototype.clearSpec = function() { /** * Returns whether this field is set. - * @return {!boolean} + * @return {boolean} */ proto.agones.dev.sdk.GameServer.prototype.hasSpec = function() { return jspb.Message.getField(this, 2) != null; @@ -1833,6 +1888,9 @@ proto.agones.dev.sdk.GameServer.prototype.setStatus = function(value) { }; +/** + * Clears the message field making it undefined. + */ proto.agones.dev.sdk.GameServer.prototype.clearStatus = function() { this.setStatus(undefined); }; @@ -1840,7 +1898,7 @@ proto.agones.dev.sdk.GameServer.prototype.clearStatus = function() { /** * Returns whether this field is set. - * @return {!boolean} + * @return {boolean} */ proto.agones.dev.sdk.GameServer.prototype.hasStatus = function() { return jspb.Message.getField(this, 3) != null; diff --git a/sdks/rust/src/grpc/sdk.rs b/sdks/rust/src/grpc/sdk.rs index 36ae66e9d0..0e7f4760d9 100644 --- a/sdks/rust/src/grpc/sdk.rs +++ b/sdks/rust/src/grpc/sdk.rs @@ -2230,11 +2230,11 @@ static file_descriptor_proto_data: &'static [u8] = b"\ DITIONS\x20OF\x20ANY\x20KIND,\x20either\x20express\x20or\x20implied.\n\ \x20See\x20the\x20License\x20for\x20the\x20specific\x20language\x20gover\ ning\x20permissions\x20and\n\x20limitations\x20under\x20the\x20License.\ - \n\n\x08\n\x01\x02\x12\x03\x10\x08\x16\n\x08\n\x01\x08\x12\x03\x11\0\x1a\ - \n\t\n\x02\x08\x0b\x12\x03\x11\0\x1a\n\t\n\x02\x03\0\x12\x03\x13\x07%\nM\ - \n\x02\x06\0\x12\x04\x16\0Y\x01\x1aA\x20SDK\x20service\x20to\x20be\x20us\ - ed\x20in\x20the\x20GameServer\x20SDK\x20to\x20the\x20Pod\x20Sidecar\n\n\ - \n\n\x03\x06\0\x01\x12\x03\x16\x08\x0b\n1\n\x04\x06\0\x02\0\x12\x04\x18\ + \n\n\x08\n\x01\x02\x12\x03\x10\0\x17\n\x08\n\x01\x08\x12\x03\x11\0\x1a\n\ + \t\n\x02\x08\x0b\x12\x03\x11\0\x1a\n\t\n\x02\x03\0\x12\x03\x13\0&\nM\n\ + \x02\x06\0\x12\x04\x16\0Y\x01\x1aA\x20SDK\x20service\x20to\x20be\x20used\ + \x20in\x20the\x20GameServer\x20SDK\x20to\x20the\x20Pod\x20Sidecar\n\n\n\ + \n\x03\x06\0\x01\x12\x03\x16\x08\x0b\n1\n\x04\x06\0\x02\0\x12\x04\x18\ \x04\x1d\x05\x1a#\x20Call\x20when\x20the\x20GameServer\x20is\x20ready\n\ \n\x0c\n\x05\x06\0\x02\0\x01\x12\x03\x18\x08\r\n\x0c\n\x05\x06\0\x02\0\ \x02\x12\x03\x18\x0f\x14\n\x0c\n\x05\x06\0\x02\0\x03\x12\x03\x18\x1f$\n\ diff --git a/vendor/github.com/golang/protobuf/descriptor/descriptor.go b/vendor/github.com/golang/protobuf/descriptor/descriptor.go new file mode 100644 index 0000000000..ac7e51bfb1 --- /dev/null +++ b/vendor/github.com/golang/protobuf/descriptor/descriptor.go @@ -0,0 +1,93 @@ +// Go support for Protocol Buffers - Google's data interchange format +// +// Copyright 2016 The Go Authors. All rights reserved. +// https://github.com/golang/protobuf +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +// Package descriptor provides functions for obtaining protocol buffer +// descriptors for generated Go types. +// +// These functions cannot go in package proto because they depend on the +// generated protobuf descriptor messages, which themselves depend on proto. +package descriptor + +import ( + "bytes" + "compress/gzip" + "fmt" + "io/ioutil" + + "github.com/golang/protobuf/proto" + protobuf "github.com/golang/protobuf/protoc-gen-go/descriptor" +) + +// extractFile extracts a FileDescriptorProto from a gzip'd buffer. +func extractFile(gz []byte) (*protobuf.FileDescriptorProto, error) { + r, err := gzip.NewReader(bytes.NewReader(gz)) + if err != nil { + return nil, fmt.Errorf("failed to open gzip reader: %v", err) + } + defer r.Close() + + b, err := ioutil.ReadAll(r) + if err != nil { + return nil, fmt.Errorf("failed to uncompress descriptor: %v", err) + } + + fd := new(protobuf.FileDescriptorProto) + if err := proto.Unmarshal(b, fd); err != nil { + return nil, fmt.Errorf("malformed FileDescriptorProto: %v", err) + } + + return fd, nil +} + +// Message is a proto.Message with a method to return its descriptor. +// +// Message types generated by the protocol compiler always satisfy +// the Message interface. +type Message interface { + proto.Message + Descriptor() ([]byte, []int) +} + +// ForMessage returns a FileDescriptorProto and a DescriptorProto from within it +// describing the given message. +func ForMessage(msg Message) (fd *protobuf.FileDescriptorProto, md *protobuf.DescriptorProto) { + gz, path := msg.Descriptor() + fd, err := extractFile(gz) + if err != nil { + panic(fmt.Sprintf("invalid FileDescriptorProto for %T: %v", msg, err)) + } + + md = fd.MessageType[path[0]] + for _, i := range path[1:] { + md = md.NestedType[i] + } + return fd, md +} diff --git a/vendor/github.com/golang/protobuf/jsonpb/jsonpb.go b/vendor/github.com/golang/protobuf/jsonpb/jsonpb.go index ada2b78e89..e9cc202585 100644 --- a/vendor/github.com/golang/protobuf/jsonpb/jsonpb.go +++ b/vendor/github.com/golang/protobuf/jsonpb/jsonpb.go @@ -57,6 +57,7 @@ import ( ) const secondInNanos = int64(time.Second / time.Nanosecond) +const maxSecondsInDuration = 315576000000 // Marshaler is a configurable object for converting between // protocol buffer objects and a JSON representation for them. @@ -182,7 +183,12 @@ func (m *Marshaler) marshalObject(out *errWriter, v proto.Message, indent, typeU return fmt.Errorf("failed to marshal type URL %q to JSON: %v", typeURL, err) } js["@type"] = (*json.RawMessage)(&turl) - if b, err = json.Marshal(js); err != nil { + if m.Indent != "" { + b, err = json.MarshalIndent(js, indent, m.Indent) + } else { + b, err = json.Marshal(js) + } + if err != nil { return err } } @@ -206,19 +212,26 @@ func (m *Marshaler) marshalObject(out *errWriter, v proto.Message, indent, typeU // Any is a bit more involved. return m.marshalAny(out, v, indent) case "Duration": - // "Generated output always contains 0, 3, 6, or 9 fractional digits, - // depending on required precision." s, ns := s.Field(0).Int(), s.Field(1).Int() + if s < -maxSecondsInDuration || s > maxSecondsInDuration { + return fmt.Errorf("seconds out of range %v", s) + } if ns <= -secondInNanos || ns >= secondInNanos { return fmt.Errorf("ns out of range (%v, %v)", -secondInNanos, secondInNanos) } if (s > 0 && ns < 0) || (s < 0 && ns > 0) { return errors.New("signs of seconds and nanos do not match") } - if s < 0 { + // Generated output always contains 0, 3, 6, or 9 fractional digits, + // depending on required precision, followed by the suffix "s". + f := "%d.%09d" + if ns < 0 { ns = -ns + if s == 0 { + f = "-%d.%09d" + } } - x := fmt.Sprintf("%d.%09d", s, ns) + x := fmt.Sprintf(f, s, ns) x = strings.TrimSuffix(x, "000") x = strings.TrimSuffix(x, "000") x = strings.TrimSuffix(x, ".000") diff --git a/vendor/github.com/golang/protobuf/proto/decode.go b/vendor/github.com/golang/protobuf/proto/decode.go index d9aa3c42d6..63b0f08bef 100644 --- a/vendor/github.com/golang/protobuf/proto/decode.go +++ b/vendor/github.com/golang/protobuf/proto/decode.go @@ -186,7 +186,6 @@ func (p *Buffer) DecodeVarint() (x uint64, err error) { if b&0x80 == 0 { goto done } - // x -= 0x80 << 63 // Always zero. return 0, errOverflow diff --git a/vendor/github.com/golang/protobuf/proto/deprecated.go b/vendor/github.com/golang/protobuf/proto/deprecated.go new file mode 100644 index 0000000000..35b882c09a --- /dev/null +++ b/vendor/github.com/golang/protobuf/proto/deprecated.go @@ -0,0 +1,63 @@ +// Go support for Protocol Buffers - Google's data interchange format +// +// Copyright 2018 The Go Authors. All rights reserved. +// https://github.com/golang/protobuf +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +package proto + +import "errors" + +// Deprecated: do not use. +type Stats struct{ Emalloc, Dmalloc, Encode, Decode, Chit, Cmiss, Size uint64 } + +// Deprecated: do not use. +func GetStats() Stats { return Stats{} } + +// Deprecated: do not use. +func MarshalMessageSet(interface{}) ([]byte, error) { + return nil, errors.New("proto: not implemented") +} + +// Deprecated: do not use. +func UnmarshalMessageSet([]byte, interface{}) error { + return errors.New("proto: not implemented") +} + +// Deprecated: do not use. +func MarshalMessageSetJSON(interface{}) ([]byte, error) { + return nil, errors.New("proto: not implemented") +} + +// Deprecated: do not use. +func UnmarshalMessageSetJSON([]byte, interface{}) error { + return errors.New("proto: not implemented") +} + +// Deprecated: do not use. +func RegisterMessageSetType(Message, int32, string) {} diff --git a/vendor/github.com/golang/protobuf/proto/equal.go b/vendor/github.com/golang/protobuf/proto/equal.go index d4db5a1c14..f9b6e41b3c 100644 --- a/vendor/github.com/golang/protobuf/proto/equal.go +++ b/vendor/github.com/golang/protobuf/proto/equal.go @@ -246,7 +246,8 @@ func equalExtMap(base reflect.Type, em1, em2 map[int32]Extension) bool { return false } - m1, m2 := e1.value, e2.value + m1 := extensionAsLegacyType(e1.value) + m2 := extensionAsLegacyType(e2.value) if m1 == nil && m2 == nil { // Both have only encoded form. diff --git a/vendor/github.com/golang/protobuf/proto/extensions.go b/vendor/github.com/golang/protobuf/proto/extensions.go index 816a3b9d6c..fa88add30a 100644 --- a/vendor/github.com/golang/protobuf/proto/extensions.go +++ b/vendor/github.com/golang/protobuf/proto/extensions.go @@ -185,9 +185,25 @@ type Extension struct { // extension will have only enc set. When such an extension is // accessed using GetExtension (or GetExtensions) desc and value // will be set. - desc *ExtensionDesc + desc *ExtensionDesc + + // value is a concrete value for the extension field. Let the type of + // desc.ExtensionType be the "API type" and the type of Extension.value + // be the "storage type". The API type and storage type are the same except: + // * For scalars (except []byte), the API type uses *T, + // while the storage type uses T. + // * For repeated fields, the API type uses []T, while the storage type + // uses *[]T. + // + // The reason for the divergence is so that the storage type more naturally + // matches what is expected of when retrieving the values through the + // protobuf reflection APIs. + // + // The value may only be populated if desc is also populated. value interface{} - enc []byte + + // enc is the raw bytes for the extension field. + enc []byte } // SetRawExtension is for testing only. @@ -334,7 +350,7 @@ func GetExtension(pb Message, extension *ExtensionDesc) (interface{}, error) { // descriptors with the same field number. return nil, errors.New("proto: descriptor conflict") } - return e.value, nil + return extensionAsLegacyType(e.value), nil } if extension.ExtensionType == nil { @@ -349,11 +365,11 @@ func GetExtension(pb Message, extension *ExtensionDesc) (interface{}, error) { // Remember the decoded version and drop the encoded version. // That way it is safe to mutate what we return. - e.value = v + e.value = extensionAsStorageType(v) e.desc = extension e.enc = nil emap[extension.Field] = e - return e.value, nil + return extensionAsLegacyType(e.value), nil } // defaultExtensionValue returns the default value for extension. @@ -488,7 +504,7 @@ func SetExtension(pb Message, extension *ExtensionDesc, value interface{}) error } typ := reflect.TypeOf(extension.ExtensionType) if typ != reflect.TypeOf(value) { - return errors.New("proto: bad extension value type") + return fmt.Errorf("proto: bad extension value type. got: %T, want: %T", value, extension.ExtensionType) } // nil extension values need to be caught early, because the // encoder can't distinguish an ErrNil due to a nil extension @@ -500,7 +516,7 @@ func SetExtension(pb Message, extension *ExtensionDesc, value interface{}) error } extmap := epb.extensionsWrite() - extmap[extension.Field] = Extension{desc: extension, value: value} + extmap[extension.Field] = Extension{desc: extension, value: extensionAsStorageType(value)} return nil } @@ -541,3 +557,51 @@ func RegisterExtension(desc *ExtensionDesc) { func RegisteredExtensions(pb Message) map[int32]*ExtensionDesc { return extensionMaps[reflect.TypeOf(pb).Elem()] } + +// extensionAsLegacyType converts an value in the storage type as the API type. +// See Extension.value. +func extensionAsLegacyType(v interface{}) interface{} { + switch rv := reflect.ValueOf(v); rv.Kind() { + case reflect.Bool, reflect.Int32, reflect.Int64, reflect.Uint32, reflect.Uint64, reflect.Float32, reflect.Float64, reflect.String: + // Represent primitive types as a pointer to the value. + rv2 := reflect.New(rv.Type()) + rv2.Elem().Set(rv) + v = rv2.Interface() + case reflect.Ptr: + // Represent slice types as the value itself. + switch rv.Type().Elem().Kind() { + case reflect.Slice: + if rv.IsNil() { + v = reflect.Zero(rv.Type().Elem()).Interface() + } else { + v = rv.Elem().Interface() + } + } + } + return v +} + +// extensionAsStorageType converts an value in the API type as the storage type. +// See Extension.value. +func extensionAsStorageType(v interface{}) interface{} { + switch rv := reflect.ValueOf(v); rv.Kind() { + case reflect.Ptr: + // Represent slice types as the value itself. + switch rv.Type().Elem().Kind() { + case reflect.Bool, reflect.Int32, reflect.Int64, reflect.Uint32, reflect.Uint64, reflect.Float32, reflect.Float64, reflect.String: + if rv.IsNil() { + v = reflect.Zero(rv.Type().Elem()).Interface() + } else { + v = rv.Elem().Interface() + } + } + case reflect.Slice: + // Represent slice types as a pointer to the value. + if rv.Type().Elem().Kind() != reflect.Uint8 { + rv2 := reflect.New(rv.Type()) + rv2.Elem().Set(rv) + v = rv2.Interface() + } + } + return v +} diff --git a/vendor/github.com/golang/protobuf/proto/lib.go b/vendor/github.com/golang/protobuf/proto/lib.go index 75565cc6dc..fdd328bb7f 100644 --- a/vendor/github.com/golang/protobuf/proto/lib.go +++ b/vendor/github.com/golang/protobuf/proto/lib.go @@ -341,26 +341,6 @@ type Message interface { ProtoMessage() } -// Stats records allocation details about the protocol buffer encoders -// and decoders. Useful for tuning the library itself. -type Stats struct { - Emalloc uint64 // mallocs in encode - Dmalloc uint64 // mallocs in decode - Encode uint64 // number of encodes - Decode uint64 // number of decodes - Chit uint64 // number of cache hits - Cmiss uint64 // number of cache misses - Size uint64 // number of sizes -} - -// Set to true to enable stats collection. -const collectStats = false - -var stats Stats - -// GetStats returns a copy of the global Stats structure. -func GetStats() Stats { return stats } - // A Buffer is a buffer manager for marshaling and unmarshaling // protocol buffers. It may be reused between invocations to // reduce memory usage. It is not necessary to use a Buffer; @@ -960,13 +940,19 @@ func isProto3Zero(v reflect.Value) bool { return false } -// ProtoPackageIsVersion2 is referenced from generated protocol buffer files -// to assert that that code is compatible with this version of the proto package. -const ProtoPackageIsVersion2 = true +const ( + // ProtoPackageIsVersion3 is referenced from generated protocol buffer files + // to assert that that code is compatible with this version of the proto package. + ProtoPackageIsVersion3 = true + + // ProtoPackageIsVersion2 is referenced from generated protocol buffer files + // to assert that that code is compatible with this version of the proto package. + ProtoPackageIsVersion2 = true -// ProtoPackageIsVersion1 is referenced from generated protocol buffer files -// to assert that that code is compatible with this version of the proto package. -const ProtoPackageIsVersion1 = true + // ProtoPackageIsVersion1 is referenced from generated protocol buffer files + // to assert that that code is compatible with this version of the proto package. + ProtoPackageIsVersion1 = true +) // InternalMessageInfo is a type used internally by generated .pb.go files. // This type is not intended to be used by non-generated code. diff --git a/vendor/github.com/golang/protobuf/proto/message_set.go b/vendor/github.com/golang/protobuf/proto/message_set.go index 3b6ca41d5e..f48a756761 100644 --- a/vendor/github.com/golang/protobuf/proto/message_set.go +++ b/vendor/github.com/golang/protobuf/proto/message_set.go @@ -36,13 +36,7 @@ package proto */ import ( - "bytes" - "encoding/json" "errors" - "fmt" - "reflect" - "sort" - "sync" ) // errNoMessageTypeID occurs when a protocol buffer does not have a message type ID. @@ -145,46 +139,9 @@ func skipVarint(buf []byte) []byte { return buf[i+1:] } -// MarshalMessageSet encodes the extension map represented by m in the message set wire format. -// It is called by generated Marshal methods on protocol buffer messages with the message_set_wire_format option. -func MarshalMessageSet(exts interface{}) ([]byte, error) { - return marshalMessageSet(exts, false) -} - -// marshaMessageSet implements above function, with the opt to turn on / off deterministic during Marshal. -func marshalMessageSet(exts interface{}, deterministic bool) ([]byte, error) { - switch exts := exts.(type) { - case *XXX_InternalExtensions: - var u marshalInfo - siz := u.sizeMessageSet(exts) - b := make([]byte, 0, siz) - return u.appendMessageSet(b, exts, deterministic) - - case map[int32]Extension: - // This is an old-style extension map. - // Wrap it in a new-style XXX_InternalExtensions. - ie := XXX_InternalExtensions{ - p: &struct { - mu sync.Mutex - extensionMap map[int32]Extension - }{ - extensionMap: exts, - }, - } - - var u marshalInfo - siz := u.sizeMessageSet(&ie) - b := make([]byte, 0, siz) - return u.appendMessageSet(b, &ie, deterministic) - - default: - return nil, errors.New("proto: not an extension map") - } -} - -// UnmarshalMessageSet decodes the extension map encoded in buf in the message set wire format. +// unmarshalMessageSet decodes the extension map encoded in buf in the message set wire format. // It is called by Unmarshal methods on protocol buffer messages with the message_set_wire_format option. -func UnmarshalMessageSet(buf []byte, exts interface{}) error { +func unmarshalMessageSet(buf []byte, exts interface{}) error { var m map[int32]Extension switch exts := exts.(type) { case *XXX_InternalExtensions: @@ -222,93 +179,3 @@ func UnmarshalMessageSet(buf []byte, exts interface{}) error { } return nil } - -// MarshalMessageSetJSON encodes the extension map represented by m in JSON format. -// It is called by generated MarshalJSON methods on protocol buffer messages with the message_set_wire_format option. -func MarshalMessageSetJSON(exts interface{}) ([]byte, error) { - var m map[int32]Extension - switch exts := exts.(type) { - case *XXX_InternalExtensions: - var mu sync.Locker - m, mu = exts.extensionsRead() - if m != nil { - // Keep the extensions map locked until we're done marshaling to prevent - // races between marshaling and unmarshaling the lazily-{en,de}coded - // values. - mu.Lock() - defer mu.Unlock() - } - case map[int32]Extension: - m = exts - default: - return nil, errors.New("proto: not an extension map") - } - var b bytes.Buffer - b.WriteByte('{') - - // Process the map in key order for deterministic output. - ids := make([]int32, 0, len(m)) - for id := range m { - ids = append(ids, id) - } - sort.Sort(int32Slice(ids)) // int32Slice defined in text.go - - for i, id := range ids { - ext := m[id] - msd, ok := messageSetMap[id] - if !ok { - // Unknown type; we can't render it, so skip it. - continue - } - - if i > 0 && b.Len() > 1 { - b.WriteByte(',') - } - - fmt.Fprintf(&b, `"[%s]":`, msd.name) - - x := ext.value - if x == nil { - x = reflect.New(msd.t.Elem()).Interface() - if err := Unmarshal(ext.enc, x.(Message)); err != nil { - return nil, err - } - } - d, err := json.Marshal(x) - if err != nil { - return nil, err - } - b.Write(d) - } - b.WriteByte('}') - return b.Bytes(), nil -} - -// UnmarshalMessageSetJSON decodes the extension map encoded in buf in JSON format. -// It is called by generated UnmarshalJSON methods on protocol buffer messages with the message_set_wire_format option. -func UnmarshalMessageSetJSON(buf []byte, exts interface{}) error { - // Common-case fast path. - if len(buf) == 0 || bytes.Equal(buf, []byte("{}")) { - return nil - } - - // This is fairly tricky, and it's not clear that it is needed. - return errors.New("TODO: UnmarshalMessageSetJSON not yet implemented") -} - -// A global registry of types that can be used in a MessageSet. - -var messageSetMap = make(map[int32]messageSetDesc) - -type messageSetDesc struct { - t reflect.Type // pointer to struct - name string -} - -// RegisterMessageSetType is called from the generated code. -func RegisterMessageSetType(m Message, fieldNum int32, name string) { - messageSetMap[fieldNum] = messageSetDesc{ - t: reflect.TypeOf(m), - name: name, - } -} diff --git a/vendor/github.com/golang/protobuf/proto/pointer_reflect.go b/vendor/github.com/golang/protobuf/proto/pointer_reflect.go index b6cad90834..94fa9194a8 100644 --- a/vendor/github.com/golang/protobuf/proto/pointer_reflect.go +++ b/vendor/github.com/golang/protobuf/proto/pointer_reflect.go @@ -79,10 +79,13 @@ func toPointer(i *Message) pointer { // toAddrPointer converts an interface to a pointer that points to // the interface data. -func toAddrPointer(i *interface{}, isptr bool) pointer { +func toAddrPointer(i *interface{}, isptr, deref bool) pointer { v := reflect.ValueOf(*i) u := reflect.New(v.Type()) u.Elem().Set(v) + if deref { + u = u.Elem() + } return pointer{v: u} } diff --git a/vendor/github.com/golang/protobuf/proto/pointer_unsafe.go b/vendor/github.com/golang/protobuf/proto/pointer_unsafe.go index d55a335d94..dbfffe071b 100644 --- a/vendor/github.com/golang/protobuf/proto/pointer_unsafe.go +++ b/vendor/github.com/golang/protobuf/proto/pointer_unsafe.go @@ -85,16 +85,21 @@ func toPointer(i *Message) pointer { // toAddrPointer converts an interface to a pointer that points to // the interface data. -func toAddrPointer(i *interface{}, isptr bool) pointer { +func toAddrPointer(i *interface{}, isptr, deref bool) (p pointer) { // Super-tricky - read or get the address of data word of interface value. if isptr { // The interface is of pointer type, thus it is a direct interface. // The data word is the pointer data itself. We take its address. - return pointer{p: unsafe.Pointer(uintptr(unsafe.Pointer(i)) + ptrSize)} + p = pointer{p: unsafe.Pointer(uintptr(unsafe.Pointer(i)) + ptrSize)} + } else { + // The interface is not of pointer type. The data word is the pointer + // to the data. + p = pointer{p: (*[2]unsafe.Pointer)(unsafe.Pointer(i))[1]} } - // The interface is not of pointer type. The data word is the pointer - // to the data. - return pointer{p: (*[2]unsafe.Pointer)(unsafe.Pointer(i))[1]} + if deref { + p.p = *(*unsafe.Pointer)(p.p) + } + return p } // valToPointer converts v to a pointer. v must be of pointer type. diff --git a/vendor/github.com/golang/protobuf/proto/properties.go b/vendor/github.com/golang/protobuf/proto/properties.go index 50b99b83a8..a4b8c0cd3a 100644 --- a/vendor/github.com/golang/protobuf/proto/properties.go +++ b/vendor/github.com/golang/protobuf/proto/properties.go @@ -38,7 +38,6 @@ package proto import ( "fmt" "log" - "os" "reflect" "sort" "strconv" @@ -194,7 +193,7 @@ func (p *Properties) Parse(s string) { // "bytes,49,opt,name=foo,def=hello!" fields := strings.Split(s, ",") // breaks def=, but handled below. if len(fields) < 2 { - fmt.Fprintf(os.Stderr, "proto: tag has too few fields: %q\n", s) + log.Printf("proto: tag has too few fields: %q", s) return } @@ -214,7 +213,7 @@ func (p *Properties) Parse(s string) { p.WireType = WireBytes // no numeric converter for non-numeric types default: - fmt.Fprintf(os.Stderr, "proto: tag has unknown wire type: %q\n", s) + log.Printf("proto: tag has unknown wire type: %q", s) return } @@ -334,9 +333,6 @@ func GetProperties(t reflect.Type) *StructProperties { sprop, ok := propertiesMap[t] propertiesMu.RUnlock() if ok { - if collectStats { - stats.Chit++ - } return sprop } @@ -346,17 +342,20 @@ func GetProperties(t reflect.Type) *StructProperties { return sprop } +type ( + oneofFuncsIface interface { + XXX_OneofFuncs() (func(Message, *Buffer) error, func(Message, int, int, *Buffer) (bool, error), func(Message) int, []interface{}) + } + oneofWrappersIface interface { + XXX_OneofWrappers() []interface{} + } +) + // getPropertiesLocked requires that propertiesMu is held. func getPropertiesLocked(t reflect.Type) *StructProperties { if prop, ok := propertiesMap[t]; ok { - if collectStats { - stats.Chit++ - } return prop } - if collectStats { - stats.Cmiss++ - } prop := new(StructProperties) // in case of recursive protos, fill this in now. @@ -391,13 +390,14 @@ func getPropertiesLocked(t reflect.Type) *StructProperties { // Re-order prop.order. sort.Sort(prop) - type oneofMessage interface { - XXX_OneofFuncs() (func(Message, *Buffer) error, func(Message, int, int, *Buffer) (bool, error), func(Message) int, []interface{}) + var oots []interface{} + switch m := reflect.Zero(reflect.PtrTo(t)).Interface().(type) { + case oneofFuncsIface: + _, _, _, oots = m.XXX_OneofFuncs() + case oneofWrappersIface: + oots = m.XXX_OneofWrappers() } - if om, ok := reflect.Zero(reflect.PtrTo(t)).Interface().(oneofMessage); ok { - var oots []interface{} - _, _, _, oots = om.XXX_OneofFuncs() - + if len(oots) > 0 { // Interpret oneof metadata. prop.OneofTypes = make(map[string]*OneofProperties) for _, oot := range oots { diff --git a/vendor/github.com/golang/protobuf/proto/table_marshal.go b/vendor/github.com/golang/protobuf/proto/table_marshal.go index b16794496f..5cb11fa955 100644 --- a/vendor/github.com/golang/protobuf/proto/table_marshal.go +++ b/vendor/github.com/golang/protobuf/proto/table_marshal.go @@ -87,6 +87,7 @@ type marshalElemInfo struct { sizer sizer marshaler marshaler isptr bool // elem is pointer typed, thus interface of this type is a direct interface (extension only) + deref bool // dereference the pointer before operating on it; implies isptr } var ( @@ -320,8 +321,11 @@ func (u *marshalInfo) computeMarshalInfo() { // get oneof implementers var oneofImplementers []interface{} - if m, ok := reflect.Zero(reflect.PtrTo(t)).Interface().(oneofMessage); ok { + switch m := reflect.Zero(reflect.PtrTo(t)).Interface().(type) { + case oneofFuncsIface: _, _, _, oneofImplementers = m.XXX_OneofFuncs() + case oneofWrappersIface: + oneofImplementers = m.XXX_OneofWrappers() } n := t.NumField() @@ -407,13 +411,22 @@ func (u *marshalInfo) getExtElemInfo(desc *ExtensionDesc) *marshalElemInfo { panic("tag is not an integer") } wt := wiretype(tags[0]) + if t.Kind() == reflect.Ptr && t.Elem().Kind() != reflect.Struct { + t = t.Elem() + } sizer, marshaler := typeMarshaler(t, tags, false, false) + var deref bool + if t.Kind() == reflect.Slice && t.Elem().Kind() != reflect.Uint8 { + t = reflect.PtrTo(t) + deref = true + } e = &marshalElemInfo{ wiretag: uint64(tag)<<3 | wt, tagsize: SizeVarint(uint64(tag) << 3), sizer: sizer, marshaler: marshaler, isptr: t.Kind() == reflect.Ptr, + deref: deref, } // update cache @@ -448,7 +461,7 @@ func (fi *marshalFieldInfo) computeMarshalFieldInfo(f *reflect.StructField) { func (fi *marshalFieldInfo) computeOneofFieldInfo(f *reflect.StructField, oneofImplementers []interface{}) { fi.field = toField(f) - fi.wiretag = 1<<31 - 1 // Use a large tag number, make oneofs sorted at the end. This tag will not appear on the wire. + fi.wiretag = math.MaxInt32 // Use a large tag number, make oneofs sorted at the end. This tag will not appear on the wire. fi.isPointer = true fi.sizer, fi.marshaler = makeOneOfMarshaler(fi, f) fi.oneofElems = make(map[reflect.Type]*marshalElemInfo) @@ -476,10 +489,6 @@ func (fi *marshalFieldInfo) computeOneofFieldInfo(f *reflect.StructField, oneofI } } -type oneofMessage interface { - XXX_OneofFuncs() (func(Message, *Buffer) error, func(Message, int, int, *Buffer) (bool, error), func(Message) int, []interface{}) -} - // wiretype returns the wire encoding of the type. func wiretype(encoding string) uint64 { switch encoding { @@ -2310,8 +2319,8 @@ func makeMapMarshaler(f *reflect.StructField) (sizer, marshaler) { for _, k := range m.MapKeys() { ki := k.Interface() vi := m.MapIndex(k).Interface() - kaddr := toAddrPointer(&ki, false) // pointer to key - vaddr := toAddrPointer(&vi, valIsPtr) // pointer to value + kaddr := toAddrPointer(&ki, false, false) // pointer to key + vaddr := toAddrPointer(&vi, valIsPtr, false) // pointer to value siz := keySizer(kaddr, 1) + valSizer(vaddr, 1) // tag of key = 1 (size=1), tag of val = 2 (size=1) n += siz + SizeVarint(uint64(siz)) + tagsize } @@ -2329,8 +2338,8 @@ func makeMapMarshaler(f *reflect.StructField) (sizer, marshaler) { for _, k := range keys { ki := k.Interface() vi := m.MapIndex(k).Interface() - kaddr := toAddrPointer(&ki, false) // pointer to key - vaddr := toAddrPointer(&vi, valIsPtr) // pointer to value + kaddr := toAddrPointer(&ki, false, false) // pointer to key + vaddr := toAddrPointer(&vi, valIsPtr, false) // pointer to value b = appendVarint(b, tag) siz := keySizer(kaddr, 1) + valCachedSizer(vaddr, 1) // tag of key = 1 (size=1), tag of val = 2 (size=1) b = appendVarint(b, uint64(siz)) @@ -2399,7 +2408,7 @@ func (u *marshalInfo) sizeExtensions(ext *XXX_InternalExtensions) int { // the last time this function was called. ei := u.getExtElemInfo(e.desc) v := e.value - p := toAddrPointer(&v, ei.isptr) + p := toAddrPointer(&v, ei.isptr, ei.deref) n += ei.sizer(p, ei.tagsize) } mu.Unlock() @@ -2434,7 +2443,7 @@ func (u *marshalInfo) appendExtensions(b []byte, ext *XXX_InternalExtensions, de ei := u.getExtElemInfo(e.desc) v := e.value - p := toAddrPointer(&v, ei.isptr) + p := toAddrPointer(&v, ei.isptr, ei.deref) b, err = ei.marshaler(b, p, ei.wiretag, deterministic) if !nerr.Merge(err) { return b, err @@ -2465,7 +2474,7 @@ func (u *marshalInfo) appendExtensions(b []byte, ext *XXX_InternalExtensions, de ei := u.getExtElemInfo(e.desc) v := e.value - p := toAddrPointer(&v, ei.isptr) + p := toAddrPointer(&v, ei.isptr, ei.deref) b, err = ei.marshaler(b, p, ei.wiretag, deterministic) if !nerr.Merge(err) { return b, err @@ -2510,7 +2519,7 @@ func (u *marshalInfo) sizeMessageSet(ext *XXX_InternalExtensions) int { ei := u.getExtElemInfo(e.desc) v := e.value - p := toAddrPointer(&v, ei.isptr) + p := toAddrPointer(&v, ei.isptr, ei.deref) n += ei.sizer(p, 1) // message, tag = 3 (size=1) } mu.Unlock() @@ -2553,7 +2562,7 @@ func (u *marshalInfo) appendMessageSet(b []byte, ext *XXX_InternalExtensions, de ei := u.getExtElemInfo(e.desc) v := e.value - p := toAddrPointer(&v, ei.isptr) + p := toAddrPointer(&v, ei.isptr, ei.deref) b, err = ei.marshaler(b, p, 3<<3|WireBytes, deterministic) if !nerr.Merge(err) { return b, err @@ -2591,7 +2600,7 @@ func (u *marshalInfo) appendMessageSet(b []byte, ext *XXX_InternalExtensions, de ei := u.getExtElemInfo(e.desc) v := e.value - p := toAddrPointer(&v, ei.isptr) + p := toAddrPointer(&v, ei.isptr, ei.deref) b, err = ei.marshaler(b, p, 3<<3|WireBytes, deterministic) b = append(b, 1<<3|WireEndGroup) if !nerr.Merge(err) { @@ -2621,7 +2630,7 @@ func (u *marshalInfo) sizeV1Extensions(m map[int32]Extension) int { ei := u.getExtElemInfo(e.desc) v := e.value - p := toAddrPointer(&v, ei.isptr) + p := toAddrPointer(&v, ei.isptr, ei.deref) n += ei.sizer(p, ei.tagsize) } return n @@ -2656,7 +2665,7 @@ func (u *marshalInfo) appendV1Extensions(b []byte, m map[int32]Extension, determ ei := u.getExtElemInfo(e.desc) v := e.value - p := toAddrPointer(&v, ei.isptr) + p := toAddrPointer(&v, ei.isptr, ei.deref) b, err = ei.marshaler(b, p, ei.wiretag, deterministic) if !nerr.Merge(err) { return b, err diff --git a/vendor/github.com/golang/protobuf/proto/table_unmarshal.go b/vendor/github.com/golang/protobuf/proto/table_unmarshal.go index ebf1caa56a..acee2fc529 100644 --- a/vendor/github.com/golang/protobuf/proto/table_unmarshal.go +++ b/vendor/github.com/golang/protobuf/proto/table_unmarshal.go @@ -136,7 +136,7 @@ func (u *unmarshalInfo) unmarshal(m pointer, b []byte) error { u.computeUnmarshalInfo() } if u.isMessageSet { - return UnmarshalMessageSet(b, m.offset(u.extensions).toExtensions()) + return unmarshalMessageSet(b, m.offset(u.extensions).toExtensions()) } var reqMask uint64 // bitmask of required fields we've seen. var errLater error @@ -362,46 +362,48 @@ func (u *unmarshalInfo) computeUnmarshalInfo() { } // Find any types associated with oneof fields. - // TODO: XXX_OneofFuncs returns more info than we need. Get rid of some of it? - fn := reflect.Zero(reflect.PtrTo(t)).MethodByName("XXX_OneofFuncs") - if fn.IsValid() { - res := fn.Call(nil)[3] // last return value from XXX_OneofFuncs: []interface{} - for i := res.Len() - 1; i >= 0; i-- { - v := res.Index(i) // interface{} - tptr := reflect.ValueOf(v.Interface()).Type() // *Msg_X - typ := tptr.Elem() // Msg_X - - f := typ.Field(0) // oneof implementers have one field - baseUnmarshal := fieldUnmarshaler(&f) - tags := strings.Split(f.Tag.Get("protobuf"), ",") - fieldNum, err := strconv.Atoi(tags[1]) - if err != nil { - panic("protobuf tag field not an integer: " + tags[1]) - } - var name string - for _, tag := range tags { - if strings.HasPrefix(tag, "name=") { - name = strings.TrimPrefix(tag, "name=") - break - } + var oneofImplementers []interface{} + switch m := reflect.Zero(reflect.PtrTo(t)).Interface().(type) { + case oneofFuncsIface: + _, _, _, oneofImplementers = m.XXX_OneofFuncs() + case oneofWrappersIface: + oneofImplementers = m.XXX_OneofWrappers() + } + for _, v := range oneofImplementers { + tptr := reflect.TypeOf(v) // *Msg_X + typ := tptr.Elem() // Msg_X + + f := typ.Field(0) // oneof implementers have one field + baseUnmarshal := fieldUnmarshaler(&f) + tags := strings.Split(f.Tag.Get("protobuf"), ",") + fieldNum, err := strconv.Atoi(tags[1]) + if err != nil { + panic("protobuf tag field not an integer: " + tags[1]) + } + var name string + for _, tag := range tags { + if strings.HasPrefix(tag, "name=") { + name = strings.TrimPrefix(tag, "name=") + break } + } - // Find the oneof field that this struct implements. - // Might take O(n^2) to process all of the oneofs, but who cares. - for _, of := range oneofFields { - if tptr.Implements(of.ityp) { - // We have found the corresponding interface for this struct. - // That lets us know where this struct should be stored - // when we encounter it during unmarshaling. - unmarshal := makeUnmarshalOneof(typ, of.ityp, baseUnmarshal) - u.setTag(fieldNum, of.field, unmarshal, 0, name) - } + // Find the oneof field that this struct implements. + // Might take O(n^2) to process all of the oneofs, but who cares. + for _, of := range oneofFields { + if tptr.Implements(of.ityp) { + // We have found the corresponding interface for this struct. + // That lets us know where this struct should be stored + // when we encounter it during unmarshaling. + unmarshal := makeUnmarshalOneof(typ, of.ityp, baseUnmarshal) + u.setTag(fieldNum, of.field, unmarshal, 0, name) } } + } // Get extension ranges, if any. - fn = reflect.Zero(reflect.PtrTo(t)).MethodByName("ExtensionRangeArray") + fn := reflect.Zero(reflect.PtrTo(t)).MethodByName("ExtensionRangeArray") if fn.IsValid() { if !u.extensions.IsValid() && !u.oldExtensions.IsValid() { panic("a message with extensions, but no extensions field in " + t.Name()) @@ -1948,7 +1950,7 @@ func encodeVarint(b []byte, x uint64) []byte { // If there is an error, it returns 0,0. func decodeVarint(b []byte) (uint64, int) { var x, y uint64 - if len(b) <= 0 { + if len(b) == 0 { goto bad } x = uint64(b[0]) diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.pb.go b/vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.pb.go index e855b1f5c4..1ded05bbe7 100644 --- a/vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.pb.go +++ b/vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.pb.go @@ -1,11 +1,13 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: google/protobuf/descriptor.proto -package descriptor // import "github.com/golang/protobuf/protoc-gen-go/descriptor" +package descriptor -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -16,7 +18,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package type FieldDescriptorProto_Type int32 @@ -72,6 +74,7 @@ var FieldDescriptorProto_Type_name = map[int32]string{ 17: "TYPE_SINT32", 18: "TYPE_SINT64", } + var FieldDescriptorProto_Type_value = map[string]int32{ "TYPE_DOUBLE": 1, "TYPE_FLOAT": 2, @@ -98,9 +101,11 @@ func (x FieldDescriptorProto_Type) Enum() *FieldDescriptorProto_Type { *p = x return p } + func (x FieldDescriptorProto_Type) String() string { return proto.EnumName(FieldDescriptorProto_Type_name, int32(x)) } + func (x *FieldDescriptorProto_Type) UnmarshalJSON(data []byte) error { value, err := proto.UnmarshalJSONEnum(FieldDescriptorProto_Type_value, data, "FieldDescriptorProto_Type") if err != nil { @@ -109,8 +114,9 @@ func (x *FieldDescriptorProto_Type) UnmarshalJSON(data []byte) error { *x = FieldDescriptorProto_Type(value) return nil } + func (FieldDescriptorProto_Type) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{4, 0} + return fileDescriptor_e5baabe45344a177, []int{4, 0} } type FieldDescriptorProto_Label int32 @@ -127,6 +133,7 @@ var FieldDescriptorProto_Label_name = map[int32]string{ 2: "LABEL_REQUIRED", 3: "LABEL_REPEATED", } + var FieldDescriptorProto_Label_value = map[string]int32{ "LABEL_OPTIONAL": 1, "LABEL_REQUIRED": 2, @@ -138,9 +145,11 @@ func (x FieldDescriptorProto_Label) Enum() *FieldDescriptorProto_Label { *p = x return p } + func (x FieldDescriptorProto_Label) String() string { return proto.EnumName(FieldDescriptorProto_Label_name, int32(x)) } + func (x *FieldDescriptorProto_Label) UnmarshalJSON(data []byte) error { value, err := proto.UnmarshalJSONEnum(FieldDescriptorProto_Label_value, data, "FieldDescriptorProto_Label") if err != nil { @@ -149,8 +158,9 @@ func (x *FieldDescriptorProto_Label) UnmarshalJSON(data []byte) error { *x = FieldDescriptorProto_Label(value) return nil } + func (FieldDescriptorProto_Label) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{4, 1} + return fileDescriptor_e5baabe45344a177, []int{4, 1} } // Generated classes can be optimized for speed or code size. @@ -168,6 +178,7 @@ var FileOptions_OptimizeMode_name = map[int32]string{ 2: "CODE_SIZE", 3: "LITE_RUNTIME", } + var FileOptions_OptimizeMode_value = map[string]int32{ "SPEED": 1, "CODE_SIZE": 2, @@ -179,9 +190,11 @@ func (x FileOptions_OptimizeMode) Enum() *FileOptions_OptimizeMode { *p = x return p } + func (x FileOptions_OptimizeMode) String() string { return proto.EnumName(FileOptions_OptimizeMode_name, int32(x)) } + func (x *FileOptions_OptimizeMode) UnmarshalJSON(data []byte) error { value, err := proto.UnmarshalJSONEnum(FileOptions_OptimizeMode_value, data, "FileOptions_OptimizeMode") if err != nil { @@ -190,8 +203,9 @@ func (x *FileOptions_OptimizeMode) UnmarshalJSON(data []byte) error { *x = FileOptions_OptimizeMode(value) return nil } + func (FileOptions_OptimizeMode) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{10, 0} + return fileDescriptor_e5baabe45344a177, []int{10, 0} } type FieldOptions_CType int32 @@ -208,6 +222,7 @@ var FieldOptions_CType_name = map[int32]string{ 1: "CORD", 2: "STRING_PIECE", } + var FieldOptions_CType_value = map[string]int32{ "STRING": 0, "CORD": 1, @@ -219,9 +234,11 @@ func (x FieldOptions_CType) Enum() *FieldOptions_CType { *p = x return p } + func (x FieldOptions_CType) String() string { return proto.EnumName(FieldOptions_CType_name, int32(x)) } + func (x *FieldOptions_CType) UnmarshalJSON(data []byte) error { value, err := proto.UnmarshalJSONEnum(FieldOptions_CType_value, data, "FieldOptions_CType") if err != nil { @@ -230,8 +247,9 @@ func (x *FieldOptions_CType) UnmarshalJSON(data []byte) error { *x = FieldOptions_CType(value) return nil } + func (FieldOptions_CType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{12, 0} + return fileDescriptor_e5baabe45344a177, []int{12, 0} } type FieldOptions_JSType int32 @@ -250,6 +268,7 @@ var FieldOptions_JSType_name = map[int32]string{ 1: "JS_STRING", 2: "JS_NUMBER", } + var FieldOptions_JSType_value = map[string]int32{ "JS_NORMAL": 0, "JS_STRING": 1, @@ -261,9 +280,11 @@ func (x FieldOptions_JSType) Enum() *FieldOptions_JSType { *p = x return p } + func (x FieldOptions_JSType) String() string { return proto.EnumName(FieldOptions_JSType_name, int32(x)) } + func (x *FieldOptions_JSType) UnmarshalJSON(data []byte) error { value, err := proto.UnmarshalJSONEnum(FieldOptions_JSType_value, data, "FieldOptions_JSType") if err != nil { @@ -272,8 +293,9 @@ func (x *FieldOptions_JSType) UnmarshalJSON(data []byte) error { *x = FieldOptions_JSType(value) return nil } + func (FieldOptions_JSType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{12, 1} + return fileDescriptor_e5baabe45344a177, []int{12, 1} } // Is this method side-effect-free (or safe in HTTP parlance), or idempotent, @@ -292,6 +314,7 @@ var MethodOptions_IdempotencyLevel_name = map[int32]string{ 1: "NO_SIDE_EFFECTS", 2: "IDEMPOTENT", } + var MethodOptions_IdempotencyLevel_value = map[string]int32{ "IDEMPOTENCY_UNKNOWN": 0, "NO_SIDE_EFFECTS": 1, @@ -303,9 +326,11 @@ func (x MethodOptions_IdempotencyLevel) Enum() *MethodOptions_IdempotencyLevel { *p = x return p } + func (x MethodOptions_IdempotencyLevel) String() string { return proto.EnumName(MethodOptions_IdempotencyLevel_name, int32(x)) } + func (x *MethodOptions_IdempotencyLevel) UnmarshalJSON(data []byte) error { value, err := proto.UnmarshalJSONEnum(MethodOptions_IdempotencyLevel_value, data, "MethodOptions_IdempotencyLevel") if err != nil { @@ -314,8 +339,9 @@ func (x *MethodOptions_IdempotencyLevel) UnmarshalJSON(data []byte) error { *x = MethodOptions_IdempotencyLevel(value) return nil } + func (MethodOptions_IdempotencyLevel) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{17, 0} + return fileDescriptor_e5baabe45344a177, []int{17, 0} } // The protocol compiler can output a FileDescriptorSet containing the .proto @@ -331,16 +357,17 @@ func (m *FileDescriptorSet) Reset() { *m = FileDescriptorSet{} } func (m *FileDescriptorSet) String() string { return proto.CompactTextString(m) } func (*FileDescriptorSet) ProtoMessage() {} func (*FileDescriptorSet) Descriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{0} + return fileDescriptor_e5baabe45344a177, []int{0} } + func (m *FileDescriptorSet) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FileDescriptorSet.Unmarshal(m, b) } func (m *FileDescriptorSet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_FileDescriptorSet.Marshal(b, m, deterministic) } -func (dst *FileDescriptorSet) XXX_Merge(src proto.Message) { - xxx_messageInfo_FileDescriptorSet.Merge(dst, src) +func (m *FileDescriptorSet) XXX_Merge(src proto.Message) { + xxx_messageInfo_FileDescriptorSet.Merge(m, src) } func (m *FileDescriptorSet) XXX_Size() int { return xxx_messageInfo_FileDescriptorSet.Size(m) @@ -392,16 +419,17 @@ func (m *FileDescriptorProto) Reset() { *m = FileDescriptorProto{} } func (m *FileDescriptorProto) String() string { return proto.CompactTextString(m) } func (*FileDescriptorProto) ProtoMessage() {} func (*FileDescriptorProto) Descriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{1} + return fileDescriptor_e5baabe45344a177, []int{1} } + func (m *FileDescriptorProto) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FileDescriptorProto.Unmarshal(m, b) } func (m *FileDescriptorProto) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_FileDescriptorProto.Marshal(b, m, deterministic) } -func (dst *FileDescriptorProto) XXX_Merge(src proto.Message) { - xxx_messageInfo_FileDescriptorProto.Merge(dst, src) +func (m *FileDescriptorProto) XXX_Merge(src proto.Message) { + xxx_messageInfo_FileDescriptorProto.Merge(m, src) } func (m *FileDescriptorProto) XXX_Size() int { return xxx_messageInfo_FileDescriptorProto.Size(m) @@ -519,16 +547,17 @@ func (m *DescriptorProto) Reset() { *m = DescriptorProto{} } func (m *DescriptorProto) String() string { return proto.CompactTextString(m) } func (*DescriptorProto) ProtoMessage() {} func (*DescriptorProto) Descriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{2} + return fileDescriptor_e5baabe45344a177, []int{2} } + func (m *DescriptorProto) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DescriptorProto.Unmarshal(m, b) } func (m *DescriptorProto) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_DescriptorProto.Marshal(b, m, deterministic) } -func (dst *DescriptorProto) XXX_Merge(src proto.Message) { - xxx_messageInfo_DescriptorProto.Merge(dst, src) +func (m *DescriptorProto) XXX_Merge(src proto.Message) { + xxx_messageInfo_DescriptorProto.Merge(m, src) } func (m *DescriptorProto) XXX_Size() int { return xxx_messageInfo_DescriptorProto.Size(m) @@ -622,16 +651,17 @@ func (m *DescriptorProto_ExtensionRange) Reset() { *m = DescriptorProto_ func (m *DescriptorProto_ExtensionRange) String() string { return proto.CompactTextString(m) } func (*DescriptorProto_ExtensionRange) ProtoMessage() {} func (*DescriptorProto_ExtensionRange) Descriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{2, 0} + return fileDescriptor_e5baabe45344a177, []int{2, 0} } + func (m *DescriptorProto_ExtensionRange) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DescriptorProto_ExtensionRange.Unmarshal(m, b) } func (m *DescriptorProto_ExtensionRange) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_DescriptorProto_ExtensionRange.Marshal(b, m, deterministic) } -func (dst *DescriptorProto_ExtensionRange) XXX_Merge(src proto.Message) { - xxx_messageInfo_DescriptorProto_ExtensionRange.Merge(dst, src) +func (m *DescriptorProto_ExtensionRange) XXX_Merge(src proto.Message) { + xxx_messageInfo_DescriptorProto_ExtensionRange.Merge(m, src) } func (m *DescriptorProto_ExtensionRange) XXX_Size() int { return xxx_messageInfo_DescriptorProto_ExtensionRange.Size(m) @@ -678,16 +708,17 @@ func (m *DescriptorProto_ReservedRange) Reset() { *m = DescriptorProto_R func (m *DescriptorProto_ReservedRange) String() string { return proto.CompactTextString(m) } func (*DescriptorProto_ReservedRange) ProtoMessage() {} func (*DescriptorProto_ReservedRange) Descriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{2, 1} + return fileDescriptor_e5baabe45344a177, []int{2, 1} } + func (m *DescriptorProto_ReservedRange) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DescriptorProto_ReservedRange.Unmarshal(m, b) } func (m *DescriptorProto_ReservedRange) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_DescriptorProto_ReservedRange.Marshal(b, m, deterministic) } -func (dst *DescriptorProto_ReservedRange) XXX_Merge(src proto.Message) { - xxx_messageInfo_DescriptorProto_ReservedRange.Merge(dst, src) +func (m *DescriptorProto_ReservedRange) XXX_Merge(src proto.Message) { + xxx_messageInfo_DescriptorProto_ReservedRange.Merge(m, src) } func (m *DescriptorProto_ReservedRange) XXX_Size() int { return xxx_messageInfo_DescriptorProto_ReservedRange.Size(m) @@ -725,7 +756,7 @@ func (m *ExtensionRangeOptions) Reset() { *m = ExtensionRangeOptions{} } func (m *ExtensionRangeOptions) String() string { return proto.CompactTextString(m) } func (*ExtensionRangeOptions) ProtoMessage() {} func (*ExtensionRangeOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{3} + return fileDescriptor_e5baabe45344a177, []int{3} } var extRange_ExtensionRangeOptions = []proto.ExtensionRange{ @@ -735,14 +766,15 @@ var extRange_ExtensionRangeOptions = []proto.ExtensionRange{ func (*ExtensionRangeOptions) ExtensionRangeArray() []proto.ExtensionRange { return extRange_ExtensionRangeOptions } + func (m *ExtensionRangeOptions) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ExtensionRangeOptions.Unmarshal(m, b) } func (m *ExtensionRangeOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ExtensionRangeOptions.Marshal(b, m, deterministic) } -func (dst *ExtensionRangeOptions) XXX_Merge(src proto.Message) { - xxx_messageInfo_ExtensionRangeOptions.Merge(dst, src) +func (m *ExtensionRangeOptions) XXX_Merge(src proto.Message) { + xxx_messageInfo_ExtensionRangeOptions.Merge(m, src) } func (m *ExtensionRangeOptions) XXX_Size() int { return xxx_messageInfo_ExtensionRangeOptions.Size(m) @@ -801,16 +833,17 @@ func (m *FieldDescriptorProto) Reset() { *m = FieldDescriptorProto{} } func (m *FieldDescriptorProto) String() string { return proto.CompactTextString(m) } func (*FieldDescriptorProto) ProtoMessage() {} func (*FieldDescriptorProto) Descriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{4} + return fileDescriptor_e5baabe45344a177, []int{4} } + func (m *FieldDescriptorProto) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FieldDescriptorProto.Unmarshal(m, b) } func (m *FieldDescriptorProto) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_FieldDescriptorProto.Marshal(b, m, deterministic) } -func (dst *FieldDescriptorProto) XXX_Merge(src proto.Message) { - xxx_messageInfo_FieldDescriptorProto.Merge(dst, src) +func (m *FieldDescriptorProto) XXX_Merge(src proto.Message) { + xxx_messageInfo_FieldDescriptorProto.Merge(m, src) } func (m *FieldDescriptorProto) XXX_Size() int { return xxx_messageInfo_FieldDescriptorProto.Size(m) @@ -904,16 +937,17 @@ func (m *OneofDescriptorProto) Reset() { *m = OneofDescriptorProto{} } func (m *OneofDescriptorProto) String() string { return proto.CompactTextString(m) } func (*OneofDescriptorProto) ProtoMessage() {} func (*OneofDescriptorProto) Descriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{5} + return fileDescriptor_e5baabe45344a177, []int{5} } + func (m *OneofDescriptorProto) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_OneofDescriptorProto.Unmarshal(m, b) } func (m *OneofDescriptorProto) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_OneofDescriptorProto.Marshal(b, m, deterministic) } -func (dst *OneofDescriptorProto) XXX_Merge(src proto.Message) { - xxx_messageInfo_OneofDescriptorProto.Merge(dst, src) +func (m *OneofDescriptorProto) XXX_Merge(src proto.Message) { + xxx_messageInfo_OneofDescriptorProto.Merge(m, src) } func (m *OneofDescriptorProto) XXX_Size() int { return xxx_messageInfo_OneofDescriptorProto.Size(m) @@ -959,16 +993,17 @@ func (m *EnumDescriptorProto) Reset() { *m = EnumDescriptorProto{} } func (m *EnumDescriptorProto) String() string { return proto.CompactTextString(m) } func (*EnumDescriptorProto) ProtoMessage() {} func (*EnumDescriptorProto) Descriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{6} + return fileDescriptor_e5baabe45344a177, []int{6} } + func (m *EnumDescriptorProto) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_EnumDescriptorProto.Unmarshal(m, b) } func (m *EnumDescriptorProto) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_EnumDescriptorProto.Marshal(b, m, deterministic) } -func (dst *EnumDescriptorProto) XXX_Merge(src proto.Message) { - xxx_messageInfo_EnumDescriptorProto.Merge(dst, src) +func (m *EnumDescriptorProto) XXX_Merge(src proto.Message) { + xxx_messageInfo_EnumDescriptorProto.Merge(m, src) } func (m *EnumDescriptorProto) XXX_Size() int { return xxx_messageInfo_EnumDescriptorProto.Size(m) @@ -1032,16 +1067,17 @@ func (m *EnumDescriptorProto_EnumReservedRange) Reset() { *m = EnumDescr func (m *EnumDescriptorProto_EnumReservedRange) String() string { return proto.CompactTextString(m) } func (*EnumDescriptorProto_EnumReservedRange) ProtoMessage() {} func (*EnumDescriptorProto_EnumReservedRange) Descriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{6, 0} + return fileDescriptor_e5baabe45344a177, []int{6, 0} } + func (m *EnumDescriptorProto_EnumReservedRange) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_EnumDescriptorProto_EnumReservedRange.Unmarshal(m, b) } func (m *EnumDescriptorProto_EnumReservedRange) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_EnumDescriptorProto_EnumReservedRange.Marshal(b, m, deterministic) } -func (dst *EnumDescriptorProto_EnumReservedRange) XXX_Merge(src proto.Message) { - xxx_messageInfo_EnumDescriptorProto_EnumReservedRange.Merge(dst, src) +func (m *EnumDescriptorProto_EnumReservedRange) XXX_Merge(src proto.Message) { + xxx_messageInfo_EnumDescriptorProto_EnumReservedRange.Merge(m, src) } func (m *EnumDescriptorProto_EnumReservedRange) XXX_Size() int { return xxx_messageInfo_EnumDescriptorProto_EnumReservedRange.Size(m) @@ -1080,16 +1116,17 @@ func (m *EnumValueDescriptorProto) Reset() { *m = EnumValueDescriptorPro func (m *EnumValueDescriptorProto) String() string { return proto.CompactTextString(m) } func (*EnumValueDescriptorProto) ProtoMessage() {} func (*EnumValueDescriptorProto) Descriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{7} + return fileDescriptor_e5baabe45344a177, []int{7} } + func (m *EnumValueDescriptorProto) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_EnumValueDescriptorProto.Unmarshal(m, b) } func (m *EnumValueDescriptorProto) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_EnumValueDescriptorProto.Marshal(b, m, deterministic) } -func (dst *EnumValueDescriptorProto) XXX_Merge(src proto.Message) { - xxx_messageInfo_EnumValueDescriptorProto.Merge(dst, src) +func (m *EnumValueDescriptorProto) XXX_Merge(src proto.Message) { + xxx_messageInfo_EnumValueDescriptorProto.Merge(m, src) } func (m *EnumValueDescriptorProto) XXX_Size() int { return xxx_messageInfo_EnumValueDescriptorProto.Size(m) @@ -1135,16 +1172,17 @@ func (m *ServiceDescriptorProto) Reset() { *m = ServiceDescriptorProto{} func (m *ServiceDescriptorProto) String() string { return proto.CompactTextString(m) } func (*ServiceDescriptorProto) ProtoMessage() {} func (*ServiceDescriptorProto) Descriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{8} + return fileDescriptor_e5baabe45344a177, []int{8} } + func (m *ServiceDescriptorProto) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ServiceDescriptorProto.Unmarshal(m, b) } func (m *ServiceDescriptorProto) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ServiceDescriptorProto.Marshal(b, m, deterministic) } -func (dst *ServiceDescriptorProto) XXX_Merge(src proto.Message) { - xxx_messageInfo_ServiceDescriptorProto.Merge(dst, src) +func (m *ServiceDescriptorProto) XXX_Merge(src proto.Message) { + xxx_messageInfo_ServiceDescriptorProto.Merge(m, src) } func (m *ServiceDescriptorProto) XXX_Size() int { return xxx_messageInfo_ServiceDescriptorProto.Size(m) @@ -1197,16 +1235,17 @@ func (m *MethodDescriptorProto) Reset() { *m = MethodDescriptorProto{} } func (m *MethodDescriptorProto) String() string { return proto.CompactTextString(m) } func (*MethodDescriptorProto) ProtoMessage() {} func (*MethodDescriptorProto) Descriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{9} + return fileDescriptor_e5baabe45344a177, []int{9} } + func (m *MethodDescriptorProto) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MethodDescriptorProto.Unmarshal(m, b) } func (m *MethodDescriptorProto) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_MethodDescriptorProto.Marshal(b, m, deterministic) } -func (dst *MethodDescriptorProto) XXX_Merge(src proto.Message) { - xxx_messageInfo_MethodDescriptorProto.Merge(dst, src) +func (m *MethodDescriptorProto) XXX_Merge(src proto.Message) { + xxx_messageInfo_MethodDescriptorProto.Merge(m, src) } func (m *MethodDescriptorProto) XXX_Size() int { return xxx_messageInfo_MethodDescriptorProto.Size(m) @@ -1336,6 +1375,14 @@ type FileOptions struct { // is empty. When this option is empty, the package name will be used for // determining the namespace. PhpNamespace *string `protobuf:"bytes,41,opt,name=php_namespace,json=phpNamespace" json:"php_namespace,omitempty"` + // Use this option to change the namespace of php generated metadata classes. + // Default is empty. When this option is empty, the proto file name will be used + // for determining the namespace. + PhpMetadataNamespace *string `protobuf:"bytes,44,opt,name=php_metadata_namespace,json=phpMetadataNamespace" json:"php_metadata_namespace,omitempty"` + // Use this option to change the package of ruby generated classes. Default + // is empty. When this option is not set, the package name will be used for + // determining the ruby package. + RubyPackage *string `protobuf:"bytes,45,opt,name=ruby_package,json=rubyPackage" json:"ruby_package,omitempty"` // The parser stores options it doesn't recognize here. // See the documentation for the "Options" section above. UninterpretedOption []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"` @@ -1349,7 +1396,7 @@ func (m *FileOptions) Reset() { *m = FileOptions{} } func (m *FileOptions) String() string { return proto.CompactTextString(m) } func (*FileOptions) ProtoMessage() {} func (*FileOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{10} + return fileDescriptor_e5baabe45344a177, []int{10} } var extRange_FileOptions = []proto.ExtensionRange{ @@ -1359,14 +1406,15 @@ var extRange_FileOptions = []proto.ExtensionRange{ func (*FileOptions) ExtensionRangeArray() []proto.ExtensionRange { return extRange_FileOptions } + func (m *FileOptions) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FileOptions.Unmarshal(m, b) } func (m *FileOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_FileOptions.Marshal(b, m, deterministic) } -func (dst *FileOptions) XXX_Merge(src proto.Message) { - xxx_messageInfo_FileOptions.Merge(dst, src) +func (m *FileOptions) XXX_Merge(src proto.Message) { + xxx_messageInfo_FileOptions.Merge(m, src) } func (m *FileOptions) XXX_Size() int { return xxx_messageInfo_FileOptions.Size(m) @@ -1514,6 +1562,20 @@ func (m *FileOptions) GetPhpNamespace() string { return "" } +func (m *FileOptions) GetPhpMetadataNamespace() string { + if m != nil && m.PhpMetadataNamespace != nil { + return *m.PhpMetadataNamespace + } + return "" +} + +func (m *FileOptions) GetRubyPackage() string { + if m != nil && m.RubyPackage != nil { + return *m.RubyPackage + } + return "" +} + func (m *FileOptions) GetUninterpretedOption() []*UninterpretedOption { if m != nil { return m.UninterpretedOption @@ -1584,7 +1646,7 @@ func (m *MessageOptions) Reset() { *m = MessageOptions{} } func (m *MessageOptions) String() string { return proto.CompactTextString(m) } func (*MessageOptions) ProtoMessage() {} func (*MessageOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{11} + return fileDescriptor_e5baabe45344a177, []int{11} } var extRange_MessageOptions = []proto.ExtensionRange{ @@ -1594,14 +1656,15 @@ var extRange_MessageOptions = []proto.ExtensionRange{ func (*MessageOptions) ExtensionRangeArray() []proto.ExtensionRange { return extRange_MessageOptions } + func (m *MessageOptions) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MessageOptions.Unmarshal(m, b) } func (m *MessageOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_MessageOptions.Marshal(b, m, deterministic) } -func (dst *MessageOptions) XXX_Merge(src proto.Message) { - xxx_messageInfo_MessageOptions.Merge(dst, src) +func (m *MessageOptions) XXX_Merge(src proto.Message) { + xxx_messageInfo_MessageOptions.Merge(m, src) } func (m *MessageOptions) XXX_Size() int { return xxx_messageInfo_MessageOptions.Size(m) @@ -1723,7 +1786,7 @@ func (m *FieldOptions) Reset() { *m = FieldOptions{} } func (m *FieldOptions) String() string { return proto.CompactTextString(m) } func (*FieldOptions) ProtoMessage() {} func (*FieldOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{12} + return fileDescriptor_e5baabe45344a177, []int{12} } var extRange_FieldOptions = []proto.ExtensionRange{ @@ -1733,14 +1796,15 @@ var extRange_FieldOptions = []proto.ExtensionRange{ func (*FieldOptions) ExtensionRangeArray() []proto.ExtensionRange { return extRange_FieldOptions } + func (m *FieldOptions) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FieldOptions.Unmarshal(m, b) } func (m *FieldOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_FieldOptions.Marshal(b, m, deterministic) } -func (dst *FieldOptions) XXX_Merge(src proto.Message) { - xxx_messageInfo_FieldOptions.Merge(dst, src) +func (m *FieldOptions) XXX_Merge(src proto.Message) { + xxx_messageInfo_FieldOptions.Merge(m, src) } func (m *FieldOptions) XXX_Size() int { return xxx_messageInfo_FieldOptions.Size(m) @@ -1819,7 +1883,7 @@ func (m *OneofOptions) Reset() { *m = OneofOptions{} } func (m *OneofOptions) String() string { return proto.CompactTextString(m) } func (*OneofOptions) ProtoMessage() {} func (*OneofOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{13} + return fileDescriptor_e5baabe45344a177, []int{13} } var extRange_OneofOptions = []proto.ExtensionRange{ @@ -1829,14 +1893,15 @@ var extRange_OneofOptions = []proto.ExtensionRange{ func (*OneofOptions) ExtensionRangeArray() []proto.ExtensionRange { return extRange_OneofOptions } + func (m *OneofOptions) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_OneofOptions.Unmarshal(m, b) } func (m *OneofOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_OneofOptions.Marshal(b, m, deterministic) } -func (dst *OneofOptions) XXX_Merge(src proto.Message) { - xxx_messageInfo_OneofOptions.Merge(dst, src) +func (m *OneofOptions) XXX_Merge(src proto.Message) { + xxx_messageInfo_OneofOptions.Merge(m, src) } func (m *OneofOptions) XXX_Size() int { return xxx_messageInfo_OneofOptions.Size(m) @@ -1875,7 +1940,7 @@ func (m *EnumOptions) Reset() { *m = EnumOptions{} } func (m *EnumOptions) String() string { return proto.CompactTextString(m) } func (*EnumOptions) ProtoMessage() {} func (*EnumOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{14} + return fileDescriptor_e5baabe45344a177, []int{14} } var extRange_EnumOptions = []proto.ExtensionRange{ @@ -1885,14 +1950,15 @@ var extRange_EnumOptions = []proto.ExtensionRange{ func (*EnumOptions) ExtensionRangeArray() []proto.ExtensionRange { return extRange_EnumOptions } + func (m *EnumOptions) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_EnumOptions.Unmarshal(m, b) } func (m *EnumOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_EnumOptions.Marshal(b, m, deterministic) } -func (dst *EnumOptions) XXX_Merge(src proto.Message) { - xxx_messageInfo_EnumOptions.Merge(dst, src) +func (m *EnumOptions) XXX_Merge(src proto.Message) { + xxx_messageInfo_EnumOptions.Merge(m, src) } func (m *EnumOptions) XXX_Size() int { return xxx_messageInfo_EnumOptions.Size(m) @@ -1944,7 +2010,7 @@ func (m *EnumValueOptions) Reset() { *m = EnumValueOptions{} } func (m *EnumValueOptions) String() string { return proto.CompactTextString(m) } func (*EnumValueOptions) ProtoMessage() {} func (*EnumValueOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{15} + return fileDescriptor_e5baabe45344a177, []int{15} } var extRange_EnumValueOptions = []proto.ExtensionRange{ @@ -1954,14 +2020,15 @@ var extRange_EnumValueOptions = []proto.ExtensionRange{ func (*EnumValueOptions) ExtensionRangeArray() []proto.ExtensionRange { return extRange_EnumValueOptions } + func (m *EnumValueOptions) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_EnumValueOptions.Unmarshal(m, b) } func (m *EnumValueOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_EnumValueOptions.Marshal(b, m, deterministic) } -func (dst *EnumValueOptions) XXX_Merge(src proto.Message) { - xxx_messageInfo_EnumValueOptions.Merge(dst, src) +func (m *EnumValueOptions) XXX_Merge(src proto.Message) { + xxx_messageInfo_EnumValueOptions.Merge(m, src) } func (m *EnumValueOptions) XXX_Size() int { return xxx_messageInfo_EnumValueOptions.Size(m) @@ -2006,7 +2073,7 @@ func (m *ServiceOptions) Reset() { *m = ServiceOptions{} } func (m *ServiceOptions) String() string { return proto.CompactTextString(m) } func (*ServiceOptions) ProtoMessage() {} func (*ServiceOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{16} + return fileDescriptor_e5baabe45344a177, []int{16} } var extRange_ServiceOptions = []proto.ExtensionRange{ @@ -2016,14 +2083,15 @@ var extRange_ServiceOptions = []proto.ExtensionRange{ func (*ServiceOptions) ExtensionRangeArray() []proto.ExtensionRange { return extRange_ServiceOptions } + func (m *ServiceOptions) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ServiceOptions.Unmarshal(m, b) } func (m *ServiceOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ServiceOptions.Marshal(b, m, deterministic) } -func (dst *ServiceOptions) XXX_Merge(src proto.Message) { - xxx_messageInfo_ServiceOptions.Merge(dst, src) +func (m *ServiceOptions) XXX_Merge(src proto.Message) { + xxx_messageInfo_ServiceOptions.Merge(m, src) } func (m *ServiceOptions) XXX_Size() int { return xxx_messageInfo_ServiceOptions.Size(m) @@ -2069,7 +2137,7 @@ func (m *MethodOptions) Reset() { *m = MethodOptions{} } func (m *MethodOptions) String() string { return proto.CompactTextString(m) } func (*MethodOptions) ProtoMessage() {} func (*MethodOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{17} + return fileDescriptor_e5baabe45344a177, []int{17} } var extRange_MethodOptions = []proto.ExtensionRange{ @@ -2079,14 +2147,15 @@ var extRange_MethodOptions = []proto.ExtensionRange{ func (*MethodOptions) ExtensionRangeArray() []proto.ExtensionRange { return extRange_MethodOptions } + func (m *MethodOptions) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MethodOptions.Unmarshal(m, b) } func (m *MethodOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_MethodOptions.Marshal(b, m, deterministic) } -func (dst *MethodOptions) XXX_Merge(src proto.Message) { - xxx_messageInfo_MethodOptions.Merge(dst, src) +func (m *MethodOptions) XXX_Merge(src proto.Message) { + xxx_messageInfo_MethodOptions.Merge(m, src) } func (m *MethodOptions) XXX_Size() int { return xxx_messageInfo_MethodOptions.Size(m) @@ -2146,16 +2215,17 @@ func (m *UninterpretedOption) Reset() { *m = UninterpretedOption{} } func (m *UninterpretedOption) String() string { return proto.CompactTextString(m) } func (*UninterpretedOption) ProtoMessage() {} func (*UninterpretedOption) Descriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{18} + return fileDescriptor_e5baabe45344a177, []int{18} } + func (m *UninterpretedOption) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UninterpretedOption.Unmarshal(m, b) } func (m *UninterpretedOption) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_UninterpretedOption.Marshal(b, m, deterministic) } -func (dst *UninterpretedOption) XXX_Merge(src proto.Message) { - xxx_messageInfo_UninterpretedOption.Merge(dst, src) +func (m *UninterpretedOption) XXX_Merge(src proto.Message) { + xxx_messageInfo_UninterpretedOption.Merge(m, src) } func (m *UninterpretedOption) XXX_Size() int { return xxx_messageInfo_UninterpretedOption.Size(m) @@ -2232,16 +2302,17 @@ func (m *UninterpretedOption_NamePart) Reset() { *m = UninterpretedOptio func (m *UninterpretedOption_NamePart) String() string { return proto.CompactTextString(m) } func (*UninterpretedOption_NamePart) ProtoMessage() {} func (*UninterpretedOption_NamePart) Descriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{18, 0} + return fileDescriptor_e5baabe45344a177, []int{18, 0} } + func (m *UninterpretedOption_NamePart) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UninterpretedOption_NamePart.Unmarshal(m, b) } func (m *UninterpretedOption_NamePart) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_UninterpretedOption_NamePart.Marshal(b, m, deterministic) } -func (dst *UninterpretedOption_NamePart) XXX_Merge(src proto.Message) { - xxx_messageInfo_UninterpretedOption_NamePart.Merge(dst, src) +func (m *UninterpretedOption_NamePart) XXX_Merge(src proto.Message) { + xxx_messageInfo_UninterpretedOption_NamePart.Merge(m, src) } func (m *UninterpretedOption_NamePart) XXX_Size() int { return xxx_messageInfo_UninterpretedOption_NamePart.Size(m) @@ -2322,16 +2393,17 @@ func (m *SourceCodeInfo) Reset() { *m = SourceCodeInfo{} } func (m *SourceCodeInfo) String() string { return proto.CompactTextString(m) } func (*SourceCodeInfo) ProtoMessage() {} func (*SourceCodeInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{19} + return fileDescriptor_e5baabe45344a177, []int{19} } + func (m *SourceCodeInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SourceCodeInfo.Unmarshal(m, b) } func (m *SourceCodeInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_SourceCodeInfo.Marshal(b, m, deterministic) } -func (dst *SourceCodeInfo) XXX_Merge(src proto.Message) { - xxx_messageInfo_SourceCodeInfo.Merge(dst, src) +func (m *SourceCodeInfo) XXX_Merge(src proto.Message) { + xxx_messageInfo_SourceCodeInfo.Merge(m, src) } func (m *SourceCodeInfo) XXX_Size() int { return xxx_messageInfo_SourceCodeInfo.Size(m) @@ -2439,16 +2511,17 @@ func (m *SourceCodeInfo_Location) Reset() { *m = SourceCodeInfo_Location func (m *SourceCodeInfo_Location) String() string { return proto.CompactTextString(m) } func (*SourceCodeInfo_Location) ProtoMessage() {} func (*SourceCodeInfo_Location) Descriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{19, 0} + return fileDescriptor_e5baabe45344a177, []int{19, 0} } + func (m *SourceCodeInfo_Location) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SourceCodeInfo_Location.Unmarshal(m, b) } func (m *SourceCodeInfo_Location) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_SourceCodeInfo_Location.Marshal(b, m, deterministic) } -func (dst *SourceCodeInfo_Location) XXX_Merge(src proto.Message) { - xxx_messageInfo_SourceCodeInfo_Location.Merge(dst, src) +func (m *SourceCodeInfo_Location) XXX_Merge(src proto.Message) { + xxx_messageInfo_SourceCodeInfo_Location.Merge(m, src) } func (m *SourceCodeInfo_Location) XXX_Size() int { return xxx_messageInfo_SourceCodeInfo_Location.Size(m) @@ -2510,16 +2583,17 @@ func (m *GeneratedCodeInfo) Reset() { *m = GeneratedCodeInfo{} } func (m *GeneratedCodeInfo) String() string { return proto.CompactTextString(m) } func (*GeneratedCodeInfo) ProtoMessage() {} func (*GeneratedCodeInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{20} + return fileDescriptor_e5baabe45344a177, []int{20} } + func (m *GeneratedCodeInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GeneratedCodeInfo.Unmarshal(m, b) } func (m *GeneratedCodeInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_GeneratedCodeInfo.Marshal(b, m, deterministic) } -func (dst *GeneratedCodeInfo) XXX_Merge(src proto.Message) { - xxx_messageInfo_GeneratedCodeInfo.Merge(dst, src) +func (m *GeneratedCodeInfo) XXX_Merge(src proto.Message) { + xxx_messageInfo_GeneratedCodeInfo.Merge(m, src) } func (m *GeneratedCodeInfo) XXX_Size() int { return xxx_messageInfo_GeneratedCodeInfo.Size(m) @@ -2559,16 +2633,17 @@ func (m *GeneratedCodeInfo_Annotation) Reset() { *m = GeneratedCodeInfo_ func (m *GeneratedCodeInfo_Annotation) String() string { return proto.CompactTextString(m) } func (*GeneratedCodeInfo_Annotation) ProtoMessage() {} func (*GeneratedCodeInfo_Annotation) Descriptor() ([]byte, []int) { - return fileDescriptor_descriptor_4df4cb5f42392df6, []int{20, 0} + return fileDescriptor_e5baabe45344a177, []int{20, 0} } + func (m *GeneratedCodeInfo_Annotation) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GeneratedCodeInfo_Annotation.Unmarshal(m, b) } func (m *GeneratedCodeInfo_Annotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_GeneratedCodeInfo_Annotation.Marshal(b, m, deterministic) } -func (dst *GeneratedCodeInfo_Annotation) XXX_Merge(src proto.Message) { - xxx_messageInfo_GeneratedCodeInfo_Annotation.Merge(dst, src) +func (m *GeneratedCodeInfo_Annotation) XXX_Merge(src proto.Message) { + xxx_messageInfo_GeneratedCodeInfo_Annotation.Merge(m, src) } func (m *GeneratedCodeInfo_Annotation) XXX_Size() int { return xxx_messageInfo_GeneratedCodeInfo_Annotation.Size(m) @@ -2608,6 +2683,12 @@ func (m *GeneratedCodeInfo_Annotation) GetEnd() int32 { } func init() { + proto.RegisterEnum("google.protobuf.FieldDescriptorProto_Type", FieldDescriptorProto_Type_name, FieldDescriptorProto_Type_value) + proto.RegisterEnum("google.protobuf.FieldDescriptorProto_Label", FieldDescriptorProto_Label_name, FieldDescriptorProto_Label_value) + proto.RegisterEnum("google.protobuf.FileOptions_OptimizeMode", FileOptions_OptimizeMode_name, FileOptions_OptimizeMode_value) + proto.RegisterEnum("google.protobuf.FieldOptions_CType", FieldOptions_CType_name, FieldOptions_CType_value) + proto.RegisterEnum("google.protobuf.FieldOptions_JSType", FieldOptions_JSType_name, FieldOptions_JSType_value) + proto.RegisterEnum("google.protobuf.MethodOptions_IdempotencyLevel", MethodOptions_IdempotencyLevel_name, MethodOptions_IdempotencyLevel_value) proto.RegisterType((*FileDescriptorSet)(nil), "google.protobuf.FileDescriptorSet") proto.RegisterType((*FileDescriptorProto)(nil), "google.protobuf.FileDescriptorProto") proto.RegisterType((*DescriptorProto)(nil), "google.protobuf.DescriptorProto") @@ -2635,178 +2716,172 @@ func init() { proto.RegisterType((*SourceCodeInfo_Location)(nil), "google.protobuf.SourceCodeInfo.Location") proto.RegisterType((*GeneratedCodeInfo)(nil), "google.protobuf.GeneratedCodeInfo") proto.RegisterType((*GeneratedCodeInfo_Annotation)(nil), "google.protobuf.GeneratedCodeInfo.Annotation") - proto.RegisterEnum("google.protobuf.FieldDescriptorProto_Type", FieldDescriptorProto_Type_name, FieldDescriptorProto_Type_value) - proto.RegisterEnum("google.protobuf.FieldDescriptorProto_Label", FieldDescriptorProto_Label_name, FieldDescriptorProto_Label_value) - proto.RegisterEnum("google.protobuf.FileOptions_OptimizeMode", FileOptions_OptimizeMode_name, FileOptions_OptimizeMode_value) - proto.RegisterEnum("google.protobuf.FieldOptions_CType", FieldOptions_CType_name, FieldOptions_CType_value) - proto.RegisterEnum("google.protobuf.FieldOptions_JSType", FieldOptions_JSType_name, FieldOptions_JSType_value) - proto.RegisterEnum("google.protobuf.MethodOptions_IdempotencyLevel", MethodOptions_IdempotencyLevel_name, MethodOptions_IdempotencyLevel_value) } -func init() { - proto.RegisterFile("google/protobuf/descriptor.proto", fileDescriptor_descriptor_4df4cb5f42392df6) -} - -var fileDescriptor_descriptor_4df4cb5f42392df6 = []byte{ - // 2555 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0xdd, 0x6e, 0x1b, 0xc7, - 0xf5, 0xcf, 0xf2, 0x4b, 0xe4, 0x21, 0x45, 0x8d, 0x46, 0x8a, 0xbd, 0x56, 0x3e, 0x2c, 0x33, 0x1f, - 0x96, 0x9d, 0x7f, 0xa8, 0xc0, 0xb1, 0x1d, 0x47, 0xfe, 0x23, 0x2d, 0x45, 0xae, 0x15, 0xaa, 0x12, - 0xc9, 0x2e, 0xa9, 0xe6, 0x03, 0x28, 0x16, 0xa3, 0xdd, 0x21, 0xb9, 0xf6, 0x72, 0x77, 0xb3, 0xbb, - 0xb4, 0xad, 0xa0, 0x17, 0x06, 0x7a, 0xd5, 0xab, 0xde, 0x16, 0x45, 0xd1, 0x8b, 0xde, 0x04, 0xe8, - 0x03, 0x14, 0xc8, 0x5d, 0x9f, 0xa0, 0x40, 0xde, 0xa0, 0x68, 0x0b, 0xb4, 0x8f, 0xd0, 0xcb, 0x62, - 0x66, 0x76, 0x97, 0xbb, 0x24, 0x15, 0x2b, 0x01, 0xe2, 0x5c, 0x91, 0xf3, 0x9b, 0xdf, 0x39, 0x73, - 0xe6, 0xcc, 0x99, 0x33, 0x67, 0x66, 0x61, 0x7b, 0xe4, 0x38, 0x23, 0x8b, 0xee, 0xba, 0x9e, 0x13, - 0x38, 0xa7, 0xd3, 0xe1, 0xae, 0x41, 0x7d, 0xdd, 0x33, 0xdd, 0xc0, 0xf1, 0xea, 0x1c, 0xc3, 0x6b, - 0x82, 0x51, 0x8f, 0x18, 0xb5, 0x63, 0x58, 0x7f, 0x60, 0x5a, 0xb4, 0x15, 0x13, 0xfb, 0x34, 0xc0, - 0xf7, 0x20, 0x37, 0x34, 0x2d, 0x2a, 0x4b, 0xdb, 0xd9, 0x9d, 0xf2, 0xad, 0x37, 0xeb, 0x73, 0x42, - 0xf5, 0xb4, 0x44, 0x8f, 0xc1, 0x2a, 0x97, 0xa8, 0xfd, 0x2b, 0x07, 0x1b, 0x4b, 0x7a, 0x31, 0x86, - 0x9c, 0x4d, 0x26, 0x4c, 0xa3, 0xb4, 0x53, 0x52, 0xf9, 0x7f, 0x2c, 0xc3, 0x8a, 0x4b, 0xf4, 0x47, - 0x64, 0x44, 0xe5, 0x0c, 0x87, 0xa3, 0x26, 0x7e, 0x1d, 0xc0, 0xa0, 0x2e, 0xb5, 0x0d, 0x6a, 0xeb, - 0x67, 0x72, 0x76, 0x3b, 0xbb, 0x53, 0x52, 0x13, 0x08, 0x7e, 0x07, 0xd6, 0xdd, 0xe9, 0xa9, 0x65, - 0xea, 0x5a, 0x82, 0x06, 0xdb, 0xd9, 0x9d, 0xbc, 0x8a, 0x44, 0x47, 0x6b, 0x46, 0xbe, 0x0e, 0x6b, - 0x4f, 0x28, 0x79, 0x94, 0xa4, 0x96, 0x39, 0xb5, 0xca, 0xe0, 0x04, 0xb1, 0x09, 0x95, 0x09, 0xf5, - 0x7d, 0x32, 0xa2, 0x5a, 0x70, 0xe6, 0x52, 0x39, 0xc7, 0x67, 0xbf, 0xbd, 0x30, 0xfb, 0xf9, 0x99, - 0x97, 0x43, 0xa9, 0xc1, 0x99, 0x4b, 0x71, 0x03, 0x4a, 0xd4, 0x9e, 0x4e, 0x84, 0x86, 0xfc, 0x39, - 0xfe, 0x53, 0xec, 0xe9, 0x64, 0x5e, 0x4b, 0x91, 0x89, 0x85, 0x2a, 0x56, 0x7c, 0xea, 0x3d, 0x36, - 0x75, 0x2a, 0x17, 0xb8, 0x82, 0xeb, 0x0b, 0x0a, 0xfa, 0xa2, 0x7f, 0x5e, 0x47, 0x24, 0x87, 0x9b, - 0x50, 0xa2, 0x4f, 0x03, 0x6a, 0xfb, 0xa6, 0x63, 0xcb, 0x2b, 0x5c, 0xc9, 0x5b, 0x4b, 0x56, 0x91, - 0x5a, 0xc6, 0xbc, 0x8a, 0x99, 0x1c, 0xbe, 0x0b, 0x2b, 0x8e, 0x1b, 0x98, 0x8e, 0xed, 0xcb, 0xc5, - 0x6d, 0x69, 0xa7, 0x7c, 0xeb, 0xd5, 0xa5, 0x81, 0xd0, 0x15, 0x1c, 0x35, 0x22, 0xe3, 0x36, 0x20, - 0xdf, 0x99, 0x7a, 0x3a, 0xd5, 0x74, 0xc7, 0xa0, 0x9a, 0x69, 0x0f, 0x1d, 0xb9, 0xc4, 0x15, 0x5c, - 0x5d, 0x9c, 0x08, 0x27, 0x36, 0x1d, 0x83, 0xb6, 0xed, 0xa1, 0xa3, 0x56, 0xfd, 0x54, 0x1b, 0x5f, - 0x82, 0x82, 0x7f, 0x66, 0x07, 0xe4, 0xa9, 0x5c, 0xe1, 0x11, 0x12, 0xb6, 0x6a, 0x5f, 0x17, 0x60, - 0xed, 0x22, 0x21, 0x76, 0x1f, 0xf2, 0x43, 0x36, 0x4b, 0x39, 0xf3, 0x5d, 0x7c, 0x20, 0x64, 0xd2, - 0x4e, 0x2c, 0x7c, 0x4f, 0x27, 0x36, 0xa0, 0x6c, 0x53, 0x3f, 0xa0, 0x86, 0x88, 0x88, 0xec, 0x05, - 0x63, 0x0a, 0x84, 0xd0, 0x62, 0x48, 0xe5, 0xbe, 0x57, 0x48, 0x7d, 0x0a, 0x6b, 0xb1, 0x49, 0x9a, - 0x47, 0xec, 0x51, 0x14, 0x9b, 0xbb, 0xcf, 0xb3, 0xa4, 0xae, 0x44, 0x72, 0x2a, 0x13, 0x53, 0xab, - 0x34, 0xd5, 0xc6, 0x2d, 0x00, 0xc7, 0xa6, 0xce, 0x50, 0x33, 0xa8, 0x6e, 0xc9, 0xc5, 0x73, 0xbc, - 0xd4, 0x65, 0x94, 0x05, 0x2f, 0x39, 0x02, 0xd5, 0x2d, 0xfc, 0xe1, 0x2c, 0xd4, 0x56, 0xce, 0x89, - 0x94, 0x63, 0xb1, 0xc9, 0x16, 0xa2, 0xed, 0x04, 0xaa, 0x1e, 0x65, 0x71, 0x4f, 0x8d, 0x70, 0x66, - 0x25, 0x6e, 0x44, 0xfd, 0xb9, 0x33, 0x53, 0x43, 0x31, 0x31, 0xb1, 0x55, 0x2f, 0xd9, 0xc4, 0x6f, - 0x40, 0x0c, 0x68, 0x3c, 0xac, 0x80, 0x67, 0xa1, 0x4a, 0x04, 0x76, 0xc8, 0x84, 0x6e, 0x7d, 0x09, - 0xd5, 0xb4, 0x7b, 0xf0, 0x26, 0xe4, 0xfd, 0x80, 0x78, 0x01, 0x8f, 0xc2, 0xbc, 0x2a, 0x1a, 0x18, - 0x41, 0x96, 0xda, 0x06, 0xcf, 0x72, 0x79, 0x95, 0xfd, 0xc5, 0x3f, 0x9d, 0x4d, 0x38, 0xcb, 0x27, - 0xfc, 0xf6, 0xe2, 0x8a, 0xa6, 0x34, 0xcf, 0xcf, 0x7b, 0xeb, 0x03, 0x58, 0x4d, 0x4d, 0xe0, 0xa2, - 0x43, 0xd7, 0x7e, 0x05, 0x2f, 0x2f, 0x55, 0x8d, 0x3f, 0x85, 0xcd, 0xa9, 0x6d, 0xda, 0x01, 0xf5, - 0x5c, 0x8f, 0xb2, 0x88, 0x15, 0x43, 0xc9, 0xff, 0x5e, 0x39, 0x27, 0xe6, 0x4e, 0x92, 0x6c, 0xa1, - 0x45, 0xdd, 0x98, 0x2e, 0x82, 0x37, 0x4b, 0xc5, 0xff, 0xac, 0xa0, 0x67, 0xcf, 0x9e, 0x3d, 0xcb, - 0xd4, 0x7e, 0x57, 0x80, 0xcd, 0x65, 0x7b, 0x66, 0xe9, 0xf6, 0xbd, 0x04, 0x05, 0x7b, 0x3a, 0x39, - 0xa5, 0x1e, 0x77, 0x52, 0x5e, 0x0d, 0x5b, 0xb8, 0x01, 0x79, 0x8b, 0x9c, 0x52, 0x4b, 0xce, 0x6d, - 0x4b, 0x3b, 0xd5, 0x5b, 0xef, 0x5c, 0x68, 0x57, 0xd6, 0x8f, 0x98, 0x88, 0x2a, 0x24, 0xf1, 0x47, - 0x90, 0x0b, 0x53, 0x34, 0xd3, 0x70, 0xf3, 0x62, 0x1a, 0xd8, 0x5e, 0x52, 0xb9, 0x1c, 0x7e, 0x05, - 0x4a, 0xec, 0x57, 0xc4, 0x46, 0x81, 0xdb, 0x5c, 0x64, 0x00, 0x8b, 0x0b, 0xbc, 0x05, 0x45, 0xbe, - 0x4d, 0x0c, 0x1a, 0x1d, 0x6d, 0x71, 0x9b, 0x05, 0x96, 0x41, 0x87, 0x64, 0x6a, 0x05, 0xda, 0x63, - 0x62, 0x4d, 0x29, 0x0f, 0xf8, 0x92, 0x5a, 0x09, 0xc1, 0x5f, 0x30, 0x0c, 0x5f, 0x85, 0xb2, 0xd8, - 0x55, 0xa6, 0x6d, 0xd0, 0xa7, 0x3c, 0x7b, 0xe6, 0x55, 0xb1, 0xd1, 0xda, 0x0c, 0x61, 0xc3, 0x3f, - 0xf4, 0x1d, 0x3b, 0x0a, 0x4d, 0x3e, 0x04, 0x03, 0xf8, 0xf0, 0x1f, 0xcc, 0x27, 0xee, 0xd7, 0x96, - 0x4f, 0x6f, 0x3e, 0xa6, 0x6a, 0x7f, 0xc9, 0x40, 0x8e, 0xe7, 0x8b, 0x35, 0x28, 0x0f, 0x3e, 0xeb, - 0x29, 0x5a, 0xab, 0x7b, 0xb2, 0x7f, 0xa4, 0x20, 0x09, 0x57, 0x01, 0x38, 0xf0, 0xe0, 0xa8, 0xdb, - 0x18, 0xa0, 0x4c, 0xdc, 0x6e, 0x77, 0x06, 0x77, 0x6f, 0xa3, 0x6c, 0x2c, 0x70, 0x22, 0x80, 0x5c, - 0x92, 0xf0, 0xfe, 0x2d, 0x94, 0xc7, 0x08, 0x2a, 0x42, 0x41, 0xfb, 0x53, 0xa5, 0x75, 0xf7, 0x36, - 0x2a, 0xa4, 0x91, 0xf7, 0x6f, 0xa1, 0x15, 0xbc, 0x0a, 0x25, 0x8e, 0xec, 0x77, 0xbb, 0x47, 0xa8, - 0x18, 0xeb, 0xec, 0x0f, 0xd4, 0x76, 0xe7, 0x00, 0x95, 0x62, 0x9d, 0x07, 0x6a, 0xf7, 0xa4, 0x87, - 0x20, 0xd6, 0x70, 0xac, 0xf4, 0xfb, 0x8d, 0x03, 0x05, 0x95, 0x63, 0xc6, 0xfe, 0x67, 0x03, 0xa5, - 0x8f, 0x2a, 0x29, 0xb3, 0xde, 0xbf, 0x85, 0x56, 0xe3, 0x21, 0x94, 0xce, 0xc9, 0x31, 0xaa, 0xe2, - 0x75, 0x58, 0x15, 0x43, 0x44, 0x46, 0xac, 0xcd, 0x41, 0x77, 0x6f, 0x23, 0x34, 0x33, 0x44, 0x68, - 0x59, 0x4f, 0x01, 0x77, 0x6f, 0x23, 0x5c, 0x6b, 0x42, 0x9e, 0x47, 0x17, 0xc6, 0x50, 0x3d, 0x6a, - 0xec, 0x2b, 0x47, 0x5a, 0xb7, 0x37, 0x68, 0x77, 0x3b, 0x8d, 0x23, 0x24, 0xcd, 0x30, 0x55, 0xf9, - 0xf9, 0x49, 0x5b, 0x55, 0x5a, 0x28, 0x93, 0xc4, 0x7a, 0x4a, 0x63, 0xa0, 0xb4, 0x50, 0xb6, 0xa6, - 0xc3, 0xe6, 0xb2, 0x3c, 0xb9, 0x74, 0x67, 0x24, 0x96, 0x38, 0x73, 0xce, 0x12, 0x73, 0x5d, 0x0b, - 0x4b, 0xfc, 0xcf, 0x0c, 0x6c, 0x2c, 0x39, 0x2b, 0x96, 0x0e, 0xf2, 0x13, 0xc8, 0x8b, 0x10, 0x15, - 0xa7, 0xe7, 0x8d, 0xa5, 0x87, 0x0e, 0x0f, 0xd8, 0x85, 0x13, 0x94, 0xcb, 0x25, 0x2b, 0x88, 0xec, - 0x39, 0x15, 0x04, 0x53, 0xb1, 0x90, 0xd3, 0x7f, 0xb9, 0x90, 0xd3, 0xc5, 0xb1, 0x77, 0xf7, 0x22, - 0xc7, 0x1e, 0xc7, 0xbe, 0x5b, 0x6e, 0xcf, 0x2f, 0xc9, 0xed, 0xf7, 0x61, 0x7d, 0x41, 0xd1, 0x85, - 0x73, 0xec, 0xaf, 0x25, 0x90, 0xcf, 0x73, 0xce, 0x73, 0x32, 0x5d, 0x26, 0x95, 0xe9, 0xee, 0xcf, - 0x7b, 0xf0, 0xda, 0xf9, 0x8b, 0xb0, 0xb0, 0xd6, 0x5f, 0x49, 0x70, 0x69, 0x79, 0xa5, 0xb8, 0xd4, - 0x86, 0x8f, 0xa0, 0x30, 0xa1, 0xc1, 0xd8, 0x89, 0xaa, 0xa5, 0xb7, 0x97, 0x9c, 0xc1, 0xac, 0x7b, - 0x7e, 0xb1, 0x43, 0xa9, 0xe4, 0x21, 0x9e, 0x3d, 0xaf, 0xdc, 0x13, 0xd6, 0x2c, 0x58, 0xfa, 0x9b, - 0x0c, 0xbc, 0xbc, 0x54, 0xf9, 0x52, 0x43, 0x5f, 0x03, 0x30, 0x6d, 0x77, 0x1a, 0x88, 0x8a, 0x48, - 0x24, 0xd8, 0x12, 0x47, 0x78, 0xf2, 0x62, 0xc9, 0x73, 0x1a, 0xc4, 0xfd, 0x59, 0xde, 0x0f, 0x02, - 0xe2, 0x84, 0x7b, 0x33, 0x43, 0x73, 0xdc, 0xd0, 0xd7, 0xcf, 0x99, 0xe9, 0x42, 0x60, 0xbe, 0x07, - 0x48, 0xb7, 0x4c, 0x6a, 0x07, 0x9a, 0x1f, 0x78, 0x94, 0x4c, 0x4c, 0x7b, 0xc4, 0x4f, 0x90, 0xe2, - 0x5e, 0x7e, 0x48, 0x2c, 0x9f, 0xaa, 0x6b, 0xa2, 0xbb, 0x1f, 0xf5, 0x32, 0x09, 0x1e, 0x40, 0x5e, - 0x42, 0xa2, 0x90, 0x92, 0x10, 0xdd, 0xb1, 0x44, 0xed, 0xeb, 0x22, 0x94, 0x13, 0x75, 0x35, 0xbe, - 0x06, 0x95, 0x87, 0xe4, 0x31, 0xd1, 0xa2, 0xbb, 0x92, 0xf0, 0x44, 0x99, 0x61, 0xbd, 0xf0, 0xbe, - 0xf4, 0x1e, 0x6c, 0x72, 0x8a, 0x33, 0x0d, 0xa8, 0xa7, 0xe9, 0x16, 0xf1, 0x7d, 0xee, 0xb4, 0x22, - 0xa7, 0x62, 0xd6, 0xd7, 0x65, 0x5d, 0xcd, 0xa8, 0x07, 0xdf, 0x81, 0x0d, 0x2e, 0x31, 0x99, 0x5a, - 0x81, 0xe9, 0x5a, 0x54, 0x63, 0xb7, 0x37, 0x9f, 0x9f, 0x24, 0xb1, 0x65, 0xeb, 0x8c, 0x71, 0x1c, - 0x12, 0x98, 0x45, 0x3e, 0x6e, 0xc1, 0x6b, 0x5c, 0x6c, 0x44, 0x6d, 0xea, 0x91, 0x80, 0x6a, 0xf4, - 0x8b, 0x29, 0xb1, 0x7c, 0x8d, 0xd8, 0x86, 0x36, 0x26, 0xfe, 0x58, 0xde, 0x64, 0x0a, 0xf6, 0x33, - 0xb2, 0xa4, 0x5e, 0x61, 0xc4, 0x83, 0x90, 0xa7, 0x70, 0x5a, 0xc3, 0x36, 0x3e, 0x26, 0xfe, 0x18, - 0xef, 0xc1, 0x25, 0xae, 0xc5, 0x0f, 0x3c, 0xd3, 0x1e, 0x69, 0xfa, 0x98, 0xea, 0x8f, 0xb4, 0x69, - 0x30, 0xbc, 0x27, 0xbf, 0x92, 0x1c, 0x9f, 0x5b, 0xd8, 0xe7, 0x9c, 0x26, 0xa3, 0x9c, 0x04, 0xc3, - 0x7b, 0xb8, 0x0f, 0x15, 0xb6, 0x18, 0x13, 0xf3, 0x4b, 0xaa, 0x0d, 0x1d, 0x8f, 0x1f, 0x8d, 0xd5, - 0x25, 0xa9, 0x29, 0xe1, 0xc1, 0x7a, 0x37, 0x14, 0x38, 0x76, 0x0c, 0xba, 0x97, 0xef, 0xf7, 0x14, - 0xa5, 0xa5, 0x96, 0x23, 0x2d, 0x0f, 0x1c, 0x8f, 0x05, 0xd4, 0xc8, 0x89, 0x1d, 0x5c, 0x16, 0x01, - 0x35, 0x72, 0x22, 0xf7, 0xde, 0x81, 0x0d, 0x5d, 0x17, 0x73, 0x36, 0x75, 0x2d, 0xbc, 0x63, 0xf9, - 0x32, 0x4a, 0x39, 0x4b, 0xd7, 0x0f, 0x04, 0x21, 0x8c, 0x71, 0x1f, 0x7f, 0x08, 0x2f, 0xcf, 0x9c, - 0x95, 0x14, 0x5c, 0x5f, 0x98, 0xe5, 0xbc, 0xe8, 0x1d, 0xd8, 0x70, 0xcf, 0x16, 0x05, 0x71, 0x6a, - 0x44, 0xf7, 0x6c, 0x5e, 0xec, 0x03, 0xd8, 0x74, 0xc7, 0xee, 0xa2, 0xdc, 0xcd, 0xa4, 0x1c, 0x76, - 0xc7, 0xee, 0xbc, 0xe0, 0x5b, 0xfc, 0xc2, 0xed, 0x51, 0x9d, 0x04, 0xd4, 0x90, 0x2f, 0x27, 0xe9, - 0x89, 0x0e, 0xbc, 0x0b, 0x48, 0xd7, 0x35, 0x6a, 0x93, 0x53, 0x8b, 0x6a, 0xc4, 0xa3, 0x36, 0xf1, - 0xe5, 0xab, 0x49, 0x72, 0x55, 0xd7, 0x15, 0xde, 0xdb, 0xe0, 0x9d, 0xf8, 0x26, 0xac, 0x3b, 0xa7, - 0x0f, 0x75, 0x11, 0x92, 0x9a, 0xeb, 0xd1, 0xa1, 0xf9, 0x54, 0x7e, 0x93, 0xfb, 0x77, 0x8d, 0x75, - 0xf0, 0x80, 0xec, 0x71, 0x18, 0xdf, 0x00, 0xa4, 0xfb, 0x63, 0xe2, 0xb9, 0x3c, 0x27, 0xfb, 0x2e, - 0xd1, 0xa9, 0xfc, 0x96, 0xa0, 0x0a, 0xbc, 0x13, 0xc1, 0x6c, 0x4b, 0xf8, 0x4f, 0xcc, 0x61, 0x10, - 0x69, 0xbc, 0x2e, 0xb6, 0x04, 0xc7, 0x42, 0x6d, 0x3b, 0x80, 0x98, 0x2b, 0x52, 0x03, 0xef, 0x70, - 0x5a, 0xd5, 0x1d, 0xbb, 0xc9, 0x71, 0xdf, 0x80, 0x55, 0xc6, 0x9c, 0x0d, 0x7a, 0x43, 0x14, 0x64, - 0xee, 0x38, 0x31, 0xe2, 0x0f, 0x56, 0x1b, 0xd7, 0xf6, 0xa0, 0x92, 0x8c, 0x4f, 0x5c, 0x02, 0x11, - 0xa1, 0x48, 0x62, 0xc5, 0x4a, 0xb3, 0xdb, 0x62, 0x65, 0xc6, 0xe7, 0x0a, 0xca, 0xb0, 0x72, 0xe7, - 0xa8, 0x3d, 0x50, 0x34, 0xf5, 0xa4, 0x33, 0x68, 0x1f, 0x2b, 0x28, 0x9b, 0xa8, 0xab, 0x0f, 0x73, - 0xc5, 0xb7, 0xd1, 0xf5, 0xda, 0x37, 0x19, 0xa8, 0xa6, 0x2f, 0x4a, 0xf8, 0xff, 0xe1, 0x72, 0xf4, - 0xaa, 0xe1, 0xd3, 0x40, 0x7b, 0x62, 0x7a, 0x7c, 0xe3, 0x4c, 0x88, 0x38, 0xc4, 0xe2, 0xa5, 0xdb, - 0x0c, 0x59, 0x7d, 0x1a, 0x7c, 0x62, 0x7a, 0x6c, 0x5b, 0x4c, 0x48, 0x80, 0x8f, 0xe0, 0xaa, 0xed, - 0x68, 0x7e, 0x40, 0x6c, 0x83, 0x78, 0x86, 0x36, 0x7b, 0x4f, 0xd2, 0x88, 0xae, 0x53, 0xdf, 0x77, - 0xc4, 0x81, 0x15, 0x6b, 0x79, 0xd5, 0x76, 0xfa, 0x21, 0x79, 0x96, 0xc9, 0x1b, 0x21, 0x75, 0x2e, - 0xcc, 0xb2, 0xe7, 0x85, 0xd9, 0x2b, 0x50, 0x9a, 0x10, 0x57, 0xa3, 0x76, 0xe0, 0x9d, 0xf1, 0xf2, - 0xb8, 0xa8, 0x16, 0x27, 0xc4, 0x55, 0x58, 0xfb, 0x85, 0xdc, 0x52, 0x0e, 0x73, 0xc5, 0x22, 0x2a, - 0x1d, 0xe6, 0x8a, 0x25, 0x04, 0xb5, 0x7f, 0x64, 0xa1, 0x92, 0x2c, 0x97, 0xd9, 0xed, 0x43, 0xe7, - 0x27, 0x8b, 0xc4, 0x73, 0xcf, 0x1b, 0xdf, 0x5a, 0x5c, 0xd7, 0x9b, 0xec, 0xc8, 0xd9, 0x2b, 0x88, - 0x22, 0x56, 0x15, 0x92, 0xec, 0xb8, 0x67, 0xd9, 0x86, 0x8a, 0xa2, 0xa1, 0xa8, 0x86, 0x2d, 0x7c, - 0x00, 0x85, 0x87, 0x3e, 0xd7, 0x5d, 0xe0, 0xba, 0xdf, 0xfc, 0x76, 0xdd, 0x87, 0x7d, 0xae, 0xbc, - 0x74, 0xd8, 0xd7, 0x3a, 0x5d, 0xf5, 0xb8, 0x71, 0xa4, 0x86, 0xe2, 0xf8, 0x0a, 0xe4, 0x2c, 0xf2, - 0xe5, 0x59, 0xfa, 0x70, 0xe2, 0xd0, 0x45, 0x17, 0xe1, 0x0a, 0xe4, 0x9e, 0x50, 0xf2, 0x28, 0x7d, - 0x24, 0x70, 0xe8, 0x07, 0xdc, 0x0c, 0xbb, 0x90, 0xe7, 0xfe, 0xc2, 0x00, 0xa1, 0xc7, 0xd0, 0x4b, - 0xb8, 0x08, 0xb9, 0x66, 0x57, 0x65, 0x1b, 0x02, 0x41, 0x45, 0xa0, 0x5a, 0xaf, 0xad, 0x34, 0x15, - 0x94, 0xa9, 0xdd, 0x81, 0x82, 0x70, 0x02, 0xdb, 0x2c, 0xb1, 0x1b, 0xd0, 0x4b, 0x61, 0x33, 0xd4, - 0x21, 0x45, 0xbd, 0x27, 0xc7, 0xfb, 0x8a, 0x8a, 0x32, 0xe9, 0xa5, 0xce, 0xa1, 0x7c, 0xcd, 0x87, - 0x4a, 0xb2, 0x5e, 0x7e, 0x31, 0x77, 0xe1, 0xbf, 0x4a, 0x50, 0x4e, 0xd4, 0xbf, 0xac, 0x70, 0x21, - 0x96, 0xe5, 0x3c, 0xd1, 0x88, 0x65, 0x12, 0x3f, 0x0c, 0x0d, 0xe0, 0x50, 0x83, 0x21, 0x17, 0x5d, - 0xba, 0x17, 0xb4, 0x45, 0xf2, 0xa8, 0x50, 0xfb, 0xa3, 0x04, 0x68, 0xbe, 0x00, 0x9d, 0x33, 0x53, - 0xfa, 0x31, 0xcd, 0xac, 0xfd, 0x41, 0x82, 0x6a, 0xba, 0xea, 0x9c, 0x33, 0xef, 0xda, 0x8f, 0x6a, - 0xde, 0xdf, 0x33, 0xb0, 0x9a, 0xaa, 0x35, 0x2f, 0x6a, 0xdd, 0x17, 0xb0, 0x6e, 0x1a, 0x74, 0xe2, - 0x3a, 0x01, 0xb5, 0xf5, 0x33, 0xcd, 0xa2, 0x8f, 0xa9, 0x25, 0xd7, 0x78, 0xd2, 0xd8, 0xfd, 0xf6, - 0x6a, 0xb6, 0xde, 0x9e, 0xc9, 0x1d, 0x31, 0xb1, 0xbd, 0x8d, 0x76, 0x4b, 0x39, 0xee, 0x75, 0x07, - 0x4a, 0xa7, 0xf9, 0x99, 0x76, 0xd2, 0xf9, 0x59, 0xa7, 0xfb, 0x49, 0x47, 0x45, 0xe6, 0x1c, 0xed, - 0x07, 0xdc, 0xf6, 0x3d, 0x40, 0xf3, 0x46, 0xe1, 0xcb, 0xb0, 0xcc, 0x2c, 0xf4, 0x12, 0xde, 0x80, - 0xb5, 0x4e, 0x57, 0xeb, 0xb7, 0x5b, 0x8a, 0xa6, 0x3c, 0x78, 0xa0, 0x34, 0x07, 0x7d, 0xf1, 0x3e, - 0x11, 0xb3, 0x07, 0xa9, 0x0d, 0x5e, 0xfb, 0x7d, 0x16, 0x36, 0x96, 0x58, 0x82, 0x1b, 0xe1, 0xcd, - 0x42, 0x5c, 0x76, 0xde, 0xbd, 0x88, 0xf5, 0x75, 0x56, 0x10, 0xf4, 0x88, 0x17, 0x84, 0x17, 0x91, - 0x1b, 0xc0, 0xbc, 0x64, 0x07, 0xe6, 0xd0, 0xa4, 0x5e, 0xf8, 0x9c, 0x23, 0xae, 0x1b, 0x6b, 0x33, - 0x5c, 0xbc, 0xe8, 0xfc, 0x1f, 0x60, 0xd7, 0xf1, 0xcd, 0xc0, 0x7c, 0x4c, 0x35, 0xd3, 0x8e, 0xde, - 0x7e, 0xd8, 0xf5, 0x23, 0xa7, 0xa2, 0xa8, 0xa7, 0x6d, 0x07, 0x31, 0xdb, 0xa6, 0x23, 0x32, 0xc7, - 0x66, 0xc9, 0x3c, 0xab, 0xa2, 0xa8, 0x27, 0x66, 0x5f, 0x83, 0x8a, 0xe1, 0x4c, 0x59, 0x4d, 0x26, - 0x78, 0xec, 0xec, 0x90, 0xd4, 0xb2, 0xc0, 0x62, 0x4a, 0x58, 0x6d, 0xcf, 0x1e, 0x9d, 0x2a, 0x6a, - 0x59, 0x60, 0x82, 0x72, 0x1d, 0xd6, 0xc8, 0x68, 0xe4, 0x31, 0xe5, 0x91, 0x22, 0x71, 0x7f, 0xa8, - 0xc6, 0x30, 0x27, 0x6e, 0x1d, 0x42, 0x31, 0xf2, 0x03, 0x3b, 0xaa, 0x99, 0x27, 0x34, 0x57, 0x5c, - 0x8a, 0x33, 0x3b, 0x25, 0xb5, 0x68, 0x47, 0x9d, 0xd7, 0xa0, 0x62, 0xfa, 0xda, 0xec, 0x0d, 0x3d, - 0xb3, 0x9d, 0xd9, 0x29, 0xaa, 0x65, 0xd3, 0x8f, 0xdf, 0x1f, 0x6b, 0x5f, 0x65, 0xa0, 0x9a, 0xfe, - 0x06, 0x80, 0x5b, 0x50, 0xb4, 0x1c, 0x9d, 0xf0, 0xd0, 0x12, 0x1f, 0xa0, 0x76, 0x9e, 0xf3, 0xd9, - 0xa0, 0x7e, 0x14, 0xf2, 0xd5, 0x58, 0x72, 0xeb, 0x6f, 0x12, 0x14, 0x23, 0x18, 0x5f, 0x82, 0x9c, - 0x4b, 0x82, 0x31, 0x57, 0x97, 0xdf, 0xcf, 0x20, 0x49, 0xe5, 0x6d, 0x86, 0xfb, 0x2e, 0xb1, 0x79, - 0x08, 0x84, 0x38, 0x6b, 0xb3, 0x75, 0xb5, 0x28, 0x31, 0xf8, 0xe5, 0xc4, 0x99, 0x4c, 0xa8, 0x1d, - 0xf8, 0xd1, 0xba, 0x86, 0x78, 0x33, 0x84, 0xf1, 0x3b, 0xb0, 0x1e, 0x78, 0xc4, 0xb4, 0x52, 0xdc, - 0x1c, 0xe7, 0xa2, 0xa8, 0x23, 0x26, 0xef, 0xc1, 0x95, 0x48, 0xaf, 0x41, 0x03, 0xa2, 0x8f, 0xa9, - 0x31, 0x13, 0x2a, 0xf0, 0x47, 0x88, 0xcb, 0x21, 0xa1, 0x15, 0xf6, 0x47, 0xb2, 0xb5, 0x6f, 0x24, - 0x58, 0x8f, 0xae, 0x53, 0x46, 0xec, 0xac, 0x63, 0x00, 0x62, 0xdb, 0x4e, 0x90, 0x74, 0xd7, 0x62, - 0x28, 0x2f, 0xc8, 0xd5, 0x1b, 0xb1, 0x90, 0x9a, 0x50, 0xb0, 0x35, 0x01, 0x98, 0xf5, 0x9c, 0xeb, - 0xb6, 0xab, 0x50, 0x0e, 0x3f, 0xf0, 0xf0, 0xaf, 0x84, 0xe2, 0x02, 0x0e, 0x02, 0x62, 0xf7, 0x2e, - 0xbc, 0x09, 0xf9, 0x53, 0x3a, 0x32, 0xed, 0xf0, 0xd9, 0x56, 0x34, 0xa2, 0x67, 0x92, 0x5c, 0xfc, - 0x4c, 0xb2, 0xff, 0x5b, 0x09, 0x36, 0x74, 0x67, 0x32, 0x6f, 0xef, 0x3e, 0x9a, 0x7b, 0x05, 0xf0, - 0x3f, 0x96, 0x3e, 0xff, 0x68, 0x64, 0x06, 0xe3, 0xe9, 0x69, 0x5d, 0x77, 0x26, 0xbb, 0x23, 0xc7, - 0x22, 0xf6, 0x68, 0xf6, 0x99, 0x93, 0xff, 0xd1, 0xdf, 0x1d, 0x51, 0xfb, 0xdd, 0x91, 0x93, 0xf8, - 0xe8, 0x79, 0x7f, 0xf6, 0xf7, 0xbf, 0x92, 0xf4, 0xa7, 0x4c, 0xf6, 0xa0, 0xb7, 0xff, 0xe7, 0xcc, - 0xd6, 0x81, 0x18, 0xae, 0x17, 0xb9, 0x47, 0xa5, 0x43, 0x8b, 0xea, 0x6c, 0xca, 0xff, 0x0b, 0x00, - 0x00, 0xff, 0xff, 0x1a, 0x28, 0x25, 0x79, 0x42, 0x1d, 0x00, 0x00, +func init() { proto.RegisterFile("google/protobuf/descriptor.proto", fileDescriptor_e5baabe45344a177) } + +var fileDescriptor_e5baabe45344a177 = []byte{ + // 2589 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0xdd, 0x8e, 0xdb, 0xc6, + 0x15, 0x0e, 0xf5, 0xb7, 0xd2, 0x91, 0x56, 0x3b, 0x3b, 0xbb, 0xb1, 0xe9, 0xcd, 0x8f, 0xd7, 0xca, + 0x8f, 0xd7, 0x4e, 0xac, 0x0d, 0x1c, 0xdb, 0x71, 0xd6, 0x45, 0x5a, 0xad, 0x44, 0x6f, 0xe4, 0xee, + 0x4a, 0x2a, 0xa5, 0x6d, 0x7e, 0x80, 0x82, 0x98, 0x25, 0x47, 0x12, 0x6d, 0x8a, 0x64, 0x48, 0xca, + 0xf6, 0x06, 0xbd, 0x30, 0xd0, 0xab, 0x5e, 0x15, 0xe8, 0x55, 0x51, 0x14, 0xbd, 0xe8, 0x4d, 0x80, + 0x3e, 0x40, 0x81, 0xde, 0xf5, 0x09, 0x0a, 0xe4, 0x0d, 0x8a, 0xb6, 0x40, 0xfb, 0x08, 0xbd, 0x2c, + 0x66, 0x86, 0xa4, 0x48, 0x49, 0x1b, 0x6f, 0x02, 0xc4, 0xb9, 0x92, 0xe6, 0x3b, 0xdf, 0x39, 0x73, + 0xe6, 0xcc, 0x99, 0x99, 0x33, 0x43, 0xd8, 0x1e, 0x39, 0xce, 0xc8, 0xa2, 0xbb, 0xae, 0xe7, 0x04, + 0xce, 0xc9, 0x74, 0xb8, 0x6b, 0x50, 0x5f, 0xf7, 0x4c, 0x37, 0x70, 0xbc, 0x3a, 0xc7, 0xf0, 0x9a, + 0x60, 0xd4, 0x23, 0x46, 0xed, 0x08, 0xd6, 0xef, 0x9b, 0x16, 0x6d, 0xc5, 0xc4, 0x3e, 0x0d, 0xf0, + 0x5d, 0xc8, 0x0d, 0x4d, 0x8b, 0xca, 0xd2, 0x76, 0x76, 0xa7, 0x7c, 0xf3, 0xcd, 0xfa, 0x9c, 0x52, + 0x3d, 0xad, 0xd1, 0x63, 0xb0, 0xca, 0x35, 0x6a, 0xff, 0xce, 0xc1, 0xc6, 0x12, 0x29, 0xc6, 0x90, + 0xb3, 0xc9, 0x84, 0x59, 0x94, 0x76, 0x4a, 0x2a, 0xff, 0x8f, 0x65, 0x58, 0x71, 0x89, 0xfe, 0x88, + 0x8c, 0xa8, 0x9c, 0xe1, 0x70, 0xd4, 0xc4, 0xaf, 0x03, 0x18, 0xd4, 0xa5, 0xb6, 0x41, 0x6d, 0xfd, + 0x54, 0xce, 0x6e, 0x67, 0x77, 0x4a, 0x6a, 0x02, 0xc1, 0xef, 0xc0, 0xba, 0x3b, 0x3d, 0xb1, 0x4c, + 0x5d, 0x4b, 0xd0, 0x60, 0x3b, 0xbb, 0x93, 0x57, 0x91, 0x10, 0xb4, 0x66, 0xe4, 0xab, 0xb0, 0xf6, + 0x84, 0x92, 0x47, 0x49, 0x6a, 0x99, 0x53, 0xab, 0x0c, 0x4e, 0x10, 0x9b, 0x50, 0x99, 0x50, 0xdf, + 0x27, 0x23, 0xaa, 0x05, 0xa7, 0x2e, 0x95, 0x73, 0x7c, 0xf4, 0xdb, 0x0b, 0xa3, 0x9f, 0x1f, 0x79, + 0x39, 0xd4, 0x1a, 0x9c, 0xba, 0x14, 0x37, 0xa0, 0x44, 0xed, 0xe9, 0x44, 0x58, 0xc8, 0x9f, 0x11, + 0x3f, 0xc5, 0x9e, 0x4e, 0xe6, 0xad, 0x14, 0x99, 0x5a, 0x68, 0x62, 0xc5, 0xa7, 0xde, 0x63, 0x53, + 0xa7, 0x72, 0x81, 0x1b, 0xb8, 0xba, 0x60, 0xa0, 0x2f, 0xe4, 0xf3, 0x36, 0x22, 0x3d, 0xdc, 0x84, + 0x12, 0x7d, 0x1a, 0x50, 0xdb, 0x37, 0x1d, 0x5b, 0x5e, 0xe1, 0x46, 0xde, 0x5a, 0x32, 0x8b, 0xd4, + 0x32, 0xe6, 0x4d, 0xcc, 0xf4, 0xf0, 0x1d, 0x58, 0x71, 0xdc, 0xc0, 0x74, 0x6c, 0x5f, 0x2e, 0x6e, + 0x4b, 0x3b, 0xe5, 0x9b, 0xaf, 0x2e, 0x4d, 0x84, 0xae, 0xe0, 0xa8, 0x11, 0x19, 0xb7, 0x01, 0xf9, + 0xce, 0xd4, 0xd3, 0xa9, 0xa6, 0x3b, 0x06, 0xd5, 0x4c, 0x7b, 0xe8, 0xc8, 0x25, 0x6e, 0xe0, 0xf2, + 0xe2, 0x40, 0x38, 0xb1, 0xe9, 0x18, 0xb4, 0x6d, 0x0f, 0x1d, 0xb5, 0xea, 0xa7, 0xda, 0xf8, 0x02, + 0x14, 0xfc, 0x53, 0x3b, 0x20, 0x4f, 0xe5, 0x0a, 0xcf, 0x90, 0xb0, 0x55, 0xfb, 0x6b, 0x01, 0xd6, + 0xce, 0x93, 0x62, 0xf7, 0x20, 0x3f, 0x64, 0xa3, 0x94, 0x33, 0xdf, 0x26, 0x06, 0x42, 0x27, 0x1d, + 0xc4, 0xc2, 0x77, 0x0c, 0x62, 0x03, 0xca, 0x36, 0xf5, 0x03, 0x6a, 0x88, 0x8c, 0xc8, 0x9e, 0x33, + 0xa7, 0x40, 0x28, 0x2d, 0xa6, 0x54, 0xee, 0x3b, 0xa5, 0xd4, 0xa7, 0xb0, 0x16, 0xbb, 0xa4, 0x79, + 0xc4, 0x1e, 0x45, 0xb9, 0xb9, 0xfb, 0x3c, 0x4f, 0xea, 0x4a, 0xa4, 0xa7, 0x32, 0x35, 0xb5, 0x4a, + 0x53, 0x6d, 0xdc, 0x02, 0x70, 0x6c, 0xea, 0x0c, 0x35, 0x83, 0xea, 0x96, 0x5c, 0x3c, 0x23, 0x4a, + 0x5d, 0x46, 0x59, 0x88, 0x92, 0x23, 0x50, 0xdd, 0xc2, 0x1f, 0xce, 0x52, 0x6d, 0xe5, 0x8c, 0x4c, + 0x39, 0x12, 0x8b, 0x6c, 0x21, 0xdb, 0x8e, 0xa1, 0xea, 0x51, 0x96, 0xf7, 0xd4, 0x08, 0x47, 0x56, + 0xe2, 0x4e, 0xd4, 0x9f, 0x3b, 0x32, 0x35, 0x54, 0x13, 0x03, 0x5b, 0xf5, 0x92, 0x4d, 0xfc, 0x06, + 0xc4, 0x80, 0xc6, 0xd3, 0x0a, 0xf8, 0x2e, 0x54, 0x89, 0xc0, 0x0e, 0x99, 0xd0, 0xad, 0x2f, 0xa1, + 0x9a, 0x0e, 0x0f, 0xde, 0x84, 0xbc, 0x1f, 0x10, 0x2f, 0xe0, 0x59, 0x98, 0x57, 0x45, 0x03, 0x23, + 0xc8, 0x52, 0xdb, 0xe0, 0xbb, 0x5c, 0x5e, 0x65, 0x7f, 0xf1, 0x4f, 0x66, 0x03, 0xce, 0xf2, 0x01, + 0xbf, 0xbd, 0x38, 0xa3, 0x29, 0xcb, 0xf3, 0xe3, 0xde, 0xfa, 0x00, 0x56, 0x53, 0x03, 0x38, 0x6f, + 0xd7, 0xb5, 0x5f, 0xc2, 0xcb, 0x4b, 0x4d, 0xe3, 0x4f, 0x61, 0x73, 0x6a, 0x9b, 0x76, 0x40, 0x3d, + 0xd7, 0xa3, 0x2c, 0x63, 0x45, 0x57, 0xf2, 0x7f, 0x56, 0xce, 0xc8, 0xb9, 0xe3, 0x24, 0x5b, 0x58, + 0x51, 0x37, 0xa6, 0x8b, 0xe0, 0xf5, 0x52, 0xf1, 0xbf, 0x2b, 0xe8, 0xd9, 0xb3, 0x67, 0xcf, 0x32, + 0xb5, 0xdf, 0x15, 0x60, 0x73, 0xd9, 0x9a, 0x59, 0xba, 0x7c, 0x2f, 0x40, 0xc1, 0x9e, 0x4e, 0x4e, + 0xa8, 0xc7, 0x83, 0x94, 0x57, 0xc3, 0x16, 0x6e, 0x40, 0xde, 0x22, 0x27, 0xd4, 0x92, 0x73, 0xdb, + 0xd2, 0x4e, 0xf5, 0xe6, 0x3b, 0xe7, 0x5a, 0x95, 0xf5, 0x43, 0xa6, 0xa2, 0x0a, 0x4d, 0xfc, 0x11, + 0xe4, 0xc2, 0x2d, 0x9a, 0x59, 0xb8, 0x7e, 0x3e, 0x0b, 0x6c, 0x2d, 0xa9, 0x5c, 0x0f, 0xbf, 0x02, + 0x25, 0xf6, 0x2b, 0x72, 0xa3, 0xc0, 0x7d, 0x2e, 0x32, 0x80, 0xe5, 0x05, 0xde, 0x82, 0x22, 0x5f, + 0x26, 0x06, 0x8d, 0x8e, 0xb6, 0xb8, 0xcd, 0x12, 0xcb, 0xa0, 0x43, 0x32, 0xb5, 0x02, 0xed, 0x31, + 0xb1, 0xa6, 0x94, 0x27, 0x7c, 0x49, 0xad, 0x84, 0xe0, 0xcf, 0x19, 0x86, 0x2f, 0x43, 0x59, 0xac, + 0x2a, 0xd3, 0x36, 0xe8, 0x53, 0xbe, 0x7b, 0xe6, 0x55, 0xb1, 0xd0, 0xda, 0x0c, 0x61, 0xdd, 0x3f, + 0xf4, 0x1d, 0x3b, 0x4a, 0x4d, 0xde, 0x05, 0x03, 0x78, 0xf7, 0x1f, 0xcc, 0x6f, 0xdc, 0xaf, 0x2d, + 0x1f, 0xde, 0x7c, 0x4e, 0xd5, 0xfe, 0x92, 0x81, 0x1c, 0xdf, 0x2f, 0xd6, 0xa0, 0x3c, 0xf8, 0xac, + 0xa7, 0x68, 0xad, 0xee, 0xf1, 0xfe, 0xa1, 0x82, 0x24, 0x5c, 0x05, 0xe0, 0xc0, 0xfd, 0xc3, 0x6e, + 0x63, 0x80, 0x32, 0x71, 0xbb, 0xdd, 0x19, 0xdc, 0xb9, 0x85, 0xb2, 0xb1, 0xc2, 0xb1, 0x00, 0x72, + 0x49, 0xc2, 0xfb, 0x37, 0x51, 0x1e, 0x23, 0xa8, 0x08, 0x03, 0xed, 0x4f, 0x95, 0xd6, 0x9d, 0x5b, + 0xa8, 0x90, 0x46, 0xde, 0xbf, 0x89, 0x56, 0xf0, 0x2a, 0x94, 0x38, 0xb2, 0xdf, 0xed, 0x1e, 0xa2, + 0x62, 0x6c, 0xb3, 0x3f, 0x50, 0xdb, 0x9d, 0x03, 0x54, 0x8a, 0x6d, 0x1e, 0xa8, 0xdd, 0xe3, 0x1e, + 0x82, 0xd8, 0xc2, 0x91, 0xd2, 0xef, 0x37, 0x0e, 0x14, 0x54, 0x8e, 0x19, 0xfb, 0x9f, 0x0d, 0x94, + 0x3e, 0xaa, 0xa4, 0xdc, 0x7a, 0xff, 0x26, 0x5a, 0x8d, 0xbb, 0x50, 0x3a, 0xc7, 0x47, 0xa8, 0x8a, + 0xd7, 0x61, 0x55, 0x74, 0x11, 0x39, 0xb1, 0x36, 0x07, 0xdd, 0xb9, 0x85, 0xd0, 0xcc, 0x11, 0x61, + 0x65, 0x3d, 0x05, 0xdc, 0xb9, 0x85, 0x70, 0xad, 0x09, 0x79, 0x9e, 0x5d, 0x18, 0x43, 0xf5, 0xb0, + 0xb1, 0xaf, 0x1c, 0x6a, 0xdd, 0xde, 0xa0, 0xdd, 0xed, 0x34, 0x0e, 0x91, 0x34, 0xc3, 0x54, 0xe5, + 0x67, 0xc7, 0x6d, 0x55, 0x69, 0xa1, 0x4c, 0x12, 0xeb, 0x29, 0x8d, 0x81, 0xd2, 0x42, 0xd9, 0x9a, + 0x0e, 0x9b, 0xcb, 0xf6, 0xc9, 0xa5, 0x2b, 0x23, 0x31, 0xc5, 0x99, 0x33, 0xa6, 0x98, 0xdb, 0x5a, + 0x98, 0xe2, 0x7f, 0x65, 0x60, 0x63, 0xc9, 0x59, 0xb1, 0xb4, 0x93, 0x1f, 0x43, 0x5e, 0xa4, 0xa8, + 0x38, 0x3d, 0xaf, 0x2d, 0x3d, 0x74, 0x78, 0xc2, 0x2e, 0x9c, 0xa0, 0x5c, 0x2f, 0x59, 0x41, 0x64, + 0xcf, 0xa8, 0x20, 0x98, 0x89, 0x85, 0x3d, 0xfd, 0x17, 0x0b, 0x7b, 0xba, 0x38, 0xf6, 0xee, 0x9c, + 0xe7, 0xd8, 0xe3, 0xd8, 0xb7, 0xdb, 0xdb, 0xf3, 0x4b, 0xf6, 0xf6, 0x7b, 0xb0, 0xbe, 0x60, 0xe8, + 0xdc, 0x7b, 0xec, 0xaf, 0x24, 0x90, 0xcf, 0x0a, 0xce, 0x73, 0x76, 0xba, 0x4c, 0x6a, 0xa7, 0xbb, + 0x37, 0x1f, 0xc1, 0x2b, 0x67, 0x4f, 0xc2, 0xc2, 0x5c, 0x7f, 0x25, 0xc1, 0x85, 0xe5, 0x95, 0xe2, + 0x52, 0x1f, 0x3e, 0x82, 0xc2, 0x84, 0x06, 0x63, 0x27, 0xaa, 0x96, 0xde, 0x5e, 0x72, 0x06, 0x33, + 0xf1, 0xfc, 0x64, 0x87, 0x5a, 0xc9, 0x43, 0x3c, 0x7b, 0x56, 0xb9, 0x27, 0xbc, 0x59, 0xf0, 0xf4, + 0xd7, 0x19, 0x78, 0x79, 0xa9, 0xf1, 0xa5, 0x8e, 0xbe, 0x06, 0x60, 0xda, 0xee, 0x34, 0x10, 0x15, + 0x91, 0xd8, 0x60, 0x4b, 0x1c, 0xe1, 0x9b, 0x17, 0xdb, 0x3c, 0xa7, 0x41, 0x2c, 0xcf, 0x72, 0x39, + 0x08, 0x88, 0x13, 0xee, 0xce, 0x1c, 0xcd, 0x71, 0x47, 0x5f, 0x3f, 0x63, 0xa4, 0x0b, 0x89, 0xf9, + 0x1e, 0x20, 0xdd, 0x32, 0xa9, 0x1d, 0x68, 0x7e, 0xe0, 0x51, 0x32, 0x31, 0xed, 0x11, 0x3f, 0x41, + 0x8a, 0x7b, 0xf9, 0x21, 0xb1, 0x7c, 0xaa, 0xae, 0x09, 0x71, 0x3f, 0x92, 0x32, 0x0d, 0x9e, 0x40, + 0x5e, 0x42, 0xa3, 0x90, 0xd2, 0x10, 0xe2, 0x58, 0xa3, 0xf6, 0xdb, 0x12, 0x94, 0x13, 0x75, 0x35, + 0xbe, 0x02, 0x95, 0x87, 0xe4, 0x31, 0xd1, 0xa2, 0xbb, 0x92, 0x88, 0x44, 0x99, 0x61, 0xbd, 0xf0, + 0xbe, 0xf4, 0x1e, 0x6c, 0x72, 0x8a, 0x33, 0x0d, 0xa8, 0xa7, 0xe9, 0x16, 0xf1, 0x7d, 0x1e, 0xb4, + 0x22, 0xa7, 0x62, 0x26, 0xeb, 0x32, 0x51, 0x33, 0x92, 0xe0, 0xdb, 0xb0, 0xc1, 0x35, 0x26, 0x53, + 0x2b, 0x30, 0x5d, 0x8b, 0x6a, 0xec, 0xf6, 0xe6, 0xf3, 0x93, 0x24, 0xf6, 0x6c, 0x9d, 0x31, 0x8e, + 0x42, 0x02, 0xf3, 0xc8, 0xc7, 0x2d, 0x78, 0x8d, 0xab, 0x8d, 0xa8, 0x4d, 0x3d, 0x12, 0x50, 0x8d, + 0x7e, 0x31, 0x25, 0x96, 0xaf, 0x11, 0xdb, 0xd0, 0xc6, 0xc4, 0x1f, 0xcb, 0x9b, 0xcc, 0xc0, 0x7e, + 0x46, 0x96, 0xd4, 0x4b, 0x8c, 0x78, 0x10, 0xf2, 0x14, 0x4e, 0x6b, 0xd8, 0xc6, 0xc7, 0xc4, 0x1f, + 0xe3, 0x3d, 0xb8, 0xc0, 0xad, 0xf8, 0x81, 0x67, 0xda, 0x23, 0x4d, 0x1f, 0x53, 0xfd, 0x91, 0x36, + 0x0d, 0x86, 0x77, 0xe5, 0x57, 0x92, 0xfd, 0x73, 0x0f, 0xfb, 0x9c, 0xd3, 0x64, 0x94, 0xe3, 0x60, + 0x78, 0x17, 0xf7, 0xa1, 0xc2, 0x26, 0x63, 0x62, 0x7e, 0x49, 0xb5, 0xa1, 0xe3, 0xf1, 0xa3, 0xb1, + 0xba, 0x64, 0x6b, 0x4a, 0x44, 0xb0, 0xde, 0x0d, 0x15, 0x8e, 0x1c, 0x83, 0xee, 0xe5, 0xfb, 0x3d, + 0x45, 0x69, 0xa9, 0xe5, 0xc8, 0xca, 0x7d, 0xc7, 0x63, 0x09, 0x35, 0x72, 0xe2, 0x00, 0x97, 0x45, + 0x42, 0x8d, 0x9c, 0x28, 0xbc, 0xb7, 0x61, 0x43, 0xd7, 0xc5, 0x98, 0x4d, 0x5d, 0x0b, 0xef, 0x58, + 0xbe, 0x8c, 0x52, 0xc1, 0xd2, 0xf5, 0x03, 0x41, 0x08, 0x73, 0xdc, 0xc7, 0x1f, 0xc2, 0xcb, 0xb3, + 0x60, 0x25, 0x15, 0xd7, 0x17, 0x46, 0x39, 0xaf, 0x7a, 0x1b, 0x36, 0xdc, 0xd3, 0x45, 0x45, 0x9c, + 0xea, 0xd1, 0x3d, 0x9d, 0x57, 0xfb, 0x00, 0x36, 0xdd, 0xb1, 0xbb, 0xa8, 0x77, 0x3d, 0xa9, 0x87, + 0xdd, 0xb1, 0x3b, 0xaf, 0xf8, 0x16, 0xbf, 0x70, 0x7b, 0x54, 0x27, 0x01, 0x35, 0xe4, 0x8b, 0x49, + 0x7a, 0x42, 0x80, 0x77, 0x01, 0xe9, 0xba, 0x46, 0x6d, 0x72, 0x62, 0x51, 0x8d, 0x78, 0xd4, 0x26, + 0xbe, 0x7c, 0x39, 0x49, 0xae, 0xea, 0xba, 0xc2, 0xa5, 0x0d, 0x2e, 0xc4, 0xd7, 0x61, 0xdd, 0x39, + 0x79, 0xa8, 0x8b, 0x94, 0xd4, 0x5c, 0x8f, 0x0e, 0xcd, 0xa7, 0xf2, 0x9b, 0x3c, 0xbe, 0x6b, 0x4c, + 0xc0, 0x13, 0xb2, 0xc7, 0x61, 0x7c, 0x0d, 0x90, 0xee, 0x8f, 0x89, 0xe7, 0xf2, 0x3d, 0xd9, 0x77, + 0x89, 0x4e, 0xe5, 0xb7, 0x04, 0x55, 0xe0, 0x9d, 0x08, 0x66, 0x4b, 0xc2, 0x7f, 0x62, 0x0e, 0x83, + 0xc8, 0xe2, 0x55, 0xb1, 0x24, 0x38, 0x16, 0x5a, 0xdb, 0x01, 0xc4, 0x42, 0x91, 0xea, 0x78, 0x87, + 0xd3, 0xaa, 0xee, 0xd8, 0x4d, 0xf6, 0xfb, 0x06, 0xac, 0x32, 0xe6, 0xac, 0xd3, 0x6b, 0xa2, 0x20, + 0x73, 0xc7, 0x89, 0x1e, 0x6f, 0xc1, 0x05, 0x46, 0x9a, 0xd0, 0x80, 0x18, 0x24, 0x20, 0x09, 0xf6, + 0xbb, 0x9c, 0xcd, 0xe2, 0x7e, 0x14, 0x0a, 0x53, 0x7e, 0x7a, 0xd3, 0x93, 0xd3, 0x38, 0xb3, 0x6e, + 0x08, 0x3f, 0x19, 0x16, 0xe5, 0xd6, 0xf7, 0x56, 0x74, 0xd7, 0xf6, 0xa0, 0x92, 0x4c, 0x7c, 0x5c, + 0x02, 0x91, 0xfa, 0x48, 0x62, 0x55, 0x50, 0xb3, 0xdb, 0x62, 0xf5, 0xcb, 0xe7, 0x0a, 0xca, 0xb0, + 0x3a, 0xea, 0xb0, 0x3d, 0x50, 0x34, 0xf5, 0xb8, 0x33, 0x68, 0x1f, 0x29, 0x28, 0x9b, 0x28, 0xd8, + 0x1f, 0xe4, 0x8a, 0x6f, 0xa3, 0xab, 0xb5, 0xaf, 0x33, 0x50, 0x4d, 0xdf, 0xc0, 0xf0, 0x8f, 0xe0, + 0x62, 0xf4, 0x5c, 0xe2, 0xd3, 0x40, 0x7b, 0x62, 0x7a, 0x7c, 0x45, 0x4e, 0x88, 0x38, 0x1d, 0xe3, + 0x9c, 0xd8, 0x0c, 0x59, 0x7d, 0x1a, 0x7c, 0x62, 0x7a, 0x6c, 0xbd, 0x4d, 0x48, 0x80, 0x0f, 0xe1, + 0xb2, 0xed, 0x68, 0x7e, 0x40, 0x6c, 0x83, 0x78, 0x86, 0x36, 0x7b, 0xa8, 0xd2, 0x88, 0xae, 0x53, + 0xdf, 0x77, 0xc4, 0x49, 0x18, 0x5b, 0x79, 0xd5, 0x76, 0xfa, 0x21, 0x79, 0x76, 0x44, 0x34, 0x42, + 0xea, 0x5c, 0xfe, 0x66, 0xcf, 0xca, 0xdf, 0x57, 0xa0, 0x34, 0x21, 0xae, 0x46, 0xed, 0xc0, 0x3b, + 0xe5, 0x75, 0x77, 0x51, 0x2d, 0x4e, 0x88, 0xab, 0xb0, 0xf6, 0x0b, 0xb9, 0xfe, 0x3c, 0xc8, 0x15, + 0x8b, 0xa8, 0xf4, 0x20, 0x57, 0x2c, 0x21, 0xa8, 0xfd, 0x33, 0x0b, 0x95, 0x64, 0x1d, 0xce, 0xae, + 0x35, 0x3a, 0x3f, 0xb2, 0x24, 0xbe, 0xa9, 0xbd, 0xf1, 0x8d, 0x55, 0x7b, 0xbd, 0xc9, 0xce, 0xb2, + 0xbd, 0x82, 0xa8, 0x8e, 0x55, 0xa1, 0xc9, 0xea, 0x08, 0x96, 0x6c, 0x54, 0x54, 0x23, 0x45, 0x35, + 0x6c, 0xe1, 0x03, 0x28, 0x3c, 0xf4, 0xb9, 0xed, 0x02, 0xb7, 0xfd, 0xe6, 0x37, 0xdb, 0x7e, 0xd0, + 0xe7, 0xc6, 0x4b, 0x0f, 0xfa, 0x5a, 0xa7, 0xab, 0x1e, 0x35, 0x0e, 0xd5, 0x50, 0x1d, 0x5f, 0x82, + 0x9c, 0x45, 0xbe, 0x3c, 0x4d, 0x9f, 0x7a, 0x1c, 0x3a, 0xef, 0x24, 0x5c, 0x82, 0xdc, 0x13, 0x4a, + 0x1e, 0xa5, 0xcf, 0x1a, 0x0e, 0x7d, 0x8f, 0x8b, 0x61, 0x17, 0xf2, 0x3c, 0x5e, 0x18, 0x20, 0x8c, + 0x18, 0x7a, 0x09, 0x17, 0x21, 0xd7, 0xec, 0xaa, 0x6c, 0x41, 0x20, 0xa8, 0x08, 0x54, 0xeb, 0xb5, + 0x95, 0xa6, 0x82, 0x32, 0xb5, 0xdb, 0x50, 0x10, 0x41, 0x60, 0x8b, 0x25, 0x0e, 0x03, 0x7a, 0x29, + 0x6c, 0x86, 0x36, 0xa4, 0x48, 0x7a, 0x7c, 0xb4, 0xaf, 0xa8, 0x28, 0x93, 0x9e, 0xea, 0x1c, 0xca, + 0xd7, 0x7c, 0xa8, 0x24, 0x0b, 0xf1, 0x17, 0x73, 0xc9, 0xfe, 0x9b, 0x04, 0xe5, 0x44, 0x61, 0xcd, + 0x2a, 0x22, 0x62, 0x59, 0xce, 0x13, 0x8d, 0x58, 0x26, 0xf1, 0xc3, 0xd4, 0x00, 0x0e, 0x35, 0x18, + 0x72, 0xde, 0xa9, 0x7b, 0x41, 0x4b, 0x24, 0x8f, 0x0a, 0xb5, 0x3f, 0x4a, 0x80, 0xe6, 0x2b, 0xdb, + 0x39, 0x37, 0xa5, 0x1f, 0xd2, 0xcd, 0xda, 0x1f, 0x24, 0xa8, 0xa6, 0xcb, 0xd9, 0x39, 0xf7, 0xae, + 0xfc, 0xa0, 0xee, 0xfd, 0x23, 0x03, 0xab, 0xa9, 0x22, 0xf6, 0xbc, 0xde, 0x7d, 0x01, 0xeb, 0xa6, + 0x41, 0x27, 0xae, 0x13, 0x50, 0x5b, 0x3f, 0xd5, 0x2c, 0xfa, 0x98, 0x5a, 0x72, 0x8d, 0x6f, 0x1a, + 0xbb, 0xdf, 0x5c, 0x26, 0xd7, 0xdb, 0x33, 0xbd, 0x43, 0xa6, 0xb6, 0xb7, 0xd1, 0x6e, 0x29, 0x47, + 0xbd, 0xee, 0x40, 0xe9, 0x34, 0x3f, 0xd3, 0x8e, 0x3b, 0x3f, 0xed, 0x74, 0x3f, 0xe9, 0xa8, 0xc8, + 0x9c, 0xa3, 0x7d, 0x8f, 0xcb, 0xbe, 0x07, 0x68, 0xde, 0x29, 0x7c, 0x11, 0x96, 0xb9, 0x85, 0x5e, + 0xc2, 0x1b, 0xb0, 0xd6, 0xe9, 0x6a, 0xfd, 0x76, 0x4b, 0xd1, 0x94, 0xfb, 0xf7, 0x95, 0xe6, 0xa0, + 0x2f, 0x1e, 0x3e, 0x62, 0xf6, 0x20, 0xb5, 0xc0, 0x6b, 0xbf, 0xcf, 0xc2, 0xc6, 0x12, 0x4f, 0x70, + 0x23, 0xbc, 0xb2, 0x88, 0x5b, 0xd4, 0x8d, 0xf3, 0x78, 0x5f, 0x67, 0x35, 0x43, 0x8f, 0x78, 0x41, + 0x78, 0xc3, 0xb9, 0x06, 0x2c, 0x4a, 0x76, 0x60, 0x0e, 0x4d, 0xea, 0x85, 0xef, 0x44, 0xe2, 0x1e, + 0xb3, 0x36, 0xc3, 0xc5, 0x53, 0xd1, 0xbb, 0x80, 0x5d, 0xc7, 0x37, 0x03, 0xf3, 0x31, 0xd5, 0x4c, + 0x3b, 0x7a, 0x54, 0x62, 0xf7, 0x9a, 0x9c, 0x8a, 0x22, 0x49, 0xdb, 0x0e, 0x62, 0xb6, 0x4d, 0x47, + 0x64, 0x8e, 0xcd, 0x36, 0xf3, 0xac, 0x8a, 0x22, 0x49, 0xcc, 0xbe, 0x02, 0x15, 0xc3, 0x99, 0xb2, + 0x62, 0x4f, 0xf0, 0xd8, 0xd9, 0x21, 0xa9, 0x65, 0x81, 0xc5, 0x94, 0xb0, 0x8c, 0x9f, 0xbd, 0x66, + 0x55, 0xd4, 0xb2, 0xc0, 0x04, 0xe5, 0x2a, 0xac, 0x91, 0xd1, 0xc8, 0x63, 0xc6, 0x23, 0x43, 0xe2, + 0x62, 0x52, 0x8d, 0x61, 0x4e, 0xdc, 0x7a, 0x00, 0xc5, 0x28, 0x0e, 0xec, 0xa8, 0x66, 0x91, 0xd0, + 0x5c, 0x71, 0xdb, 0xce, 0xec, 0x94, 0xd4, 0xa2, 0x1d, 0x09, 0xaf, 0x40, 0xc5, 0xf4, 0xb5, 0xd9, + 0xe3, 0x7c, 0x66, 0x3b, 0xb3, 0x53, 0x54, 0xcb, 0xa6, 0x1f, 0x3f, 0x6c, 0xd6, 0xbe, 0xca, 0x40, + 0x35, 0xfd, 0x71, 0x01, 0xb7, 0xa0, 0x68, 0x39, 0x3a, 0xe1, 0xa9, 0x25, 0xbe, 0x6c, 0xed, 0x3c, + 0xe7, 0x7b, 0x44, 0xfd, 0x30, 0xe4, 0xab, 0xb1, 0xe6, 0xd6, 0xdf, 0x25, 0x28, 0x46, 0x30, 0xbe, + 0x00, 0x39, 0x97, 0x04, 0x63, 0x6e, 0x2e, 0xbf, 0x9f, 0x41, 0x92, 0xca, 0xdb, 0x0c, 0xf7, 0x5d, + 0x62, 0xf3, 0x14, 0x08, 0x71, 0xd6, 0x66, 0xf3, 0x6a, 0x51, 0x62, 0xf0, 0x5b, 0x8f, 0x33, 0x99, + 0x50, 0x3b, 0xf0, 0xa3, 0x79, 0x0d, 0xf1, 0x66, 0x08, 0xe3, 0x77, 0x60, 0x3d, 0xf0, 0x88, 0x69, + 0xa5, 0xb8, 0x39, 0xce, 0x45, 0x91, 0x20, 0x26, 0xef, 0xc1, 0xa5, 0xc8, 0xae, 0x41, 0x03, 0xa2, + 0x8f, 0xa9, 0x31, 0x53, 0x2a, 0xf0, 0xd7, 0x8d, 0x8b, 0x21, 0xa1, 0x15, 0xca, 0x23, 0xdd, 0xda, + 0xd7, 0x12, 0xac, 0x47, 0xf7, 0x34, 0x23, 0x0e, 0xd6, 0x11, 0x00, 0xb1, 0x6d, 0x27, 0x48, 0x86, + 0x6b, 0x31, 0x95, 0x17, 0xf4, 0xea, 0x8d, 0x58, 0x49, 0x4d, 0x18, 0xd8, 0x9a, 0x00, 0xcc, 0x24, + 0x67, 0x86, 0xed, 0x32, 0x94, 0xc3, 0x2f, 0x47, 0xfc, 0xf3, 0xa3, 0xb8, 0xd9, 0x83, 0x80, 0xd8, + 0x85, 0x0e, 0x6f, 0x42, 0xfe, 0x84, 0x8e, 0x4c, 0x3b, 0x7c, 0x0f, 0x16, 0x8d, 0xe8, 0xfd, 0x25, + 0x17, 0xbf, 0xbf, 0xec, 0xff, 0x46, 0x82, 0x0d, 0xdd, 0x99, 0xcc, 0xfb, 0xbb, 0x8f, 0xe6, 0x9e, + 0x17, 0xfc, 0x8f, 0xa5, 0xcf, 0x3f, 0x1a, 0x99, 0xc1, 0x78, 0x7a, 0x52, 0xd7, 0x9d, 0xc9, 0xee, + 0xc8, 0xb1, 0x88, 0x3d, 0x9a, 0x7d, 0x3f, 0xe5, 0x7f, 0xf4, 0x1b, 0x23, 0x6a, 0xdf, 0x18, 0x39, + 0x89, 0xaf, 0xa9, 0xf7, 0x66, 0x7f, 0xff, 0x27, 0x49, 0x7f, 0xca, 0x64, 0x0f, 0x7a, 0xfb, 0x7f, + 0xce, 0x6c, 0x1d, 0x88, 0xee, 0x7a, 0x51, 0x78, 0x54, 0x3a, 0xb4, 0xa8, 0xce, 0x86, 0xfc, 0xff, + 0x00, 0x00, 0x00, 0xff, 0xff, 0x3e, 0xe8, 0xef, 0xc4, 0x9b, 0x1d, 0x00, 0x00, } diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.proto b/vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.proto index 8697a50de4..ed08fcbc54 100644 --- a/vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.proto +++ b/vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.proto @@ -417,6 +417,17 @@ message FileOptions { // determining the namespace. optional string php_namespace = 41; + + // Use this option to change the namespace of php generated metadata classes. + // Default is empty. When this option is empty, the proto file name will be used + // for determining the namespace. + optional string php_metadata_namespace = 44; + + // Use this option to change the package of ruby generated classes. Default + // is empty. When this option is not set, the package name will be used for + // determining the ruby package. + optional string ruby_package = 45; + // The parser stores options it doesn't recognize here. // See the documentation for the "Options" section above. repeated UninterpretedOption uninterpreted_option = 999; diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/generator/generator.go b/vendor/github.com/golang/protobuf/protoc-gen-go/generator/generator.go index c13a9f1e63..6f4a902b5b 100644 --- a/vendor/github.com/golang/protobuf/protoc-gen-go/generator/generator.go +++ b/vendor/github.com/golang/protobuf/protoc-gen-go/generator/generator.go @@ -43,6 +43,7 @@ import ( "crypto/sha256" "encoding/hex" "fmt" + "go/ast" "go/build" "go/parser" "go/printer" @@ -67,7 +68,7 @@ import ( // It is incremented whenever an incompatibility between the generated code and // proto package is introduced; the generated code references // a constant, proto.ProtoPackageIsVersionN (where N is generatedCodeVersion). -const generatedCodeVersion = 2 +const generatedCodeVersion = 3 // A Plugin provides functionality to add to the output during Go code generation, // such as to produce RPC stubs. @@ -271,7 +272,6 @@ type FileDescriptor struct { // This is used for supporting public imports. exported map[Object][]symbol - fingerprint string // Fingerprint of this file's contents. importPath GoImportPath // Import path of this file's package. packageName GoPackageName // Name of this file's Go package. @@ -282,8 +282,8 @@ type FileDescriptor struct { // to the compressed bytes of this descriptor. It is not exported, so // it is only valid inside the generated package. func (d *FileDescriptor) VarName() string { - name := strings.Map(badToUnderscore, baseName(d.GetName())) - return fmt.Sprintf("fileDescriptor_%s_%s", name, d.fingerprint) + h := sha256.Sum256([]byte(d.GetName())) + return fmt.Sprintf("fileDescriptor_%s", hex.EncodeToString(h[:8])) } // goPackageOption interprets the file's go_package option. @@ -340,7 +340,7 @@ func (d *FileDescriptor) addExport(obj Object, sym symbol) { type symbol interface { // GenerateAlias should generate an appropriate alias // for the symbol from the named package. - GenerateAlias(g *Generator, pkg GoPackageName) + GenerateAlias(g *Generator, filename string, pkg GoPackageName) } type messageSymbol struct { @@ -356,7 +356,8 @@ type getterSymbol struct { genType bool // whether typ contains a generated type (message/group/enum) } -func (ms *messageSymbol) GenerateAlias(g *Generator, pkg GoPackageName) { +func (ms *messageSymbol) GenerateAlias(g *Generator, filename string, pkg GoPackageName) { + g.P("// ", ms.sym, " from public import ", filename) g.P("type ", ms.sym, " = ", pkg, ".", ms.sym) for _, name := range ms.oneofTypes { g.P("type ", name, " = ", pkg, ".", name) @@ -368,8 +369,9 @@ type enumSymbol struct { proto3 bool // Whether this came from a proto3 file. } -func (es enumSymbol) GenerateAlias(g *Generator, pkg GoPackageName) { +func (es enumSymbol) GenerateAlias(g *Generator, filename string, pkg GoPackageName) { s := es.name + g.P("// ", s, " from public import ", filename) g.P("type ", s, " = ", pkg, ".", s) g.P("var ", s, "_name = ", pkg, ".", s, "_name") g.P("var ", s, "_value = ", pkg, ".", s, "_value") @@ -381,7 +383,7 @@ type constOrVarSymbol struct { cast string // if non-empty, a type cast is required (used for enums) } -func (cs constOrVarSymbol) GenerateAlias(g *Generator, pkg GoPackageName) { +func (cs constOrVarSymbol) GenerateAlias(g *Generator, filename string, pkg GoPackageName) { v := string(pkg) + "." + cs.sym if cs.cast != "" { v = cs.cast + "(" + v + ")" @@ -418,6 +420,7 @@ type Generator struct { packageNames map[GoImportPath]GoPackageName // Imported package names in the current file. usedPackages map[GoImportPath]bool // Packages used in current file. usedPackageNames map[GoPackageName]bool // Package names used in the current file. + addedImports map[GoImportPath]bool // Additional imports to emit. typeNameToObject map[string]Object // Key is a fully-qualified name in input syntax. init []string // Lines to emit in the init function. indent string @@ -532,7 +535,7 @@ func (g *Generator) GoPackageName(importPath GoImportPath) GoPackageName { return name } name := cleanPackageName(baseName(string(importPath))) - for i, orig := 1, name; g.usedPackageNames[name]; i++ { + for i, orig := 1, name; g.usedPackageNames[name] || isGoPredeclaredIdentifier[string(name)]; i++ { name = orig + GoPackageName(strconv.Itoa(i)) } g.packageNames[importPath] = name @@ -540,6 +543,13 @@ func (g *Generator) GoPackageName(importPath GoImportPath) GoPackageName { return name } +// AddImport adds a package to the generated file's import section. +// It returns the name used for the package. +func (g *Generator) AddImport(importPath GoImportPath) GoPackageName { + g.addedImports[importPath] = true + return g.GoPackageName(importPath) +} + var globalPackageNames = map[GoPackageName]bool{ "fmt": true, "math": true, @@ -585,9 +595,51 @@ var isGoKeyword = map[string]bool{ "var": true, } +var isGoPredeclaredIdentifier = map[string]bool{ + "append": true, + "bool": true, + "byte": true, + "cap": true, + "close": true, + "complex": true, + "complex128": true, + "complex64": true, + "copy": true, + "delete": true, + "error": true, + "false": true, + "float32": true, + "float64": true, + "imag": true, + "int": true, + "int16": true, + "int32": true, + "int64": true, + "int8": true, + "iota": true, + "len": true, + "make": true, + "new": true, + "nil": true, + "panic": true, + "print": true, + "println": true, + "real": true, + "recover": true, + "rune": true, + "string": true, + "true": true, + "uint": true, + "uint16": true, + "uint32": true, + "uint64": true, + "uint8": true, + "uintptr": true, +} + func cleanPackageName(name string) GoPackageName { name = strings.Map(badToUnderscore, name) - // Identifier must not be keyword: insert _. + // Identifier must not be keyword or predeclared identifier: insert _. if isGoKeyword[name] { name = "_" + name } @@ -724,27 +776,10 @@ func (g *Generator) WrapTypes() { if fd == nil { g.Fail("could not find file named", fileName) } - fingerprint, err := fingerprintProto(fd.FileDescriptorProto) - if err != nil { - g.Error(err) - } - fd.fingerprint = fingerprint g.genFiles = append(g.genFiles, fd) } } -// fingerprintProto returns a fingerprint for a message. -// The fingerprint is intended to prevent conflicts between generated fileds, -// not to provide cryptographic security. -func fingerprintProto(m proto.Message) (string, error) { - b, err := proto.Marshal(m) - if err != nil { - return "", err - } - h := sha256.Sum256(b) - return hex.EncodeToString(h[:8]), nil -} - // Scan the descriptors in this file. For each one, build the slice of nested descriptors func (g *Generator) buildNestedDescriptors(descs []*Descriptor) { for _, desc := range descs { @@ -938,39 +973,6 @@ func (g *Generator) ObjectNamed(typeName string) Object { if !ok { g.Fail("can't find object with type", typeName) } - - // If the file of this object isn't a direct dependency of the current file, - // or in the current file, then this object has been publicly imported into - // a dependency of the current file. - // We should return the ImportedDescriptor object for it instead. - direct := *o.File().Name == *g.file.Name - if !direct { - for _, dep := range g.file.Dependency { - if *g.fileByName(dep).Name == *o.File().Name { - direct = true - break - } - } - } - if !direct { - found := false - Loop: - for _, dep := range g.file.Dependency { - df := g.fileByName(*g.fileByName(dep).Name) - for _, td := range df.imp { - if td.o == o { - // Found it! - o = td - found = true - break Loop - } - } - } - if !found { - log.Printf("protoc-gen-go: WARNING: failed finding publicly imported dependency for %v, used in %v", typeName, *g.file.Name) - } - } - return o } @@ -1124,6 +1126,7 @@ func (g *Generator) generate(file *FileDescriptor) { g.usedPackages = make(map[GoImportPath]bool) g.packageNames = make(map[GoImportPath]GoPackageName) g.usedPackageNames = make(map[GoPackageName]bool) + g.addedImports = make(map[GoImportPath]bool) for name := range globalPackageNames { g.usedPackageNames[name] = true } @@ -1152,12 +1155,11 @@ func (g *Generator) generate(file *FileDescriptor) { g.generateExtension(ext) } g.generateInitFunction() + g.generateFileDescriptor(file) // Run the plugins before the imports so we know which imports are necessary. g.runPlugins(file) - g.generateFileDescriptor(file) - // Generate header and imports last, though they appear first in the output. rem := g.Buffer remAnno := g.annotations @@ -1183,7 +1185,7 @@ func (g *Generator) generate(file *FileDescriptor) { // make a copy independent of g; we'll need it after Reset. original = append([]byte(nil), original...) } - ast, err := parser.ParseFile(fset, "", original, parser.ParseComments) + fileAST, err := parser.ParseFile(fset, "", original, parser.ParseComments) if err != nil { // Print out the bad code with line numbers. // This should never happen in practice, but it can while changing generated code, @@ -1195,8 +1197,9 @@ func (g *Generator) generate(file *FileDescriptor) { } g.Fail("bad Go source code was generated:", err.Error(), "\n"+src.String()) } + ast.SortImports(fset, fileAST) g.Reset() - err = (&printer.Config{Mode: printer.TabIndent | printer.UseSpaces, Tabwidth: 8}).Fprint(g, fset, ast) + err = (&printer.Config{Mode: printer.TabIndent | printer.UseSpaces, Tabwidth: 8}).Fprint(g, fset, fileAST) if err != nil { g.Fail("generated Go source code could not be reformatted:", err.Error()) } @@ -1225,28 +1228,10 @@ func (g *Generator) generateHeader() { g.P("// source: ", g.file.Name) } g.P() - - importPath, _, _ := g.file.goPackageOption() - if importPath == "" { - g.P("package ", g.file.packageName) - } else { - g.P("package ", g.file.packageName, " // import ", GoImportPath(g.ImportPrefix)+importPath) - } + g.PrintComments(strconv.Itoa(packagePath)) + g.P() + g.P("package ", g.file.packageName) g.P() - - if loc, ok := g.file.comments[strconv.Itoa(packagePath)]; ok { - g.P("/*") - // not using g.PrintComments because this is a /* */ comment block. - text := strings.TrimSuffix(loc.GetLeadingComments(), "\n") - for _, line := range strings.Split(text, "\n") { - line = strings.TrimPrefix(line, " ") - // ensure we don't escape from the block comment - line = strings.Replace(line, "*/", "* /", -1) - g.P(line) - } - g.P("*/") - g.P() - } } // deprecationComment is the standard comment added to deprecated @@ -1277,7 +1262,7 @@ func (g *Generator) makeComments(path string) (string, bool) { w := new(bytes.Buffer) nl := "" for _, line := range strings.Split(strings.TrimSuffix(loc.GetLeadingComments(), "\n"), "\n") { - fmt.Fprintf(w, "%s// %s", nl, strings.TrimPrefix(line, " ")) + fmt.Fprintf(w, "%s//%s", nl, line) nl = "\n" } return w.String(), true @@ -1299,17 +1284,7 @@ func (g *Generator) weak(i int32) bool { // Generate the imports func (g *Generator) generateImports() { - // We almost always need a proto import. Rather than computing when we - // do, which is tricky when there's a plugin, just import it and - // reference it later. The same argument applies to the fmt and math packages. - g.P("import "+g.Pkg["proto"]+" ", GoImportPath(g.ImportPrefix)+"github.com/golang/protobuf/proto") - g.P("import " + g.Pkg["fmt"] + ` "fmt"`) - g.P("import " + g.Pkg["math"] + ` "math"`) - var ( - imports = make(map[GoImportPath]bool) - strongImports = make(map[GoImportPath]bool) - importPaths []string - ) + imports := make(map[GoImportPath]GoPackageName) for i, s := range g.file.Dependency { fd := g.fileByName(s) importPath := fd.importPath @@ -1317,32 +1292,37 @@ func (g *Generator) generateImports() { if importPath == g.file.importPath { continue } - if !imports[importPath] { - importPaths = append(importPaths, string(importPath)) - } - imports[importPath] = true - if !g.weak(int32(i)) { - strongImports[importPath] = true + // Do not import weak imports. + if g.weak(int32(i)) { + continue } - } - sort.Strings(importPaths) - for i := range importPaths { - importPath := GoImportPath(importPaths[i]) - packageName := g.GoPackageName(importPath) - fullPath := GoImportPath(g.ImportPrefix) + importPath - // Skip weak imports. - if !strongImports[importPath] { - g.P("// skipping weak import ", packageName, " ", fullPath) + // Do not import a package twice. + if _, ok := imports[importPath]; ok { continue } // We need to import all the dependencies, even if we don't reference them, // because other code and tools depend on having the full transitive closure // of protocol buffer types in the binary. + packageName := g.GoPackageName(importPath) if _, ok := g.usedPackages[importPath]; !ok { packageName = "_" } - g.P("import ", packageName, " ", fullPath) + imports[importPath] = packageName + } + for importPath := range g.addedImports { + imports[importPath] = g.GoPackageName(importPath) + } + // We almost always need a proto import. Rather than computing when we + // do, which is tricky when there's a plugin, just import it and + // reference it later. The same argument applies to the fmt and math packages. + g.P("import (") + g.P(g.Pkg["fmt"] + ` "fmt"`) + g.P(g.Pkg["math"] + ` "math"`) + g.P(g.Pkg["proto"]+" ", GoImportPath(g.ImportPrefix)+"github.com/golang/protobuf/proto") + for importPath, packageName := range imports { + g.P(packageName, " ", GoImportPath(g.ImportPrefix)+importPath) } + g.P(")") g.P() // TODO: may need to worry about uniqueness across plugins for _, p := range plugins { @@ -1357,24 +1337,19 @@ func (g *Generator) generateImports() { } func (g *Generator) generateImported(id *ImportedDescriptor) { - tn := id.TypeName() - sn := tn[len(tn)-1] df := id.o.File() filename := *df.Name if df.importPath == g.file.importPath { // Don't generate type aliases for files in the same Go package as this one. - g.P("// Ignoring public import of ", sn, " from ", filename) - g.P() return } if !supportTypeAliases { g.Fail(fmt.Sprintf("%s: public imports require at least go1.9", filename)) } - g.P("// ", sn, " from public import ", filename) g.usedPackages[df.importPath] = true for _, sym := range df.exported[id.o] { - sym.GenerateAlias(g, g.GoPackageName(df.importPath)) + sym.GenerateAlias(g, filename, g.GoPackageName(df.importPath)) } g.P() @@ -1410,6 +1385,7 @@ func (g *Generator) generateEnum(enum *EnumDescriptor) { g.file.addExport(enum, constOrVarSymbol{name, "const", ccTypeName}) } g.P(")") + g.P() g.P("var ", ccTypeName, "_name = map[int32]string{") generated := make(map[int32]bool) // avoid duplicate values for _, e := range enum.Value { @@ -1421,11 +1397,13 @@ func (g *Generator) generateEnum(enum *EnumDescriptor) { generated[*e.Number] = true } g.P("}") + g.P() g.P("var ", ccTypeName, "_value = map[string]int32{") for _, e := range enum.Value { g.P(strconv.Quote(*e.Name), ": ", e.Number, ",") } g.P("}") + g.P() if !enum.proto3() { g.P("func (x ", ccTypeName, ") Enum() *", ccTypeName, " {") @@ -1433,11 +1411,13 @@ func (g *Generator) generateEnum(enum *EnumDescriptor) { g.P("*p = x") g.P("return p") g.P("}") + g.P() } g.P("func (x ", ccTypeName, ") String() string {") g.P("return ", g.Pkg["proto"], ".EnumName(", ccTypeName, "_name, int32(x))") g.P("}") + g.P() if !enum.proto3() { g.P("func (x *", ccTypeName, ") UnmarshalJSON(data []byte) error {") @@ -1448,6 +1428,7 @@ func (g *Generator) generateEnum(enum *EnumDescriptor) { g.P("*x = ", ccTypeName, "(value)") g.P("return nil") g.P("}") + g.P() } var indexes []string @@ -1459,11 +1440,13 @@ func (g *Generator) generateEnum(enum *EnumDescriptor) { g.P("func (", ccTypeName, ") EnumDescriptor() ([]byte, []int) {") g.P("return ", g.file.VarName(), ", []int{", strings.Join(indexes, ", "), "}") g.P("}") + g.P() if enum.file.GetPackage() == "google.protobuf" && enum.GetName() == "NullValue" { g.P("func (", ccTypeName, `) XXX_WellKnownType() string { return "`, enum.GetName(), `" }`) + g.P() } - g.P() + g.generateEnumRegistration(enum) } // The tag is a string like "varint,2,opt,name=fieldname,def=7" that @@ -1520,6 +1503,18 @@ func (g *Generator) goTag(message *Descriptor, field *descriptor.FieldDescriptor g.Fail("unknown enum type", CamelCaseSlice(obj.TypeName())) } defaultValue = enum.integerValueAsString(defaultValue) + case descriptor.FieldDescriptorProto_TYPE_FLOAT: + if def := defaultValue; def != "inf" && def != "-inf" && def != "nan" { + if f, err := strconv.ParseFloat(defaultValue, 32); err == nil { + defaultValue = fmt.Sprint(float32(f)) + } + } + case descriptor.FieldDescriptorProto_TYPE_DOUBLE: + if def := defaultValue; def != "inf" && def != "-inf" && def != "nan" { + if f, err := strconv.ParseFloat(defaultValue, 64); err == nil { + defaultValue = fmt.Sprint(f) + } + } } defaultValue = ",def=" + defaultValue } @@ -1557,7 +1552,7 @@ func (g *Generator) goTag(message *Descriptor, field *descriptor.FieldDescriptor name = name[i+1:] } } - if json := field.GetJsonName(); json != "" && json != name { + if json := field.GetJsonName(); field.Extendee == nil && json != "" && json != name { // TODO: escaping might be needed, in which case // perhaps this should be in its own "json" tag. name += ",json=" + json @@ -1661,11 +1656,16 @@ func (g *Generator) GoType(message *Descriptor, field *descriptor.FieldDescripto } func (g *Generator) RecordTypeUse(t string) { - if _, ok := g.typeNameToObject[t]; ok { - // Call ObjectNamed to get the true object to record the use. - obj := g.ObjectNamed(t) - g.usedPackages[obj.GoImportPath()] = true + if _, ok := g.typeNameToObject[t]; !ok { + return + } + importPath := g.ObjectNamed(t).GoImportPath() + if importPath == g.outputImportPath { + // Don't record use of objects in our package. + return } + g.AddImport(importPath) + g.usedPackages[importPath] = true } // Method names that may be generated. Fields with these names get an @@ -1765,7 +1765,7 @@ func (g *Generator) defaultConstantName(goMessageType, protoFieldName string) st // oneofField - field containing list of subfields: // - oneofSubField - a field within the oneof -// msgCtx contais the context for the generator functions. +// msgCtx contains the context for the generator functions. type msgCtx struct { goName string // Go struct name of the message, e.g. MessageName message *Descriptor // The descriptor for the message @@ -1869,216 +1869,15 @@ type oneofSubField struct { fieldNumber int // Actual field number, as defined in proto, e.g. 12 getterDef string // Default for getters, e.g. "nil", `""` or "Default_MessageType_FieldName" protoDef string // Default value as defined in the proto file, e.g "yoshi" or "5" -} - -// wireTypeName returns a textual wire type, needed for oneof sub fields in generated code. -func (f *oneofSubField) wireTypeName() string { - switch f.protoType { - case descriptor.FieldDescriptorProto_TYPE_FIXED64, - descriptor.FieldDescriptorProto_TYPE_SFIXED64, - descriptor.FieldDescriptorProto_TYPE_DOUBLE: - return "WireFixed64" - case descriptor.FieldDescriptorProto_TYPE_FIXED32, - descriptor.FieldDescriptorProto_TYPE_SFIXED32, - descriptor.FieldDescriptorProto_TYPE_FLOAT: - return "WireFixed32" - case descriptor.FieldDescriptorProto_TYPE_GROUP: - return "WireStartGroup" - case descriptor.FieldDescriptorProto_TYPE_MESSAGE, - descriptor.FieldDescriptorProto_TYPE_STRING, - descriptor.FieldDescriptorProto_TYPE_BYTES: - return "WireBytes" - default: // All others are Varints - return "WireVarint" - } + deprecated string // Deprecation comment, if any. } // typedNil prints a nil casted to the pointer to this field. -// - for XXX_OneofFuncs +// - for XXX_OneofWrappers func (f *oneofSubField) typedNil(g *Generator) { g.P("(*", f.oneofTypeName, ")(nil),") } -// marshalCase prints the case matching this oneof subfield in the marshalling code. -func (f *oneofSubField) marshalCase(g *Generator) { - g.P("case *", f.oneofTypeName, ":") - wire := f.wireTypeName() - var pre, post string - val := "x." + f.goName // overridden for TYPE_BOOL - switch f.protoType { - case descriptor.FieldDescriptorProto_TYPE_DOUBLE: - pre = "b.EncodeFixed64(" + g.Pkg["math"] + ".Float64bits(" - post = "))" - case descriptor.FieldDescriptorProto_TYPE_FLOAT: - pre = "b.EncodeFixed32(uint64(" + g.Pkg["math"] + ".Float32bits(" - post = ")))" - case descriptor.FieldDescriptorProto_TYPE_INT64, descriptor.FieldDescriptorProto_TYPE_UINT64: - pre, post = "b.EncodeVarint(uint64(", "))" - case descriptor.FieldDescriptorProto_TYPE_INT32, descriptor.FieldDescriptorProto_TYPE_UINT32, descriptor.FieldDescriptorProto_TYPE_ENUM: - pre, post = "b.EncodeVarint(uint64(", "))" - case descriptor.FieldDescriptorProto_TYPE_FIXED64, descriptor.FieldDescriptorProto_TYPE_SFIXED64: - pre, post = "b.EncodeFixed64(uint64(", "))" - case descriptor.FieldDescriptorProto_TYPE_FIXED32, descriptor.FieldDescriptorProto_TYPE_SFIXED32: - pre, post = "b.EncodeFixed32(uint64(", "))" - case descriptor.FieldDescriptorProto_TYPE_BOOL: - g.P("t := uint64(0)") - g.P("if ", val, " { t = 1 }") - val = "t" - pre, post = "b.EncodeVarint(", ")" - case descriptor.FieldDescriptorProto_TYPE_STRING: - pre, post = "b.EncodeStringBytes(", ")" - case descriptor.FieldDescriptorProto_TYPE_GROUP: - pre, post = "b.Marshal(", ")" - case descriptor.FieldDescriptorProto_TYPE_MESSAGE: - pre, post = "b.EncodeMessage(", ")" - case descriptor.FieldDescriptorProto_TYPE_BYTES: - pre, post = "b.EncodeRawBytes(", ")" - case descriptor.FieldDescriptorProto_TYPE_SINT32: - pre, post = "b.EncodeZigzag32(uint64(", "))" - case descriptor.FieldDescriptorProto_TYPE_SINT64: - pre, post = "b.EncodeZigzag64(uint64(", "))" - default: - g.Fail("unhandled oneof field type ", f.protoType.String()) - } - g.P("b.EncodeVarint(", f.fieldNumber, "<<3|", g.Pkg["proto"], ".", wire, ")") - if t := f.protoType; t != descriptor.FieldDescriptorProto_TYPE_GROUP && t != descriptor.FieldDescriptorProto_TYPE_MESSAGE { - g.P(pre, val, post) - } else { - g.P("if err := ", pre, val, post, "; err != nil {") - g.P("return err") - g.P("}") - } - if f.protoType == descriptor.FieldDescriptorProto_TYPE_GROUP { - g.P("b.EncodeVarint(", f.fieldNumber, "<<3|", g.Pkg["proto"], ".WireEndGroup)") - } -} - -// unmarshalCase prints the case matching this oneof subfield in the unmarshalling code. -func (f *oneofSubField) unmarshalCase(g *Generator, origOneofName string, oneofName string) { - g.P("case ", f.fieldNumber, ": // ", origOneofName, ".", f.getProtoName()) - g.P("if wire != ", g.Pkg["proto"], ".", f.wireTypeName(), " {") - g.P("return true, ", g.Pkg["proto"], ".ErrInternalBadWireType") - g.P("}") - lhs := "x, err" // overridden for TYPE_MESSAGE and TYPE_GROUP - var dec, cast, cast2 string - switch f.protoType { - case descriptor.FieldDescriptorProto_TYPE_DOUBLE: - dec, cast = "b.DecodeFixed64()", g.Pkg["math"]+".Float64frombits" - case descriptor.FieldDescriptorProto_TYPE_FLOAT: - dec, cast, cast2 = "b.DecodeFixed32()", "uint32", g.Pkg["math"]+".Float32frombits" - case descriptor.FieldDescriptorProto_TYPE_INT64: - dec, cast = "b.DecodeVarint()", "int64" - case descriptor.FieldDescriptorProto_TYPE_UINT64: - dec = "b.DecodeVarint()" - case descriptor.FieldDescriptorProto_TYPE_INT32: - dec, cast = "b.DecodeVarint()", "int32" - case descriptor.FieldDescriptorProto_TYPE_FIXED64: - dec = "b.DecodeFixed64()" - case descriptor.FieldDescriptorProto_TYPE_FIXED32: - dec, cast = "b.DecodeFixed32()", "uint32" - case descriptor.FieldDescriptorProto_TYPE_BOOL: - dec = "b.DecodeVarint()" - // handled specially below - case descriptor.FieldDescriptorProto_TYPE_STRING: - dec = "b.DecodeStringBytes()" - case descriptor.FieldDescriptorProto_TYPE_GROUP: - g.P("msg := new(", f.goType[1:], ")") // drop star - lhs = "err" - dec = "b.DecodeGroup(msg)" - // handled specially below - case descriptor.FieldDescriptorProto_TYPE_MESSAGE: - g.P("msg := new(", f.goType[1:], ")") // drop star - lhs = "err" - dec = "b.DecodeMessage(msg)" - // handled specially below - case descriptor.FieldDescriptorProto_TYPE_BYTES: - dec = "b.DecodeRawBytes(true)" - case descriptor.FieldDescriptorProto_TYPE_UINT32: - dec, cast = "b.DecodeVarint()", "uint32" - case descriptor.FieldDescriptorProto_TYPE_ENUM: - dec, cast = "b.DecodeVarint()", f.goType - case descriptor.FieldDescriptorProto_TYPE_SFIXED32: - dec, cast = "b.DecodeFixed32()", "int32" - case descriptor.FieldDescriptorProto_TYPE_SFIXED64: - dec, cast = "b.DecodeFixed64()", "int64" - case descriptor.FieldDescriptorProto_TYPE_SINT32: - dec, cast = "b.DecodeZigzag32()", "int32" - case descriptor.FieldDescriptorProto_TYPE_SINT64: - dec, cast = "b.DecodeZigzag64()", "int64" - default: - g.Fail("unhandled oneof field type ", f.protoType.String()) - } - g.P(lhs, " := ", dec) - val := "x" - if cast != "" { - val = cast + "(" + val + ")" - } - if cast2 != "" { - val = cast2 + "(" + val + ")" - } - switch f.protoType { - case descriptor.FieldDescriptorProto_TYPE_BOOL: - val += " != 0" - case descriptor.FieldDescriptorProto_TYPE_GROUP, - descriptor.FieldDescriptorProto_TYPE_MESSAGE: - val = "msg" - } - g.P("m.", oneofName, " = &", f.oneofTypeName, "{", val, "}") - g.P("return true, err") -} - -// sizerCase prints the case matching this oneof subfield in the sizer code. -func (f *oneofSubField) sizerCase(g *Generator) { - g.P("case *", f.oneofTypeName, ":") - val := "x." + f.goName - var varint, fixed string - switch f.protoType { - case descriptor.FieldDescriptorProto_TYPE_DOUBLE: - fixed = "8" - case descriptor.FieldDescriptorProto_TYPE_FLOAT: - fixed = "4" - case descriptor.FieldDescriptorProto_TYPE_INT64, descriptor.FieldDescriptorProto_TYPE_UINT64, descriptor.FieldDescriptorProto_TYPE_INT32, descriptor.FieldDescriptorProto_TYPE_UINT32, descriptor.FieldDescriptorProto_TYPE_ENUM: - varint = val - case descriptor.FieldDescriptorProto_TYPE_FIXED64, descriptor.FieldDescriptorProto_TYPE_SFIXED64: - fixed = "8" - case descriptor.FieldDescriptorProto_TYPE_FIXED32, descriptor.FieldDescriptorProto_TYPE_SFIXED32: - fixed = "4" - case descriptor.FieldDescriptorProto_TYPE_BOOL: - fixed = "1" - case descriptor.FieldDescriptorProto_TYPE_STRING: - fixed = "len(" + val + ")" - varint = fixed - case descriptor.FieldDescriptorProto_TYPE_GROUP: - fixed = g.Pkg["proto"] + ".Size(" + val + ")" - case descriptor.FieldDescriptorProto_TYPE_MESSAGE: - g.P("s := ", g.Pkg["proto"], ".Size(", val, ")") - fixed = "s" - varint = fixed - case descriptor.FieldDescriptorProto_TYPE_BYTES: - fixed = "len(" + val + ")" - varint = fixed - case descriptor.FieldDescriptorProto_TYPE_SINT32: - varint = "(uint32(" + val + ") << 1) ^ uint32((int32(" + val + ") >> 31))" - case descriptor.FieldDescriptorProto_TYPE_SINT64: - varint = "uint64(" + val + " << 1) ^ uint64((int64(" + val + ") >> 63))" - default: - g.Fail("unhandled oneof field type ", f.protoType.String()) - } - // Tag and wire varint is known statically, - // so don't generate code for that part of the size computation. - tagAndWireSize := proto.SizeVarint(uint64(f.fieldNumber << 3)) // wire doesn't affect varint size - g.P("n += ", tagAndWireSize, " // tag and wire") - if varint != "" { - g.P("n += ", g.Pkg["proto"], ".SizeVarint(uint64(", varint, "))") - } - if fixed != "" { - g.P("n += ", fixed) - } - if f.protoType == descriptor.FieldDescriptorProto_TYPE_GROUP { - g.P("n += ", tagAndWireSize, " // tag and wire") - } -} - // getProtoDef returns the default value explicitly stated in the proto file, e.g "yoshi" or "5". func (f *oneofSubField) getProtoDef() string { return f.protoDef @@ -2138,6 +1937,9 @@ func (f *oneofField) getter(g *Generator, mc *msgCtx) { g.P() // Getters for each oneof for _, sf := range f.subFields { + if sf.deprecated != "" { + g.P(sf.deprecated) + } g.P("func (m *", mc.goName, ") ", Annotate(mc.message.file, sf.fullPath, sf.getterName), "() "+sf.goType+" {") g.P("if x, ok := m.", f.getterName, "().(*", sf.oneofTypeName, "); ok {") g.P("return x.", sf.goName) @@ -2215,6 +2017,14 @@ func (g *Generator) generateDefaultConstants(mc *msgCtx, topLevelFields []topLev def = "float32(" + def + ")" } kind = "var " + case df.getProtoType() == descriptor.FieldDescriptorProto_TYPE_FLOAT: + if f, err := strconv.ParseFloat(def, 32); err == nil { + def = fmt.Sprint(float32(f)) + } + case df.getProtoType() == descriptor.FieldDescriptorProto_TYPE_DOUBLE: + if f, err := strconv.ParseFloat(def, 64); err == nil { + def = fmt.Sprint(f) + } case df.getProtoType() == descriptor.FieldDescriptorProto_TYPE_ENUM: // Must be an enum. Need to construct the prefixed name. obj := g.ObjectNamed(df.getProtoTypeName()) @@ -2263,17 +2073,11 @@ func (g *Generator) generateOneofFuncs(mc *msgCtx, topLevelFields []topLevelFiel if len(ofields) == 0 { return } - enc := "_" + mc.goName + "_OneofMarshaler" - dec := "_" + mc.goName + "_OneofUnmarshaler" - size := "_" + mc.goName + "_OneofSizer" - encSig := "(msg " + g.Pkg["proto"] + ".Message, b *" + g.Pkg["proto"] + ".Buffer) error" - decSig := "(msg " + g.Pkg["proto"] + ".Message, tag, wire int, b *" + g.Pkg["proto"] + ".Buffer) (bool, error)" - sizeSig := "(msg " + g.Pkg["proto"] + ".Message) (n int)" // OneofFuncs - g.P("// XXX_OneofFuncs is for the internal use of the proto package.") - g.P("func (*", mc.goName, ") XXX_OneofFuncs() (func", encSig, ", func", decSig, ", func", sizeSig, ", []interface{}) {") - g.P("return ", enc, ", ", dec, ", ", size, ", []interface{}{") + g.P("// XXX_OneofWrappers is for the internal use of the proto package.") + g.P("func (*", mc.goName, ") XXX_OneofWrappers() []interface{} {") + g.P("return []interface{}{") for _, of := range ofields { for _, sf := range of.subFields { sf.typedNil(g) @@ -2282,59 +2086,6 @@ func (g *Generator) generateOneofFuncs(mc *msgCtx, topLevelFields []topLevelFiel g.P("}") g.P("}") g.P() - - // marshaler - g.P("func ", enc, encSig, " {") - g.P("m := msg.(*", mc.goName, ")") - for _, of := range ofields { - g.P("// ", of.getProtoName()) - g.P("switch x := m.", of.goName, ".(type) {") - for _, sf := range of.subFields { - // also fills in field.wire - sf.marshalCase(g) - } - g.P("case nil:") - g.P("default:") - g.P(" return ", g.Pkg["fmt"], `.Errorf("`, mc.goName, ".", of.goName, ` has unexpected type %T", x)`) - g.P("}") - } - g.P("return nil") - g.P("}") - g.P() - - // unmarshaler - g.P("func ", dec, decSig, " {") - g.P("m := msg.(*", mc.goName, ")") - g.P("switch tag {") - for _, of := range ofields { - for _, sf := range of.subFields { - sf.unmarshalCase(g, of.getProtoName(), of.goName) - } - } - g.P("default:") - g.P("return false, nil") - g.P("}") - g.P("}") - g.P() - - // sizer - g.P("func ", size, sizeSig, " {") - g.P("m := msg.(*", mc.goName, ")") - for _, of := range ofields { - g.P("// ", of.getProtoName()) - g.P("switch x := m.", of.goName, ".(type) {") - for _, sf := range of.subFields { - // also fills in field.wire - sf.sizerCase(g) - } - g.P("case nil:") - g.P("default:") - g.P("panic(", g.Pkg["fmt"], ".Sprintf(\"proto: unexpected type %T in oneof\", x))") - g.P("}") - } - g.P("return n") - g.P("}") - g.P() } // generateMessageStruct adds the actual struct with it's members (but not methods) to the output. @@ -2386,25 +2137,16 @@ func (g *Generator) generateCommonMethods(mc *msgCtx) { g.P("func (*", mc.goName, ") Descriptor() ([]byte, []int) {") g.P("return ", g.file.VarName(), ", []int{", strings.Join(indexes, ", "), "}") g.P("}") + g.P() // TODO: Revisit the decision to use a XXX_WellKnownType method // if we change proto.MessageName to work with multiple equivalents. if mc.message.file.GetPackage() == "google.protobuf" && wellKnownTypes[mc.message.GetName()] { g.P("func (*", mc.goName, `) XXX_WellKnownType() string { return "`, mc.message.GetName(), `" }`) + g.P() } // Extension support methods if len(mc.message.ExtensionRange) > 0 { - // message_set_wire_format only makes sense when extensions are defined. - if opts := mc.message.Options; opts != nil && opts.GetMessageSetWireFormat() { - g.P() - g.P("func (m *", mc.goName, ") MarshalJSON() ([]byte, error) {") - g.P("return ", g.Pkg["proto"], ".MarshalMessageSetJSON(&m.XXX_InternalExtensions)") - g.P("}") - g.P("func (m *", mc.goName, ") UnmarshalJSON(buf []byte) error {") - g.P("return ", g.Pkg["proto"], ".UnmarshalMessageSetJSON(buf, &m.XXX_InternalExtensions)") - g.P("}") - } - g.P() g.P("var extRange_", mc.goName, " = []", g.Pkg["proto"], ".ExtensionRange{") for _, r := range mc.message.ExtensionRange { @@ -2415,6 +2157,7 @@ func (g *Generator) generateCommonMethods(mc *msgCtx) { g.P("func (*", mc.goName, ") ExtensionRangeArray() []", g.Pkg["proto"], ".ExtensionRange {") g.P("return extRange_", mc.goName) g.P("}") + g.P() } // TODO: It does not scale to keep adding another method for every @@ -2432,8 +2175,8 @@ func (g *Generator) generateCommonMethods(mc *msgCtx) { g.P("return xxx_messageInfo_", mc.goName, ".Marshal(b, m, deterministic)") g.P("}") - g.P("func (dst *", mc.goName, ") XXX_Merge(src ", g.Pkg["proto"], ".Message) {") - g.P("xxx_messageInfo_", mc.goName, ".Merge(dst, src)") + g.P("func (m *", mc.goName, ") XXX_Merge(src ", g.Pkg["proto"], ".Message) {") + g.P("xxx_messageInfo_", mc.goName, ".Merge(m, src)") g.P("}") g.P("func (m *", mc.goName, ") XXX_Size() int {") // avoid name clash with "Size" field in some message @@ -2503,8 +2246,7 @@ func (g *Generator) generateMessage(message *Descriptor) { if oneof && oFields[*field.OneofIndex] == nil { odp := message.OneofDecl[int(*field.OneofIndex)] base := CamelCase(odp.GetName()) - names := allocNames(base, "Get"+base) - fname, gname := names[0], names[1] + fname := allocNames(base)[0] // This is the first field of a oneof we haven't seen before. // Generate the union field. @@ -2522,7 +2264,7 @@ func (g *Generator) generateMessage(message *Descriptor) { of := oneofField{ fieldCommon: fieldCommon{ goName: fname, - getterName: gname, + getterName: "Get"+fname, goType: dname, tags: tag, protoName: odp.GetName(), @@ -2564,6 +2306,11 @@ func (g *Generator) generateMessage(message *Descriptor) { } } + fieldDeprecated := "" + if field.GetOptions().GetDeprecated() { + fieldDeprecated = deprecationComment + } + dvalue := g.getterDefault(field, goTypeName) if oneof { tname := goTypeName + "_" + fieldName @@ -2607,17 +2354,13 @@ func (g *Generator) generateMessage(message *Descriptor) { getterDef: dvalue, protoDef: field.GetDefaultValue(), oneofTypeName: tname, + deprecated: fieldDeprecated, } oneofField.subFields = append(oneofField.subFields, &sf) g.RecordTypeUse(field.GetTypeName()) continue } - fieldDeprecated := "" - if field.GetOptions().GetDeprecated() { - fieldDeprecated = deprecationComment - } - fieldFullPath := fmt.Sprintf("%s,%d,%d", message.path, messageFieldPath, i) c, ok := g.makeComments(fieldFullPath) if ok { @@ -2663,26 +2406,23 @@ func (g *Generator) generateMessage(message *Descriptor) { g.generateOneofFuncs(mc, topLevelFields) g.P() - if !message.group { - - var oneofTypes []string - for _, f := range topLevelFields { - if of, ok := f.(*oneofField); ok { - for _, osf := range of.subFields { - oneofTypes = append(oneofTypes, osf.oneofTypeName) - } + var oneofTypes []string + for _, f := range topLevelFields { + if of, ok := f.(*oneofField); ok { + for _, osf := range of.subFields { + oneofTypes = append(oneofTypes, osf.oneofTypeName) } } + } - opts := message.Options - ms := &messageSymbol{ - sym: goTypeName, - hasExtensions: len(message.ExtensionRange) > 0, - isMessageSet: opts != nil && opts.GetMessageSetWireFormat(), - oneofTypes: oneofTypes, - } - g.file.addExport(message, ms) + opts := message.Options + ms := &messageSymbol{ + sym: goTypeName, + hasExtensions: len(message.ExtensionRange) > 0, + isMessageSet: opts != nil && opts.GetMessageSetWireFormat(), + oneofTypes: oneofTypes, } + g.file.addExport(message, ms) for _, ext := range message.ext { g.generateExtension(ext) @@ -2811,10 +2551,8 @@ func (g *Generator) generateExtension(ext *ExtensionDescriptor) { // In addition, the situation for when to apply this special case is implemented // differently in other languages: // https://github.com/google/protobuf/blob/aff10976/src/google/protobuf/text_format.cc#L1560 - mset := false if extDesc.GetOptions().GetMessageSetWireFormat() && typeName[len(typeName)-1] == "message_set_extension" { typeName = typeName[:len(typeName)-1] - mset = true } // For text formatting, the package must be exactly what the .proto file declares, @@ -2835,26 +2573,12 @@ func (g *Generator) generateExtension(ext *ExtensionDescriptor) { g.P("}") g.P() - if mset { - // Generate a bit more code to register with message_set.go. - g.addInitf("%s.RegisterMessageSetType((%s)(nil), %d, %q)", g.Pkg["proto"], fieldType, *field.Number, extName) - } + g.addInitf("%s.RegisterExtension(%s)", g.Pkg["proto"], ext.DescName()) g.file.addExport(ext, constOrVarSymbol{ccTypeName, "var", ""}) } func (g *Generator) generateInitFunction() { - for _, enum := range g.file.enum { - g.generateEnumRegistration(enum) - } - for _, d := range g.file.desc { - for _, ext := range d.ext { - g.generateExtensionRegistration(ext) - } - } - for _, ext := range g.file.ext { - g.generateExtensionRegistration(ext) - } if len(g.init) == 0 { return } @@ -2918,10 +2642,6 @@ func (g *Generator) generateEnumRegistration(enum *EnumDescriptor) { g.addInitf("%s.RegisterEnum(%q, %[3]s_name, %[3]s_value)", g.Pkg["proto"], pkg+ccTypeName, ccTypeName) } -func (g *Generator) generateExtensionRegistration(ext *ExtensionDescriptor) { - g.addInitf("%s.RegisterExtension(%s)", g.Pkg["proto"], ext.DescName()) -} - // And now lots of helper functions. // Is c an ASCII lower-case letter? diff --git a/vendor/github.com/golang/protobuf/protoc-gen-go/grpc/grpc.go b/vendor/github.com/golang/protobuf/protoc-gen-go/grpc/grpc.go index faef1abb70..5d1e3f0f61 100644 --- a/vendor/github.com/golang/protobuf/protoc-gen-go/grpc/grpc.go +++ b/vendor/github.com/golang/protobuf/protoc-gen-go/grpc/grpc.go @@ -36,7 +36,6 @@ package grpc import ( "fmt" - "path" "strconv" "strings" @@ -53,8 +52,10 @@ const generatedCodeVersion = 4 // Paths for packages used by code generated in this file, // relative to the import_prefix of the generator.Generator. const ( - contextPkgPath = "golang.org/x/net/context" + contextPkgPath = "context" grpcPkgPath = "google.golang.org/grpc" + codePkgPath = "google.golang.org/grpc/codes" + statusPkgPath = "google.golang.org/grpc/status" ) func init() { @@ -83,8 +84,6 @@ var ( // Init initializes the plugin. func (g *grpc) Init(gen *generator.Generator) { g.gen = gen - contextPkg = generator.RegisterUniquePackageName("context", nil) - grpcPkg = generator.RegisterUniquePackageName("grpc", nil) } // Given a type name defined in a .proto, return its object. @@ -108,6 +107,9 @@ func (g *grpc) Generate(file *generator.FileDescriptor) { return } + contextPkg = string(g.gen.AddImport(contextPkgPath)) + grpcPkg = string(g.gen.AddImport(grpcPkgPath)) + g.P("// Reference imports to suppress errors if they are not otherwise used.") g.P("var _ ", contextPkg, ".Context") g.P("var _ ", grpcPkg, ".ClientConn") @@ -126,14 +128,6 @@ func (g *grpc) Generate(file *generator.FileDescriptor) { // GenerateImports generates the import declaration for this file. func (g *grpc) GenerateImports(file *generator.FileDescriptor) { - if len(file.FileDescriptorProto.Service) == 0 { - return - } - g.P("import (") - g.P(contextPkg, " ", generator.GoImportPath(path.Join(string(g.gen.ImportPrefix), contextPkgPath))) - g.P(grpcPkg, " ", generator.GoImportPath(path.Join(string(g.gen.ImportPrefix), grpcPkgPath))) - g.P(")") - g.P() } // reservedClientName records whether a client name is reserved on the client side. @@ -224,6 +218,12 @@ func (g *grpc) generateService(file *generator.FileDescriptor, service *pb.Servi g.P("}") g.P() + // Server Unimplemented struct for forward compatability. + if deprecated { + g.P(deprecationComment) + } + g.generateUnimplementedServer(servName, service) + // Server registration. if deprecated { g.P(deprecationComment) @@ -277,6 +277,35 @@ func (g *grpc) generateService(file *generator.FileDescriptor, service *pb.Servi g.P() } +// generateUnimplementedServer creates the unimplemented server struct +func (g *grpc) generateUnimplementedServer(servName string, service *pb.ServiceDescriptorProto) { + serverType := servName + "Server" + g.P("// Unimplemented", serverType, " can be embedded to have forward compatible implementations.") + g.P("type Unimplemented", serverType, " struct {") + g.P("}") + g.P() + // UnimplementedServer's concrete methods + for _, method := range service.Method { + g.generateServerMethodConcrete(servName, method) + } + g.P() +} + +// generateServerMethodConcrete returns unimplemented methods which ensure forward compatibility +func (g *grpc) generateServerMethodConcrete(servName string, method *pb.MethodDescriptorProto) { + header := g.generateServerSignatureWithParamNames(servName, method) + g.P("func (*Unimplemented", servName, "Server) ", header, " {") + var nilArg string + if !method.GetServerStreaming() && !method.GetClientStreaming() { + nilArg = "nil, " + } + methName := generator.CamelCase(method.GetName()) + statusPkg := string(g.gen.AddImport(statusPkgPath)) + codePkg := string(g.gen.AddImport(codePkgPath)) + g.P("return ", nilArg, statusPkg, `.Errorf(`, codePkg, `.Unimplemented, "method `, methName, ` not implemented")`) + g.P("}") +} + // generateClientSignature returns the client-side signature for a method. func (g *grpc) generateClientSignature(servName string, method *pb.MethodDescriptorProto) string { origMethName := method.GetName() @@ -376,6 +405,30 @@ func (g *grpc) generateClientMethod(servName, fullServName, serviceDescVar strin } } +// generateServerSignatureWithParamNames returns the server-side signature for a method with parameter names. +func (g *grpc) generateServerSignatureWithParamNames(servName string, method *pb.MethodDescriptorProto) string { + origMethName := method.GetName() + methName := generator.CamelCase(origMethName) + if reservedClientName[methName] { + methName += "_" + } + + var reqArgs []string + ret := "error" + if !method.GetServerStreaming() && !method.GetClientStreaming() { + reqArgs = append(reqArgs, "ctx "+contextPkg+".Context") + ret = "(*" + g.typeName(method.GetOutputType()) + ", error)" + } + if !method.GetClientStreaming() { + reqArgs = append(reqArgs, "req *"+g.typeName(method.GetInputType())) + } + if method.GetServerStreaming() || method.GetClientStreaming() { + reqArgs = append(reqArgs, "srv "+servName+"_"+generator.CamelCase(origMethName)+"Server") + } + + return methName + "(" + strings.Join(reqArgs, ", ") + ") " + ret +} + // generateServerSignature returns the server-side signature for a method. func (g *grpc) generateServerSignature(servName string, method *pb.MethodDescriptorProto) string { origMethName := method.GetName() diff --git a/vendor/github.com/golang/protobuf/ptypes/any/any.pb.go b/vendor/github.com/golang/protobuf/ptypes/any/any.pb.go index e3c56d3ffa..78ee523349 100644 --- a/vendor/github.com/golang/protobuf/ptypes/any/any.pb.go +++ b/vendor/github.com/golang/protobuf/ptypes/any/any.pb.go @@ -1,11 +1,13 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: google/protobuf/any.proto -package any // import "github.com/golang/protobuf/ptypes/any" +package any -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -16,7 +18,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // `Any` contains an arbitrary serialized protocol buffer message along with a // URL that describes the type of the serialized message. @@ -99,17 +101,18 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package // } // type Any struct { - // A URL/resource name whose content describes the type of the - // serialized protocol buffer message. + // A URL/resource name that uniquely identifies the type of the serialized + // protocol buffer message. The last segment of the URL's path must represent + // the fully qualified name of the type (as in + // `path/google.protobuf.Duration`). The name should be in a canonical form + // (e.g., leading "." is not accepted). // - // For URLs which use the scheme `http`, `https`, or no scheme, the - // following restrictions and interpretations apply: + // In practice, teams usually precompile into the binary all types that they + // expect it to use in the context of Any. However, for URLs which use the + // scheme `http`, `https`, or no scheme, one can optionally set up a type + // server that maps type URLs to message definitions as follows: // // * If no scheme is provided, `https` is assumed. - // * The last segment of the URL's path must represent the fully - // qualified name of the type (as in `path/google.protobuf.Duration`). - // The name should be in a canonical form (e.g., leading "." is - // not accepted). // * An HTTP GET on the URL must yield a [google.protobuf.Type][] // value in binary format, or produce an error. // * Applications are allowed to cache lookup results based on the @@ -118,6 +121,10 @@ type Any struct { // on changes to types. (Use versioned type names to manage // breaking changes.) // + // Note: this functionality is not currently available in the official + // protobuf release, and it is not used for type URLs beginning with + // type.googleapis.com. + // // Schemes other than `http`, `https` (or the empty scheme) might be // used with implementation specific semantics. // @@ -133,17 +140,19 @@ func (m *Any) Reset() { *m = Any{} } func (m *Any) String() string { return proto.CompactTextString(m) } func (*Any) ProtoMessage() {} func (*Any) Descriptor() ([]byte, []int) { - return fileDescriptor_any_744b9ca530f228db, []int{0} + return fileDescriptor_b53526c13ae22eb4, []int{0} } + func (*Any) XXX_WellKnownType() string { return "Any" } + func (m *Any) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Any.Unmarshal(m, b) } func (m *Any) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Any.Marshal(b, m, deterministic) } -func (dst *Any) XXX_Merge(src proto.Message) { - xxx_messageInfo_Any.Merge(dst, src) +func (m *Any) XXX_Merge(src proto.Message) { + xxx_messageInfo_Any.Merge(m, src) } func (m *Any) XXX_Size() int { return xxx_messageInfo_Any.Size(m) @@ -172,9 +181,9 @@ func init() { proto.RegisterType((*Any)(nil), "google.protobuf.Any") } -func init() { proto.RegisterFile("google/protobuf/any.proto", fileDescriptor_any_744b9ca530f228db) } +func init() { proto.RegisterFile("google/protobuf/any.proto", fileDescriptor_b53526c13ae22eb4) } -var fileDescriptor_any_744b9ca530f228db = []byte{ +var fileDescriptor_b53526c13ae22eb4 = []byte{ // 185 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4c, 0xcf, 0xcf, 0x4f, 0xcf, 0x49, 0xd5, 0x2f, 0x28, 0xca, 0x2f, 0xc9, 0x4f, 0x2a, 0x4d, 0xd3, 0x4f, 0xcc, 0xab, 0xd4, diff --git a/vendor/github.com/golang/protobuf/ptypes/any/any.proto b/vendor/github.com/golang/protobuf/ptypes/any/any.proto index c748667623..4932942558 100644 --- a/vendor/github.com/golang/protobuf/ptypes/any/any.proto +++ b/vendor/github.com/golang/protobuf/ptypes/any/any.proto @@ -120,17 +120,18 @@ option objc_class_prefix = "GPB"; // } // message Any { - // A URL/resource name whose content describes the type of the - // serialized protocol buffer message. + // A URL/resource name that uniquely identifies the type of the serialized + // protocol buffer message. The last segment of the URL's path must represent + // the fully qualified name of the type (as in + // `path/google.protobuf.Duration`). The name should be in a canonical form + // (e.g., leading "." is not accepted). // - // For URLs which use the scheme `http`, `https`, or no scheme, the - // following restrictions and interpretations apply: + // In practice, teams usually precompile into the binary all types that they + // expect it to use in the context of Any. However, for URLs which use the + // scheme `http`, `https`, or no scheme, one can optionally set up a type + // server that maps type URLs to message definitions as follows: // // * If no scheme is provided, `https` is assumed. - // * The last segment of the URL's path must represent the fully - // qualified name of the type (as in `path/google.protobuf.Duration`). - // The name should be in a canonical form (e.g., leading "." is - // not accepted). // * An HTTP GET on the URL must yield a [google.protobuf.Type][] // value in binary format, or produce an error. // * Applications are allowed to cache lookup results based on the @@ -139,6 +140,10 @@ message Any { // on changes to types. (Use versioned type names to manage // breaking changes.) // + // Note: this functionality is not currently available in the official + // protobuf release, and it is not used for type URLs beginning with + // type.googleapis.com. + // // Schemes other than `http`, `https` (or the empty scheme) might be // used with implementation specific semantics. // diff --git a/vendor/github.com/golang/protobuf/ptypes/duration.go b/vendor/github.com/golang/protobuf/ptypes/duration.go index 65cb0f8eb5..26d1ca2fb5 100644 --- a/vendor/github.com/golang/protobuf/ptypes/duration.go +++ b/vendor/github.com/golang/protobuf/ptypes/duration.go @@ -82,7 +82,7 @@ func Duration(p *durpb.Duration) (time.Duration, error) { return 0, fmt.Errorf("duration: %v is out of range for time.Duration", p) } if p.Nanos != 0 { - d += time.Duration(p.Nanos) + d += time.Duration(p.Nanos) * time.Nanosecond if (d < 0) != (p.Nanos < 0) { return 0, fmt.Errorf("duration: %v is out of range for time.Duration", p) } diff --git a/vendor/github.com/golang/protobuf/ptypes/duration/duration.pb.go b/vendor/github.com/golang/protobuf/ptypes/duration/duration.pb.go index a7beb2c414..0d681ee21a 100644 --- a/vendor/github.com/golang/protobuf/ptypes/duration/duration.pb.go +++ b/vendor/github.com/golang/protobuf/ptypes/duration/duration.pb.go @@ -1,11 +1,13 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: google/protobuf/duration.proto -package duration // import "github.com/golang/protobuf/ptypes/duration" +package duration -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -16,7 +18,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // A Duration represents a signed, fixed-length span of time represented // as a count of seconds and fractions of seconds at nanosecond @@ -99,17 +101,19 @@ func (m *Duration) Reset() { *m = Duration{} } func (m *Duration) String() string { return proto.CompactTextString(m) } func (*Duration) ProtoMessage() {} func (*Duration) Descriptor() ([]byte, []int) { - return fileDescriptor_duration_e7d612259e3f0613, []int{0} + return fileDescriptor_23597b2ebd7ac6c5, []int{0} } + func (*Duration) XXX_WellKnownType() string { return "Duration" } + func (m *Duration) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Duration.Unmarshal(m, b) } func (m *Duration) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Duration.Marshal(b, m, deterministic) } -func (dst *Duration) XXX_Merge(src proto.Message) { - xxx_messageInfo_Duration.Merge(dst, src) +func (m *Duration) XXX_Merge(src proto.Message) { + xxx_messageInfo_Duration.Merge(m, src) } func (m *Duration) XXX_Size() int { return xxx_messageInfo_Duration.Size(m) @@ -138,11 +142,9 @@ func init() { proto.RegisterType((*Duration)(nil), "google.protobuf.Duration") } -func init() { - proto.RegisterFile("google/protobuf/duration.proto", fileDescriptor_duration_e7d612259e3f0613) -} +func init() { proto.RegisterFile("google/protobuf/duration.proto", fileDescriptor_23597b2ebd7ac6c5) } -var fileDescriptor_duration_e7d612259e3f0613 = []byte{ +var fileDescriptor_23597b2ebd7ac6c5 = []byte{ // 190 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4b, 0xcf, 0xcf, 0x4f, 0xcf, 0x49, 0xd5, 0x2f, 0x28, 0xca, 0x2f, 0xc9, 0x4f, 0x2a, 0x4d, 0xd3, 0x4f, 0x29, 0x2d, 0x4a, diff --git a/vendor/github.com/golang/protobuf/ptypes/empty/empty.pb.go b/vendor/github.com/golang/protobuf/ptypes/empty/empty.pb.go index a69b403ce1..b4eb03eccf 100644 --- a/vendor/github.com/golang/protobuf/ptypes/empty/empty.pb.go +++ b/vendor/github.com/golang/protobuf/ptypes/empty/empty.pb.go @@ -1,11 +1,13 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: google/protobuf/empty.proto -package empty // import "github.com/golang/protobuf/ptypes/empty" +package empty -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -16,7 +18,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // A generic empty message that you can re-use to avoid defining duplicated // empty messages in your APIs. A typical example is to use it as the request @@ -37,17 +39,19 @@ func (m *Empty) Reset() { *m = Empty{} } func (m *Empty) String() string { return proto.CompactTextString(m) } func (*Empty) ProtoMessage() {} func (*Empty) Descriptor() ([]byte, []int) { - return fileDescriptor_empty_39e6d6db0632e5b2, []int{0} + return fileDescriptor_900544acb223d5b8, []int{0} } + func (*Empty) XXX_WellKnownType() string { return "Empty" } + func (m *Empty) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Empty.Unmarshal(m, b) } func (m *Empty) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Empty.Marshal(b, m, deterministic) } -func (dst *Empty) XXX_Merge(src proto.Message) { - xxx_messageInfo_Empty.Merge(dst, src) +func (m *Empty) XXX_Merge(src proto.Message) { + xxx_messageInfo_Empty.Merge(m, src) } func (m *Empty) XXX_Size() int { return xxx_messageInfo_Empty.Size(m) @@ -62,9 +66,9 @@ func init() { proto.RegisterType((*Empty)(nil), "google.protobuf.Empty") } -func init() { proto.RegisterFile("google/protobuf/empty.proto", fileDescriptor_empty_39e6d6db0632e5b2) } +func init() { proto.RegisterFile("google/protobuf/empty.proto", fileDescriptor_900544acb223d5b8) } -var fileDescriptor_empty_39e6d6db0632e5b2 = []byte{ +var fileDescriptor_900544acb223d5b8 = []byte{ // 148 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4e, 0xcf, 0xcf, 0x4f, 0xcf, 0x49, 0xd5, 0x2f, 0x28, 0xca, 0x2f, 0xc9, 0x4f, 0x2a, 0x4d, 0xd3, 0x4f, 0xcd, 0x2d, 0x28, diff --git a/vendor/github.com/golang/protobuf/ptypes/struct/struct.pb.go b/vendor/github.com/golang/protobuf/ptypes/struct/struct.pb.go index ee6382e143..33daa73dd2 100644 --- a/vendor/github.com/golang/protobuf/ptypes/struct/struct.pb.go +++ b/vendor/github.com/golang/protobuf/ptypes/struct/struct.pb.go @@ -1,11 +1,13 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: google/protobuf/struct.proto -package structpb // import "github.com/golang/protobuf/ptypes/struct" +package structpb -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -16,7 +18,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // `NullValue` is a singleton enumeration to represent the null value for the // `Value` type union. @@ -32,6 +34,7 @@ const ( var NullValue_name = map[int32]string{ 0: "NULL_VALUE", } + var NullValue_value = map[string]int32{ "NULL_VALUE": 0, } @@ -39,9 +42,11 @@ var NullValue_value = map[string]int32{ func (x NullValue) String() string { return proto.EnumName(NullValue_name, int32(x)) } + func (NullValue) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_struct_3a5a94e0c7801b27, []int{0} + return fileDescriptor_df322afd6c9fb402, []int{0} } + func (NullValue) XXX_WellKnownType() string { return "NullValue" } // `Struct` represents a structured data value, consisting of fields @@ -64,17 +69,19 @@ func (m *Struct) Reset() { *m = Struct{} } func (m *Struct) String() string { return proto.CompactTextString(m) } func (*Struct) ProtoMessage() {} func (*Struct) Descriptor() ([]byte, []int) { - return fileDescriptor_struct_3a5a94e0c7801b27, []int{0} + return fileDescriptor_df322afd6c9fb402, []int{0} } + func (*Struct) XXX_WellKnownType() string { return "Struct" } + func (m *Struct) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Struct.Unmarshal(m, b) } func (m *Struct) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Struct.Marshal(b, m, deterministic) } -func (dst *Struct) XXX_Merge(src proto.Message) { - xxx_messageInfo_Struct.Merge(dst, src) +func (m *Struct) XXX_Merge(src proto.Message) { + xxx_messageInfo_Struct.Merge(m, src) } func (m *Struct) XXX_Size() int { return xxx_messageInfo_Struct.Size(m) @@ -118,17 +125,19 @@ func (m *Value) Reset() { *m = Value{} } func (m *Value) String() string { return proto.CompactTextString(m) } func (*Value) ProtoMessage() {} func (*Value) Descriptor() ([]byte, []int) { - return fileDescriptor_struct_3a5a94e0c7801b27, []int{1} + return fileDescriptor_df322afd6c9fb402, []int{1} } + func (*Value) XXX_WellKnownType() string { return "Value" } + func (m *Value) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Value.Unmarshal(m, b) } func (m *Value) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Value.Marshal(b, m, deterministic) } -func (dst *Value) XXX_Merge(src proto.Message) { - xxx_messageInfo_Value.Merge(dst, src) +func (m *Value) XXX_Merge(src proto.Message) { + xxx_messageInfo_Value.Merge(m, src) } func (m *Value) XXX_Size() int { return xxx_messageInfo_Value.Size(m) @@ -228,9 +237,9 @@ func (m *Value) GetListValue() *ListValue { return nil } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*Value) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _Value_OneofMarshaler, _Value_OneofUnmarshaler, _Value_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*Value) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*Value_NullValue)(nil), (*Value_NumberValue)(nil), (*Value_StringValue)(nil), @@ -240,129 +249,6 @@ func (*Value) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, } } -func _Value_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*Value) - // kind - switch x := m.Kind.(type) { - case *Value_NullValue: - b.EncodeVarint(1<<3 | proto.WireVarint) - b.EncodeVarint(uint64(x.NullValue)) - case *Value_NumberValue: - b.EncodeVarint(2<<3 | proto.WireFixed64) - b.EncodeFixed64(math.Float64bits(x.NumberValue)) - case *Value_StringValue: - b.EncodeVarint(3<<3 | proto.WireBytes) - b.EncodeStringBytes(x.StringValue) - case *Value_BoolValue: - t := uint64(0) - if x.BoolValue { - t = 1 - } - b.EncodeVarint(4<<3 | proto.WireVarint) - b.EncodeVarint(t) - case *Value_StructValue: - b.EncodeVarint(5<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.StructValue); err != nil { - return err - } - case *Value_ListValue: - b.EncodeVarint(6<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.ListValue); err != nil { - return err - } - case nil: - default: - return fmt.Errorf("Value.Kind has unexpected type %T", x) - } - return nil -} - -func _Value_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*Value) - switch tag { - case 1: // kind.null_value - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.Kind = &Value_NullValue{NullValue(x)} - return true, err - case 2: // kind.number_value - if wire != proto.WireFixed64 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed64() - m.Kind = &Value_NumberValue{math.Float64frombits(x)} - return true, err - case 3: // kind.string_value - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeStringBytes() - m.Kind = &Value_StringValue{x} - return true, err - case 4: // kind.bool_value - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.Kind = &Value_BoolValue{x != 0} - return true, err - case 5: // kind.struct_value - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(Struct) - err := b.DecodeMessage(msg) - m.Kind = &Value_StructValue{msg} - return true, err - case 6: // kind.list_value - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(ListValue) - err := b.DecodeMessage(msg) - m.Kind = &Value_ListValue{msg} - return true, err - default: - return false, nil - } -} - -func _Value_OneofSizer(msg proto.Message) (n int) { - m := msg.(*Value) - // kind - switch x := m.Kind.(type) { - case *Value_NullValue: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.NullValue)) - case *Value_NumberValue: - n += 1 // tag and wire - n += 8 - case *Value_StringValue: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(len(x.StringValue))) - n += len(x.StringValue) - case *Value_BoolValue: - n += 1 // tag and wire - n += 1 - case *Value_StructValue: - s := proto.Size(x.StructValue) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *Value_ListValue: - s := proto.Size(x.ListValue) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - // `ListValue` is a wrapper around a repeated field of values. // // The JSON representation for `ListValue` is JSON array. @@ -378,17 +264,19 @@ func (m *ListValue) Reset() { *m = ListValue{} } func (m *ListValue) String() string { return proto.CompactTextString(m) } func (*ListValue) ProtoMessage() {} func (*ListValue) Descriptor() ([]byte, []int) { - return fileDescriptor_struct_3a5a94e0c7801b27, []int{2} + return fileDescriptor_df322afd6c9fb402, []int{2} } + func (*ListValue) XXX_WellKnownType() string { return "ListValue" } + func (m *ListValue) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ListValue.Unmarshal(m, b) } func (m *ListValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ListValue.Marshal(b, m, deterministic) } -func (dst *ListValue) XXX_Merge(src proto.Message) { - xxx_messageInfo_ListValue.Merge(dst, src) +func (m *ListValue) XXX_Merge(src proto.Message) { + xxx_messageInfo_ListValue.Merge(m, src) } func (m *ListValue) XXX_Size() int { return xxx_messageInfo_ListValue.Size(m) @@ -407,18 +295,16 @@ func (m *ListValue) GetValues() []*Value { } func init() { + proto.RegisterEnum("google.protobuf.NullValue", NullValue_name, NullValue_value) proto.RegisterType((*Struct)(nil), "google.protobuf.Struct") proto.RegisterMapType((map[string]*Value)(nil), "google.protobuf.Struct.FieldsEntry") proto.RegisterType((*Value)(nil), "google.protobuf.Value") proto.RegisterType((*ListValue)(nil), "google.protobuf.ListValue") - proto.RegisterEnum("google.protobuf.NullValue", NullValue_name, NullValue_value) } -func init() { - proto.RegisterFile("google/protobuf/struct.proto", fileDescriptor_struct_3a5a94e0c7801b27) -} +func init() { proto.RegisterFile("google/protobuf/struct.proto", fileDescriptor_df322afd6c9fb402) } -var fileDescriptor_struct_3a5a94e0c7801b27 = []byte{ +var fileDescriptor_df322afd6c9fb402 = []byte{ // 417 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x92, 0x41, 0x8b, 0xd3, 0x40, 0x14, 0xc7, 0x3b, 0xc9, 0x36, 0x98, 0x17, 0x59, 0x97, 0x11, 0xb4, 0xac, 0xa2, 0xa1, 0x7b, 0x09, diff --git a/vendor/github.com/golang/protobuf/ptypes/timestamp.go b/vendor/github.com/golang/protobuf/ptypes/timestamp.go index 47f10dbc2c..8da0df01ac 100644 --- a/vendor/github.com/golang/protobuf/ptypes/timestamp.go +++ b/vendor/github.com/golang/protobuf/ptypes/timestamp.go @@ -111,11 +111,9 @@ func TimestampNow() *tspb.Timestamp { // TimestampProto converts the time.Time to a google.protobuf.Timestamp proto. // It returns an error if the resulting Timestamp is invalid. func TimestampProto(t time.Time) (*tspb.Timestamp, error) { - seconds := t.Unix() - nanos := int32(t.Sub(time.Unix(seconds, 0))) ts := &tspb.Timestamp{ - Seconds: seconds, - Nanos: nanos, + Seconds: t.Unix(), + Nanos: int32(t.Nanosecond()), } if err := validateTimestamp(ts); err != nil { return nil, err diff --git a/vendor/github.com/golang/protobuf/ptypes/timestamp/timestamp.pb.go b/vendor/github.com/golang/protobuf/ptypes/timestamp/timestamp.pb.go index 8e76ae9763..31cd846de9 100644 --- a/vendor/github.com/golang/protobuf/ptypes/timestamp/timestamp.pb.go +++ b/vendor/github.com/golang/protobuf/ptypes/timestamp/timestamp.pb.go @@ -1,11 +1,13 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: google/protobuf/timestamp.proto -package timestamp // import "github.com/golang/protobuf/ptypes/timestamp" +package timestamp -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -16,7 +18,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // A Timestamp represents a point in time independent of any time zone // or calendar, represented as seconds and fractions of seconds at @@ -81,7 +83,9 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package // {hour}, {min}, and {sec} are zero-padded to two digits each. The fractional // seconds, which can go up to 9 digits (i.e. up to 1 nanosecond resolution), // are optional. The "Z" suffix indicates the timezone ("UTC"); the timezone -// is required, though only UTC (as indicated by "Z") is presently supported. +// is required. A proto3 JSON serializer should always use UTC (as indicated by +// "Z") when printing the Timestamp type and a proto3 JSON parser should be +// able to accept both UTC and other timezones (as indicated by an offset). // // For example, "2017-01-15T01:30:15.01Z" encodes 15.01 seconds past // 01:30 UTC on January 15, 2017. @@ -92,8 +96,8 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package // to this format using [`strftime`](https://docs.python.org/2/library/time.html#time.strftime) // with the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one // can use the Joda Time's [`ISODateTimeFormat.dateTime()`]( -// http://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime--) -// to obtain a formatter capable of generating timestamps in this format. +// http://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime-- +// ) to obtain a formatter capable of generating timestamps in this format. // // type Timestamp struct { @@ -115,17 +119,19 @@ func (m *Timestamp) Reset() { *m = Timestamp{} } func (m *Timestamp) String() string { return proto.CompactTextString(m) } func (*Timestamp) ProtoMessage() {} func (*Timestamp) Descriptor() ([]byte, []int) { - return fileDescriptor_timestamp_b826e8e5fba671a8, []int{0} + return fileDescriptor_292007bbfe81227e, []int{0} } + func (*Timestamp) XXX_WellKnownType() string { return "Timestamp" } + func (m *Timestamp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Timestamp.Unmarshal(m, b) } func (m *Timestamp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Timestamp.Marshal(b, m, deterministic) } -func (dst *Timestamp) XXX_Merge(src proto.Message) { - xxx_messageInfo_Timestamp.Merge(dst, src) +func (m *Timestamp) XXX_Merge(src proto.Message) { + xxx_messageInfo_Timestamp.Merge(m, src) } func (m *Timestamp) XXX_Size() int { return xxx_messageInfo_Timestamp.Size(m) @@ -154,11 +160,9 @@ func init() { proto.RegisterType((*Timestamp)(nil), "google.protobuf.Timestamp") } -func init() { - proto.RegisterFile("google/protobuf/timestamp.proto", fileDescriptor_timestamp_b826e8e5fba671a8) -} +func init() { proto.RegisterFile("google/protobuf/timestamp.proto", fileDescriptor_292007bbfe81227e) } -var fileDescriptor_timestamp_b826e8e5fba671a8 = []byte{ +var fileDescriptor_292007bbfe81227e = []byte{ // 191 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4f, 0xcf, 0xcf, 0x4f, 0xcf, 0x49, 0xd5, 0x2f, 0x28, 0xca, 0x2f, 0xc9, 0x4f, 0x2a, 0x4d, 0xd3, 0x2f, 0xc9, 0xcc, 0x4d, diff --git a/vendor/github.com/golang/protobuf/ptypes/timestamp/timestamp.proto b/vendor/github.com/golang/protobuf/ptypes/timestamp/timestamp.proto index 06750ab1f1..eafb3fa03a 100644 --- a/vendor/github.com/golang/protobuf/ptypes/timestamp/timestamp.proto +++ b/vendor/github.com/golang/protobuf/ptypes/timestamp/timestamp.proto @@ -103,7 +103,9 @@ option objc_class_prefix = "GPB"; // {hour}, {min}, and {sec} are zero-padded to two digits each. The fractional // seconds, which can go up to 9 digits (i.e. up to 1 nanosecond resolution), // are optional. The "Z" suffix indicates the timezone ("UTC"); the timezone -// is required, though only UTC (as indicated by "Z") is presently supported. +// is required. A proto3 JSON serializer should always use UTC (as indicated by +// "Z") when printing the Timestamp type and a proto3 JSON parser should be +// able to accept both UTC and other timezones (as indicated by an offset). // // For example, "2017-01-15T01:30:15.01Z" encodes 15.01 seconds past // 01:30 UTC on January 15, 2017. @@ -114,8 +116,8 @@ option objc_class_prefix = "GPB"; // to this format using [`strftime`](https://docs.python.org/2/library/time.html#time.strftime) // with the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one // can use the Joda Time's [`ISODateTimeFormat.dateTime()`]( -// http://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime--) -// to obtain a formatter capable of generating timestamps in this format. +// http://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime-- +// ) to obtain a formatter capable of generating timestamps in this format. // // message Timestamp { diff --git a/vendor/github.com/golang/protobuf/ptypes/wrappers/wrappers.pb.go b/vendor/github.com/golang/protobuf/ptypes/wrappers/wrappers.pb.go index 0f0fa837f6..add19a1adb 100644 --- a/vendor/github.com/golang/protobuf/ptypes/wrappers/wrappers.pb.go +++ b/vendor/github.com/golang/protobuf/ptypes/wrappers/wrappers.pb.go @@ -1,11 +1,13 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: google/protobuf/wrappers.proto -package wrappers // import "github.com/golang/protobuf/ptypes/wrappers" +package wrappers -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -16,7 +18,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // Wrapper message for `double`. // @@ -33,17 +35,19 @@ func (m *DoubleValue) Reset() { *m = DoubleValue{} } func (m *DoubleValue) String() string { return proto.CompactTextString(m) } func (*DoubleValue) ProtoMessage() {} func (*DoubleValue) Descriptor() ([]byte, []int) { - return fileDescriptor_wrappers_16c7c35c009f3253, []int{0} + return fileDescriptor_5377b62bda767935, []int{0} } + func (*DoubleValue) XXX_WellKnownType() string { return "DoubleValue" } + func (m *DoubleValue) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DoubleValue.Unmarshal(m, b) } func (m *DoubleValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_DoubleValue.Marshal(b, m, deterministic) } -func (dst *DoubleValue) XXX_Merge(src proto.Message) { - xxx_messageInfo_DoubleValue.Merge(dst, src) +func (m *DoubleValue) XXX_Merge(src proto.Message) { + xxx_messageInfo_DoubleValue.Merge(m, src) } func (m *DoubleValue) XXX_Size() int { return xxx_messageInfo_DoubleValue.Size(m) @@ -76,17 +80,19 @@ func (m *FloatValue) Reset() { *m = FloatValue{} } func (m *FloatValue) String() string { return proto.CompactTextString(m) } func (*FloatValue) ProtoMessage() {} func (*FloatValue) Descriptor() ([]byte, []int) { - return fileDescriptor_wrappers_16c7c35c009f3253, []int{1} + return fileDescriptor_5377b62bda767935, []int{1} } + func (*FloatValue) XXX_WellKnownType() string { return "FloatValue" } + func (m *FloatValue) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FloatValue.Unmarshal(m, b) } func (m *FloatValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_FloatValue.Marshal(b, m, deterministic) } -func (dst *FloatValue) XXX_Merge(src proto.Message) { - xxx_messageInfo_FloatValue.Merge(dst, src) +func (m *FloatValue) XXX_Merge(src proto.Message) { + xxx_messageInfo_FloatValue.Merge(m, src) } func (m *FloatValue) XXX_Size() int { return xxx_messageInfo_FloatValue.Size(m) @@ -119,17 +125,19 @@ func (m *Int64Value) Reset() { *m = Int64Value{} } func (m *Int64Value) String() string { return proto.CompactTextString(m) } func (*Int64Value) ProtoMessage() {} func (*Int64Value) Descriptor() ([]byte, []int) { - return fileDescriptor_wrappers_16c7c35c009f3253, []int{2} + return fileDescriptor_5377b62bda767935, []int{2} } + func (*Int64Value) XXX_WellKnownType() string { return "Int64Value" } + func (m *Int64Value) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Int64Value.Unmarshal(m, b) } func (m *Int64Value) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Int64Value.Marshal(b, m, deterministic) } -func (dst *Int64Value) XXX_Merge(src proto.Message) { - xxx_messageInfo_Int64Value.Merge(dst, src) +func (m *Int64Value) XXX_Merge(src proto.Message) { + xxx_messageInfo_Int64Value.Merge(m, src) } func (m *Int64Value) XXX_Size() int { return xxx_messageInfo_Int64Value.Size(m) @@ -162,17 +170,19 @@ func (m *UInt64Value) Reset() { *m = UInt64Value{} } func (m *UInt64Value) String() string { return proto.CompactTextString(m) } func (*UInt64Value) ProtoMessage() {} func (*UInt64Value) Descriptor() ([]byte, []int) { - return fileDescriptor_wrappers_16c7c35c009f3253, []int{3} + return fileDescriptor_5377b62bda767935, []int{3} } + func (*UInt64Value) XXX_WellKnownType() string { return "UInt64Value" } + func (m *UInt64Value) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UInt64Value.Unmarshal(m, b) } func (m *UInt64Value) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_UInt64Value.Marshal(b, m, deterministic) } -func (dst *UInt64Value) XXX_Merge(src proto.Message) { - xxx_messageInfo_UInt64Value.Merge(dst, src) +func (m *UInt64Value) XXX_Merge(src proto.Message) { + xxx_messageInfo_UInt64Value.Merge(m, src) } func (m *UInt64Value) XXX_Size() int { return xxx_messageInfo_UInt64Value.Size(m) @@ -205,17 +215,19 @@ func (m *Int32Value) Reset() { *m = Int32Value{} } func (m *Int32Value) String() string { return proto.CompactTextString(m) } func (*Int32Value) ProtoMessage() {} func (*Int32Value) Descriptor() ([]byte, []int) { - return fileDescriptor_wrappers_16c7c35c009f3253, []int{4} + return fileDescriptor_5377b62bda767935, []int{4} } + func (*Int32Value) XXX_WellKnownType() string { return "Int32Value" } + func (m *Int32Value) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Int32Value.Unmarshal(m, b) } func (m *Int32Value) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Int32Value.Marshal(b, m, deterministic) } -func (dst *Int32Value) XXX_Merge(src proto.Message) { - xxx_messageInfo_Int32Value.Merge(dst, src) +func (m *Int32Value) XXX_Merge(src proto.Message) { + xxx_messageInfo_Int32Value.Merge(m, src) } func (m *Int32Value) XXX_Size() int { return xxx_messageInfo_Int32Value.Size(m) @@ -248,17 +260,19 @@ func (m *UInt32Value) Reset() { *m = UInt32Value{} } func (m *UInt32Value) String() string { return proto.CompactTextString(m) } func (*UInt32Value) ProtoMessage() {} func (*UInt32Value) Descriptor() ([]byte, []int) { - return fileDescriptor_wrappers_16c7c35c009f3253, []int{5} + return fileDescriptor_5377b62bda767935, []int{5} } + func (*UInt32Value) XXX_WellKnownType() string { return "UInt32Value" } + func (m *UInt32Value) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UInt32Value.Unmarshal(m, b) } func (m *UInt32Value) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_UInt32Value.Marshal(b, m, deterministic) } -func (dst *UInt32Value) XXX_Merge(src proto.Message) { - xxx_messageInfo_UInt32Value.Merge(dst, src) +func (m *UInt32Value) XXX_Merge(src proto.Message) { + xxx_messageInfo_UInt32Value.Merge(m, src) } func (m *UInt32Value) XXX_Size() int { return xxx_messageInfo_UInt32Value.Size(m) @@ -291,17 +305,19 @@ func (m *BoolValue) Reset() { *m = BoolValue{} } func (m *BoolValue) String() string { return proto.CompactTextString(m) } func (*BoolValue) ProtoMessage() {} func (*BoolValue) Descriptor() ([]byte, []int) { - return fileDescriptor_wrappers_16c7c35c009f3253, []int{6} + return fileDescriptor_5377b62bda767935, []int{6} } + func (*BoolValue) XXX_WellKnownType() string { return "BoolValue" } + func (m *BoolValue) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BoolValue.Unmarshal(m, b) } func (m *BoolValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_BoolValue.Marshal(b, m, deterministic) } -func (dst *BoolValue) XXX_Merge(src proto.Message) { - xxx_messageInfo_BoolValue.Merge(dst, src) +func (m *BoolValue) XXX_Merge(src proto.Message) { + xxx_messageInfo_BoolValue.Merge(m, src) } func (m *BoolValue) XXX_Size() int { return xxx_messageInfo_BoolValue.Size(m) @@ -334,17 +350,19 @@ func (m *StringValue) Reset() { *m = StringValue{} } func (m *StringValue) String() string { return proto.CompactTextString(m) } func (*StringValue) ProtoMessage() {} func (*StringValue) Descriptor() ([]byte, []int) { - return fileDescriptor_wrappers_16c7c35c009f3253, []int{7} + return fileDescriptor_5377b62bda767935, []int{7} } + func (*StringValue) XXX_WellKnownType() string { return "StringValue" } + func (m *StringValue) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StringValue.Unmarshal(m, b) } func (m *StringValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_StringValue.Marshal(b, m, deterministic) } -func (dst *StringValue) XXX_Merge(src proto.Message) { - xxx_messageInfo_StringValue.Merge(dst, src) +func (m *StringValue) XXX_Merge(src proto.Message) { + xxx_messageInfo_StringValue.Merge(m, src) } func (m *StringValue) XXX_Size() int { return xxx_messageInfo_StringValue.Size(m) @@ -377,17 +395,19 @@ func (m *BytesValue) Reset() { *m = BytesValue{} } func (m *BytesValue) String() string { return proto.CompactTextString(m) } func (*BytesValue) ProtoMessage() {} func (*BytesValue) Descriptor() ([]byte, []int) { - return fileDescriptor_wrappers_16c7c35c009f3253, []int{8} + return fileDescriptor_5377b62bda767935, []int{8} } + func (*BytesValue) XXX_WellKnownType() string { return "BytesValue" } + func (m *BytesValue) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BytesValue.Unmarshal(m, b) } func (m *BytesValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_BytesValue.Marshal(b, m, deterministic) } -func (dst *BytesValue) XXX_Merge(src proto.Message) { - xxx_messageInfo_BytesValue.Merge(dst, src) +func (m *BytesValue) XXX_Merge(src proto.Message) { + xxx_messageInfo_BytesValue.Merge(m, src) } func (m *BytesValue) XXX_Size() int { return xxx_messageInfo_BytesValue.Size(m) @@ -417,11 +437,9 @@ func init() { proto.RegisterType((*BytesValue)(nil), "google.protobuf.BytesValue") } -func init() { - proto.RegisterFile("google/protobuf/wrappers.proto", fileDescriptor_wrappers_16c7c35c009f3253) -} +func init() { proto.RegisterFile("google/protobuf/wrappers.proto", fileDescriptor_5377b62bda767935) } -var fileDescriptor_wrappers_16c7c35c009f3253 = []byte{ +var fileDescriptor_5377b62bda767935 = []byte{ // 259 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4b, 0xcf, 0xcf, 0x4f, 0xcf, 0x49, 0xd5, 0x2f, 0x28, 0xca, 0x2f, 0xc9, 0x4f, 0x2a, 0x4d, 0xd3, 0x2f, 0x2f, 0x4a, 0x2c, diff --git a/vendor/github.com/google/btree/btree_mem.go b/vendor/github.com/google/btree/btree_mem.go deleted file mode 100644 index cb95b7fa1b..0000000000 --- a/vendor/github.com/google/btree/btree_mem.go +++ /dev/null @@ -1,76 +0,0 @@ -// Copyright 2014 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// +build ignore - -// This binary compares memory usage between btree and gollrb. -package main - -import ( - "flag" - "fmt" - "math/rand" - "runtime" - "time" - - "github.com/google/btree" - "github.com/petar/GoLLRB/llrb" -) - -var ( - size = flag.Int("size", 1000000, "size of the tree to build") - degree = flag.Int("degree", 8, "degree of btree") - gollrb = flag.Bool("llrb", false, "use llrb instead of btree") -) - -func main() { - flag.Parse() - vals := rand.Perm(*size) - var t, v interface{} - v = vals - var stats runtime.MemStats - for i := 0; i < 10; i++ { - runtime.GC() - } - fmt.Println("-------- BEFORE ----------") - runtime.ReadMemStats(&stats) - fmt.Printf("%+v\n", stats) - start := time.Now() - if *gollrb { - tr := llrb.New() - for _, v := range vals { - tr.ReplaceOrInsert(llrb.Int(v)) - } - t = tr // keep it around - } else { - tr := btree.New(*degree) - for _, v := range vals { - tr.ReplaceOrInsert(btree.Int(v)) - } - t = tr // keep it around - } - fmt.Printf("%v inserts in %v\n", *size, time.Since(start)) - fmt.Println("-------- AFTER ----------") - runtime.ReadMemStats(&stats) - fmt.Printf("%+v\n", stats) - for i := 0; i < 10; i++ { - runtime.GC() - } - fmt.Println("-------- AFTER GC ----------") - runtime.ReadMemStats(&stats) - fmt.Printf("%+v\n", stats) - if t == v { - fmt.Println("to make sure vals and tree aren't GC'd") - } -} diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/codegenerator/BUILD.bazel b/vendor/github.com/grpc-ecosystem/grpc-gateway/codegenerator/BUILD.bazel index 1eddaaf739..651177fa15 100644 --- a/vendor/github.com/grpc-ecosystem/grpc-gateway/codegenerator/BUILD.bazel +++ b/vendor/github.com/grpc-ecosystem/grpc-gateway/codegenerator/BUILD.bazel @@ -11,16 +11,16 @@ go_library( importpath = "github.com/grpc-ecosystem/grpc-gateway/codegenerator", deps = [ "@com_github_golang_protobuf//proto:go_default_library", - "@com_github_golang_protobuf//protoc-gen-go/plugin:go_default_library", + "@io_bazel_rules_go//proto/wkt:compiler_plugin_go_proto", ], ) go_test( - name = "go_default_xtest", + name = "go_default_test", srcs = ["parse_req_test.go"], + embed = [":go_default_library"], deps = [ - ":go_default_library", "@com_github_golang_protobuf//proto:go_default_library", - "@com_github_golang_protobuf//protoc-gen-go/plugin:go_default_library", + "@io_bazel_rules_go//proto/wkt:compiler_plugin_go_proto", ], ) diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/internal/BUILD.bazel b/vendor/github.com/grpc-ecosystem/grpc-gateway/internal/BUILD.bazel similarity index 59% rename from vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/internal/BUILD.bazel rename to vendor/github.com/grpc-ecosystem/grpc-gateway/internal/BUILD.bazel index 937e66089e..76cafe6ec7 100644 --- a/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/internal/BUILD.bazel +++ b/vendor/github.com/grpc-ecosystem/grpc-gateway/internal/BUILD.bazel @@ -1,7 +1,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library") -package(default_visibility = ["//runtime:__subpackages__"]) +package(default_visibility = ["//visibility:public"]) proto_library( name = "internal_proto", @@ -11,13 +11,12 @@ proto_library( go_proto_library( name = "internal_go_proto", - importpath = "github.com/grpc-ecosystem/grpc-gateway/runtime/internal", + importpath = "github.com/grpc-ecosystem/grpc-gateway/internal", proto = ":internal_proto", - deps = ["@com_github_golang_protobuf//ptypes/any:go_default_library"], ) go_library( name = "go_default_library", embed = [":internal_go_proto"], - importpath = "github.com/grpc-ecosystem/grpc-gateway/runtime/internal", + importpath = "github.com/grpc-ecosystem/grpc-gateway/internal", ) diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/internal/stream_chunk.pb.go b/vendor/github.com/grpc-ecosystem/grpc-gateway/internal/stream_chunk.pb.go similarity index 64% rename from vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/internal/stream_chunk.pb.go rename to vendor/github.com/grpc-ecosystem/grpc-gateway/internal/stream_chunk.pb.go index f4af074808..8858f06904 100644 --- a/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/internal/stream_chunk.pb.go +++ b/vendor/github.com/grpc-ecosystem/grpc-gateway/internal/stream_chunk.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-go. DO NOT EDIT. -// source: runtime/internal/stream_chunk.proto +// source: internal/stream_chunk.proto package internal @@ -36,7 +36,7 @@ func (m *StreamError) Reset() { *m = StreamError{} } func (m *StreamError) String() string { return proto.CompactTextString(m) } func (*StreamError) ProtoMessage() {} func (*StreamError) Descriptor() ([]byte, []int) { - return fileDescriptor_stream_chunk_6adb10b40700458b, []int{0} + return fileDescriptor_stream_chunk_a2afb657504565d7, []int{0} } func (m *StreamError) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StreamError.Unmarshal(m, b) @@ -96,24 +96,23 @@ func init() { } func init() { - proto.RegisterFile("runtime/internal/stream_chunk.proto", fileDescriptor_stream_chunk_6adb10b40700458b) + proto.RegisterFile("internal/stream_chunk.proto", fileDescriptor_stream_chunk_a2afb657504565d7) } -var fileDescriptor_stream_chunk_6adb10b40700458b = []byte{ - // 226 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x34, 0x90, 0xc1, 0x4e, 0x84, 0x30, - 0x10, 0x86, 0x83, 0xeb, 0xba, 0xbb, 0xc3, 0x8d, 0xec, 0xa1, 0xea, 0x41, 0xa2, 0x17, 0x4e, 0x25, - 0xd1, 0x27, 0x50, 0xe3, 0x0b, 0xb0, 0x37, 0x2f, 0x9b, 0x59, 0x18, 0x0b, 0x11, 0x5a, 0x32, 0x1d, - 0x62, 0x78, 0x2d, 0x9f, 0xd0, 0xb4, 0xc8, 0xb1, 0xdf, 0xf7, 0xff, 0x93, 0x3f, 0x85, 0x27, 0x9e, - 0xac, 0x74, 0x03, 0x95, 0x9d, 0x15, 0x62, 0x8b, 0x7d, 0xe9, 0x85, 0x09, 0x87, 0x73, 0xdd, 0x4e, - 0xf6, 0x5b, 0x8f, 0xec, 0xc4, 0x65, 0x47, 0xc3, 0x63, 0xad, 0x0d, 0x0a, 0xfd, 0xe0, 0xac, 0xff, - 0x1b, 0x77, 0xb7, 0xc6, 0x39, 0xd3, 0x53, 0x19, 0x33, 0x97, 0xe9, 0xab, 0x44, 0x3b, 0x2f, 0x85, - 0xc7, 0xdf, 0x04, 0xd2, 0x53, 0xbc, 0xf3, 0xc1, 0xec, 0x38, 0xbb, 0x87, 0x43, 0x38, 0x71, 0xae, - 0x5d, 0x43, 0x2a, 0xc9, 0x93, 0x62, 0x5b, 0xed, 0x03, 0x78, 0x77, 0x0d, 0x05, 0xd9, 0x8a, 0x8c, - 0x8b, 0xbc, 0x5a, 0x64, 0x00, 0x51, 0x2a, 0xd8, 0x0d, 0xe4, 0x3d, 0x1a, 0x52, 0x9b, 0x3c, 0x29, - 0x0e, 0xd5, 0xfa, 0xcc, 0x1e, 0x20, 0x8d, 0x35, 0x2f, 0x28, 0x93, 0x57, 0xd7, 0xd1, 0x42, 0x40, - 0xa7, 0x48, 0x32, 0x0d, 0xbb, 0x86, 0x04, 0xbb, 0xde, 0xab, 0x6d, 0xbe, 0x29, 0xd2, 0xe7, 0xa3, - 0x5e, 0x16, 0xeb, 0x75, 0xb1, 0x7e, 0xb5, 0x73, 0xb5, 0x86, 0xde, 0xe0, 0x73, 0xbf, 0x7e, 0xc2, - 0xe5, 0x26, 0x46, 0x5e, 0xfe, 0x02, 0x00, 0x00, 0xff, 0xff, 0x16, 0x75, 0x92, 0x08, 0x1f, 0x01, - 0x00, 0x00, +var fileDescriptor_stream_chunk_a2afb657504565d7 = []byte{ + // 223 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x34, 0x90, 0x41, 0x4e, 0xc3, 0x30, + 0x10, 0x45, 0x15, 0x4a, 0x69, 0x3b, 0xd9, 0x45, 0x5d, 0x18, 0xba, 0x20, 0x62, 0x95, 0x95, 0x23, + 0xc1, 0x09, 0x00, 0x71, 0x81, 0x74, 0xc7, 0xa6, 0x9a, 0x26, 0x83, 0x13, 0x91, 0xd8, 0xd1, 0x78, + 0x22, 0x94, 0x6b, 0x71, 0xc2, 0xca, 0x8e, 0xb2, 0xf4, 0x7b, 0x7f, 0xbe, 0xbe, 0x0c, 0xa7, 0xce, + 0x0a, 0xb1, 0xc5, 0xbe, 0xf4, 0xc2, 0x84, 0xc3, 0xa5, 0x6e, 0x27, 0xfb, 0xab, 0x47, 0x76, 0xe2, + 0xb2, 0xa3, 0xe1, 0xb1, 0xd6, 0x06, 0x85, 0xfe, 0x70, 0xd6, 0x3c, 0x59, 0xe9, 0x06, 0x7a, 0x7a, + 0x34, 0xce, 0x99, 0x9e, 0xca, 0x98, 0xb9, 0x4e, 0x3f, 0x25, 0xda, 0x79, 0x39, 0x78, 0xf9, 0x4f, + 0x20, 0x3d, 0xc7, 0x9e, 0x2f, 0x66, 0xc7, 0xd9, 0x09, 0x0e, 0xa1, 0xe2, 0x52, 0xbb, 0x86, 0x54, + 0x92, 0x27, 0xc5, 0xb6, 0xda, 0x07, 0xf0, 0xe9, 0x1a, 0x0a, 0xb2, 0x15, 0x19, 0x17, 0x79, 0xb7, + 0xc8, 0x00, 0xa2, 0x54, 0xb0, 0x1b, 0xc8, 0x7b, 0x34, 0xa4, 0x36, 0x79, 0x52, 0x1c, 0xaa, 0xf5, + 0x99, 0x3d, 0x43, 0x1a, 0xcf, 0xbc, 0xa0, 0x4c, 0x5e, 0xdd, 0x47, 0x0b, 0x01, 0x9d, 0x23, 0xc9, + 0x34, 0xec, 0x1a, 0x12, 0xec, 0x7a, 0xaf, 0xb6, 0xf9, 0xa6, 0x48, 0x5f, 0x8f, 0x7a, 0x59, 0xac, + 0xd7, 0xc5, 0xfa, 0xdd, 0xce, 0xd5, 0x1a, 0xfa, 0x80, 0xef, 0xfd, 0xfa, 0x09, 0xd7, 0x87, 0x18, + 0x79, 0xbb, 0x05, 0x00, 0x00, 0xff, 0xff, 0x0d, 0x7d, 0xa5, 0x18, 0x17, 0x01, 0x00, 0x00, } diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/internal/stream_chunk.proto b/vendor/github.com/grpc-ecosystem/grpc-gateway/internal/stream_chunk.proto similarity index 100% rename from vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/internal/stream_chunk.proto rename to vendor/github.com/grpc-ecosystem/grpc-gateway/internal/stream_chunk.proto diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/BUILD.bazel b/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/BUILD.bazel index 8ca170d3da..cb772efe9e 100644 --- a/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/BUILD.bazel +++ b/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/BUILD.bazel @@ -13,7 +13,7 @@ go_library( "//protoc-gen-grpc-gateway/gengateway:go_default_library", "@com_github_golang_glog//:go_default_library", "@com_github_golang_protobuf//proto:go_default_library", - "@com_github_golang_protobuf//protoc-gen-go/plugin:go_default_library", + "@io_bazel_rules_go//proto/wkt:compiler_plugin_go_proto", ], ) @@ -25,7 +25,10 @@ go_binary( go_proto_compiler( name = "go_gen_grpc_gateway", - options = ["logtostderr=true"], + options = [ + "logtostderr=true", + "allow_repeated_fields_in_body=true", + ], plugin = ":protoc-gen-grpc-gateway", suffix = ".pb.gw.go", visibility = ["//visibility:public"], diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/descriptor/BUILD.bazel b/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/descriptor/BUILD.bazel index 93670c5272..cfbdc277a8 100644 --- a/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/descriptor/BUILD.bazel +++ b/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/descriptor/BUILD.bazel @@ -16,12 +16,12 @@ go_library( "//protoc-gen-grpc-gateway/httprule:go_default_library", "@com_github_ghodss_yaml//:go_default_library", "@com_github_golang_glog//:go_default_library", - "@com_github_golang_protobuf//jsonpb:go_default_library", + "@com_github_golang_protobuf//jsonpb:go_default_library_gen", "@com_github_golang_protobuf//proto:go_default_library", - "@com_github_golang_protobuf//protoc-gen-go/descriptor:go_default_library", - "@com_github_golang_protobuf//protoc-gen-go/generator:go_default_library", - "@com_github_golang_protobuf//protoc-gen-go/plugin:go_default_library", - "@org_golang_google_genproto//googleapis/api/annotations:go_default_library", + "@com_github_golang_protobuf//protoc-gen-go/generator:go_default_library_gen", + "@go_googleapis//google/api:annotations_go_proto", + "@io_bazel_rules_go//proto/wkt:compiler_plugin_go_proto", + "@io_bazel_rules_go//proto/wkt:descriptor_go_proto", ], ) @@ -38,7 +38,7 @@ go_test( deps = [ "//protoc-gen-grpc-gateway/httprule:go_default_library", "@com_github_golang_protobuf//proto:go_default_library", - "@com_github_golang_protobuf//protoc-gen-go/descriptor:go_default_library", - "@com_github_golang_protobuf//protoc-gen-go/plugin:go_default_library", + "@io_bazel_rules_go//proto/wkt:compiler_plugin_go_proto", + "@io_bazel_rules_go//proto/wkt:descriptor_go_proto", ], ) diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/descriptor/registry.go b/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/descriptor/registry.go index 9a201112b0..2f056364b8 100644 --- a/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/descriptor/registry.go +++ b/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/descriptor/registry.go @@ -50,6 +50,10 @@ type Registry struct { // allowRepeatedFieldsInBody permits repeated field in body field path of `google.api.http` annotation option allowRepeatedFieldsInBody bool + // includePackageInTags controls whether the package name defined in the `package` directive + // in the proto file can be prepended to the gRPC service name in the `Tags` field of every operation. + includePackageInTags bool + // repeatedPathParamSeparator specifies how path parameter repeated fields are separated repeatedPathParamSeparator repeatedFieldSeparator @@ -57,6 +61,16 @@ type Registry struct { // otherwise the original proto name is used. It's helpful for synchronizing the swagger definition // with grpc-gateway response, if it uses json tags for marshaling. useJSONNamesForFields bool + + // useFQNForSwaggerName if true swagger names will use the full qualified name (FQN) from proto definition, + // and generate a dot-separated swagger name concatenating all elements from the proto FQN. + // If false, the default behavior is to concat the last 2 elements of the FQN if they are unique, otherwise concat + // all the elements of the FQN without any separator + useFQNForSwaggerName bool + + // allowColonFinalSegments determines whether colons are permitted + // in the final segment of a path. + allowColonFinalSegments bool } type repeatedFieldSeparator struct { @@ -350,6 +364,18 @@ func (r *Registry) IsAllowRepeatedFieldsInBody() bool { return r.allowRepeatedFieldsInBody } +// SetIncludePackageInTags controls whether the package name defined in the `package` directive +// in the proto file can be prepended to the gRPC service name in the `Tags` field of every operation. +func (r *Registry) SetIncludePackageInTags(allow bool) { + r.includePackageInTags = allow +} + +// IsIncludePackageInTags checks whether the package name defined in the `package` directive +// in the proto file can be prepended to the gRPC service name in the `Tags` field of every operation. +func (r *Registry) IsIncludePackageInTags() bool { + return r.includePackageInTags +} + // GetRepeatedPathParamSeparator returns a rune spcifying how // path parameter repeated fields are separated. func (r *Registry) GetRepeatedPathParamSeparator() rune { @@ -395,6 +421,26 @@ func (r *Registry) GetUseJSONNamesForFields() bool { return r.useJSONNamesForFields } +// SetUseFQNForSwaggerName sets useFQNForSwaggerName +func (r *Registry) SetUseFQNForSwaggerName(use bool) { + r.useFQNForSwaggerName = use +} + +// GetAllowColonFinalSegments returns allowColonFinalSegments +func (r *Registry) GetAllowColonFinalSegments() bool { + return r.allowColonFinalSegments +} + +// SetAllowColonFinalSegments sets allowColonFinalSegments +func (r *Registry) SetAllowColonFinalSegments(use bool) { + r.allowColonFinalSegments = use +} + +// GetUseFQNForSwaggerName returns useFQNForSwaggerName +func (r *Registry) GetUseFQNForSwaggerName() bool { + return r.useFQNForSwaggerName +} + // GetMergeFileName return the target merge swagger file name func (r *Registry) GetMergeFileName() string { return r.mergeFileName diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/descriptor/types.go b/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/descriptor/types.go index 5cf9d597fb..4aa75f85db 100644 --- a/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/descriptor/types.go +++ b/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/descriptor/types.go @@ -451,7 +451,16 @@ var ( } wellKnownTypeConv = map[string]string{ - ".google.protobuf.Timestamp": "runtime.Timestamp", - ".google.protobuf.Duration": "runtime.Duration", + ".google.protobuf.Timestamp": "runtime.Timestamp", + ".google.protobuf.Duration": "runtime.Duration", + ".google.protobuf.StringValue": "runtime.StringValue", + ".google.protobuf.FloatValue": "runtime.FloatValue", + ".google.protobuf.DoubleValue": "runtime.DoubleValue", + ".google.protobuf.BoolValue": "runtime.BoolValue", + ".google.protobuf.BytesValue": "runtime.BytesValue", + ".google.protobuf.Int32Value": "runtime.Int32Value", + ".google.protobuf.UInt32Value": "runtime.UInt32Value", + ".google.protobuf.Int64Value": "runtime.Int64Value", + ".google.protobuf.UInt64Value": "runtime.UInt64Value", } ) diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/generator/BUILD.bazel b/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/generator/BUILD.bazel index 5995e5df88..6cb2162d84 100644 --- a/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/generator/BUILD.bazel +++ b/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/generator/BUILD.bazel @@ -8,6 +8,6 @@ go_library( importpath = "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/generator", deps = [ "//protoc-gen-grpc-gateway/descriptor:go_default_library", - "@com_github_golang_protobuf//protoc-gen-go/plugin:go_default_library", + "@io_bazel_rules_go//proto/wkt:compiler_plugin_go_proto", ], ) diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/gengateway/BUILD.bazel b/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/gengateway/BUILD.bazel index 3ab955c1fe..316010f500 100644 --- a/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/gengateway/BUILD.bazel +++ b/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/gengateway/BUILD.bazel @@ -16,9 +16,8 @@ go_library( "//utilities:go_default_library", "@com_github_golang_glog//:go_default_library", "@com_github_golang_protobuf//proto:go_default_library", - "@com_github_golang_protobuf//protoc-gen-go/descriptor:go_default_library", - "@com_github_golang_protobuf//protoc-gen-go/plugin:go_default_library", - "@org_golang_google_genproto//googleapis/api/annotations:go_default_library", + "@com_github_golang_protobuf//protoc-gen-go/generator:go_default_library_gen", + "@io_bazel_rules_go//proto/wkt:compiler_plugin_go_proto", ], ) @@ -34,6 +33,6 @@ go_test( "//protoc-gen-grpc-gateway/descriptor:go_default_library", "//protoc-gen-grpc-gateway/httprule:go_default_library", "@com_github_golang_protobuf//proto:go_default_library", - "@com_github_golang_protobuf//protoc-gen-go/descriptor:go_default_library", + "@io_bazel_rules_go//proto/wkt:descriptor_go_proto", ], ) diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/gengateway/generator.go b/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/gengateway/generator.go index a619fae399..0b6bfbd2b9 100644 --- a/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/gengateway/generator.go +++ b/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/gengateway/generator.go @@ -32,18 +32,20 @@ type generator struct { useRequestContext bool registerFuncSuffix string pathType pathType + allowPatchFeature bool } // New returns a new generator which generates grpc gateway files. -func New(reg *descriptor.Registry, useRequestContext bool, registerFuncSuffix, pathTypeString string) gen.Generator { +func New(reg *descriptor.Registry, useRequestContext bool, registerFuncSuffix, pathTypeString string, allowPatchFeature bool) gen.Generator { var imports []descriptor.GoPackage for _, pkgpath := range []string{ + "context", "io", "net/http", "github.com/grpc-ecosystem/grpc-gateway/runtime", "github.com/grpc-ecosystem/grpc-gateway/utilities", + "github.com/golang/protobuf/descriptor", "github.com/golang/protobuf/proto", - "golang.org/x/net/context", "google.golang.org/grpc", "google.golang.org/grpc/codes", "google.golang.org/grpc/grpclog", @@ -82,6 +84,7 @@ func New(reg *descriptor.Registry, useRequestContext bool, registerFuncSuffix, p useRequestContext: useRequestContext, registerFuncSuffix: registerFuncSuffix, pathType: pathType, + allowPatchFeature: allowPatchFeature, } } @@ -142,6 +145,7 @@ func (g *generator) generate(file *descriptor.File) (string, error) { Imports: imports, UseRequestContext: g.useRequestContext, RegisterFuncSuffix: g.registerFuncSuffix, + AllowPatchFeature: g.allowPatchFeature, } return applyTemplate(params, g.reg) } diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/gengateway/template.go b/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/gengateway/template.go index a803106870..1d3d3ca8f1 100644 --- a/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/gengateway/template.go +++ b/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/gengateway/template.go @@ -2,11 +2,13 @@ package gengateway import ( "bytes" + "errors" "fmt" "strings" "text/template" "github.com/golang/glog" + generator2 "github.com/golang/protobuf/protoc-gen-go/generator" "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/descriptor" "github.com/grpc-ecosystem/grpc-gateway/utilities" ) @@ -16,11 +18,29 @@ type param struct { Imports []descriptor.GoPackage UseRequestContext bool RegisterFuncSuffix string + AllowPatchFeature bool } type binding struct { *descriptor.Binding - Registry *descriptor.Registry + Registry *descriptor.Registry + AllowPatchFeature bool +} + +// GetBodyFieldPath returns the binding body's fieldpath. +func (b binding) GetBodyFieldPath() string { + if b.Body != nil && len(b.Body.FieldPath) != 0 { + return b.Body.FieldPath.String() + } + return "*" +} + +// GetBodyFieldPath returns the binding body's struct field name. +func (b binding) GetBodyFieldStructName() (string, error) { + if b.Body != nil && len(b.Body.FieldPath) != 0 { + return generator2.CamelCase(b.Body.FieldPath.String()), nil + } + return "", errors.New("No body field found") } // HasQueryParam determines if the binding needs parameters in query string. @@ -88,6 +108,25 @@ func (b binding) LookupEnum(p descriptor.Parameter) *descriptor.Enum { return e } +// FieldMaskField returns the golang-style name of the variable for a FieldMask, if there is exactly one of that type in +// the message. Otherwise, it returns an empty string. +func (b binding) FieldMaskField() string { + var fieldMaskField *descriptor.Field + for _, f := range b.Method.RequestType.Fields { + if f.GetTypeName() == ".google.protobuf.FieldMask" { + // if there is more than 1 FieldMask for this request, then return none + if fieldMaskField != nil { + return "" + } + fieldMaskField = f + } + } + if fieldMaskField != nil { + return generator2.CamelCase(fieldMaskField.GetName()) + } + return "" +} + // queryParamFilter is a wrapper of utilities.DoubleArray which provides String() to output DoubleArray.Encoding in a stable and predictable format. type queryParamFilter struct { *utilities.DoubleArray @@ -106,6 +145,7 @@ type trailerParams struct { Services []*descriptor.Service UseRequestContext bool RegisterFuncSuffix string + AssumeColonVerb bool } func applyTemplate(p param, reg *descriptor.Registry) (string, error) { @@ -114,17 +154,35 @@ func applyTemplate(p param, reg *descriptor.Registry) (string, error) { return "", err } var targetServices []*descriptor.Service + + for _, msg := range p.Messages { + msgName := generator2.CamelCase(*msg.Name) + msg.Name = &msgName + } for _, svc := range p.Services { var methodWithBindingsSeen bool - svcName := strings.Title(*svc.Name) + svcName := generator2.CamelCase(*svc.Name) svc.Name = &svcName for _, meth := range svc.Methods { glog.V(2).Infof("Processing %s.%s", svc.GetName(), meth.GetName()) - methName := strings.Title(*meth.Name) + methName := generator2.CamelCase(*meth.Name) meth.Name = &methName for _, b := range meth.Bindings { methodWithBindingsSeen = true - if err := handlerTemplate.Execute(w, binding{Binding: b, Registry: reg}); err != nil { + if err := handlerTemplate.Execute(w, binding{ + Binding: b, + Registry: reg, + AllowPatchFeature: p.AllowPatchFeature, + }); err != nil { + return "", err + } + + // Local + if err := localHandlerTemplate.Execute(w, binding{ + Binding: b, + Registry: reg, + AllowPatchFeature: p.AllowPatchFeature, + }); err != nil { return "", err } } @@ -137,11 +195,21 @@ func applyTemplate(p param, reg *descriptor.Registry) (string, error) { return "", errNoTargetService } + assumeColonVerb := true + if reg != nil { + assumeColonVerb = !reg.GetAllowColonFinalSegments() + } tp := trailerParams{ Services: targetServices, UseRequestContext: p.UseRequestContext, RegisterFuncSuffix: p.RegisterFuncSuffix, + AssumeColonVerb: assumeColonVerb, + } + // Local + if err := localTrailerTemplate.Execute(w, tp); err != nil { + return "", err } + if err := trailerTemplate.Execute(w, tp); err != nil { return "", err } @@ -165,11 +233,13 @@ import ( {{range $i := .Imports}}{{if not $i.Standard}}{{$i | printf "%s\n"}}{{end}}{{end}} ) +// Suppress "imported and not used" errors var _ codes.Code var _ io.Reader var _ status.Status var _ = runtime.String var _ = utilities.NewDoubleArray +var _ = descriptor.ForMessage `)) handlerTemplate = template.Must(template.New("handler").Parse(` @@ -209,6 +279,9 @@ func request_{{.Method.Service.GetName}}_{{.Method.GetName}}_{{.Index}}(ctx cont return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } if err = stream.Send(&protoReq); err != nil { + if err == io.EOF { + break + } grpclog.Infof("Failed to send request: %v", err) return nil, metadata, err } @@ -235,6 +308,7 @@ func request_{{.Method.Service.GetName}}_{{.Method.GetName}}_{{.Index}}(ctx cont `)) _ = template.Must(handlerTemplate.New("client-rpc-request-func").Parse(` +{{$AllowPatchFeature := .AllowPatchFeature}} {{if .HasQueryParam}} var ( filter_{{.Method.Service.GetName}}_{{.Method.GetName}}_{{.Index}} = {{.QueryParamFilter}} @@ -244,9 +318,23 @@ var ( var protoReq {{.Method.RequestType.GoType .Method.Service.File.GoPkg.Path}} var metadata runtime.ServerMetadata {{if .Body}} - if err := marshaler.NewDecoder(req.Body).Decode(&{{.Body.AssignableExpr "protoReq"}}); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&{{.Body.AssignableExpr "protoReq"}}); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + {{- if and $AllowPatchFeature (eq (.HTTPMethod) "PATCH") (.FieldMaskField) (not (eq "*" .GetBodyFieldPath)) }} + if protoReq.{{.FieldMaskField}} == nil || len(protoReq.{{.FieldMaskField}}.GetPaths()) == 0 { + _, md := descriptor.ForMessage(protoReq.{{.GetBodyFieldStructName}}) + if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), md); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } else { + protoReq.{{.FieldMaskField}} = fieldMask + } + } + {{end}} {{end}} {{if .PathParams}} var ( @@ -270,6 +358,9 @@ var ( } {{if $param.IsNestedProto3}} err = runtime.PopulateFieldFromPath(&protoReq, {{$param | printf "%q"}}, val) + {{if $enum}} + e{{if $param.IsRepeated}}s{{end}}, err = {{$param.ConvertFuncExpr}}(val{{if $param.IsRepeated}}, {{$binding.Registry.GetRepeatedPathParamSeparator | printf "%c" | printf "%q"}}{{end}}, {{$enum.GoType $param.Target.Message.File.GoPkg.Path}}_value) + {{end}} {{else if $enum}} e{{if $param.IsRepeated}}s{{end}}, err = {{$param.ConvertFuncExpr}}(val{{if $param.IsRepeated}}, {{$binding.Registry.GetRepeatedPathParamSeparator | printf "%c" | printf "%q"}}{{end}}, {{$enum.GoType $param.Target.Message.File.GoPkg.Path}}_value) {{else}} @@ -290,7 +381,10 @@ var ( {{end}} {{end}} {{if .HasQueryParam}} - if err := runtime.PopulateQueryParameters(&protoReq, req.URL.Query(), filter_{{.Method.Service.GetName}}_{{.Method.GetName}}_{{.Index}}); err != nil { + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_{{.Method.Service.GetName}}_{{.Method.GetName}}_{{.Index}}); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } {{end}} @@ -365,6 +459,152 @@ var ( } `)) + localHandlerTemplate = template.Must(template.New("local-handler").Parse(` +{{if and .Method.GetClientStreaming .Method.GetServerStreaming}} +{{else if .Method.GetClientStreaming}} +{{else if .Method.GetServerStreaming}} +{{else}} +{{template "local-client-rpc-request-func" .}} +{{end}} +`)) + + _ = template.Must(localHandlerTemplate.New("local-request-func-signature").Parse(strings.Replace(` +{{if .Method.GetServerStreaming}} +{{else}} +func local_request_{{.Method.Service.GetName}}_{{.Method.GetName}}_{{.Index}}(ctx context.Context, marshaler runtime.Marshaler, server {{.Method.Service.GetName}}Server, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) +{{end}}`, "\n", "", -1))) + + _ = template.Must(localHandlerTemplate.New("local-client-rpc-request-func").Parse(` +{{$AllowPatchFeature := .AllowPatchFeature}} +{{template "local-request-func-signature" .}} { + var protoReq {{.Method.RequestType.GoType .Method.Service.File.GoPkg.Path}} + var metadata runtime.ServerMetadata +{{if .Body}} + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&{{.Body.AssignableExpr "protoReq"}}); err != nil && err != io.EOF { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + {{- if and $AllowPatchFeature (eq (.HTTPMethod) "PATCH") (.FieldMaskField) (not (eq "*" .GetBodyFieldPath)) }} + if protoReq.{{.FieldMaskField}} == nil || len(protoReq.{{.FieldMaskField}}.GetPaths()) == 0 { + _, md := descriptor.ForMessage(protoReq.{{.GetBodyFieldStructName}}) + if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), md); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } else { + protoReq.{{.FieldMaskField}} = fieldMask + } + } + {{end}} +{{end}} +{{if .PathParams}} + var ( + val string +{{- if .HasEnumPathParam}} + e int32 +{{- end}} +{{- if .HasRepeatedEnumPathParam}} + es []int32 +{{- end}} + ok bool + err error + _ = err + ) + {{$binding := .}} + {{range $param := .PathParams}} + {{$enum := $binding.LookupEnum $param}} + val, ok = pathParams[{{$param | printf "%q"}}] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", {{$param | printf "%q"}}) + } +{{if $param.IsNestedProto3}} + err = runtime.PopulateFieldFromPath(&protoReq, {{$param | printf "%q"}}, val) + {{if $enum}} + e{{if $param.IsRepeated}}s{{end}}, err = {{$param.ConvertFuncExpr}}(val{{if $param.IsRepeated}}, {{$binding.Registry.GetRepeatedPathParamSeparator | printf "%c" | printf "%q"}}{{end}}, {{$enum.GoType $param.Target.Message.File.GoPkg.Path}}_value) + {{end}} +{{else if $enum}} + e{{if $param.IsRepeated}}s{{end}}, err = {{$param.ConvertFuncExpr}}(val{{if $param.IsRepeated}}, {{$binding.Registry.GetRepeatedPathParamSeparator | printf "%c" | printf "%q"}}{{end}}, {{$enum.GoType $param.Target.Message.File.GoPkg.Path}}_value) +{{else}} + {{$param.AssignableExpr "protoReq"}}, err = {{$param.ConvertFuncExpr}}(val{{if $param.IsRepeated}}, {{$binding.Registry.GetRepeatedPathParamSeparator | printf "%c" | printf "%q"}}{{end}}) +{{end}} + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", {{$param | printf "%q"}}, err) + } +{{if and $enum $param.IsRepeated}} + s := make([]{{$enum.GoType $param.Target.Message.File.GoPkg.Path}}, len(es)) + for i, v := range es { + s[i] = {{$enum.GoType $param.Target.Message.File.GoPkg.Path}}(v) + } + {{$param.AssignableExpr "protoReq"}} = s +{{else if $enum}} + {{$param.AssignableExpr "protoReq"}} = {{$enum.GoType $param.Target.Message.File.GoPkg.Path}}(e) +{{end}} + {{end}} +{{end}} +{{if .HasQueryParam}} + if err := runtime.PopulateQueryParameters(&protoReq, req.URL.Query(), filter_{{.Method.Service.GetName}}_{{.Method.GetName}}_{{.Index}}); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } +{{end}} +{{if .Method.GetServerStreaming}} + // TODO +{{else}} + msg, err := server.{{.Method.GetName}}(ctx, &protoReq) + return msg, metadata, err +{{end}} +}`)) + + localTrailerTemplate = template.Must(template.New("local-trailer").Parse(` +{{$UseRequestContext := .UseRequestContext}} +{{range $svc := .Services}} +// Register{{$svc.GetName}}{{$.RegisterFuncSuffix}}Server registers the http handlers for service {{$svc.GetName}} to "mux". +// UnaryRPC :call {{$svc.GetName}}Server directly. +// StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. +func Register{{$svc.GetName}}{{$.RegisterFuncSuffix}}Server(ctx context.Context, mux *runtime.ServeMux, server {{$svc.GetName}}Server) error { + {{range $m := $svc.Methods}} + {{range $b := $m.Bindings}} + {{if or $m.GetClientStreaming $m.GetServerStreaming}} + mux.Handle({{$b.HTTPMethod | printf "%q"}}, pattern_{{$svc.GetName}}_{{$m.GetName}}_{{$b.Index}}, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + err := status.Error(codes.Unimplemented, "streaming calls are not yet supported in the in-process transport") + _, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + }) + {{else}} + mux.Handle({{$b.HTTPMethod | printf "%q"}}, pattern_{{$svc.GetName}}_{{$m.GetName}}_{{$b.Index}}, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + {{- if $UseRequestContext }} + ctx, cancel := context.WithCancel(req.Context()) + {{- else -}} + ctx, cancel := context.WithCancel(ctx) + {{- end }} + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_{{$svc.GetName}}_{{$m.GetName}}_{{$b.Index}}(rctx, inboundMarshaler, server, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + {{ if $b.ResponseBody }} + forward_{{$svc.GetName}}_{{$m.GetName}}_{{$b.Index}}(ctx, mux, outboundMarshaler, w, req, response_{{$svc.GetName}}_{{$m.GetName}}_{{$b.Index}}{resp}, mux.GetForwardResponseOptions()...) + {{ else }} + forward_{{$svc.GetName}}_{{$m.GetName}}_{{$b.Index}}(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + {{end}} + }) + {{end}} + {{end}} + {{end}} + return nil +} +{{end}}`)) + trailerTemplate = template.Must(template.New("trailer").Parse(` {{$UseRequestContext := .UseRequestContext}} {{range $svc := .Services}} @@ -414,15 +654,6 @@ func Register{{$svc.GetName}}{{$.RegisterFuncSuffix}}Client(ctx context.Context, ctx, cancel := context.WithCancel(ctx) {{- end }} defer cancel() - if cn, ok := w.(http.CloseNotifier); ok { - go func(done <-chan struct{}, closed <-chan bool) { - select { - case <-done: - case <-closed: - cancel() - } - }(ctx.Done(), cn.CloseNotify()) - } inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) rctx, err := runtime.AnnotateContext(ctx, mux, req) if err != nil { @@ -468,7 +699,7 @@ func (m response_{{$svc.GetName}}_{{$m.GetName}}_{{$b.Index}}) XXX_ResponseBody( var ( {{range $m := $svc.Methods}} {{range $b := $m.Bindings}} - pattern_{{$svc.GetName}}_{{$m.GetName}}_{{$b.Index}} = runtime.MustPattern(runtime.NewPattern({{$b.PathTmpl.Version}}, {{$b.PathTmpl.OpCodes | printf "%#v"}}, {{$b.PathTmpl.Pool | printf "%#v"}}, {{$b.PathTmpl.Verb | printf "%q"}})) + pattern_{{$svc.GetName}}_{{$m.GetName}}_{{$b.Index}} = runtime.MustPattern(runtime.NewPattern({{$b.PathTmpl.Version}}, {{$b.PathTmpl.OpCodes | printf "%#v"}}, {{$b.PathTmpl.Pool | printf "%#v"}}, {{$b.PathTmpl.Verb | printf "%q"}}, runtime.AssumeColonVerbOpt({{$.AssumeColonVerb}}))) {{end}} {{end}} ) diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/httprule/fuzz.go b/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/httprule/fuzz.go new file mode 100644 index 0000000000..138f7c12f0 --- /dev/null +++ b/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/httprule/fuzz.go @@ -0,0 +1,11 @@ +// +build gofuzz + +package httprule + +func Fuzz(data []byte) int { + _, err := Parse(string(data)) + if err != nil { + return 0 + } + return 0 +} diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/httprule/parse.go b/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/httprule/parse.go index 3be742685c..f933cd85ef 100644 --- a/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/httprule/parse.go +++ b/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/httprule/parse.go @@ -232,7 +232,7 @@ func (p *parser) accept(term termType) (string, error) { t := p.tokens[0] switch term { case "/", "*", "**", ".", "=", "{", "}": - if t != string(term) { + if t != string(term) && t != "/" { return "", fmt.Errorf("expected %q but got %q", term, t) } case typeEOF: diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/main.go b/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/main.go index a34627534c..291ba7deb2 100644 --- a/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/main.go +++ b/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/main.go @@ -10,6 +10,7 @@ package main import ( "flag" + "fmt" "os" "strings" @@ -31,12 +32,27 @@ var ( pathType = flag.String("paths", "", "specifies how the paths of generated files are structured") allowRepeatedFieldsInBody = flag.Bool("allow_repeated_fields_in_body", false, "allows to use repeated field in `body` and `response_body` field of `google.api.http` annotation option") repeatedPathParamSeparator = flag.String("repeated_path_param_separator", "csv", "configures how repeated fields should be split. Allowed values are `csv`, `pipes`, `ssv` and `tsv`.") + allowPatchFeature = flag.Bool("allow_patch_feature", true, "determines whether to use PATCH feature involving update masks (using google.protobuf.FieldMask).") + allowColonFinalSegments = flag.Bool("allow_colon_final_segments", false, "determines whether colons are permitted in the final segment of a path") + versionFlag = flag.Bool("version", false, "print the current verison") +) + +// Variables set by goreleaser at build time +var ( + version = "dev" + commit = "unknown" + date = "unknown" ) func main() { flag.Parse() defer glog.Flush() + if *versionFlag { + fmt.Printf("Version %v, commit %v, built at %v\n", version, commit, date) + os.Exit(0) + } + reg := descriptor.NewRegistry() glog.V(1).Info("Parsing code generator request") @@ -65,7 +81,7 @@ func main() { } } - g := gengateway.New(reg, *useRequestContext, *registerFuncSuffix, *pathType) + g := gengateway.New(reg, *useRequestContext, *registerFuncSuffix, *pathType, *allowPatchFeature) if *grpcAPIConfiguration != "" { if err := reg.LoadGrpcAPIServiceFromYAML(*grpcAPIConfiguration); err != nil { @@ -78,6 +94,7 @@ func main() { reg.SetImportPath(*importPath) reg.SetAllowDeleteBody(*allowDeleteBody) reg.SetAllowRepeatedFieldsInBody(*allowRepeatedFieldsInBody) + reg.SetAllowColonFinalSegments(*allowColonFinalSegments) if err := reg.SetRepeatedPathParamSeparator(*repeatedPathParamSeparator); err != nil { emitError(err) return diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/BUILD.bazel b/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/BUILD.bazel index 62384ef349..d5a1d05fcc 100644 --- a/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/BUILD.bazel +++ b/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/BUILD.bazel @@ -12,7 +12,7 @@ go_library( "//protoc-gen-swagger/genswagger:go_default_library", "@com_github_golang_glog//:go_default_library", "@com_github_golang_protobuf//proto:go_default_library", - "@com_github_golang_protobuf//protoc-gen-go/plugin:go_default_library", + "@io_bazel_rules_go//proto/wkt:compiler_plugin_go_proto", ], ) diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/defs.bzl b/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/defs.bzl index ada033139c..4f90807f0f 100644 --- a/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/defs.bzl +++ b/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/defs.bzl @@ -30,46 +30,83 @@ def _collect_includes(gen_dir, srcs): return includes -def _run_proto_gen_swagger(ctx, direct_proto_srcs, transitive_proto_srcs, actions, protoc, protoc_gen_swagger, grpc_api_configuration): +def _run_proto_gen_swagger(ctx, direct_proto_srcs, transitive_proto_srcs, actions, protoc, protoc_gen_swagger, grpc_api_configuration, single_output): swagger_files = [] - for proto in direct_proto_srcs: - swagger_file = actions.declare_file( - "%s.swagger.json" % proto.basename[:-len(".proto")], - sibling = proto, - ) - inputs = direct_proto_srcs + transitive_proto_srcs + [protoc_gen_swagger] + inputs = direct_proto_srcs + transitive_proto_srcs + tools = [protoc_gen_swagger] - options=["logtostderr=true"] - if grpc_api_configuration: - options.append("grpc_api_configuration=%s" % grpc_api_configuration.path) - inputs.append(grpc_api_configuration) + options = ["logtostderr=true", "allow_repeated_fields_in_body=true"] + if grpc_api_configuration: + options.append("grpc_api_configuration=%s" % grpc_api_configuration.path) + inputs.append(grpc_api_configuration) - includes = _collect_includes(ctx.genfiles_dir.path, direct_proto_srcs + transitive_proto_srcs) + includes = _collect_includes(ctx.genfiles_dir.path, direct_proto_srcs + transitive_proto_srcs) - args = actions.args() - args.add("--plugin=%s" % protoc_gen_swagger.path) - args.add("--swagger_out=%s:%s" % (",".join(options), ctx.bin_dir.path)) - args.add(["-I%s" % include for include in includes]) - args.add(proto.path) + if single_output: + swagger_file = actions.declare_file( + "%s.swagger.json" % ctx.attr.name, + sibling = direct_proto_srcs[0], + ) + output_dir = ctx.bin_dir.path + if direct_proto_srcs[0].owner.workspace_root: + output_dir = "/".join([output_dir, direct_proto_srcs[0].owner.workspace_root]) + + output_dir = "/".join([output_dir, direct_proto_srcs[0].dirname]) + + options.append("allow_merge=true") + options.append("merge_file_name=%s" % ctx.attr.name) + + args = actions.args() + args.add("--plugin=%s" % protoc_gen_swagger.path) + args.add("--swagger_out=%s:%s" % (",".join(options), output_dir)) + args.add_all(["-I%s" % include for include in includes]) + args.add_all([src.path for src in direct_proto_srcs]) + + actions.run( + executable = protoc, + inputs = inputs, + tools = tools, + outputs = [swagger_file], + arguments = [args], + ) - actions.run( - executable = protoc, - inputs = inputs, - outputs = [swagger_file], - arguments = [args], - ) + swagger_files.append(swagger_file) + else: + for proto in direct_proto_srcs: + swagger_file = actions.declare_file( + "%s.swagger.json" % proto.basename[:-len(".proto")], + sibling = proto, + ) + + output_dir = ctx.bin_dir.path + if proto.owner.workspace_root: + output_dir = "/".join([output_dir, proto.owner.workspace_root]) + + args = actions.args() + args.add("--plugin=%s" % protoc_gen_swagger.path) + args.add("--swagger_out=%s:%s" % (",".join(options), output_dir)) + args.add_all(["-I%s" % include for include in includes]) + args.add(proto.path) + + actions.run( + executable = protoc, + inputs = inputs, + tools = tools, + outputs = [swagger_file], + arguments = [args], + ) - swagger_files.append(swagger_file) + swagger_files.append(swagger_file) return swagger_files def _proto_gen_swagger_impl(ctx): - proto = ctx.attr.proto.proto + proto = ctx.attr.proto[ProtoInfo] grpc_api_configuration = ctx.file.grpc_api_configuration - return struct( - files=depset( + return [DefaultInfo( + files = depset( _run_proto_gen_swagger( ctx, direct_proto_srcs = proto.direct_sources, @@ -77,21 +114,26 @@ def _proto_gen_swagger_impl(ctx): actions = ctx.actions, protoc = ctx.executable._protoc, protoc_gen_swagger = ctx.executable._protoc_gen_swagger, - grpc_api_configuration = grpc_api_configuration - ) - ) - ) + grpc_api_configuration = grpc_api_configuration, + single_output = ctx.attr.single_output, + ), + ), + )] protoc_gen_swagger = rule( attrs = { "proto": attr.label( allow_rules = ["proto_library"], mandatory = True, - providers = ['proto'], + providers = ["proto"], ), "grpc_api_configuration": attr.label( - allow_single_file=True, - mandatory=False + allow_single_file = True, + mandatory = False, + ), + "single_output": attr.bool( + default = False, + mandatory = False, ), "_protoc": attr.label( default = "@com_google_protobuf//:protoc", diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/genswagger/BUILD.bazel b/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/genswagger/BUILD.bazel index 7f34844a7a..929d0cf11d 100644 --- a/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/genswagger/BUILD.bazel +++ b/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/genswagger/BUILD.bazel @@ -12,13 +12,19 @@ go_library( ], importpath = "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/genswagger", deps = [ + "//internal:go_default_library", "//protoc-gen-grpc-gateway/descriptor:go_default_library", "//protoc-gen-grpc-gateway/generator:go_default_library", "//protoc-gen-swagger/options:go_default_library", "@com_github_golang_glog//:go_default_library", + "@com_github_golang_protobuf//descriptor:go_default_library_gen", + "@com_github_golang_protobuf//jsonpb:go_default_library_gen", "@com_github_golang_protobuf//proto:go_default_library", - "@com_github_golang_protobuf//protoc-gen-go/descriptor:go_default_library", - "@com_github_golang_protobuf//protoc-gen-go/plugin:go_default_library", + "@com_github_golang_protobuf//protoc-gen-go/generator:go_default_library_gen", + "@io_bazel_rules_go//proto/wkt:any_go_proto", + "@io_bazel_rules_go//proto/wkt:compiler_plugin_go_proto", + "@io_bazel_rules_go//proto/wkt:descriptor_go_proto", + "@io_bazel_rules_go//proto/wkt:struct_go_proto", ], ) @@ -30,8 +36,11 @@ go_test( deps = [ "//protoc-gen-grpc-gateway/descriptor:go_default_library", "//protoc-gen-grpc-gateway/httprule:go_default_library", + "//protoc-gen-swagger/options:go_default_library", "@com_github_golang_protobuf//proto:go_default_library", - "@com_github_golang_protobuf//protoc-gen-go/descriptor:go_default_library", - "@com_github_golang_protobuf//protoc-gen-go/plugin:go_default_library", + "@io_bazel_rules_go//proto/wkt:any_go_proto", + "@io_bazel_rules_go//proto/wkt:compiler_plugin_go_proto", + "@io_bazel_rules_go//proto/wkt:descriptor_go_proto", + "@io_bazel_rules_go//proto/wkt:struct_go_proto", ], ) diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/genswagger/generator.go b/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/genswagger/generator.go index 8eba8ac66a..31409ac4c1 100644 --- a/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/genswagger/generator.go +++ b/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/genswagger/generator.go @@ -6,11 +6,16 @@ import ( "errors" "fmt" "path/filepath" + "reflect" "strings" "github.com/golang/glog" + pbdescriptor "github.com/golang/protobuf/descriptor" "github.com/golang/protobuf/proto" + protocdescriptor "github.com/golang/protobuf/protoc-gen-go/descriptor" plugin "github.com/golang/protobuf/protoc-gen-go/plugin" + "github.com/golang/protobuf/ptypes/any" + "github.com/grpc-ecosystem/grpc-gateway/internal" "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/descriptor" gen "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/generator" swagger_options "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/options" @@ -47,6 +52,9 @@ func mergeTargetFile(targets []*wrapper, mergeFileName string) *wrapper { for k, v := range f.swagger.Definitions { mergedTarget.swagger.Definitions[k] = v } + for k, v := range f.swagger.StreamDefinitions { + mergedTarget.swagger.StreamDefinitions[k] = v + } for k, v := range f.swagger.Paths { mergedTarget.swagger.Paths[k] = v } @@ -59,12 +67,89 @@ func mergeTargetFile(targets []*wrapper, mergeFileName string) *wrapper { return mergedTarget } -// convert swagger file obj to plugin.CodeGeneratorResponse_File -func encodeSwagger(file *wrapper) *plugin.CodeGeneratorResponse_File { +func fieldName(k string) string { + return strings.ReplaceAll(strings.Title(k), "-", "_") +} + +// Q: What's up with the alias types here? +// A: We don't want to completely override how these structs are marshaled into +// JSON, we only want to add fields (see below, extensionMarshalJSON). +// An infinite recursion would happen if we'd call json.Marshal on the struct +// that has swaggerObject as an embedded field. To avoid that, we'll create +// type aliases, and those don't have the custom MarshalJSON methods defined +// on them. See http://choly.ca/post/go-json-marshalling/ (or, if it ever +// goes away, use +// https://web.archive.org/web/20190806073003/http://choly.ca/post/go-json-marshalling/. +func (so swaggerObject) MarshalJSON() ([]byte, error) { + type alias swaggerObject + return extensionMarshalJSON(alias(so), so.extensions) +} + +func (so swaggerInfoObject) MarshalJSON() ([]byte, error) { + type alias swaggerInfoObject + return extensionMarshalJSON(alias(so), so.extensions) +} + +func (so swaggerSecuritySchemeObject) MarshalJSON() ([]byte, error) { + type alias swaggerSecuritySchemeObject + return extensionMarshalJSON(alias(so), so.extensions) +} + +func (so swaggerOperationObject) MarshalJSON() ([]byte, error) { + type alias swaggerOperationObject + return extensionMarshalJSON(alias(so), so.extensions) +} + +func (so swaggerResponseObject) MarshalJSON() ([]byte, error) { + type alias swaggerResponseObject + return extensionMarshalJSON(alias(so), so.extensions) +} + +func extensionMarshalJSON(so interface{}, extensions []extension) ([]byte, error) { + // To append arbitrary keys to the struct we'll render into json, + // we're creating another struct that embeds the original one, and + // its extra fields: + // + // The struct will look like + // struct { + // *swaggerCore + // XGrpcGatewayFoo json.RawMessage `json:"x-grpc-gateway-foo"` + // XGrpcGatewayBar json.RawMessage `json:"x-grpc-gateway-bar"` + // } + // and thus render into what we want -- the JSON of swaggerCore with the + // extensions appended. + fields := []reflect.StructField{ + reflect.StructField{ // embedded + Name: "Embedded", + Type: reflect.TypeOf(so), + Anonymous: true, + }, + } + for _, ext := range extensions { + fields = append(fields, reflect.StructField{ + Name: fieldName(ext.key), + Type: reflect.TypeOf(ext.value), + Tag: reflect.StructTag(fmt.Sprintf("json:\"%s\"", ext.key)), + }) + } + + t := reflect.StructOf(fields) + s := reflect.New(t).Elem() + s.Field(0).Set(reflect.ValueOf(so)) + for _, ext := range extensions { + s.FieldByName(fieldName(ext.key)).Set(reflect.ValueOf(ext.value)) + } + return json.Marshal(s.Interface()) +} + +// encodeSwagger converts swagger file obj to plugin.CodeGeneratorResponse_File +func encodeSwagger(file *wrapper) (*plugin.CodeGeneratorResponse_File, error) { var formatted bytes.Buffer enc := json.NewEncoder(&formatted) enc.SetIndent("", " ") - enc.Encode(*file.swagger) + if err := enc.Encode(*file.swagger); err != nil { + return nil, err + } name := file.fileName ext := filepath.Ext(name) base := strings.TrimSuffix(name, ext) @@ -72,7 +157,7 @@ func encodeSwagger(file *wrapper) *plugin.CodeGeneratorResponse_File { return &plugin.CodeGeneratorResponse_File{ Name: proto.String(output), Content: proto.String(formatted.String()), - } + }, nil } func (g *generator) Generate(targets []*descriptor.File) ([]*plugin.CodeGeneratorResponse_File, error) { @@ -120,13 +205,43 @@ func (g *generator) Generate(targets []*descriptor.File) ([]*plugin.CodeGenerato if g.reg.IsAllowMerge() { targetSwagger := mergeTargetFile(swaggers, g.reg.GetMergeFileName()) - files = append(files, encodeSwagger(targetSwagger)) + f, err := encodeSwagger(targetSwagger) + if err != nil { + return nil, fmt.Errorf("failed to encode swagger for %s: %s", g.reg.GetMergeFileName(), err) + } + files = append(files, f) glog.V(1).Infof("New swagger file will emit") } else { for _, file := range swaggers { - files = append(files, encodeSwagger(file)) + f, err := encodeSwagger(file) + if err != nil { + return nil, fmt.Errorf("failed to encode swagger for %s: %s", file.fileName, err) + } + files = append(files, f) glog.V(1).Infof("New swagger file will emit") } } return files, nil } + +//AddStreamError Adds grpc.gateway.runtime.StreamError and google.protobuf.Any to registry for stream responses +func AddStreamError(reg *descriptor.Registry) error { + //load internal protos + any := fileDescriptorProtoForMessage(&any.Any{}) + streamError := fileDescriptorProtoForMessage(&internal.StreamError{}) + if err := reg.Load(&plugin.CodeGeneratorRequest{ + ProtoFile: []*protocdescriptor.FileDescriptorProto{ + any, + streamError, + }, + }); err != nil { + return err + } + return nil +} + +func fileDescriptorProtoForMessage(msg pbdescriptor.Message) *protocdescriptor.FileDescriptorProto { + fdp, _ := pbdescriptor.ForMessage(msg) + fdp.SourceCodeInfo = &protocdescriptor.SourceCodeInfo{} + return fdp +} diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/genswagger/template.go b/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/genswagger/template.go index e5d3749218..3d97207c7e 100644 --- a/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/genswagger/template.go +++ b/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/genswagger/template.go @@ -1,16 +1,22 @@ package genswagger import ( + "encoding/json" "fmt" "os" "reflect" "regexp" + "sort" "strconv" "strings" "sync" + "github.com/golang/glog" + "github.com/golang/protobuf/jsonpb" "github.com/golang/protobuf/proto" + structpb "github.com/golang/protobuf/ptypes/struct" pbdescriptor "github.com/golang/protobuf/protoc-gen-go/descriptor" + gogen "github.com/golang/protobuf/protoc-gen-go/generator" "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/descriptor" swagger_options "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/options" ) @@ -58,6 +64,22 @@ var wktSchemas = map[string]schemaCore{ Type: "boolean", Format: "boolean", }, + ".google.protobuf.Empty": schemaCore{}, + ".google.protobuf.Struct": schemaCore{ + Type: "object", + }, + ".google.protobuf.Value": schemaCore{ + Type: "object", + }, + ".google.protobuf.ListValue": schemaCore{ + Type: "array", + Items: (*swaggerItemsObject)(&schemaCore{ + Type: "object", + }), + }, + ".google.protobuf.NullValue": schemaCore{ + Type: "string", + }, } func listEnumNames(enum *descriptor.Enum) (names []string) { @@ -88,7 +110,7 @@ func messageToQueryParameters(message *descriptor.Message, reg *descriptor.Regis return params, nil } -// queryParams converts a field to a list of swagger query parameters recuresively. +// queryParams converts a field to a list of swagger query parameters recursively. func queryParams(message *descriptor.Message, field *descriptor.Field, prefix string, reg *descriptor.Registry, pathParams []descriptor.Parameter) (params []swaggerParameterObject, err error) { // make sure the parameter is not already listed as a path parameter for _, pathParam := range pathParams { @@ -100,7 +122,7 @@ func queryParams(message *descriptor.Message, field *descriptor.Field, prefix st fieldType := field.GetTypeName() if message.File != nil { comments := fieldProtoComments(reg, message, field) - if err := updateSwaggerDataFromComments(&schema, comments); err != nil { + if err := updateSwaggerDataFromComments(&schema, comments, false); err != nil { return nil, err } } @@ -118,14 +140,35 @@ func queryParams(message *descriptor.Message, field *descriptor.Field, prefix st if schema.Title != "" { // merge title because title of parameter object will be ignored desc = strings.TrimSpace(schema.Title + ". " + schema.Description) } + + // verify if the field is required + required := false + for _, fieldName := range schema.Required { + if fieldName == field.GetName() { + required = true + break + } + } + param := swaggerParameterObject{ - Name: prefix + field.GetName(), Description: desc, In: "query", + Default: schema.Default, Type: schema.Type, Items: schema.Items, Format: schema.Format, + Required: required, + } + if param.Type == "array" { + param.CollectionFormat = "multi" + } + + if reg.GetUseJSONNamesForFields() { + param.Name = prefix + field.GetJsonName() + } else { + param.Name = prefix + field.GetName() } + if isEnum { enum, err := reg.LookupEnum("", fieldType) if err != nil { @@ -165,16 +208,34 @@ func queryParams(message *descriptor.Message, field *descriptor.Field, prefix st } // findServicesMessagesAndEnumerations discovers all messages and enums defined in the RPC methods of the service. -func findServicesMessagesAndEnumerations(s []*descriptor.Service, reg *descriptor.Registry, m messageMap, e enumMap, refs refMap) { +func findServicesMessagesAndEnumerations(s []*descriptor.Service, reg *descriptor.Registry, m messageMap, ms messageMap, e enumMap, refs refMap) { for _, svc := range s { for _, meth := range svc.Methods { // Request may be fully included in query if _, ok := refs[fmt.Sprintf("#/definitions/%s", fullyQualifiedNameToSwaggerName(meth.RequestType.FQMN(), reg))]; ok { - m[fullyQualifiedNameToSwaggerName(meth.RequestType.FQMN(), reg)] = meth.RequestType + if !skipRenderingRef(meth.RequestType.FQMN()) { + m[fullyQualifiedNameToSwaggerName(meth.RequestType.FQMN(), reg)] = meth.RequestType + } } findNestedMessagesAndEnumerations(meth.RequestType, reg, m, e) - m[fullyQualifiedNameToSwaggerName(meth.ResponseType.FQMN(), reg)] = meth.ResponseType + if !skipRenderingRef(meth.ResponseType.FQMN()) { + m[fullyQualifiedNameToSwaggerName(meth.ResponseType.FQMN(), reg)] = meth.ResponseType + if meth.GetServerStreaming() { + runtimeStreamError := fullyQualifiedNameToSwaggerName(".grpc.gateway.runtime.StreamError", reg) + glog.V(1).Infof("StreamError FQMN: %s", runtimeStreamError) + streamError, err := reg.LookupMsg(".grpc.gateway.runtime", "StreamError") + if err == nil { + glog.V(1).Infof("StreamError: %v", streamError) + m[runtimeStreamError] = streamError + findNestedMessagesAndEnumerations(streamError, reg, m, e) + } else { + //just in case there is an error looking up StreamError + glog.Error(err) + } + ms[fullyQualifiedNameToSwaggerName(meth.ResponseType.FQMN(), reg)] = meth.ResponseType + } + } findNestedMessagesAndEnumerations(meth.ResponseType, reg, m, e) } } @@ -204,32 +265,17 @@ func findNestedMessagesAndEnumerations(message *descriptor.Message, reg *descrip } } +func skipRenderingRef(refName string) bool { + _, ok := wktSchemas[refName] + return ok +} + func renderMessagesAsDefinition(messages messageMap, d swaggerDefinitionsObject, reg *descriptor.Registry, customRefs refMap) { for name, msg := range messages { - switch name { - case ".google.protobuf.Timestamp": - continue - case ".google.protobuf.Duration": - continue - case ".google.protobuf.StringValue": - continue - case ".google.protobuf.BytesValue": - continue - case ".google.protobuf.Int32Value": - continue - case ".google.protobuf.UInt32Value": - continue - case ".google.protobuf.Int64Value": - continue - case ".google.protobuf.UInt64Value": - continue - case ".google.protobuf.FloatValue": - continue - case ".google.protobuf.DoubleValue": - continue - case ".google.protobuf.BoolValue": + if skipRenderingRef(name) { continue } + if opt := msg.GetOptions(); opt != nil && opt.MapEntry != nil && *opt.MapEntry { continue } @@ -239,7 +285,7 @@ func renderMessagesAsDefinition(messages messageMap, d swaggerDefinitionsObject, }, } msgComments := protoComments(reg, msg.File, msg.Outers, "MessageType", int32(msg.Index)) - if err := updateSwaggerDataFromComments(&schema, msgComments); err != nil { + if err := updateSwaggerDataFromComments(&schema, msgComments, false); err != nil { panic(err) } opts, err := extractSchemaOptionFromMessageDescriptor(msg.DescriptorProto) @@ -251,6 +297,7 @@ func renderMessagesAsDefinition(messages messageMap, d swaggerDefinitionsObject, // Warning: Make sure not to overwrite any fields already set on the schema type. schema.ExternalDocs = protoSchema.ExternalDocs + schema.ReadOnly = protoSchema.ReadOnly schema.MultipleOf = protoSchema.MultipleOf schema.Maximum = protoSchema.Maximum schema.ExclusiveMaximum = protoSchema.ExclusiveMaximum @@ -259,6 +306,7 @@ func renderMessagesAsDefinition(messages messageMap, d swaggerDefinitionsObject, schema.MaxLength = protoSchema.MaxLength schema.MinLength = protoSchema.MinLength schema.Pattern = protoSchema.Pattern + schema.Default = protoSchema.Default schema.MaxItems = protoSchema.MaxItems schema.MinItems = protoSchema.MinItems schema.UniqueItems = protoSchema.UniqueItems @@ -274,12 +322,15 @@ func renderMessagesAsDefinition(messages messageMap, d swaggerDefinitionsObject, if protoSchema.Description != "" { schema.Description = protoSchema.Description } + if protoSchema.Example != nil { + schema.Example = protoSchema.Example + } } for _, f := range msg.Fields { fieldValue := schemaOfField(f, reg, customRefs) comments := fieldProtoComments(reg, msg, f) - if err := updateSwaggerDataFromComments(&fieldValue, comments); err != nil { + if err := updateSwaggerDataFromComments(&fieldValue, comments, false); err != nil { panic(err) } @@ -289,12 +340,51 @@ func renderMessagesAsDefinition(messages messageMap, d swaggerDefinitionsObject, } else { kv.Key = f.GetName() } - schema.Properties = append(schema.Properties, kv) + if schema.Properties == nil { + schema.Properties = &swaggerSchemaObjectProperties{} + } + *schema.Properties = append(*schema.Properties, kv) } d[fullyQualifiedNameToSwaggerName(msg.FQMN(), reg)] = schema } } +func renderMessagesAsStreamDefinition(messages messageMap, d swaggerDefinitionsObject, reg *descriptor.Registry) { + for name, msg := range messages { + if skipRenderingRef(name) { + continue + } + + if opt := msg.GetOptions(); opt != nil && opt.MapEntry != nil && *opt.MapEntry { + continue + } + d[fullyQualifiedNameToSwaggerName(msg.FQMN(), reg)] = swaggerSchemaObject{ + schemaCore: schemaCore{ + Type: "object", + }, + Title: fmt.Sprintf("Stream result of %s", fullyQualifiedNameToSwaggerName(msg.FQMN(), reg)), + Properties: &swaggerSchemaObjectProperties{ + keyVal{ + Key: "result", + Value: swaggerSchemaObject{ + schemaCore: schemaCore{ + Ref: fmt.Sprintf("#/definitions/%s", fullyQualifiedNameToSwaggerName(msg.FQMN(), reg)), + }, + }, + }, + keyVal{ + Key: "error", + Value: swaggerSchemaObject{ + schemaCore: schemaCore{ + Ref: fmt.Sprintf("#/definitions/%s", fullyQualifiedNameToSwaggerName(".grpc.gateway.runtime.StreamError", reg)), + }, + }, + }, + }, + } + } +} + // schemaOfField returns a swagger Schema Object for a protobuf field. func schemaOfField(f *descriptor.Field, reg *descriptor.Registry, refs refMap) swaggerSchemaObject { const ( @@ -318,16 +408,23 @@ func schemaOfField(f *descriptor.Field, reg *descriptor.Registry, refs refMap) s aggregate = array } + var props *swaggerSchemaObjectProperties + switch ft := fd.GetType(); ft { case pbdescriptor.FieldDescriptorProto_TYPE_ENUM, pbdescriptor.FieldDescriptorProto_TYPE_MESSAGE, pbdescriptor.FieldDescriptorProto_TYPE_GROUP: if wktSchema, ok := wktSchemas[fd.GetTypeName()]; ok { core = wktSchema + + if fd.GetTypeName() == ".google.protobuf.Empty" { + props = &swaggerSchemaObjectProperties{} + } } else { core = schemaCore{ Ref: "#/definitions/" + fullyQualifiedNameToSwaggerName(fd.GetTypeName(), reg), } if refs != nil { refs[fd.GetTypeName()] = struct{}{} + } } default: @@ -339,30 +436,35 @@ func schemaOfField(f *descriptor.Field, reg *descriptor.Registry, refs refMap) s } } + ret := swaggerSchemaObject{} + switch aggregate { case array: - return swaggerSchemaObject{ + ret = swaggerSchemaObject{ schemaCore: schemaCore{ Type: "array", Items: (*swaggerItemsObject)(&core), }, } case object: - return swaggerSchemaObject{ + ret = swaggerSchemaObject{ schemaCore: schemaCore{ Type: "object", }, - AdditionalProperties: &swaggerSchemaObject{schemaCore: core}, + AdditionalProperties: &swaggerSchemaObject{Properties: props, schemaCore: core}, } default: - ret := swaggerSchemaObject{ + ret = swaggerSchemaObject{ schemaCore: core, + Properties: props, } - if j, err := extractJSONSchemaFromFieldDescriptor(fd); err == nil { - updateSwaggerObjectFromJSONSchema(&ret, j) - } - return ret } + + if j, err := extractJSONSchemaFromFieldDescriptor(fd); err == nil { + updateSwaggerObjectFromJSONSchema(&ret, j) + } + + return ret } // primitiveSchema returns a pair of "Type" and "Format" in JSON Schema for @@ -433,7 +535,7 @@ func renderEnumerationsAsDefinition(enums enumMap, d swaggerDefinitionsObject, r Default: defaultValue, }, } - if err := updateSwaggerDataFromComments(&enumSchemaObject, enumComments); err != nil { + if err := updateSwaggerDataFromComments(&enumSchemaObject, enumComments, false); err != nil { panic(err) } @@ -448,7 +550,7 @@ func fullyQualifiedNameToSwaggerName(fqn string, reg *descriptor.Registry) strin if mapping, present := registriesSeen[reg]; present { return mapping[fqn] } - mapping := resolveFullyQualifiedNameToSwaggerNames(append(reg.GetAllFQMNs(), reg.GetAllFQENs()...)) + mapping := resolveFullyQualifiedNameToSwaggerNames(append(reg.GetAllFQMNs(), reg.GetAllFQENs()...), reg.GetUseFQNForSwaggerName()) registriesSeen[reg] = mapping return mapping[fqn] } @@ -465,7 +567,7 @@ var registriesSeenMutex sync.Mutex // This likely could be made better. This will always generate the same names // but may not always produce optimal names. This is a reasonably close // approximation of what they should look like in most cases. -func resolveFullyQualifiedNameToSwaggerNames(messages []string) map[string]string { +func resolveFullyQualifiedNameToSwaggerNames(messages []string, useFQNForSwaggerName bool) map[string]string { packagesByDepth := make(map[int][][]string) uniqueNames := make(map[string]string) @@ -494,22 +596,29 @@ func resolveFullyQualifiedNameToSwaggerNames(messages []string) map[string]strin } for _, p := range messages { - h := hierarchy(p) - for depth := 0; depth < len(h); depth++ { - if count(packagesByDepth[depth], h[len(h)-depth:]) == 1 { - uniqueNames[p] = strings.Join(h[len(h)-depth-1:], "") - break - } - if depth == len(h)-1 { - uniqueNames[p] = strings.Join(h, "") + if useFQNForSwaggerName { + // strip leading dot from proto fqn + uniqueNames[p] = p[1:] + } else { + h := hierarchy(p) + for depth := 0; depth < len(h); depth++ { + if count(packagesByDepth[depth], h[len(h)-depth:]) == 1 { + uniqueNames[p] = strings.Join(h[len(h)-depth-1:], "") + break + } + if depth == len(h)-1 { + uniqueNames[p] = strings.Join(h, "") + } } } } return uniqueNames } +var canRegexp = regexp.MustCompile("{([a-zA-Z][a-zA-Z0-9_.]*).*}") + // Swagger expects paths of the form /path/{string_value} but grpc-gateway paths are expected to be of the form /path/{string_value=strprefix/*}. This should reformat it correctly. -func templateToSwaggerPath(path string) string { +func templateToSwaggerPath(path string, reg *descriptor.Registry) string { // It seems like the right thing to do here is to just use // strings.Split(path, "/") but that breaks badly when you hit a url like // /{my_field=prefix/*}/ and end up with 2 sections representing my_field. @@ -518,12 +627,15 @@ func templateToSwaggerPath(path string) string { var parts []string depth := 0 buffer := "" + jsonBuffer := "" for _, char := range path { switch char { case '{': // Push on the stack depth++ buffer += string(char) + jsonBuffer = "" + jsonBuffer += string(char) break case '}': if depth == 0 { @@ -532,6 +644,14 @@ func templateToSwaggerPath(path string) string { // Pop from the stack depth-- buffer += string(char) + if reg.GetUseJSONNamesForFields() && + len(jsonBuffer) > 1 { + jsonSnakeCaseName := string(jsonBuffer[1:]) + jsonCamelCaseName := string(lowerCamelCase(jsonSnakeCaseName)) + prev := string(buffer[:len(buffer)-len(jsonSnakeCaseName)-2]) + buffer = strings.Join([]string{prev, "{", jsonCamelCaseName, "}"}, "") + jsonBuffer = "" + } case '/': if depth == 0 { parts = append(parts, buffer) @@ -541,8 +661,10 @@ func templateToSwaggerPath(path string) string { continue } buffer += string(char) + jsonBuffer += string(char) default: buffer += string(char) + jsonBuffer += string(char) break } } @@ -553,14 +675,13 @@ func templateToSwaggerPath(path string) string { // Parts is now an array of segments of the path. Interestingly, since the // syntax for this subsection CAN be handled by a regexp since it has no // memory. - re := regexp.MustCompile("{([a-zA-Z][a-zA-Z0-9_.]*).*}") for index, part := range parts { // If part is a resource name such as "parent", "name", "user.name", the format info must be retained. - prefix := re.ReplaceAllString(part, "$1") + prefix := canRegexp.ReplaceAllString(part, "$1") if isResourceName(prefix) { continue } - parts[index] = re.ReplaceAllString(part, "{$1}") + parts[index] = canRegexp.ReplaceAllString(part, "{$1}") } return strings.Join(parts, "/") @@ -570,6 +691,8 @@ func isResourceName(prefix string) bool { words := strings.Split(prefix, ".") l := len(words) field := words[l-1] + words = strings.Split(field, ":") + field = words[0] return field == "parent" || field == "name" } @@ -582,7 +705,7 @@ func renderServices(services []*descriptor.Service, paths swaggerPathsObject, re parameters := swaggerParametersObject{} for _, parameter := range b.PathParams { - var paramType, paramFormat, desc, collectionFormat string + var paramType, paramFormat, desc, collectionFormat, defaultValue string var enumNames []string var items *swaggerItemsObject var minItems *int @@ -596,6 +719,7 @@ func renderServices(services []*descriptor.Service, paths swaggerPathsObject, re paramType = schema.Type paramFormat = schema.Format desc = schema.Description + defaultValue = schema.Default } else { return fmt.Errorf("only primitive and well-known types are allowed in path parameters") } @@ -607,12 +731,19 @@ func renderServices(services []*descriptor.Service, paths swaggerPathsObject, re return err } enumNames = listEnumNames(enum) + schema := schemaOfField(parameter.Target, reg, customRefs) + desc = schema.Description + defaultValue = schema.Default default: var ok bool paramType, paramFormat, ok = primitiveSchema(pt) if !ok { return fmt.Errorf("unknown field type %v", pt) } + + schema := schemaOfField(parameter.Target, reg, customRefs) + desc = schema.Description + defaultValue = schema.Default } if parameter.IsRepeated() { @@ -633,12 +764,16 @@ func renderServices(services []*descriptor.Service, paths swaggerPathsObject, re if desc == "" { desc = fieldProtoComments(reg, parameter.Target.Message, parameter.Target) } - + parameterString := parameter.String() + if reg.GetUseJSONNamesForFields() { + parameterString = lowerCamelCase(parameterString) + } parameters = append(parameters, swaggerParameterObject{ - Name: parameter.String(), + Name: parameterString, Description: desc, In: "path", Required: true, + Default: defaultValue, // Parameters in gRPC-Gateway can only be strings? Type: paramType, Format: paramFormat, @@ -655,9 +790,19 @@ func renderServices(services []*descriptor.Service, paths swaggerPathsObject, re if len(b.Body.FieldPath) == 0 { schema = swaggerSchemaObject{ - schemaCore: schemaCore{ - Ref: fmt.Sprintf("#/definitions/%s", fullyQualifiedNameToSwaggerName(meth.RequestType.FQMN(), reg)), - }, + schemaCore: schemaCore{}, + } + + wknSchemaCore, isWkn := wktSchemas[meth.RequestType.FQMN()] + if !isWkn { + schema.Ref = fmt.Sprintf("#/definitions/%s", fullyQualifiedNameToSwaggerName(meth.RequestType.FQMN(), reg)) + } else { + schema.schemaCore = wknSchemaCore + + // Special workaround for Empty: it's well-known type but wknSchemas only returns schema.schemaCore; but we need to set schema.Properties which is a level higher. + if meth.RequestType.FQMN() == ".google.protobuf.Empty" { + schema.Properties = &swaggerSchemaObjectProperties{} + } } } else { lastField := b.Body.FieldPath[len(b.Body.FieldPath)-1] @@ -688,20 +833,34 @@ func renderServices(services []*descriptor.Service, paths swaggerPathsObject, re parameters = append(parameters, queryParams...) } - pathItemObject, ok := paths[templateToSwaggerPath(b.PathTmpl.Template)] + pathItemObject, ok := paths[templateToSwaggerPath(b.PathTmpl.Template, reg)] if !ok { pathItemObject = swaggerPathItemObject{} } methProtoPath := protoPathIndex(reflect.TypeOf((*pbdescriptor.ServiceDescriptorProto)(nil)), "Method") - desc := "" + desc := "A successful response." var responseSchema swaggerSchemaObject if b.ResponseBody == nil || len(b.ResponseBody.FieldPath) == 0 { responseSchema = swaggerSchemaObject{ - schemaCore: schemaCore{ - Ref: fmt.Sprintf("#/definitions/%s", fullyQualifiedNameToSwaggerName(meth.ResponseType.FQMN(), reg)), - }, + schemaCore: schemaCore{}, + } + + // Don't link to a full definition for + // empty; it's overly verbose. + // schema.Properties{} renders it as + // well, without a definition + wknSchemaCore, isWkn := wktSchemas[meth.ResponseType.FQMN()] + if !isWkn { + responseSchema.Ref = fmt.Sprintf("#/definitions/%s", fullyQualifiedNameToSwaggerName(meth.ResponseType.FQMN(), reg)) + } else { + responseSchema.schemaCore = wknSchemaCore + + // Special workaround for Empty: it's well-known type but wknSchemas only returns schema.schemaCore; but we need to set schema.Properties which is a level higher. + if meth.ResponseType.FQMN() == ".google.protobuf.Empty" { + responseSchema.Properties = &swaggerSchemaObjectProperties{} + } } } else { // This is resolving the value of response_body in the google.api.HttpRule @@ -715,9 +874,17 @@ func renderServices(services []*descriptor.Service, paths swaggerPathsObject, re } if meth.GetServerStreaming() { desc += "(streaming responses)" + // Use the streamdefinition which wraps the message in a "result" + responseSchema.Ref = strings.Replace(responseSchema.Ref, `#/definitions/`, `#/x-stream-definitions/`, 1) + } + + tag := svc.GetName() + if pkg := svc.File.GetPackage(); pkg != "" && reg.IsIncludePackageInTags() { + tag = pkg + "." + tag } + operationObject := &swaggerOperationObject{ - Tags: []string{svc.GetName()}, + Tags: []string{tag}, Parameters: parameters, Responses: swaggerResponsesObject{ "200": swaggerResponseObject{ @@ -741,7 +908,7 @@ func renderServices(services []*descriptor.Service, paths swaggerPathsObject, re } methComments := protoComments(reg, svc.File, nil, "Method", int32(svcIdx), methProtoPath, int32(methIdx)) - if err := updateSwaggerDataFromComments(operationObject, methComments); err != nil { + if err := updateSwaggerDataFromComments(operationObject, methComments, false); err != nil { panic(err) } @@ -789,11 +956,27 @@ func renderServices(services []*descriptor.Service, paths swaggerPathsObject, re } if opts.Responses != nil { for name, resp := range opts.Responses { - operationObject.Responses[name] = swaggerResponseObject{ + respObj := swaggerResponseObject{ Description: resp.Description, Schema: swaggerSchemaFromProtoSchema(resp.Schema, reg, customRefs), } + if resp.Extensions != nil { + exts, err := processExtensions(resp.Extensions) + if err != nil { + return err + } + respObj.extensions = exts + } + operationObject.Responses[name] = respObj + } + } + + if opts.Extensions != nil { + exts, err := processExtensions(opts.Extensions) + if err != nil { + return err } + operationObject.extensions = exts } // TODO(ivucica): add remaining fields of operation object @@ -816,7 +999,7 @@ func renderServices(services []*descriptor.Service, paths swaggerPathsObject, re pathItemObject.Patch = operationObject break } - paths[templateToSwaggerPath(b.PathTmpl.Template)] = pathItemObject + paths[templateToSwaggerPath(b.PathTmpl.Template, reg)] = pathItemObject } } } @@ -831,12 +1014,13 @@ func applyTemplate(p param) (*swaggerObject, error) { // defined off of. s := swaggerObject{ // Swagger 2.0 is the version of this document - Swagger: "2.0", - Schemes: []string{"http", "https"}, - Consumes: []string{"application/json"}, - Produces: []string{"application/json"}, - Paths: make(swaggerPathsObject), - Definitions: make(swaggerDefinitionsObject), + Swagger: "2.0", + Schemes: []string{"http", "https"}, + Consumes: []string{"application/json"}, + Produces: []string{"application/json"}, + Paths: make(swaggerPathsObject), + Definitions: make(swaggerDefinitionsObject), + StreamDefinitions: make(swaggerDefinitionsObject), Info: swaggerInfoObject{ Title: *p.File.Name, Version: "version not set", @@ -854,15 +1038,17 @@ func applyTemplate(p param) (*swaggerObject, error) { // Find all the service's messages and enumerations that are defined (recursively) // and write request, response and other custom (but referenced) types out as definition objects. m := messageMap{} + ms := messageMap{} e := enumMap{} - findServicesMessagesAndEnumerations(p.Services, p.reg, m, e, requestResponseRefs) + findServicesMessagesAndEnumerations(p.Services, p.reg, m, ms, e, requestResponseRefs) renderMessagesAsDefinition(m, s.Definitions, p.reg, customRefs) + renderMessagesAsStreamDefinition(ms, s.StreamDefinitions, p.reg) renderEnumerationsAsDefinition(e, s.Definitions, p.reg) // File itself might have some comments and metadata. packageProtoPath := protoPathIndex(reflect.TypeOf((*pbdescriptor.FileDescriptorProto)(nil)), "Package") packageComments := protoComments(p.reg, p.File, nil, "Package", packageProtoPath) - if err := updateSwaggerDataFromComments(&s, packageComments); err != nil { + if err := updateSwaggerDataFromComments(&s, packageComments, true); err != nil { panic(err) } @@ -902,6 +1088,24 @@ func applyTemplate(p param) (*swaggerObject, error) { s.Info.Contact.Email = spb.Info.Contact.Email } } + if spb.Info.License != nil { + if s.Info.License == nil { + s.Info.License = &swaggerLicenseObject{} + } + if spb.Info.License.Name != "" { + s.Info.License.Name = spb.Info.License.Name + } + if spb.Info.License.Url != "" { + s.Info.License.URL = spb.Info.License.Url + } + } + if spb.Info.Extensions != nil { + exts, err := processExtensions(spb.Info.Extensions) + if err != nil { + return nil, err + } + s.Info.extensions = exts + } } if spb.Host != "" { s.Host = spb.Host @@ -984,6 +1188,13 @@ func applyTemplate(p param) (*swaggerObject, error) { newSecDefValue.Scopes[scopeKey] = scopeDesc } } + if secDefValue.Extensions != nil { + exts, err := processExtensions(secDefValue.Extensions) + if err != nil { + return nil, err + } + newSecDefValue.extensions = exts + } s.SecurityDefinitions[secDefKey] = newSecDefValue } } @@ -1042,6 +1253,14 @@ func applyTemplate(p param) (*swaggerObject, error) { } } + if spb.Extensions != nil { + exts, err := processExtensions(spb.Extensions) + if err != nil { + return nil, err + } + s.extensions = exts + } + // Additional fields on the OpenAPI v2 spec's "Swagger" object // should be added here, once supported in the proto. } @@ -1053,6 +1272,22 @@ func applyTemplate(p param) (*swaggerObject, error) { return &s, nil } +func processExtensions(inputExts map[string]*structpb.Value) ([]extension, error) { + exts := []extension{} + for k, v := range inputExts { + if !strings.HasPrefix(k, "x-") { + return nil, fmt.Errorf("Extension keys need to start with \"x-\": %q", k) + } + ext, err := (&jsonpb.Marshaler{Indent: " "}).MarshalToString(v) + if err != nil { + return nil, err + } + exts = append(exts, extension{key: k, value: json.RawMessage(ext)}) + } + sort.Slice(exts, func(i, j int) bool { return exts[i].key < exts[j].key }) + return exts, nil +} + // updateSwaggerDataFromComments updates a Swagger object based on a comment // from the proto file. // @@ -1065,7 +1300,7 @@ func applyTemplate(p param) (*swaggerObject, error) { // // If there is no 'Summary', the same behavior will be attempted on 'Title', // but only if the last character is not a period. -func updateSwaggerDataFromComments(swaggerObject interface{}, comment string) error { +func updateSwaggerDataFromComments(swaggerObject interface{}, comment string, isPackageObject bool) error { if len(comment) == 0 { return nil } @@ -1082,6 +1317,12 @@ func updateSwaggerDataFromComments(swaggerObject interface{}, comment string) er // Figure out which properties to update. summaryValue := infoObjectValue.FieldByName("Summary") descriptionValue := infoObjectValue.FieldByName("Description") + readOnlyValue := infoObjectValue.FieldByName("ReadOnly") + + if readOnlyValue.Kind() == reflect.Bool && readOnlyValue.CanSet() && strings.Contains(comment, "Output only.") { + readOnlyValue.Set(reflect.ValueOf(true)) + } + usingTitle := false if !summaryValue.CanSet() { summaryValue = infoObjectValue.FieldByName("Title") @@ -1090,27 +1331,37 @@ func updateSwaggerDataFromComments(swaggerObject interface{}, comment string) er paragraphs := strings.Split(comment, "\n\n") - // If there is a summary (or summary-equivalent), use the first + // If there is a summary (or summary-equivalent) and it's empty, use the first // paragraph as summary, and the rest as description. if summaryValue.CanSet() { summary := strings.TrimSpace(paragraphs[0]) description := strings.TrimSpace(strings.Join(paragraphs[1:], "\n\n")) if !usingTitle || (len(summary) > 0 && summary[len(summary)-1] != '.') { - summaryValue.Set(reflect.ValueOf(summary)) + // overrides the schema value only if it's empty + // keep the comment precedence when updating the package definition + if summaryValue.Len() == 0 || isPackageObject { + summaryValue.Set(reflect.ValueOf(summary)) + } if len(description) > 0 { if !descriptionValue.CanSet() { return fmt.Errorf("Encountered object type with a summary, but no description") } - descriptionValue.Set(reflect.ValueOf(description)) + // overrides the schema value only if it's empty + // keep the comment precedence when updating the package definition + if descriptionValue.Len() == 0 || isPackageObject { + descriptionValue.Set(reflect.ValueOf(description)) + } } return nil } } // There was no summary field on the swaggerObject. Try to apply the - // whole comment into description. + // whole comment into description if the swagger object description is empty. if descriptionValue.CanSet() { - descriptionValue.Set(reflect.ValueOf(strings.Join(paragraphs, "\n\n"))) + if descriptionValue.Len() == 0 || isPackageObject { + descriptionValue.Set(reflect.ValueOf(strings.Join(paragraphs, "\n\n"))) + } return nil } @@ -1390,6 +1641,7 @@ func protoJSONSchemaToSwaggerSchemaCore(j *swagger_options.JSONSchema, reg *desc func updateSwaggerObjectFromJSONSchema(s *swaggerSchemaObject, j *swagger_options.JSONSchema) { s.Title = j.GetTitle() s.Description = j.GetDescription() + s.ReadOnly = j.GetReadOnly() s.MultipleOf = j.GetMultipleOf() s.Maximum = j.GetMaximum() s.ExclusiveMaximum = j.GetExclusiveMaximum() @@ -1398,12 +1650,16 @@ func updateSwaggerObjectFromJSONSchema(s *swaggerSchemaObject, j *swagger_option s.MaxLength = j.GetMaxLength() s.MinLength = j.GetMinLength() s.Pattern = j.GetPattern() + s.Default = j.GetDefault() s.MaxItems = j.GetMaxItems() s.MinItems = j.GetMinItems() s.UniqueItems = j.GetUniqueItems() s.MaxProperties = j.GetMaxProperties() s.MinProperties = j.GetMinProperties() s.Required = j.GetRequired() + if overrideType := j.GetType(); len(overrideType) > 0 { + s.Type = strings.ToLower(overrideType[0].String()) + } } func swaggerSchemaFromProtoSchema(s *swagger_options.Schema, reg *descriptor.Registry, refs refMap) swaggerSchemaObject { @@ -1414,6 +1670,10 @@ func swaggerSchemaFromProtoSchema(s *swagger_options.Schema, reg *descriptor.Reg ret.schemaCore = protoJSONSchemaToSwaggerSchemaCore(s.GetJsonSchema(), reg, refs) updateSwaggerObjectFromJSONSchema(&ret, s.GetJsonSchema()) + if s != nil && s.Example != nil { + ret.Example = json.RawMessage(s.Example.Value) + } + return ret } @@ -1485,6 +1745,7 @@ func addCustomRefs(d swaggerDefinitionsObject, reg *descriptor.Registry, refs re enumMap[fullyQualifiedNameToSwaggerName(ref, reg)] = enum continue } + // ?? Should be either enum or msg } renderMessagesAsDefinition(msgMap, d, reg, refs) @@ -1493,3 +1754,11 @@ func addCustomRefs(d swaggerDefinitionsObject, reg *descriptor.Registry, refs re // Run again in case any new refs were added addCustomRefs(d, reg, refs) } + +func lowerCamelCase(parameter string) string { + parameterString := gogen.CamelCase(parameter) + builder := &strings.Builder{} + builder.WriteString(strings.ToLower(string(parameterString[0]))) + builder.WriteString(parameterString[1:]) + return builder.String() +} diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/genswagger/types.go b/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/genswagger/types.go index 9d01e21d15..77db96d877 100644 --- a/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/genswagger/types.go +++ b/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/genswagger/types.go @@ -25,6 +25,8 @@ type swaggerInfoObject struct { Contact *swaggerContactObject `json:"contact,omitempty"` License *swaggerLicenseObject `json:"license,omitempty"` + + extensions []extension } // http://swagger.io/specification/#contactObject @@ -46,6 +48,11 @@ type swaggerExternalDocumentationObject struct { URL string `json:"url,omitempty"` } +type extension struct { + key string + value json.RawMessage +} + // http://swagger.io/specification/#swaggerObject type swaggerObject struct { Swagger string `json:"swagger"` @@ -57,9 +64,12 @@ type swaggerObject struct { Produces []string `json:"produces"` Paths swaggerPathsObject `json:"paths"` Definitions swaggerDefinitionsObject `json:"definitions"` + StreamDefinitions swaggerDefinitionsObject `json:"x-stream-definitions,omitempty"` SecurityDefinitions swaggerSecurityDefinitionsObject `json:"securityDefinitions,omitempty"` Security []swaggerSecurityRequirementObject `json:"security,omitempty"` ExternalDocs *swaggerExternalDocumentationObject `json:"externalDocs,omitempty"` + + extensions []extension } // http://swagger.io/specification/#securityDefinitionsObject @@ -75,6 +85,8 @@ type swaggerSecuritySchemeObject struct { AuthorizationURL string `json:"authorizationUrl,omitempty"` TokenURL string `json:"tokenUrl,omitempty"` Scopes swaggerScopesObject `json:"scopes,omitempty"` + + extensions []extension } // http://swagger.io/specification/#scopesObject @@ -107,6 +119,8 @@ type swaggerOperationObject struct { Security *[]swaggerSecurityRequirementObject `json:"security,omitempty"` ExternalDocs *swaggerExternalDocumentationObject `json:"externalDocs,omitempty"` + + extensions []extension } type swaggerParametersObject []swaggerParameterObject @@ -133,9 +147,10 @@ type swaggerParameterObject struct { // core part of schema, which is common to itemsObject and schemaObject. // http://swagger.io/specification/#itemsObject type schemaCore struct { - Type string `json:"type,omitempty"` - Format string `json:"format,omitempty"` - Ref string `json:"$ref,omitempty"` + Type string `json:"type,omitempty"` + Format string `json:"format,omitempty"` + Ref string `json:"$ref,omitempty"` + Example json.RawMessage `json:"example,omitempty"` Items *swaggerItemsObject `json:"items,omitempty"` @@ -148,13 +163,6 @@ type schemaCore struct { type swaggerItemsObject schemaCore -func (o *swaggerItemsObject) getType() string { - if o == nil { - return "" - } - return o.Type -} - // http://swagger.io/specification/#responsesObject type swaggerResponsesObject map[string]swaggerResponseObject @@ -162,6 +170,8 @@ type swaggerResponsesObject map[string]swaggerResponseObject type swaggerResponseObject struct { Description string `json:"description"` Schema swaggerSchemaObject `json:"schema"` + + extensions []extension } type keyVal struct { @@ -199,14 +209,15 @@ func (op swaggerSchemaObjectProperties) MarshalJSON() ([]byte, error) { type swaggerSchemaObject struct { schemaCore // Properties can be recursively defined - Properties swaggerSchemaObjectProperties `json:"properties,omitempty"` - AdditionalProperties *swaggerSchemaObject `json:"additionalProperties,omitempty"` + Properties *swaggerSchemaObjectProperties `json:"properties,omitempty"` + AdditionalProperties *swaggerSchemaObject `json:"additionalProperties,omitempty"` Description string `json:"description,omitempty"` Title string `json:"title,omitempty"` ExternalDocs *swaggerExternalDocumentationObject `json:"externalDocs,omitempty"` + ReadOnly bool `json:"readOnly,omitempty"` MultipleOf float64 `json:"multipleOf,omitempty"` Maximum float64 `json:"maximum,omitempty"` ExclusiveMaximum bool `json:"exclusiveMaximum,omitempty"` diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/main.go b/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/main.go index 578b5c4233..237e460498 100644 --- a/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/main.go +++ b/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/main.go @@ -23,12 +23,28 @@ var ( mergeFileName = flag.String("merge_file_name", "apidocs", "target swagger file name prefix after merge") useJSONNamesForFields = flag.Bool("json_names_for_fields", false, "if it sets Field.GetJsonName() will be used for generating swagger definitions, otherwise Field.GetName() will be used") repeatedPathParamSeparator = flag.String("repeated_path_param_separator", "csv", "configures how repeated fields should be split. Allowed values are `csv`, `pipes`, `ssv` and `tsv`.") + versionFlag = flag.Bool("version", false, "print the current verison") + allowRepeatedFieldsInBody = flag.Bool("allow_repeated_fields_in_body", false, "allows to use repeated field in `body` and `response_body` field of `google.api.http` annotation option") + includePackageInTags = flag.Bool("include_package_in_tags", false, "if unset, the gRPC service name is added to the `Tags` field of each operation. if set and the `package` directive is shown in the proto file, the package name will be prepended to the service name") + useFQNForSwaggerName = flag.Bool("fqn_for_swagger_name", false, "if set, the object's swagger names will use the fully qualify name from the proto definition (ie my.package.MyMessage.MyInnerMessage") +) + +// Variables set by goreleaser at build time +var ( + version = "dev" + commit = "unknown" + date = "unknown" ) func main() { flag.Parse() defer glog.Flush() + if *versionFlag { + fmt.Printf("Version %v, commit %v, built at %v\n", version, commit, date) + os.Exit(0) + } + reg := descriptor.NewRegistry() glog.V(1).Info("Processing code generator request") @@ -59,6 +75,9 @@ func main() { reg.SetAllowMerge(*allowMerge) reg.SetMergeFileName(*mergeFileName) reg.SetUseJSONNamesForFields(*useJSONNamesForFields) + reg.SetAllowRepeatedFieldsInBody(*allowRepeatedFieldsInBody) + reg.SetIncludePackageInTags(*includePackageInTags) + reg.SetUseFQNForSwaggerName(*useFQNForSwaggerName) if err := reg.SetRepeatedPathParamSeparator(*repeatedPathParamSeparator); err != nil { emitError(err) return @@ -76,6 +95,11 @@ func main() { g := genswagger.New(reg) + if err := genswagger.AddStreamError(reg); err != nil { + emitError(err) + return + } + if err := reg.Load(req); err != nil { emitError(err) return @@ -141,6 +165,20 @@ func parseReqParam(param string, f *flag.FlagSet, pkgMap map[string]string) erro } continue } + if spec[0] == "allow_repeated_fields_in_body" { + err := f.Set(spec[0], "true") + if err != nil { + return fmt.Errorf("Cannot set flag %s: %v", p, err) + } + continue + } + if spec[0] == "include_package_in_tags" { + err := f.Set(spec[0], "true") + if err != nil { + return fmt.Errorf("Cannot set flag %s: %v", p, err) + } + continue + } err := f.Set(spec[0], "") if err != nil { return fmt.Errorf("Cannot set flag %s: %v", p, err) diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/options/BUILD.bazel b/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/options/BUILD.bazel index 476cb59db4..8dea43d297 100644 --- a/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/options/BUILD.bazel +++ b/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/options/BUILD.bazel @@ -3,6 +3,20 @@ load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library") package(default_visibility = ["//visibility:public"]) +filegroup( + name = "options_proto_files", + srcs = [ + "annotations.proto", + "openapiv2.proto", + ], +) + +go_library( + name = "go_default_library", + embed = [":options_go_proto"], + importpath = "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/options", +) + proto_library( name = "options_proto", srcs = [ @@ -12,6 +26,7 @@ proto_library( deps = [ "@com_google_protobuf//:any_proto", "@com_google_protobuf//:descriptor_proto", + "@com_google_protobuf//:struct_proto", ], ) @@ -20,14 +35,4 @@ go_proto_library( compilers = ["@io_bazel_rules_go//proto:go_grpc"], importpath = "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/options", proto = ":options_proto", - deps = [ - "@com_github_golang_protobuf//protoc-gen-go/descriptor:go_default_library", - "@com_github_golang_protobuf//ptypes/any:go_default_library", - ], -) - -go_library( - name = "go_default_library", - embed = [":options_go_proto"], - importpath = "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/options", ) diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/options/annotations.pb.go b/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/options/annotations.pb.go index a743078b45..9fc282bb7b 100644 --- a/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/options/annotations.pb.go +++ b/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/options/annotations.pb.go @@ -73,10 +73,10 @@ func init() { } func init() { - proto.RegisterFile("protoc-gen-swagger/options/annotations.proto", fileDescriptor_annotations_24d91a1b8877b604) + proto.RegisterFile("protoc-gen-swagger/options/annotations.proto", fileDescriptor_annotations_8378bd63c2853a5a) } -var fileDescriptor_annotations_24d91a1b8877b604 = []byte{ +var fileDescriptor_annotations_8378bd63c2853a5a = []byte{ // 346 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0x4f, 0x4f, 0xea, 0x40, 0x14, 0xc5, 0xc3, 0xe6, 0xe5, 0xa5, 0xef, 0xa9, 0x58, 0x37, 0x86, 0xf8, 0x87, 0x9d, 0xc6, 0xc0, diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/options/openapiv2.pb.go b/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/options/openapiv2.pb.go index 931bc38f44..6720071bde 100644 --- a/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/options/openapiv2.pb.go +++ b/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/options/openapiv2.pb.go @@ -7,6 +7,7 @@ import proto "github.com/golang/protobuf/proto" import fmt "fmt" import math "math" import any "github.com/golang/protobuf/ptypes/any" +import _struct "github.com/golang/protobuf/ptypes/struct" // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -48,7 +49,7 @@ func (x Swagger_SwaggerScheme) String() string { return proto.EnumName(Swagger_SwaggerScheme_name, int32(x)) } func (Swagger_SwaggerScheme) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_openapiv2_5363312922dcb572, []int{0, 0} + return fileDescriptor_openapiv2_7182f700aabb5117, []int{0, 0} } type JSONSchema_JSONSchemaSimpleTypes int32 @@ -89,7 +90,7 @@ func (x JSONSchema_JSONSchemaSimpleTypes) String() string { return proto.EnumName(JSONSchema_JSONSchemaSimpleTypes_name, int32(x)) } func (JSONSchema_JSONSchemaSimpleTypes) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_openapiv2_5363312922dcb572, []int{7, 0} + return fileDescriptor_openapiv2_7182f700aabb5117, []int{8, 0} } // Required. The type of the security scheme. Valid values are "basic", @@ -120,7 +121,7 @@ func (x SecurityScheme_Type) String() string { return proto.EnumName(SecurityScheme_Type_name, int32(x)) } func (SecurityScheme_Type) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_openapiv2_5363312922dcb572, []int{10, 0} + return fileDescriptor_openapiv2_7182f700aabb5117, []int{11, 0} } // Required. The location of the API key. Valid values are "query" or "header". @@ -147,7 +148,7 @@ func (x SecurityScheme_In) String() string { return proto.EnumName(SecurityScheme_In_name, int32(x)) } func (SecurityScheme_In) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_openapiv2_5363312922dcb572, []int{10, 1} + return fileDescriptor_openapiv2_7182f700aabb5117, []int{11, 1} } // Required. The flow used by the OAuth2 security scheme. Valid values are @@ -181,7 +182,7 @@ func (x SecurityScheme_Flow) String() string { return proto.EnumName(SecurityScheme_Flow_name, int32(x)) } func (SecurityScheme_Flow) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_openapiv2_5363312922dcb572, []int{10, 2} + return fileDescriptor_openapiv2_7182f700aabb5117, []int{11, 2} } // `Swagger` is a representation of OpenAPI v2 specification's Swagger object. @@ -190,27 +191,34 @@ func (SecurityScheme_Flow) EnumDescriptor() ([]byte, []int) { // // TODO(ivucica): document fields type Swagger struct { - Swagger string `protobuf:"bytes,1,opt,name=swagger,proto3" json:"swagger,omitempty"` - Info *Info `protobuf:"bytes,2,opt,name=info,proto3" json:"info,omitempty"` - Host string `protobuf:"bytes,3,opt,name=host,proto3" json:"host,omitempty"` - BasePath string `protobuf:"bytes,4,opt,name=base_path,json=basePath,proto3" json:"base_path,omitempty"` - Schemes []Swagger_SwaggerScheme `protobuf:"varint,5,rep,packed,name=schemes,proto3,enum=grpc.gateway.protoc_gen_swagger.options.Swagger_SwaggerScheme" json:"schemes,omitempty"` - Consumes []string `protobuf:"bytes,6,rep,name=consumes,proto3" json:"consumes,omitempty"` - Produces []string `protobuf:"bytes,7,rep,name=produces,proto3" json:"produces,omitempty"` - Responses map[string]*Response `protobuf:"bytes,10,rep,name=responses,proto3" json:"responses,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - SecurityDefinitions *SecurityDefinitions `protobuf:"bytes,11,opt,name=security_definitions,json=securityDefinitions,proto3" json:"security_definitions,omitempty"` - Security []*SecurityRequirement `protobuf:"bytes,12,rep,name=security,proto3" json:"security,omitempty"` - ExternalDocs *ExternalDocumentation `protobuf:"bytes,14,opt,name=external_docs,json=externalDocs,proto3" json:"external_docs,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Swagger string `protobuf:"bytes,1,opt,name=swagger,proto3" json:"swagger,omitempty"` + Info *Info `protobuf:"bytes,2,opt,name=info,proto3" json:"info,omitempty"` + Host string `protobuf:"bytes,3,opt,name=host,proto3" json:"host,omitempty"` + // `base_path` is the common prefix path used on all API endpoints (ie. /api, /v1, etc.). By adding this, + // it allows you to remove this portion from the path endpoints in your Swagger file making them easier + // to read. Note that using `base_path` does not change the endpoint paths that are generated in the resulting + // Swagger file. If you wish to use `base_path` with relatively generated Swagger paths, the + // `base_path` prefix must be manually removed from your `google.api.http` paths and your code changed to + // serve the API from the `base_path`. + BasePath string `protobuf:"bytes,4,opt,name=base_path,json=basePath,proto3" json:"base_path,omitempty"` + Schemes []Swagger_SwaggerScheme `protobuf:"varint,5,rep,packed,name=schemes,proto3,enum=grpc.gateway.protoc_gen_swagger.options.Swagger_SwaggerScheme" json:"schemes,omitempty"` + Consumes []string `protobuf:"bytes,6,rep,name=consumes,proto3" json:"consumes,omitempty"` + Produces []string `protobuf:"bytes,7,rep,name=produces,proto3" json:"produces,omitempty"` + Responses map[string]*Response `protobuf:"bytes,10,rep,name=responses,proto3" json:"responses,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + SecurityDefinitions *SecurityDefinitions `protobuf:"bytes,11,opt,name=security_definitions,json=securityDefinitions,proto3" json:"security_definitions,omitempty"` + Security []*SecurityRequirement `protobuf:"bytes,12,rep,name=security,proto3" json:"security,omitempty"` + ExternalDocs *ExternalDocumentation `protobuf:"bytes,14,opt,name=external_docs,json=externalDocs,proto3" json:"external_docs,omitempty"` + Extensions map[string]*_struct.Value `protobuf:"bytes,15,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 *Swagger) Reset() { *m = Swagger{} } func (m *Swagger) String() string { return proto.CompactTextString(m) } func (*Swagger) ProtoMessage() {} func (*Swagger) Descriptor() ([]byte, []int) { - return fileDescriptor_openapiv2_5363312922dcb572, []int{0} + return fileDescriptor_openapiv2_7182f700aabb5117, []int{0} } func (m *Swagger) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Swagger.Unmarshal(m, b) @@ -307,33 +315,41 @@ func (m *Swagger) GetExternalDocs() *ExternalDocumentation { return nil } +func (m *Swagger) GetExtensions() map[string]*_struct.Value { + if m != nil { + return m.Extensions + } + return nil +} + // `Operation` is a representation of OpenAPI v2 specification's Operation object. // // See: https://github.com/OAI/OpenAPI-Specification/blob/3.0.0/versions/2.0.md#operationObject // // TODO(ivucica): document fields type Operation struct { - Tags []string `protobuf:"bytes,1,rep,name=tags,proto3" json:"tags,omitempty"` - Summary string `protobuf:"bytes,2,opt,name=summary,proto3" json:"summary,omitempty"` - Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"` - ExternalDocs *ExternalDocumentation `protobuf:"bytes,4,opt,name=external_docs,json=externalDocs,proto3" json:"external_docs,omitempty"` - OperationId string `protobuf:"bytes,5,opt,name=operation_id,json=operationId,proto3" json:"operation_id,omitempty"` - Consumes []string `protobuf:"bytes,6,rep,name=consumes,proto3" json:"consumes,omitempty"` - Produces []string `protobuf:"bytes,7,rep,name=produces,proto3" json:"produces,omitempty"` - Responses map[string]*Response `protobuf:"bytes,9,rep,name=responses,proto3" json:"responses,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - Schemes []string `protobuf:"bytes,10,rep,name=schemes,proto3" json:"schemes,omitempty"` - Deprecated bool `protobuf:"varint,11,opt,name=deprecated,proto3" json:"deprecated,omitempty"` - Security []*SecurityRequirement `protobuf:"bytes,12,rep,name=security,proto3" json:"security,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Tags []string `protobuf:"bytes,1,rep,name=tags,proto3" json:"tags,omitempty"` + Summary string `protobuf:"bytes,2,opt,name=summary,proto3" json:"summary,omitempty"` + Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"` + ExternalDocs *ExternalDocumentation `protobuf:"bytes,4,opt,name=external_docs,json=externalDocs,proto3" json:"external_docs,omitempty"` + OperationId string `protobuf:"bytes,5,opt,name=operation_id,json=operationId,proto3" json:"operation_id,omitempty"` + Consumes []string `protobuf:"bytes,6,rep,name=consumes,proto3" json:"consumes,omitempty"` + Produces []string `protobuf:"bytes,7,rep,name=produces,proto3" json:"produces,omitempty"` + Responses map[string]*Response `protobuf:"bytes,9,rep,name=responses,proto3" json:"responses,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + Schemes []string `protobuf:"bytes,10,rep,name=schemes,proto3" json:"schemes,omitempty"` + Deprecated bool `protobuf:"varint,11,opt,name=deprecated,proto3" json:"deprecated,omitempty"` + Security []*SecurityRequirement `protobuf:"bytes,12,rep,name=security,proto3" json:"security,omitempty"` + Extensions map[string]*_struct.Value `protobuf:"bytes,13,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 *Operation) Reset() { *m = Operation{} } func (m *Operation) String() string { return proto.CompactTextString(m) } func (*Operation) ProtoMessage() {} func (*Operation) Descriptor() ([]byte, []int) { - return fileDescriptor_openapiv2_5363312922dcb572, []int{1} + return fileDescriptor_openapiv2_7182f700aabb5117, []int{1} } func (m *Operation) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Operation.Unmarshal(m, b) @@ -430,6 +446,13 @@ func (m *Operation) GetSecurity() []*SecurityRequirement { return nil } +func (m *Operation) GetExtensions() map[string]*_struct.Value { + if m != nil { + return m.Extensions + } + return nil +} + // `Response` is a representation of OpenAPI v2 specification's Response object. // // See: https://github.com/OAI/OpenAPI-Specification/blob/3.0.0/versions/2.0.md#responseObject @@ -440,17 +463,18 @@ type Response struct { Description string `protobuf:"bytes,1,opt,name=description,proto3" json:"description,omitempty"` // `Schema` optionally defines the structure of the response. // If `Schema` is not provided, it means there is no content to the response. - Schema *Schema `protobuf:"bytes,2,opt,name=schema,proto3" json:"schema,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Schema *Schema `protobuf:"bytes,2,opt,name=schema,proto3" json:"schema,omitempty"` + Extensions map[string]*_struct.Value `protobuf:"bytes,5,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 *Response) Reset() { *m = Response{} } func (m *Response) String() string { return proto.CompactTextString(m) } func (*Response) ProtoMessage() {} func (*Response) Descriptor() ([]byte, []int) { - return fileDescriptor_openapiv2_5363312922dcb572, []int{2} + return fileDescriptor_openapiv2_7182f700aabb5117, []int{2} } func (m *Response) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Response.Unmarshal(m, b) @@ -484,27 +508,36 @@ func (m *Response) GetSchema() *Schema { return nil } +func (m *Response) GetExtensions() map[string]*_struct.Value { + if m != nil { + return m.Extensions + } + return nil +} + // `Info` is a representation of OpenAPI v2 specification's Info object. // // See: https://github.com/OAI/OpenAPI-Specification/blob/3.0.0/versions/2.0.md#infoObject // // TODO(ivucica): document fields type Info struct { - Title string `protobuf:"bytes,1,opt,name=title,proto3" json:"title,omitempty"` - Description string `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"` - TermsOfService string `protobuf:"bytes,3,opt,name=terms_of_service,json=termsOfService,proto3" json:"terms_of_service,omitempty"` - Contact *Contact `protobuf:"bytes,4,opt,name=contact,proto3" json:"contact,omitempty"` - Version string `protobuf:"bytes,6,opt,name=version,proto3" json:"version,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Title string `protobuf:"bytes,1,opt,name=title,proto3" json:"title,omitempty"` + Description string `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"` + TermsOfService string `protobuf:"bytes,3,opt,name=terms_of_service,json=termsOfService,proto3" json:"terms_of_service,omitempty"` + Contact *Contact `protobuf:"bytes,4,opt,name=contact,proto3" json:"contact,omitempty"` + License *License `protobuf:"bytes,5,opt,name=license,proto3" json:"license,omitempty"` + Version string `protobuf:"bytes,6,opt,name=version,proto3" json:"version,omitempty"` + Extensions map[string]*_struct.Value `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 *Info) Reset() { *m = Info{} } func (m *Info) String() string { return proto.CompactTextString(m) } func (*Info) ProtoMessage() {} func (*Info) Descriptor() ([]byte, []int) { - return fileDescriptor_openapiv2_5363312922dcb572, []int{3} + return fileDescriptor_openapiv2_7182f700aabb5117, []int{3} } func (m *Info) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Info.Unmarshal(m, b) @@ -552,6 +585,13 @@ func (m *Info) GetContact() *Contact { return nil } +func (m *Info) GetLicense() *License { + if m != nil { + return m.License + } + return nil +} + func (m *Info) GetVersion() string { if m != nil { return m.Version @@ -559,6 +599,13 @@ func (m *Info) GetVersion() string { return "" } +func (m *Info) GetExtensions() map[string]*_struct.Value { + if m != nil { + return m.Extensions + } + return nil +} + // `Contact` is a representation of OpenAPI v2 specification's Contact object. // // See: https://github.com/OAI/OpenAPI-Specification/blob/3.0.0/versions/2.0.md#contactObject @@ -577,7 +624,7 @@ func (m *Contact) Reset() { *m = Contact{} } func (m *Contact) String() string { return proto.CompactTextString(m) } func (*Contact) ProtoMessage() {} func (*Contact) Descriptor() ([]byte, []int) { - return fileDescriptor_openapiv2_5363312922dcb572, []int{4} + return fileDescriptor_openapiv2_7182f700aabb5117, []int{4} } func (m *Contact) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Contact.Unmarshal(m, b) @@ -618,6 +665,58 @@ func (m *Contact) GetEmail() string { return "" } +// `License` is a representation of OpenAPI v2 specification's License object. +// +// See: https://github.com/OAI/OpenAPI-Specification/blob/3.0.0/versions/2.0.md#licenseObject +// +type License struct { + // Required. The license name used for the API. + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + // A URL to the license used for the API. + Url string `protobuf:"bytes,2,opt,name=url,proto3" json:"url,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *License) Reset() { *m = License{} } +func (m *License) String() string { return proto.CompactTextString(m) } +func (*License) ProtoMessage() {} +func (*License) Descriptor() ([]byte, []int) { + return fileDescriptor_openapiv2_7182f700aabb5117, []int{5} +} +func (m *License) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_License.Unmarshal(m, b) +} +func (m *License) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_License.Marshal(b, m, deterministic) +} +func (dst *License) XXX_Merge(src proto.Message) { + xxx_messageInfo_License.Merge(dst, src) +} +func (m *License) XXX_Size() int { + return xxx_messageInfo_License.Size(m) +} +func (m *License) XXX_DiscardUnknown() { + xxx_messageInfo_License.DiscardUnknown(m) +} + +var xxx_messageInfo_License proto.InternalMessageInfo + +func (m *License) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +func (m *License) GetUrl() string { + if m != nil { + return m.Url + } + return "" +} + // `ExternalDocumentation` is a representation of OpenAPI v2 specification's // ExternalDocumentation object. // @@ -636,7 +735,7 @@ func (m *ExternalDocumentation) Reset() { *m = ExternalDocumentation{} } func (m *ExternalDocumentation) String() string { return proto.CompactTextString(m) } func (*ExternalDocumentation) ProtoMessage() {} func (*ExternalDocumentation) Descriptor() ([]byte, []int) { - return fileDescriptor_openapiv2_5363312922dcb572, []int{5} + return fileDescriptor_openapiv2_7182f700aabb5117, []int{6} } func (m *ExternalDocumentation) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ExternalDocumentation.Unmarshal(m, b) @@ -690,7 +789,7 @@ func (m *Schema) Reset() { *m = Schema{} } func (m *Schema) String() string { return proto.CompactTextString(m) } func (*Schema) ProtoMessage() {} func (*Schema) Descriptor() ([]byte, []int) { - return fileDescriptor_openapiv2_5363312922dcb572, []int{6} + return fileDescriptor_openapiv2_7182f700aabb5117, []int{7} } func (m *Schema) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Schema.Unmarshal(m, b) @@ -767,6 +866,7 @@ type JSONSchema struct { Title string `protobuf:"bytes,5,opt,name=title,proto3" json:"title,omitempty"` Description string `protobuf:"bytes,6,opt,name=description,proto3" json:"description,omitempty"` Default string `protobuf:"bytes,7,opt,name=default,proto3" json:"default,omitempty"` + ReadOnly bool `protobuf:"varint,8,opt,name=read_only,json=readOnly,proto3" json:"read_only,omitempty"` MultipleOf float64 `protobuf:"fixed64,10,opt,name=multiple_of,json=multipleOf,proto3" json:"multiple_of,omitempty"` Maximum float64 `protobuf:"fixed64,11,opt,name=maximum,proto3" json:"maximum,omitempty"` ExclusiveMaximum bool `protobuf:"varint,12,opt,name=exclusive_maximum,json=exclusiveMaximum,proto3" json:"exclusive_maximum,omitempty"` @@ -793,7 +893,7 @@ func (m *JSONSchema) Reset() { *m = JSONSchema{} } func (m *JSONSchema) String() string { return proto.CompactTextString(m) } func (*JSONSchema) ProtoMessage() {} func (*JSONSchema) Descriptor() ([]byte, []int) { - return fileDescriptor_openapiv2_5363312922dcb572, []int{7} + return fileDescriptor_openapiv2_7182f700aabb5117, []int{8} } func (m *JSONSchema) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_JSONSchema.Unmarshal(m, b) @@ -841,6 +941,13 @@ func (m *JSONSchema) GetDefault() string { return "" } +func (m *JSONSchema) GetReadOnly() bool { + if m != nil { + return m.ReadOnly + } + return false +} + func (m *JSONSchema) GetMultipleOf() float64 { if m != nil { return m.MultipleOf @@ -972,7 +1079,7 @@ func (m *Tag) Reset() { *m = Tag{} } func (m *Tag) String() string { return proto.CompactTextString(m) } func (*Tag) ProtoMessage() {} func (*Tag) Descriptor() ([]byte, []int) { - return fileDescriptor_openapiv2_5363312922dcb572, []int{8} + return fileDescriptor_openapiv2_7182f700aabb5117, []int{9} } func (m *Tag) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Tag.Unmarshal(m, b) @@ -1026,7 +1133,7 @@ func (m *SecurityDefinitions) Reset() { *m = SecurityDefinitions{} } func (m *SecurityDefinitions) String() string { return proto.CompactTextString(m) } func (*SecurityDefinitions) ProtoMessage() {} func (*SecurityDefinitions) Descriptor() ([]byte, []int) { - return fileDescriptor_openapiv2_5363312922dcb572, []int{9} + return fileDescriptor_openapiv2_7182f700aabb5117, []int{10} } func (m *SecurityDefinitions) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SecurityDefinitions.Unmarshal(m, b) @@ -1094,17 +1201,18 @@ type SecurityScheme struct { // Required. The available scopes for the OAuth2 security scheme. // // Valid for oauth2. - Scopes *Scopes `protobuf:"bytes,8,opt,name=scopes,proto3" json:"scopes,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Scopes *Scopes `protobuf:"bytes,8,opt,name=scopes,proto3" json:"scopes,omitempty"` + Extensions map[string]*_struct.Value `protobuf:"bytes,9,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 *SecurityScheme) Reset() { *m = SecurityScheme{} } func (m *SecurityScheme) String() string { return proto.CompactTextString(m) } func (*SecurityScheme) ProtoMessage() {} func (*SecurityScheme) Descriptor() ([]byte, []int) { - return fileDescriptor_openapiv2_5363312922dcb572, []int{10} + return fileDescriptor_openapiv2_7182f700aabb5117, []int{11} } func (m *SecurityScheme) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SecurityScheme.Unmarshal(m, b) @@ -1180,6 +1288,13 @@ func (m *SecurityScheme) GetScopes() *Scopes { return nil } +func (m *SecurityScheme) GetExtensions() map[string]*_struct.Value { + if m != nil { + return m.Extensions + } + return nil +} + // `SecurityRequirement` is a representation of OpenAPI v2 specification's // Security Requirement object. // @@ -1206,7 +1321,7 @@ func (m *SecurityRequirement) Reset() { *m = SecurityRequirement{} } func (m *SecurityRequirement) String() string { return proto.CompactTextString(m) } func (*SecurityRequirement) ProtoMessage() {} func (*SecurityRequirement) Descriptor() ([]byte, []int) { - return fileDescriptor_openapiv2_5363312922dcb572, []int{11} + return fileDescriptor_openapiv2_7182f700aabb5117, []int{12} } func (m *SecurityRequirement) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SecurityRequirement.Unmarshal(m, b) @@ -1251,7 +1366,7 @@ func (m *SecurityRequirement_SecurityRequirementValue) String() string { } func (*SecurityRequirement_SecurityRequirementValue) ProtoMessage() {} func (*SecurityRequirement_SecurityRequirementValue) Descriptor() ([]byte, []int) { - return fileDescriptor_openapiv2_5363312922dcb572, []int{11, 0} + return fileDescriptor_openapiv2_7182f700aabb5117, []int{12, 0} } func (m *SecurityRequirement_SecurityRequirementValue) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SecurityRequirement_SecurityRequirementValue.Unmarshal(m, b) @@ -1296,7 +1411,7 @@ func (m *Scopes) Reset() { *m = Scopes{} } func (m *Scopes) String() string { return proto.CompactTextString(m) } func (*Scopes) ProtoMessage() {} func (*Scopes) Descriptor() ([]byte, []int) { - return fileDescriptor_openapiv2_5363312922dcb572, []int{12} + return fileDescriptor_openapiv2_7182f700aabb5117, []int{13} } func (m *Scopes) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Scopes.Unmarshal(m, b) @@ -1325,12 +1440,17 @@ func (m *Scopes) GetScope() map[string]string { func init() { proto.RegisterType((*Swagger)(nil), "grpc.gateway.protoc_gen_swagger.options.Swagger") + proto.RegisterMapType((map[string]*_struct.Value)(nil), "grpc.gateway.protoc_gen_swagger.options.Swagger.ExtensionsEntry") proto.RegisterMapType((map[string]*Response)(nil), "grpc.gateway.protoc_gen_swagger.options.Swagger.ResponsesEntry") proto.RegisterType((*Operation)(nil), "grpc.gateway.protoc_gen_swagger.options.Operation") + proto.RegisterMapType((map[string]*_struct.Value)(nil), "grpc.gateway.protoc_gen_swagger.options.Operation.ExtensionsEntry") proto.RegisterMapType((map[string]*Response)(nil), "grpc.gateway.protoc_gen_swagger.options.Operation.ResponsesEntry") proto.RegisterType((*Response)(nil), "grpc.gateway.protoc_gen_swagger.options.Response") + proto.RegisterMapType((map[string]*_struct.Value)(nil), "grpc.gateway.protoc_gen_swagger.options.Response.ExtensionsEntry") proto.RegisterType((*Info)(nil), "grpc.gateway.protoc_gen_swagger.options.Info") + proto.RegisterMapType((map[string]*_struct.Value)(nil), "grpc.gateway.protoc_gen_swagger.options.Info.ExtensionsEntry") proto.RegisterType((*Contact)(nil), "grpc.gateway.protoc_gen_swagger.options.Contact") + proto.RegisterType((*License)(nil), "grpc.gateway.protoc_gen_swagger.options.License") proto.RegisterType((*ExternalDocumentation)(nil), "grpc.gateway.protoc_gen_swagger.options.ExternalDocumentation") proto.RegisterType((*Schema)(nil), "grpc.gateway.protoc_gen_swagger.options.Schema") proto.RegisterType((*JSONSchema)(nil), "grpc.gateway.protoc_gen_swagger.options.JSONSchema") @@ -1338,6 +1458,7 @@ func init() { proto.RegisterType((*SecurityDefinitions)(nil), "grpc.gateway.protoc_gen_swagger.options.SecurityDefinitions") proto.RegisterMapType((map[string]*SecurityScheme)(nil), "grpc.gateway.protoc_gen_swagger.options.SecurityDefinitions.SecurityEntry") proto.RegisterType((*SecurityScheme)(nil), "grpc.gateway.protoc_gen_swagger.options.SecurityScheme") + proto.RegisterMapType((map[string]*_struct.Value)(nil), "grpc.gateway.protoc_gen_swagger.options.SecurityScheme.ExtensionsEntry") proto.RegisterType((*SecurityRequirement)(nil), "grpc.gateway.protoc_gen_swagger.options.SecurityRequirement") proto.RegisterMapType((map[string]*SecurityRequirement_SecurityRequirementValue)(nil), "grpc.gateway.protoc_gen_swagger.options.SecurityRequirement.SecurityRequirementEntry") proto.RegisterType((*SecurityRequirement_SecurityRequirementValue)(nil), "grpc.gateway.protoc_gen_swagger.options.SecurityRequirement.SecurityRequirementValue") @@ -1351,119 +1472,127 @@ func init() { } func init() { - proto.RegisterFile("protoc-gen-swagger/options/openapiv2.proto", fileDescriptor_openapiv2_5363312922dcb572) -} - -var fileDescriptor_openapiv2_5363312922dcb572 = []byte{ - // 1753 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x5f, 0x73, 0xdb, 0xc6, - 0x11, 0x0f, 0x48, 0x90, 0x04, 0x97, 0x22, 0x73, 0x3e, 0xcb, 0x2d, 0xa2, 0xc4, 0xae, 0xc2, 0xa6, - 0x53, 0x8d, 0x3d, 0xa6, 0x12, 0xe5, 0xa1, 0x99, 0x4c, 0xa7, 0x1d, 0x4a, 0x62, 0x6c, 0xc0, 0x32, - 0xc9, 0x82, 0x54, 0x14, 0x77, 0x26, 0x83, 0x81, 0xc1, 0x23, 0x85, 0x18, 0x38, 0x20, 0xf8, 0x23, - 0x89, 0x7d, 0xeb, 0x4b, 0xdb, 0xe7, 0x4e, 0x5f, 0xfb, 0x31, 0xfa, 0xd6, 0x8f, 0xd1, 0x4f, 0xd2, - 0x7e, 0x80, 0x76, 0xee, 0x0f, 0x48, 0x50, 0x62, 0x32, 0x94, 0xff, 0xf4, 0x89, 0xb7, 0xbf, 0xfd, - 0x73, 0xbb, 0x77, 0xbb, 0x7b, 0x0b, 0xc2, 0xc3, 0x28, 0x0e, 0xd3, 0xd0, 0x7d, 0x3c, 0x23, 0xf4, - 0x71, 0x72, 0xe9, 0xcc, 0x66, 0x24, 0xde, 0x0f, 0xa3, 0xd4, 0x0b, 0x69, 0xb2, 0x1f, 0x46, 0x84, - 0x3a, 0x91, 0x77, 0x71, 0xd0, 0xe1, 0x42, 0xf8, 0x97, 0xb3, 0x38, 0x72, 0x3b, 0x33, 0x27, 0x25, - 0x97, 0xce, 0x5c, 0x60, 0xae, 0x3d, 0x23, 0xd4, 0x96, 0x8a, 0x1d, 0xa9, 0xb8, 0xf3, 0xc1, 0x2c, - 0x0c, 0x67, 0x3e, 0xd9, 0xe7, 0x22, 0x2f, 0xb3, 0xe9, 0xbe, 0x43, 0xa5, 0x7c, 0xfb, 0xbf, 0x55, - 0xa8, 0x8d, 0x84, 0x38, 0xd6, 0xa1, 0x26, 0x35, 0x75, 0x65, 0x57, 0xd9, 0xab, 0x5b, 0x39, 0x89, - 0xbb, 0xa0, 0x7a, 0x74, 0x1a, 0xea, 0xa5, 0x5d, 0x65, 0xaf, 0x71, 0xf0, 0xb8, 0xb3, 0xe1, 0xc6, - 0x1d, 0x83, 0x4e, 0x43, 0x8b, 0xab, 0x62, 0x0c, 0xea, 0x79, 0x98, 0xa4, 0x7a, 0x99, 0x5b, 0xe6, - 0x6b, 0xfc, 0x21, 0xd4, 0x5f, 0x3a, 0x09, 0xb1, 0x23, 0x27, 0x3d, 0xd7, 0x55, 0xce, 0xd0, 0x18, - 0x30, 0x74, 0xd2, 0x73, 0xfc, 0x0d, 0xd4, 0x12, 0xf7, 0x9c, 0x04, 0x24, 0xd1, 0x2b, 0xbb, 0xe5, - 0xbd, 0xd6, 0xc1, 0x6f, 0x36, 0xde, 0x56, 0x06, 0x94, 0xff, 0x8e, 0xb8, 0x19, 0x2b, 0x37, 0x87, - 0x77, 0x40, 0x73, 0x43, 0x9a, 0x64, 0xcc, 0x74, 0x75, 0xb7, 0xcc, 0x76, 0xcd, 0x69, 0xc6, 0x8b, - 0xe2, 0x70, 0x92, 0xb9, 0x24, 0xd1, 0x6b, 0x82, 0x97, 0xd3, 0xf8, 0x5b, 0xa8, 0xc7, 0x24, 0x89, - 0x42, 0x9a, 0x90, 0x44, 0x87, 0xdd, 0xf2, 0x5e, 0xe3, 0xe0, 0xb7, 0xb7, 0xf6, 0xc9, 0xca, 0x2d, - 0xf4, 0x68, 0x1a, 0xcf, 0xad, 0xa5, 0x45, 0x1c, 0xc2, 0x76, 0x42, 0xdc, 0x2c, 0xf6, 0xd2, 0xb9, - 0x3d, 0x21, 0x53, 0x8f, 0x7a, 0x5c, 0x53, 0x6f, 0xf0, 0x43, 0xff, 0xf5, 0xe6, 0x3b, 0x49, 0x23, - 0xc7, 0x4b, 0x1b, 0xd6, 0xdd, 0xe4, 0x26, 0x88, 0xbf, 0x01, 0x2d, 0x87, 0xf5, 0x2d, 0x1e, 0xce, - 0xed, 0x37, 0xb1, 0xc8, 0xf7, 0x99, 0x17, 0x93, 0x80, 0xd0, 0xd4, 0x5a, 0x58, 0xc3, 0x2e, 0x34, - 0xc9, 0x55, 0x4a, 0x62, 0xea, 0xf8, 0xf6, 0x24, 0x74, 0x13, 0xbd, 0xc5, 0x63, 0xd8, 0xfc, 0x06, - 0x7b, 0x52, 0xfb, 0x38, 0x74, 0x33, 0x66, 0xdb, 0x61, 0xb0, 0xb5, 0x45, 0x96, 0x70, 0xb2, 0x13, - 0x42, 0x6b, 0xf5, 0x30, 0x31, 0x82, 0xf2, 0x2b, 0x32, 0x97, 0xc9, 0xcb, 0x96, 0xf8, 0x09, 0x54, - 0x2e, 0x1c, 0x3f, 0x23, 0x32, 0x73, 0x3f, 0xdb, 0xd8, 0x81, 0xdc, 0xb2, 0x25, 0xf4, 0xbf, 0x2c, - 0x7d, 0xa1, 0xb4, 0x0f, 0xa1, 0xb9, 0x92, 0x51, 0xb8, 0x01, 0xb5, 0xd3, 0xfe, 0xb3, 0xfe, 0xe0, - 0xac, 0x8f, 0xde, 0xc3, 0x1a, 0xa8, 0x4f, 0xc7, 0xe3, 0x21, 0x52, 0x70, 0x1d, 0x2a, 0x6c, 0x35, - 0x42, 0x25, 0x5c, 0x85, 0xd2, 0xd9, 0x08, 0x95, 0x71, 0x0d, 0xca, 0x67, 0xa3, 0x11, 0x52, 0x4d, - 0x55, 0xd3, 0x50, 0xdd, 0x54, 0xb5, 0x3a, 0x02, 0x53, 0xd5, 0x9a, 0xa8, 0xd5, 0xfe, 0x73, 0x05, - 0xea, 0x83, 0x88, 0xc4, 0x3c, 0x44, 0x56, 0x26, 0xa9, 0x33, 0x4b, 0x74, 0x85, 0xe7, 0x1e, 0x5f, - 0xf3, 0xba, 0xcc, 0x82, 0xc0, 0x89, 0xe7, 0x3c, 0x0c, 0x56, 0x97, 0x82, 0xc4, 0xbb, 0xd0, 0x98, - 0x90, 0xc4, 0x8d, 0x3d, 0xee, 0xb5, 0xac, 0xad, 0x22, 0x74, 0xf3, 0x26, 0xd4, 0xb7, 0x7f, 0x13, - 0xf8, 0x63, 0xd8, 0x0a, 0xf3, 0x08, 0x6c, 0x6f, 0xa2, 0x57, 0x84, 0x1f, 0x0b, 0xcc, 0x98, 0xbc, - 0x76, 0xcd, 0xd9, 0xc5, 0x9a, 0xab, 0xf3, 0x24, 0xed, 0x6e, 0xec, 0xfb, 0xe2, 0x58, 0x7f, 0xa4, - 0xea, 0xf4, 0x65, 0x9b, 0x01, 0xbe, 0xf7, 0xa2, 0x4d, 0x3c, 0x00, 0x98, 0x90, 0x28, 0x26, 0xae, - 0x93, 0x92, 0x09, 0xaf, 0x42, 0xcd, 0x2a, 0x20, 0xef, 0xae, 0x7c, 0xfe, 0xef, 0x99, 0x2d, 0xb2, - 0xb2, 0xfd, 0x47, 0x05, 0xb4, 0x9c, 0x7b, 0x3d, 0xb5, 0x94, 0x9b, 0xa9, 0xf5, 0x04, 0xaa, 0xfc, - 0xa8, 0x1c, 0xe9, 0xc2, 0xfe, 0xe6, 0xd1, 0x73, 0x35, 0x4b, 0xaa, 0x9b, 0xaa, 0x56, 0xe6, 0x95, - 0xa1, 0xa2, 0x4a, 0xfb, 0x5f, 0x0a, 0xa8, 0xec, 0xd5, 0xc0, 0xdb, 0x50, 0x49, 0xbd, 0xd4, 0x27, - 0x72, 0x67, 0x41, 0x5c, 0xf7, 0xaa, 0x74, 0xd3, 0xab, 0x3d, 0x40, 0x29, 0x89, 0x83, 0xc4, 0x0e, - 0xa7, 0x76, 0x42, 0xe2, 0x0b, 0xcf, 0x25, 0xb2, 0x2e, 0x5a, 0x1c, 0x1f, 0x4c, 0x47, 0x02, 0xc5, - 0x26, 0xd4, 0xdc, 0x90, 0xa6, 0x8e, 0x9b, 0xca, 0xa2, 0xf8, 0x74, 0xe3, 0x00, 0x8e, 0x84, 0x9e, - 0x95, 0x1b, 0x60, 0x59, 0x74, 0x41, 0xe2, 0x84, 0xf9, 0x54, 0x15, 0x25, 0x2a, 0x49, 0x53, 0xd5, - 0x2a, 0xa8, 0xda, 0xee, 0x41, 0x4d, 0xea, 0xb0, 0x0a, 0xa7, 0x4e, 0x90, 0xc7, 0xc5, 0xd7, 0xec, - 0x7a, 0xb3, 0xd8, 0x97, 0xe1, 0xb0, 0x25, 0x0b, 0x9f, 0x04, 0x8e, 0xe7, 0x4b, 0xdf, 0x05, 0xd1, - 0x7e, 0x06, 0xf7, 0xd6, 0xd6, 0xe3, 0x06, 0xb7, 0x75, 0x63, 0x8b, 0xf6, 0x3f, 0x4b, 0x50, 0x15, - 0x37, 0x81, 0xc7, 0xd0, 0xf8, 0x2e, 0x09, 0xa9, 0x2d, 0xef, 0x53, 0xe1, 0xc7, 0xf1, 0xf9, 0xc6, - 0xc7, 0x61, 0x8e, 0x06, 0x7d, 0x79, 0xa7, 0xc0, 0xec, 0x48, 0xab, 0x9f, 0x40, 0x73, 0xe2, 0x31, - 0x0f, 0x02, 0x8f, 0x3a, 0x69, 0x18, 0xcb, 0xcd, 0x57, 0x41, 0x36, 0x04, 0xc4, 0xc4, 0x99, 0xd8, - 0x21, 0xf5, 0xe7, 0x3c, 0x5a, 0xcd, 0xd2, 0x18, 0x30, 0xa0, 0xfe, 0x9a, 0x87, 0xa4, 0xf2, 0x0e, - 0xda, 0x57, 0x07, 0x6a, 0xe4, 0xca, 0x09, 0x22, 0x9f, 0xf0, 0xcb, 0x6b, 0x1c, 0x6c, 0x77, 0xc4, - 0xc0, 0xd4, 0xc9, 0x07, 0xa6, 0x4e, 0x97, 0xce, 0xad, 0x5c, 0x48, 0x66, 0xea, 0x9f, 0x6a, 0x00, - 0xcb, 0xc0, 0xd9, 0xf9, 0xc6, 0x64, 0x2a, 0xaf, 0x8b, 0x2d, 0x97, 0x19, 0x5c, 0xf9, 0x91, 0x0c, - 0xae, 0xde, 0xbc, 0x29, 0x1d, 0x6a, 0x13, 0x32, 0x75, 0x32, 0x3f, 0xd5, 0x6b, 0x22, 0x97, 0x24, - 0x89, 0x7f, 0x06, 0x8d, 0x20, 0xf3, 0x53, 0x2f, 0xf2, 0x89, 0x1d, 0x4e, 0x75, 0xd8, 0x55, 0xf6, - 0x14, 0x0b, 0x72, 0x68, 0x30, 0x65, 0xaa, 0x81, 0x73, 0xe5, 0x05, 0x59, 0xc0, 0xfb, 0x95, 0x62, - 0xe5, 0x24, 0x7e, 0x04, 0x77, 0xc8, 0x95, 0xeb, 0x67, 0x89, 0x77, 0x41, 0xec, 0x5c, 0x66, 0x8b, - 0x9f, 0x36, 0x5a, 0x30, 0x9e, 0x4b, 0x61, 0x66, 0xc6, 0xa3, 0x5c, 0xa4, 0x29, 0xcd, 0x08, 0xf2, - 0x9a, 0x19, 0x29, 0xd3, 0xba, 0x6e, 0x46, 0x0a, 0xdf, 0x07, 0x08, 0x9c, 0x2b, 0xdb, 0x27, 0x74, - 0x96, 0x9e, 0xeb, 0xef, 0xef, 0x2a, 0x7b, 0xaa, 0x55, 0x0f, 0x9c, 0xab, 0x13, 0x0e, 0x70, 0xb6, - 0x47, 0x73, 0x36, 0x92, 0x6c, 0x8f, 0x4a, 0xb6, 0x0e, 0xb5, 0xc8, 0x49, 0xd9, 0x35, 0xe9, 0x77, - 0xc4, 0x31, 0x48, 0x92, 0x65, 0x0c, 0xb3, 0xeb, 0xa5, 0x24, 0x48, 0xf4, 0x6d, 0xae, 0xa7, 0x05, - 0xce, 0x95, 0xc1, 0x68, 0xce, 0xf4, 0xa8, 0x64, 0xde, 0x93, 0x4c, 0x8f, 0x0a, 0xe6, 0xc7, 0xb0, - 0x95, 0x51, 0xef, 0xfb, 0x8c, 0x48, 0xfe, 0x4f, 0xb8, 0xe7, 0x0d, 0x81, 0x09, 0x91, 0x5f, 0x40, - 0x8b, 0x19, 0x8f, 0x62, 0xf6, 0x7a, 0xa5, 0x1e, 0x49, 0x74, 0x9d, 0x1b, 0x69, 0x06, 0xce, 0xd5, - 0x70, 0x01, 0x72, 0x31, 0x8f, 0x16, 0xc5, 0x3e, 0x90, 0x62, 0x1e, 0x2d, 0x88, 0xed, 0x80, 0x16, - 0x8b, 0x16, 0x3f, 0xd1, 0x77, 0xc4, 0xd3, 0x96, 0xd3, 0x2c, 0x3f, 0x9c, 0x38, 0x76, 0xe6, 0x7a, - 0x9b, 0x33, 0x04, 0x81, 0xbf, 0x05, 0x35, 0x9d, 0x47, 0x44, 0xff, 0x39, 0x9f, 0x79, 0x8d, 0xd7, - 0xa8, 0xc1, 0xc2, 0x72, 0xe4, 0xb1, 0x84, 0x1d, 0xcf, 0x23, 0x92, 0x58, 0xdc, 0x6c, 0xfb, 0x12, - 0xee, 0xad, 0x65, 0xaf, 0xce, 0x32, 0x75, 0xa8, 0x74, 0x2d, 0xab, 0xfb, 0x02, 0x29, 0x0c, 0x3f, - 0x1c, 0x0c, 0x4e, 0x7a, 0xdd, 0x3e, 0x2a, 0x31, 0xc2, 0xe8, 0x8f, 0x7b, 0x4f, 0x7a, 0x16, 0x2a, - 0xb3, 0x81, 0xa7, 0x7f, 0x7a, 0x72, 0x82, 0x54, 0x0c, 0x50, 0xed, 0x9f, 0x3e, 0x3f, 0xec, 0x59, - 0xa8, 0xc2, 0xd6, 0x83, 0x43, 0xb3, 0x77, 0x34, 0x46, 0x55, 0xb6, 0x1e, 0x8d, 0x2d, 0xa3, 0xff, - 0x04, 0xd5, 0x4c, 0x55, 0x53, 0x50, 0xc9, 0x54, 0xb5, 0x12, 0x2a, 0x8b, 0x02, 0xba, 0x36, 0x0a, - 0x61, 0x74, 0xd7, 0x54, 0xb5, 0xbb, 0x68, 0xdb, 0x54, 0xb5, 0x9f, 0x22, 0xdd, 0x54, 0xb5, 0x0f, - 0xd1, 0x47, 0xa6, 0xaa, 0x7d, 0x84, 0xee, 0x9b, 0xaa, 0x76, 0x1f, 0x3d, 0x30, 0x55, 0xed, 0x01, - 0x6a, 0x9b, 0xaa, 0xf6, 0x09, 0x7a, 0x68, 0xaa, 0xda, 0x43, 0xf4, 0xc8, 0x54, 0xb5, 0x47, 0xa8, - 0xd3, 0xfe, 0xab, 0x02, 0xe5, 0xb1, 0x33, 0xdb, 0xe0, 0x6d, 0xb8, 0xd1, 0x4d, 0xca, 0x6f, 0xbf, - 0x9b, 0x88, 0x40, 0xdb, 0xff, 0x51, 0xe0, 0xee, 0x9a, 0x41, 0x1c, 0x4f, 0x0b, 0x43, 0x83, 0xc2, - 0x87, 0x06, 0xf3, 0x4d, 0x06, 0xfb, 0x05, 0x26, 0xe6, 0x9a, 0xe5, 0x08, 0x91, 0x42, 0x73, 0x85, - 0xb5, 0x66, 0x82, 0x78, 0xbe, 0x3a, 0x41, 0xfc, 0xea, 0xd6, 0x7e, 0xc8, 0xef, 0xaa, 0xc2, 0x84, - 0xfc, 0x8f, 0x0a, 0xb4, 0x56, 0xb9, 0x78, 0x28, 0xf3, 0x99, 0x6d, 0xdc, 0x7a, 0x8d, 0x09, 0x49, - 0x98, 0xe9, 0xb0, 0x24, 0x15, 0x29, 0xbc, 0xc1, 0x3d, 0xe7, 0x4f, 0x6c, 0xb9, 0xf0, 0xc4, 0x9a, - 0x50, 0xf2, 0x28, 0x7f, 0xe8, 0x5b, 0x07, 0x5f, 0xbe, 0xae, 0x17, 0x06, 0xb5, 0x4a, 0x1e, 0x65, - 0x31, 0x4d, 0xfd, 0xf0, 0x92, 0x37, 0xf6, 0x37, 0x88, 0xe9, 0x2b, 0x3f, 0xbc, 0xb4, 0xb8, 0x25, - 0xd6, 0x57, 0x9d, 0x2c, 0x3d, 0x0f, 0x63, 0xef, 0x0f, 0x62, 0x8a, 0x66, 0x6f, 0xb5, 0x78, 0x1b, - 0xd0, 0x0a, 0xe3, 0x34, 0xf6, 0x59, 0x8b, 0x4b, 0xc3, 0x57, 0x44, 0x08, 0x89, 0x27, 0x42, 0xe3, - 0x00, 0x63, 0xf2, 0xa9, 0x2c, 0x8c, 0x48, 0xa2, 0x6b, 0xb7, 0x9e, 0xca, 0x98, 0x9a, 0x25, 0xd5, - 0xdb, 0xcf, 0x40, 0x65, 0x87, 0x8e, 0x11, 0x6c, 0x8d, 0x5f, 0x0c, 0x7b, 0xb6, 0xd1, 0xff, 0xba, - 0x7b, 0x62, 0x1c, 0xa3, 0xf7, 0x70, 0x0b, 0x80, 0x23, 0x87, 0xdd, 0x91, 0x71, 0x84, 0x94, 0x85, - 0x44, 0x77, 0x68, 0xd8, 0xcf, 0x7a, 0x2f, 0x50, 0x09, 0xbf, 0x0f, 0x0d, 0x8e, 0x0c, 0xba, 0xa7, - 0xe3, 0xa7, 0x07, 0xa8, 0xdc, 0xfe, 0x0c, 0x4a, 0x06, 0x65, 0x8a, 0x46, 0xbf, 0x60, 0x68, 0x0b, - 0x34, 0xa3, 0x6f, 0xff, 0xee, 0xb4, 0x67, 0xb1, 0x4e, 0xd3, 0x84, 0xba, 0xd1, 0xb7, 0x9f, 0xf6, - 0xba, 0xc7, 0x3d, 0x0b, 0x95, 0xda, 0xdf, 0x81, 0xca, 0x0e, 0x88, 0x59, 0xff, 0xea, 0x64, 0x70, - 0x56, 0x50, 0xbb, 0x03, 0x4d, 0x81, 0x3c, 0x1f, 0x9e, 0x18, 0x47, 0xc6, 0x18, 0x29, 0x0b, 0x68, - 0xd8, 0x1d, 0x8d, 0xce, 0x06, 0xd6, 0x31, 0x2a, 0xe1, 0x6d, 0x40, 0x1c, 0xea, 0x0e, 0x99, 0x54, - 0x77, 0x6c, 0x0c, 0xfa, 0xa8, 0xbc, 0x44, 0x8f, 0x8e, 0x7a, 0xa3, 0x91, 0x7d, 0x34, 0x38, 0xee, - 0x21, 0xb5, 0xfd, 0xef, 0xd2, 0xb2, 0x5a, 0x0b, 0x23, 0x39, 0xfe, 0x8b, 0x52, 0xf8, 0x26, 0x8f, - 0x97, 0x0c, 0x59, 0xba, 0xa7, 0x6f, 0x32, 0xef, 0xaf, 0xc3, 0x44, 0x15, 0x2f, 0x3e, 0xd6, 0x0b, - 0x9c, 0x9d, 0x4f, 0x41, 0x5f, 0xa3, 0xf0, 0x35, 0x2b, 0x3d, 0xf6, 0x92, 0xf0, 0x4b, 0x93, 0x5f, - 0x8d, 0x82, 0xd8, 0xf9, 0xbb, 0xb2, 0x56, 0xe5, 0x87, 0xda, 0xc1, 0xab, 0xd5, 0x76, 0xf0, 0xd6, - 0x63, 0xe3, 0xae, 0x16, 0x9b, 0xc5, 0xdf, 0x14, 0x36, 0x7f, 0xb2, 0x5c, 0xc3, 0xc3, 0x62, 0x00, - 0x8d, 0xdb, 0xd4, 0x27, 0xd7, 0x17, 0x3f, 0xe2, 0xf0, 0x64, 0xf0, 0x5f, 0x00, 0x2c, 0xc1, 0x35, - 0xd1, 0x6e, 0x17, 0xa3, 0xad, 0x17, 0xdc, 0x3a, 0x3c, 0xfa, 0x7d, 0x77, 0xe6, 0xa5, 0xe7, 0xd9, - 0xcb, 0x8e, 0x1b, 0x06, 0xfb, 0xcc, 0x91, 0xc7, 0xc4, 0x0d, 0x93, 0x79, 0x92, 0x12, 0x49, 0x4a, - 0xbf, 0xf6, 0x7f, 0xf8, 0xaf, 0xba, 0x97, 0x55, 0xce, 0xfb, 0xfc, 0x7f, 0x01, 0x00, 0x00, 0xff, - 0xff, 0xab, 0x81, 0x5a, 0xfc, 0xcf, 0x13, 0x00, 0x00, + proto.RegisterFile("protoc-gen-swagger/options/openapiv2.proto", fileDescriptor_openapiv2_7182f700aabb5117) +} + +var fileDescriptor_openapiv2_7182f700aabb5117 = []byte{ + // 1884 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x58, 0x5b, 0x73, 0xdb, 0xc6, + 0xf5, 0x0f, 0x48, 0x90, 0x04, 0x0f, 0x45, 0x7a, 0xbd, 0x96, 0xf3, 0x47, 0x18, 0xdb, 0x7f, 0x85, + 0x4d, 0xa7, 0x1a, 0xbb, 0xa6, 0x12, 0xe5, 0xa1, 0x99, 0x4c, 0x6f, 0x94, 0xc4, 0xc8, 0x80, 0x65, + 0x92, 0x05, 0xa9, 0x28, 0xee, 0x8c, 0x07, 0x85, 0xc0, 0x25, 0x85, 0x18, 0x17, 0x06, 0x17, 0x49, + 0xec, 0x27, 0xe8, 0x73, 0xa7, 0xaf, 0xf9, 0x1e, 0x9d, 0x69, 0x9f, 0xfa, 0x09, 0xfa, 0x59, 0xda, + 0xe9, 0x7b, 0x67, 0x2f, 0x20, 0x41, 0x91, 0xf1, 0x90, 0x72, 0x3c, 0x79, 0xe8, 0x13, 0xf7, 0xdc, + 0x7e, 0xbb, 0x7b, 0xce, 0x9e, 0x0b, 0x08, 0x8f, 0x27, 0x61, 0x10, 0x07, 0xf6, 0xd3, 0x31, 0xf1, + 0x9f, 0x46, 0x57, 0xd6, 0x78, 0x4c, 0xc2, 0xbd, 0x60, 0x12, 0x3b, 0x81, 0x1f, 0xed, 0x05, 0x13, + 0xe2, 0x5b, 0x13, 0xe7, 0x72, 0xbf, 0xc9, 0x94, 0xf0, 0xcf, 0xc6, 0xe1, 0xc4, 0x6e, 0x8e, 0xad, + 0x98, 0x5c, 0x59, 0x53, 0xce, 0xb3, 0xcd, 0x31, 0xf1, 0x4d, 0x61, 0xd8, 0x14, 0x86, 0xf5, 0x0f, + 0xc6, 0x41, 0x30, 0x76, 0xc9, 0x1e, 0x53, 0x39, 0x4f, 0x46, 0x7b, 0x96, 0x2f, 0xf4, 0xeb, 0x0f, + 0x6e, 0x8a, 0xa2, 0x38, 0x4c, 0xec, 0x98, 0x4b, 0x1b, 0x7f, 0x55, 0xa0, 0xd4, 0xe7, 0x60, 0x58, + 0x85, 0x92, 0xc0, 0x55, 0xa5, 0x1d, 0x69, 0xb7, 0x6c, 0xa4, 0x24, 0x6e, 0x81, 0xec, 0xf8, 0xa3, + 0x40, 0xcd, 0xed, 0x48, 0xbb, 0x95, 0xfd, 0xa7, 0xcd, 0x35, 0x8f, 0xd5, 0xd4, 0xfc, 0x51, 0x60, + 0x30, 0x53, 0x8c, 0x41, 0xbe, 0x08, 0xa2, 0x58, 0xcd, 0x33, 0x64, 0xb6, 0xc6, 0x1f, 0x42, 0xf9, + 0xdc, 0x8a, 0x88, 0x39, 0xb1, 0xe2, 0x0b, 0x55, 0x66, 0x02, 0x85, 0x32, 0x7a, 0x56, 0x7c, 0x81, + 0xbf, 0x86, 0x52, 0x64, 0x5f, 0x10, 0x8f, 0x44, 0x6a, 0x61, 0x27, 0xbf, 0x5b, 0xdb, 0xff, 0xf5, + 0xda, 0xdb, 0x8a, 0x0b, 0xa5, 0xbf, 0x7d, 0x06, 0x63, 0xa4, 0x70, 0xb8, 0x0e, 0x8a, 0x1d, 0xf8, + 0x51, 0x42, 0xa1, 0x8b, 0x3b, 0x79, 0xba, 0x6b, 0x4a, 0x53, 0xd9, 0x24, 0x0c, 0x86, 0x89, 0x4d, + 0x22, 0xb5, 0xc4, 0x65, 0x29, 0x8d, 0x5f, 0x41, 0x39, 0x24, 0xd1, 0x24, 0xf0, 0x23, 0x12, 0xa9, + 0xb0, 0x93, 0xdf, 0xad, 0xec, 0xff, 0x66, 0xe3, 0x33, 0x19, 0x29, 0x42, 0xdb, 0x8f, 0xc3, 0xa9, + 0x31, 0x47, 0xc4, 0x01, 0x6c, 0x47, 0xc4, 0x4e, 0x42, 0x27, 0x9e, 0x9a, 0x43, 0x32, 0x72, 0x7c, + 0x87, 0x59, 0xaa, 0x15, 0xe6, 0xf4, 0x5f, 0xae, 0xbf, 0x93, 0x00, 0x39, 0x9a, 0x63, 0x18, 0xf7, + 0xa2, 0x65, 0x26, 0xfe, 0x1a, 0x94, 0x94, 0xad, 0x6e, 0xb1, 0xeb, 0x6c, 0xbe, 0x89, 0x41, 0xbe, + 0x4d, 0x9c, 0x90, 0x78, 0xc4, 0x8f, 0x8d, 0x19, 0x1a, 0xb6, 0xa1, 0x4a, 0xae, 0x63, 0x12, 0xfa, + 0x96, 0x6b, 0x0e, 0x03, 0x3b, 0x52, 0x6b, 0xec, 0x0e, 0xeb, 0x47, 0xb0, 0x2d, 0xac, 0x8f, 0x02, + 0x3b, 0xa1, 0xd8, 0x16, 0x65, 0x1b, 0x5b, 0x64, 0xce, 0x8e, 0xf0, 0x1f, 0x00, 0x28, 0xed, 0x47, + 0xcc, 0x4b, 0x77, 0xd8, 0x05, 0x7e, 0xbb, 0x71, 0x3c, 0xda, 0x33, 0x08, 0x1e, 0x90, 0x0c, 0x66, + 0x3d, 0x80, 0xda, 0x62, 0xb8, 0x30, 0x82, 0xfc, 0x6b, 0x32, 0x15, 0xe9, 0x41, 0x97, 0xf8, 0x18, + 0x0a, 0x97, 0x96, 0x9b, 0x10, 0x91, 0x1b, 0x9f, 0xae, 0x7d, 0x80, 0x14, 0xd9, 0xe0, 0xf6, 0x5f, + 0xe4, 0x3e, 0x97, 0xea, 0xa7, 0x70, 0xe7, 0xc6, 0x79, 0x56, 0xec, 0xf8, 0xf3, 0xc5, 0x1d, 0xdf, + 0x6f, 0xf2, 0x04, 0x6f, 0xa6, 0x09, 0xde, 0xfc, 0x8a, 0x4a, 0x33, 0xb0, 0x8d, 0x03, 0xa8, 0x2e, + 0xa4, 0x02, 0xae, 0x40, 0xe9, 0xb4, 0xf3, 0xbc, 0xd3, 0x3d, 0xeb, 0xa0, 0xf7, 0xb0, 0x02, 0xf2, + 0xb3, 0xc1, 0xa0, 0x87, 0x24, 0x5c, 0x86, 0x02, 0x5d, 0xf5, 0x51, 0x0e, 0x17, 0x21, 0x77, 0xd6, + 0x47, 0x79, 0x5c, 0x82, 0xfc, 0x59, 0xbf, 0x8f, 0x64, 0x5d, 0x56, 0x14, 0x54, 0xd6, 0x65, 0xa5, + 0x8c, 0x40, 0x97, 0x95, 0x2a, 0xaa, 0x35, 0xfe, 0x51, 0x84, 0x72, 0x77, 0x42, 0x42, 0x16, 0x1b, + 0x9a, 0xdf, 0xb1, 0x35, 0x8e, 0x54, 0x89, 0x25, 0x0d, 0x5b, 0xb3, 0x82, 0x92, 0x78, 0x9e, 0x15, + 0x4e, 0xd9, 0x59, 0x69, 0x41, 0xe1, 0x24, 0xde, 0x81, 0xca, 0x90, 0x44, 0x76, 0xe8, 0x30, 0x67, + 0x88, 0xa2, 0x90, 0x65, 0x2d, 0x3f, 0x21, 0xf9, 0x1d, 0x3c, 0xa1, 0x8f, 0x60, 0x2b, 0x48, 0x6f, + 0x60, 0x3a, 0x43, 0xb5, 0xc0, 0xcf, 0x31, 0xe3, 0x69, 0xc3, 0x5b, 0x17, 0x0b, 0x33, 0x5b, 0x2c, + 0xca, 0xec, 0x71, 0xb6, 0xd6, 0x3e, 0xfb, 0xcc, 0xad, 0x6f, 0x28, 0x17, 0xea, 0xbc, 0x3e, 0x02, + 0xdb, 0x7b, 0x56, 0xdf, 0x1e, 0x01, 0x0c, 0xc9, 0x24, 0x24, 0xb6, 0x15, 0x93, 0x21, 0x2b, 0x1f, + 0x8a, 0x91, 0xe1, 0xbc, 0xc3, 0xbc, 0x3f, 0x5f, 0x48, 0xc9, 0x2a, 0xc3, 0x3e, 0xb8, 0xc5, 0xad, + 0xff, 0x07, 0x92, 0x92, 0x27, 0x54, 0xe3, 0x6f, 0x39, 0x50, 0xd2, 0x4d, 0x6f, 0x66, 0x85, 0xb4, + 0x9c, 0x15, 0xc7, 0x50, 0x64, 0x51, 0xb6, 0xc4, 0x3e, 0x7b, 0xeb, 0x07, 0x8e, 0x99, 0x19, 0xc2, + 0x1c, 0x5b, 0x0b, 0x91, 0x2a, 0x6c, 0xf8, 0x3e, 0xd3, 0x13, 0xbf, 0x31, 0x50, 0xef, 0xcc, 0x6f, + 0x79, 0x56, 0x8e, 0x64, 0x54, 0x68, 0xfc, 0x33, 0x0f, 0x32, 0x9d, 0x31, 0xf0, 0x36, 0x14, 0x62, + 0x27, 0x76, 0x89, 0x80, 0xe6, 0xc4, 0x4d, 0x7f, 0xe6, 0x96, 0xfd, 0xb9, 0x0b, 0x28, 0x26, 0xa1, + 0x17, 0x99, 0xc1, 0xc8, 0x8c, 0x48, 0x78, 0xe9, 0xd8, 0x44, 0x14, 0xa3, 0x1a, 0xe3, 0x77, 0x47, + 0x7d, 0xce, 0xc5, 0x3a, 0x94, 0xec, 0xc0, 0x8f, 0x2d, 0x3b, 0x16, 0x95, 0xe8, 0x93, 0xb5, 0xbd, + 0x75, 0xc8, 0xed, 0x8c, 0x14, 0x80, 0x62, 0xb9, 0x8e, 0x4d, 0xfc, 0x88, 0xb0, 0x8a, 0xb3, 0x09, + 0xd6, 0x09, 0xb7, 0x33, 0x52, 0x00, 0x5a, 0x06, 0x2e, 0x49, 0x48, 0x7d, 0xac, 0x16, 0x79, 0x8d, + 0x15, 0x24, 0x7e, 0xb5, 0x10, 0xe2, 0x12, 0x0b, 0xf1, 0xaf, 0x36, 0x1a, 0xdd, 0x7e, 0x84, 0xf0, + 0x36, 0xda, 0x50, 0x12, 0xfe, 0xa2, 0x2d, 0xc5, 0xb7, 0xbc, 0x34, 0xa6, 0x6c, 0x4d, 0xb7, 0x48, + 0x42, 0x57, 0x84, 0x92, 0x2e, 0x69, 0xe8, 0x89, 0x67, 0x39, 0xae, 0x88, 0x1b, 0x27, 0x1a, 0x7b, + 0x50, 0x12, 0xae, 0x5a, 0x0f, 0xa6, 0xf1, 0x1c, 0xee, 0xaf, 0xec, 0x18, 0x6b, 0x24, 0xe5, 0x32, + 0xd8, 0xdf, 0x73, 0x50, 0xe4, 0x09, 0x87, 0x07, 0x50, 0xf9, 0x26, 0x0a, 0x7c, 0x53, 0xa4, 0xad, + 0xc4, 0xfc, 0xf0, 0xd9, 0xda, 0x61, 0xd0, 0xfb, 0xdd, 0x8e, 0x48, 0x5d, 0xa0, 0x38, 0x02, 0xf5, + 0x63, 0xa8, 0x0e, 0x1d, 0x7a, 0x02, 0xcf, 0xf1, 0xad, 0x38, 0x08, 0xc5, 0xe6, 0x8b, 0x4c, 0x3a, + 0x5f, 0x87, 0xc4, 0x1a, 0x9a, 0x81, 0xef, 0x4e, 0x99, 0x7b, 0x14, 0x43, 0xa1, 0x8c, 0xae, 0xef, + 0xae, 0x98, 0xd1, 0x0a, 0xef, 0xa0, 0xc1, 0x36, 0xa1, 0x44, 0xae, 0x2d, 0x6f, 0xe2, 0x12, 0xf6, + 0x3a, 0x2b, 0xfb, 0xdb, 0x4b, 0x2f, 0xa0, 0xe5, 0x4f, 0x8d, 0x54, 0x49, 0xa4, 0xf5, 0x77, 0x25, + 0x80, 0xf9, 0xc5, 0xa9, 0x7f, 0x43, 0x32, 0x12, 0xf1, 0xa5, 0xcb, 0x79, 0xba, 0x17, 0xde, 0x90, + 0xee, 0xc5, 0xe5, 0x48, 0xa9, 0x50, 0x1a, 0x92, 0x91, 0x95, 0xb8, 0xb1, 0x5a, 0xe2, 0xc9, 0x22, + 0xc8, 0x45, 0x57, 0x29, 0x37, 0x5c, 0xf5, 0xff, 0x50, 0xf1, 0x12, 0x37, 0x76, 0x26, 0x2e, 0x31, + 0x83, 0x91, 0x0a, 0x3b, 0xd2, 0xae, 0x64, 0x40, 0xca, 0xea, 0x8e, 0x28, 0xae, 0x67, 0x5d, 0x3b, + 0x5e, 0xe2, 0xb1, 0x76, 0x2b, 0x19, 0x29, 0x89, 0x9f, 0xc0, 0x5d, 0x72, 0x6d, 0xbb, 0x49, 0xe4, + 0x5c, 0x12, 0x33, 0xd5, 0xd9, 0x62, 0xf8, 0x68, 0x26, 0x78, 0x21, 0x94, 0x29, 0x8c, 0xe3, 0x33, + 0x95, 0xaa, 0x80, 0xe1, 0xe4, 0x0d, 0x18, 0xa1, 0x53, 0xbb, 0x09, 0x23, 0x94, 0x1f, 0x02, 0x78, + 0xd6, 0xb5, 0xe9, 0x12, 0x7f, 0x1c, 0x5f, 0xa8, 0x77, 0x76, 0xa4, 0x5d, 0xd9, 0x28, 0x7b, 0xd6, + 0xf5, 0x09, 0x63, 0x30, 0xb1, 0xe3, 0xa7, 0x62, 0x24, 0xc4, 0x8e, 0x2f, 0xc4, 0x2a, 0x94, 0x26, + 0x56, 0x4c, 0x63, 0xa8, 0xde, 0xe5, 0x3e, 0x12, 0x24, 0xf5, 0x11, 0xc5, 0x75, 0x62, 0xe2, 0x45, + 0xea, 0x36, 0xb3, 0x53, 0x3c, 0xeb, 0x5a, 0xa3, 0x34, 0x13, 0x3a, 0xbe, 0x10, 0xde, 0x17, 0x42, + 0xc7, 0xe7, 0xc2, 0x8f, 0x60, 0x2b, 0xf1, 0x9d, 0x6f, 0x13, 0x22, 0xe4, 0xef, 0xb3, 0x93, 0x57, + 0x38, 0x8f, 0xab, 0xfc, 0x14, 0x6a, 0x14, 0x7c, 0x12, 0xd2, 0xe1, 0x2b, 0x76, 0x48, 0xa4, 0xaa, + 0x0c, 0xa4, 0xea, 0x59, 0xd7, 0xbd, 0x19, 0x93, 0xa9, 0x39, 0x7e, 0x56, 0xed, 0x03, 0xa1, 0xe6, + 0xf8, 0x19, 0xb5, 0x3a, 0x28, 0x21, 0x9f, 0x50, 0x86, 0x6a, 0x9d, 0x4f, 0x66, 0x29, 0x4d, 0x1f, + 0x8f, 0x15, 0x86, 0xd6, 0x54, 0x6d, 0x30, 0x01, 0x27, 0xf0, 0x2b, 0x90, 0xe3, 0xe9, 0x84, 0xa8, + 0x3f, 0x61, 0xdf, 0x9a, 0xda, 0x2d, 0x12, 0x34, 0xb3, 0xec, 0x3b, 0xf4, 0x35, 0x0f, 0xa6, 0x13, + 0x12, 0x19, 0x0c, 0xb6, 0x71, 0x05, 0xf7, 0x57, 0x8a, 0x17, 0x47, 0xf1, 0x32, 0x14, 0x5a, 0x86, + 0xd1, 0x7a, 0x89, 0x24, 0xca, 0x3f, 0xe8, 0x76, 0x4f, 0xda, 0xad, 0x0e, 0xca, 0x51, 0x42, 0xeb, + 0x0c, 0xda, 0xc7, 0x6d, 0x03, 0xe5, 0xe9, 0xbc, 0xde, 0x39, 0x3d, 0x39, 0x41, 0x32, 0x06, 0x28, + 0x76, 0x4e, 0x5f, 0x1c, 0xb4, 0x0d, 0x54, 0xa0, 0xeb, 0xee, 0x81, 0xde, 0x3e, 0x1c, 0xa0, 0x22, + 0x5d, 0xf7, 0x07, 0x86, 0xd6, 0x39, 0x46, 0x25, 0x5d, 0x56, 0x24, 0x94, 0xd3, 0x65, 0x25, 0x87, + 0xf2, 0x3c, 0xbb, 0x66, 0x33, 0x3c, 0x46, 0xf7, 0x74, 0x59, 0xb9, 0x87, 0xb6, 0x75, 0x59, 0xf9, + 0x3f, 0xa4, 0xea, 0xb2, 0xf2, 0x21, 0x7a, 0xa0, 0xcb, 0xca, 0x03, 0xf4, 0x50, 0x97, 0x95, 0x87, + 0xe8, 0x91, 0x2e, 0x2b, 0x8f, 0x50, 0x43, 0x97, 0x95, 0x8f, 0xd1, 0x63, 0x5d, 0x56, 0x1e, 0xa3, + 0x27, 0xba, 0xac, 0x3c, 0x41, 0xcd, 0xc6, 0x9f, 0x25, 0xc8, 0x0f, 0xac, 0xf1, 0x1a, 0xfd, 0x75, + 0xa9, 0xc8, 0xe4, 0x7f, 0xf8, 0x22, 0xc3, 0xaf, 0xd8, 0xf8, 0xb7, 0x04, 0xf7, 0x56, 0x7c, 0xfa, + 0xe2, 0x51, 0x66, 0xda, 0x95, 0x58, 0x13, 0xd4, 0xdf, 0xe6, 0x53, 0x7a, 0xc6, 0xe3, 0x1d, 0x71, + 0x86, 0x5d, 0x8f, 0xa1, 0xba, 0x20, 0x5a, 0xd1, 0x0d, 0x5f, 0x2c, 0x76, 0xc3, 0x5f, 0x6c, 0x7c, + 0x0e, 0xf1, 0x4f, 0x46, 0xa6, 0x5d, 0xfe, 0xa7, 0x08, 0xb5, 0x45, 0x29, 0xee, 0x89, 0x97, 0x4c, + 0x37, 0xae, 0xdd, 0x62, 0xb4, 0xe7, 0x30, 0x4d, 0xfa, 0x3c, 0xf9, 0xe3, 0x5d, 0x23, 0xce, 0x69, + 0x8f, 0xcd, 0x67, 0x7a, 0xac, 0x0e, 0x39, 0xc7, 0x67, 0xc3, 0x52, 0x6d, 0xff, 0x8b, 0xdb, 0x9e, + 0x42, 0xf3, 0x8d, 0x9c, 0xe3, 0xd3, 0x3b, 0x8d, 0xdc, 0xe0, 0x8a, 0xd5, 0xfb, 0xb7, 0xb8, 0xd3, + 0x97, 0x6e, 0x70, 0x65, 0x30, 0x24, 0x5a, 0x51, 0xad, 0x24, 0xbe, 0x08, 0x42, 0xe7, 0x8f, 0xfc, + 0xf3, 0x8f, 0xb6, 0x70, 0xde, 0x32, 0xd0, 0x82, 0xe0, 0x34, 0x74, 0x69, 0x71, 0x8b, 0x83, 0xd7, + 0x84, 0x2b, 0xf1, 0xce, 0xa1, 0x30, 0x06, 0x15, 0xb2, 0x99, 0x3c, 0x98, 0x90, 0x88, 0xf5, 0x8d, + 0xcd, 0x66, 0x72, 0x6a, 0x66, 0x08, 0x73, 0x3c, 0x5e, 0x18, 0xd8, 0xf8, 0x37, 0xe3, 0xf1, 0x6d, + 0xaf, 0xfa, 0x23, 0x8c, 0x6e, 0xcf, 0x41, 0xa6, 0x8f, 0x06, 0x23, 0xd8, 0x1a, 0xbc, 0xec, 0xb5, + 0x4d, 0xad, 0xf3, 0x55, 0xeb, 0x44, 0x3b, 0x42, 0xef, 0xe1, 0x1a, 0x00, 0xe3, 0x1c, 0xb4, 0xfa, + 0xda, 0x21, 0x92, 0x66, 0x1a, 0xad, 0x9e, 0x66, 0x3e, 0x6f, 0xbf, 0x44, 0x39, 0x7c, 0x07, 0x2a, + 0x8c, 0xd3, 0x6d, 0x9d, 0x0e, 0x9e, 0xed, 0xa3, 0x7c, 0xe3, 0x53, 0xc8, 0x69, 0x3e, 0x35, 0xd4, + 0x3a, 0x19, 0xa0, 0x2d, 0x50, 0xb4, 0x8e, 0xf9, 0xbb, 0xd3, 0xb6, 0x41, 0x6b, 0x64, 0x15, 0xca, + 0x5a, 0xc7, 0x7c, 0xd6, 0x6e, 0x1d, 0xb5, 0x0d, 0x94, 0x6b, 0x7c, 0x03, 0x32, 0x0d, 0x30, 0x45, + 0xff, 0xf2, 0xa4, 0x7b, 0x96, 0x31, 0xbb, 0x0b, 0x55, 0xce, 0x79, 0xd1, 0x3b, 0xd1, 0x0e, 0xb5, + 0x01, 0x92, 0x66, 0xac, 0x5e, 0xab, 0xdf, 0x3f, 0xeb, 0x1a, 0x47, 0x28, 0x87, 0xb7, 0x01, 0x31, + 0x56, 0xab, 0x47, 0xb5, 0x5a, 0x03, 0xad, 0xdb, 0x41, 0xf9, 0x39, 0xf7, 0xf0, 0xb0, 0xdd, 0xef, + 0x9b, 0x87, 0xdd, 0xa3, 0x36, 0x92, 0x1b, 0xff, 0xca, 0xcd, 0xab, 0x4d, 0xe6, 0x5b, 0x18, 0xff, + 0x49, 0xca, 0xfc, 0x8b, 0x17, 0xce, 0x05, 0xa2, 0xf4, 0x9c, 0xbe, 0xcd, 0x87, 0xf6, 0x2a, 0x1e, + 0x0f, 0xee, 0xec, 0xef, 0xbd, 0x8c, 0xa4, 0xfe, 0x09, 0xa8, 0x2b, 0x0c, 0x58, 0xd4, 0x68, 0x0f, + 0x64, 0x8f, 0x4e, 0xfc, 0x5d, 0xc3, 0x89, 0xfa, 0x77, 0xd2, 0x4a, 0x93, 0xef, 0x7b, 0x21, 0xaf, + 0x17, 0x5f, 0xc8, 0x0f, 0x7e, 0xb7, 0xa5, 0x07, 0xf6, 0x17, 0x89, 0x8e, 0xd5, 0x2c, 0x57, 0x7a, + 0xd9, 0x0b, 0x54, 0x36, 0xa9, 0x2f, 0xcc, 0x9e, 0xff, 0x70, 0xe7, 0x89, 0xcb, 0x7f, 0x0e, 0x30, + 0x67, 0xae, 0xb8, 0xed, 0x76, 0xf6, 0xb6, 0xe5, 0xcc, 0xb1, 0x0e, 0x0e, 0x7f, 0xdf, 0x1a, 0x3b, + 0xf1, 0x45, 0x72, 0xde, 0xb4, 0x03, 0x6f, 0x8f, 0x1e, 0xe4, 0x29, 0xb1, 0x83, 0x68, 0x1a, 0xc5, + 0x44, 0x90, 0xe2, 0x5c, 0x7b, 0xdf, 0xff, 0xd7, 0xff, 0x79, 0x91, 0xc9, 0x3e, 0xfb, 0x6f, 0x00, + 0x00, 0x00, 0xff, 0xff, 0x29, 0x5a, 0xd3, 0x93, 0x1f, 0x18, 0x00, 0x00, } diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/options/openapiv2.proto b/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/options/openapiv2.proto index c9f0386564..83cb564fa5 100644 --- a/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/options/openapiv2.proto +++ b/vendor/github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/options/openapiv2.proto @@ -5,6 +5,7 @@ package grpc.gateway.protoc_gen_swagger.options; option go_package = "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/options"; import "google/protobuf/any.proto"; +import "google/protobuf/struct.proto"; // `Swagger` is a representation of OpenAPI v2 specification's Swagger object. // @@ -15,6 +16,12 @@ message Swagger { string swagger = 1; Info info = 2; string host = 3; + // `base_path` is the common prefix path used on all API endpoints (ie. /api, /v1, etc.). By adding this, + // it allows you to remove this portion from the path endpoints in your Swagger file making them easier + // to read. Note that using `base_path` does not change the endpoint paths that are generated in the resulting + // Swagger file. If you wish to use `base_path` with relatively generated Swagger paths, the + // `base_path` prefix must be manually removed from your `google.api.http` paths and your code changed to + // serve the API from the `base_path`. string base_path = 4; enum SwaggerScheme { UNKNOWN = 0; @@ -39,6 +46,7 @@ message Swagger { // service objects into OpenAPI v2 Tag objects. reserved 13; ExternalDocumentation external_docs = 14; + map extensions = 15; } // `Operation` is a representation of OpenAPI v2 specification's Operation object. @@ -60,6 +68,7 @@ message Operation { repeated string schemes = 10; bool deprecated = 11; repeated SecurityRequirement security = 12; + map extensions = 13; } // `Response` is a representation of OpenAPI v2 specification's Response object. @@ -77,6 +86,7 @@ message Response { reserved 3; // field 3 is reserved for 'example'. reserved 4; + map extensions = 5; } // `Info` is a representation of OpenAPI v2 specification's Info object. @@ -89,9 +99,9 @@ message Info { string description = 2; string terms_of_service = 3; Contact contact = 4; - // field 5 is reserved for 'license'. - reserved 5; + License license = 5; string version = 6; + map extensions = 7; } // `Contact` is a representation of OpenAPI v2 specification's Contact object. @@ -105,6 +115,17 @@ message Contact { string email = 3; } +// `License` is a representation of OpenAPI v2 specification's License object. +// +// See: https://github.com/OAI/OpenAPI-Specification/blob/3.0.0/versions/2.0.md#licenseObject +// +message License { + // Required. The license name used for the API. + string name = 1; + // A URL to the license used for the API. + string url = 2; +} + // `ExternalDocumentation` is a representation of OpenAPI v2 specification's // ExternalDocumentation object. // @@ -159,8 +180,7 @@ message JSONSchema { string title = 5; string description = 6; string default = 7; - // field 8 is reserved for 'readOnly', which has an OpenAPI v2-specific meaning and is defined there. - reserved 8; + bool read_only = 8; // field 9 is reserved for 'examples', which is omitted from OpenAPI v2 in favor of 'example' field. reserved 9; double multiple_of = 10; @@ -319,6 +339,7 @@ message SecurityScheme { // // Valid for oauth2. Scopes scopes = 8; + map extensions = 9; } // `SecurityRequirement` is a representation of OpenAPI v2 specification's diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/BUILD.bazel b/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/BUILD.bazel index 9fce044716..819c45a765 100644 --- a/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/BUILD.bazel +++ b/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/BUILD.bazel @@ -9,7 +9,9 @@ go_library( "convert.go", "doc.go", "errors.go", + "fieldmask.go", "handler.go", + "marshal_httpbodyproto.go", "marshal_json.go", "marshal_jsonpb.go", "marshal_proto.go", @@ -23,14 +25,18 @@ go_library( ], importpath = "github.com/grpc-ecosystem/grpc-gateway/runtime", deps = [ - "//runtime/internal:go_default_library", + "//internal:go_default_library", "//utilities:go_default_library", - "@com_github_golang_protobuf//jsonpb:go_default_library", + "@com_github_golang_protobuf//descriptor:go_default_library_gen", + "@com_github_golang_protobuf//jsonpb:go_default_library_gen", "@com_github_golang_protobuf//proto:go_default_library", - "@com_github_golang_protobuf//ptypes:go_default_library", - "@com_github_golang_protobuf//ptypes/any:go_default_library", - "@com_github_golang_protobuf//ptypes/duration:go_default_library", - "@com_github_golang_protobuf//ptypes/timestamp:go_default_library", + "@go_googleapis//google/api:httpbody_go_proto", + "@io_bazel_rules_go//proto/wkt:any_go_proto", + "@io_bazel_rules_go//proto/wkt:descriptor_go_proto", + "@io_bazel_rules_go//proto/wkt:duration_go_proto", + "@io_bazel_rules_go//proto/wkt:field_mask_go_proto", + "@io_bazel_rules_go//proto/wkt:timestamp_go_proto", + "@io_bazel_rules_go//proto/wkt:wrappers_go_proto", "@org_golang_google_grpc//codes:go_default_library", "@org_golang_google_grpc//grpclog:go_default_library", "@org_golang_google_grpc//metadata:go_default_library", @@ -41,40 +47,37 @@ go_library( go_test( name = "go_default_test", size = "small", - srcs = ["pattern_test.go"], - embed = [":go_default_library"], - deps = ["//utilities:go_default_library"], -) - -go_test( - name = "go_default_xtest", - size = "small", srcs = [ "context_test.go", + "convert_test.go", "errors_test.go", + "fieldmask_test.go", "handler_test.go", + "marshal_httpbodyproto_test.go", "marshal_json_test.go", "marshal_jsonpb_test.go", "marshal_proto_test.go", "marshaler_registry_test.go", "mux_test.go", + "pattern_test.go", "query_test.go", ], + embed = [":go_default_library"], deps = [ - ":go_default_library", "//examples/proto/examplepb:go_default_library", - "//runtime/internal:go_default_library", + "//internal:go_default_library", "//utilities:go_default_library", - "@com_github_golang_protobuf//jsonpb:go_default_library", + "@com_github_golang_protobuf//jsonpb:go_default_library_gen", "@com_github_golang_protobuf//proto:go_default_library", - "@com_github_golang_protobuf//ptypes:go_default_library", - "@com_github_golang_protobuf//ptypes/duration:go_default_library", - "@com_github_golang_protobuf//ptypes/empty:go_default_library", - "@com_github_golang_protobuf//ptypes/struct:go_default_library", - "@com_github_golang_protobuf//ptypes/timestamp:go_default_library", - "@com_github_golang_protobuf//ptypes/wrappers:go_default_library", - "@org_golang_google_genproto//protobuf/field_mask:go_default_library", - "@org_golang_google_genproto//googleapis/rpc/errdetails:go_default_library", + "@com_github_golang_protobuf//ptypes:go_default_library_gen", + "@go_googleapis//google/api:httpbody_go_proto", + "@go_googleapis//google/rpc:errdetails_go_proto", + "@io_bazel_rules_go//proto/wkt:duration_go_proto", + "@io_bazel_rules_go//proto/wkt:empty_go_proto", + "@io_bazel_rules_go//proto/wkt:field_mask_go_proto", + "@io_bazel_rules_go//proto/wkt:struct_go_proto", + "@io_bazel_rules_go//proto/wkt:timestamp_go_proto", + "@io_bazel_rules_go//proto/wkt:wrappers_go_proto", "@org_golang_google_grpc//:go_default_library", "@org_golang_google_grpc//codes:go_default_library", "@org_golang_google_grpc//metadata:go_default_library", diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/context.go b/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/context.go index 896057e1e1..f8083821f3 100644 --- a/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/context.go +++ b/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/context.go @@ -57,13 +57,39 @@ except that the forwarded destination is not another HTTP service but rather a gRPC service. */ func AnnotateContext(ctx context.Context, mux *ServeMux, req *http.Request) (context.Context, error) { + ctx, md, err := annotateContext(ctx, mux, req) + if err != nil { + return nil, err + } + if md == nil { + return ctx, nil + } + + return metadata.NewOutgoingContext(ctx, md), nil +} + +// AnnotateIncomingContext adds context information such as metadata from the request. +// Attach metadata as incoming context. +func AnnotateIncomingContext(ctx context.Context, mux *ServeMux, req *http.Request) (context.Context, error) { + ctx, md, err := annotateContext(ctx, mux, req) + if err != nil { + return nil, err + } + if md == nil { + return ctx, nil + } + + return metadata.NewIncomingContext(ctx, md), nil +} + +func annotateContext(ctx context.Context, mux *ServeMux, req *http.Request) (context.Context, metadata.MD, error) { var pairs []string timeout := DefaultContextTimeout if tm := req.Header.Get(metadataGrpcTimeout); tm != "" { var err error timeout, err = timeoutDecode(tm) if err != nil { - return nil, status.Errorf(codes.InvalidArgument, "invalid grpc-timeout: %s", tm) + return nil, nil, status.Errorf(codes.InvalidArgument, "invalid grpc-timeout: %s", tm) } } @@ -80,7 +106,7 @@ func AnnotateContext(ctx context.Context, mux *ServeMux, req *http.Request) (con if strings.HasSuffix(key, metadataHeaderBinarySuffix) { b, err := decodeBinHeader(val) if err != nil { - return nil, status.Errorf(codes.InvalidArgument, "invalid binary header %s: %s", key, err) + return nil, nil, status.Errorf(codes.InvalidArgument, "invalid binary header %s: %s", key, err) } val = string(b) @@ -111,13 +137,13 @@ func AnnotateContext(ctx context.Context, mux *ServeMux, req *http.Request) (con ctx, _ = context.WithTimeout(ctx, timeout) } if len(pairs) == 0 { - return ctx, nil + return ctx, nil, nil } md := metadata.Pairs(pairs...) for _, mda := range mux.metadataAnnotators { md = metadata.Join(md, mda(ctx, req)) } - return metadata.NewOutgoingContext(ctx, md), nil + return ctx, md, nil } // ServerMetadata consists of metadata sent from gRPC server. diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/convert.go b/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/convert.go index bd54ba12be..2c279344dc 100644 --- a/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/convert.go +++ b/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/convert.go @@ -9,6 +9,7 @@ import ( "github.com/golang/protobuf/jsonpb" "github.com/golang/protobuf/ptypes/duration" "github.com/golang/protobuf/ptypes/timestamp" + "github.com/golang/protobuf/ptypes/wrappers" ) // String just returns the given string. @@ -205,16 +206,22 @@ func BytesSlice(val, sep string) ([][]byte, error) { // Timestamp converts the given RFC3339 formatted string into a timestamp.Timestamp. func Timestamp(val string) (*timestamp.Timestamp, error) { - var r *timestamp.Timestamp - err := jsonpb.UnmarshalString(val, r) - return r, err + var r timestamp.Timestamp + err := jsonpb.UnmarshalString(val, &r) + if err != nil { + return nil, err + } + return &r, nil } // Duration converts the given string into a timestamp.Duration. func Duration(val string) (*duration.Duration, error) { - var r *duration.Duration - err := jsonpb.UnmarshalString(val, r) - return r, err + var r duration.Duration + err := jsonpb.UnmarshalString(val, &r) + if err != nil { + return nil, err + } + return &r, nil } // Enum converts the given string into an int32 that should be type casted into the @@ -252,3 +259,60 @@ func EnumSlice(val, sep string, enumValMap map[string]int32) ([]int32, error) { } return values, nil } + +/* + Support fot google.protobuf.wrappers on top of primitive types +*/ + +// StringValue well-known type support as wrapper around string type +func StringValue(val string) (*wrappers.StringValue, error) { + return &wrappers.StringValue{Value: val}, nil +} + +// FloatValue well-known type support as wrapper around float32 type +func FloatValue(val string) (*wrappers.FloatValue, error) { + parsedVal, err := Float32(val) + return &wrappers.FloatValue{Value: parsedVal}, err +} + +// DoubleValue well-known type support as wrapper around float64 type +func DoubleValue(val string) (*wrappers.DoubleValue, error) { + parsedVal, err := Float64(val) + return &wrappers.DoubleValue{Value: parsedVal}, err +} + +// BoolValue well-known type support as wrapper around bool type +func BoolValue(val string) (*wrappers.BoolValue, error) { + parsedVal, err := Bool(val) + return &wrappers.BoolValue{Value: parsedVal}, err +} + +// Int32Value well-known type support as wrapper around int32 type +func Int32Value(val string) (*wrappers.Int32Value, error) { + parsedVal, err := Int32(val) + return &wrappers.Int32Value{Value: parsedVal}, err +} + +// UInt32Value well-known type support as wrapper around uint32 type +func UInt32Value(val string) (*wrappers.UInt32Value, error) { + parsedVal, err := Uint32(val) + return &wrappers.UInt32Value{Value: parsedVal}, err +} + +// Int64Value well-known type support as wrapper around int64 type +func Int64Value(val string) (*wrappers.Int64Value, error) { + parsedVal, err := Int64(val) + return &wrappers.Int64Value{Value: parsedVal}, err +} + +// UInt64Value well-known type support as wrapper around uint64 type +func UInt64Value(val string) (*wrappers.UInt64Value, error) { + parsedVal, err := Uint64(val) + return &wrappers.UInt64Value{Value: parsedVal}, err +} + +// BytesValue well-known type support as wrapper around bytes[] type +func BytesValue(val string) (*wrappers.BytesValue, error) { + parsedVal, err := Bytes(val) + return &wrappers.BytesValue{Value: parsedVal}, err +} diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/errors.go b/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/errors.go index b39f55ea82..a36080713c 100644 --- a/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/errors.go +++ b/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/errors.go @@ -37,7 +37,8 @@ func HTTPStatusFromCode(code codes.Code) int { case codes.ResourceExhausted: return http.StatusTooManyRequests case codes.FailedPrecondition: - return http.StatusPreconditionFailed + // Note, this deliberately doesn't translate to the similarly named '412 Precondition Failed' HTTP response status. + return http.StatusBadRequest case codes.Aborted: return http.StatusConflict case codes.OutOfRange: @@ -65,12 +66,12 @@ var ( ) type errorBody struct { - Error string `protobuf:"bytes,1,name=error" json:"error"` + Error string `protobuf:"bytes,100,name=error" json:"error"` // This is to make the error more compatible with users that expect errors to be Status objects: // https://github.com/grpc/grpc/blob/master/src/proto/grpc/status/status.proto // It should be the exact same message as the Error field. - Message string `protobuf:"bytes,1,name=message" json:"message"` - Code int32 `protobuf:"varint,2,name=code" json:"code"` + Code int32 `protobuf:"varint,1,name=code" json:"code"` + Message string `protobuf:"bytes,2,name=message" json:"message"` Details []*any.Any `protobuf:"bytes,3,rep,name=details" json:"details,omitempty"` } @@ -88,14 +89,23 @@ func (*errorBody) ProtoMessage() {} func DefaultHTTPError(ctx context.Context, mux *ServeMux, marshaler Marshaler, w http.ResponseWriter, _ *http.Request, err error) { const fallback = `{"error": "failed to marshal error message"}` - w.Header().Del("Trailer") - w.Header().Set("Content-Type", marshaler.ContentType()) - s, ok := status.FromError(err) if !ok { s = status.New(codes.Unknown, err.Error()) } + w.Header().Del("Trailer") + + contentType := marshaler.ContentType() + // Check marshaler on run time in order to keep backwards compatability + // An interface param needs to be added to the ContentType() function on + // the Marshal interface to be able to remove this check + if httpBodyMarshaler, ok := marshaler.(*HTTPBodyMarshaler); ok { + pb := s.Proto() + contentType = httpBodyMarshaler.ContentTypeFromMessage(pb) + } + w.Header().Set("Content-Type", contentType) + body := &errorBody{ Error: s.Message(), Message: s.Message(), diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/fieldmask.go b/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/fieldmask.go new file mode 100644 index 0000000000..341aad5a3e --- /dev/null +++ b/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/fieldmask.go @@ -0,0 +1,82 @@ +package runtime + +import ( + "encoding/json" + "io" + "strings" + + descriptor2 "github.com/golang/protobuf/descriptor" + "github.com/golang/protobuf/protoc-gen-go/descriptor" + "google.golang.org/genproto/protobuf/field_mask" +) + +func translateName(name string, md *descriptor.DescriptorProto) (string, *descriptor.DescriptorProto) { + // TODO - should really gate this with a test that the marshaller has used json names + if md != nil { + for _, f := range md.Field { + if f.JsonName != nil && f.Name != nil && *f.JsonName == name { + var subType *descriptor.DescriptorProto + + // If the field has a TypeName then we retrieve the nested type for translating the embedded message names. + if f.TypeName != nil { + typeSplit := strings.Split(*f.TypeName, ".") + typeName := typeSplit[len(typeSplit)-1] + for _, t := range md.NestedType { + if typeName == *t.Name { + subType = t + } + } + } + return *f.Name, subType + } + } + } + return name, nil +} + +// FieldMaskFromRequestBody creates a FieldMask printing all complete paths from the JSON body. +func FieldMaskFromRequestBody(r io.Reader, md *descriptor.DescriptorProto) (*field_mask.FieldMask, error) { + fm := &field_mask.FieldMask{} + var root interface{} + if err := json.NewDecoder(r).Decode(&root); err != nil { + if err == io.EOF { + return fm, nil + } + return nil, err + } + + queue := []fieldMaskPathItem{{node: root, md: md}} + for len(queue) > 0 { + // dequeue an item + item := queue[0] + queue = queue[1:] + + if m, ok := item.node.(map[string]interface{}); ok { + // if the item is an object, then enqueue all of its children + for k, v := range m { + protoName, subMd := translateName(k, item.md) + if subMsg, ok := v.(descriptor2.Message); ok { + _, subMd = descriptor2.ForMessage(subMsg) + } + queue = append(queue, fieldMaskPathItem{path: append(item.path, protoName), node: v, md: subMd}) + } + } else if len(item.path) > 0 { + // otherwise, it's a leaf node so print its path + fm.Paths = append(fm.Paths, strings.Join(item.path, ".")) + } + } + + return fm, nil +} + +// fieldMaskPathItem stores a in-progress deconstruction of a path for a fieldmask +type fieldMaskPathItem struct { + // the list of prior fields leading up to node + path []string + + // a generic decoded json object the current item to inspect for further path extraction + node interface{} + + // descriptor for parent message + md *descriptor.DescriptorProto +} diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/handler.go b/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/handler.go index 8ad9d766e1..2af900650d 100644 --- a/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/handler.go +++ b/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/handler.go @@ -1,6 +1,7 @@ package runtime import ( + "errors" "fmt" "io" "net/http" @@ -8,13 +9,12 @@ import ( "context" "github.com/golang/protobuf/proto" - "github.com/golang/protobuf/ptypes/any" - "github.com/grpc-ecosystem/grpc-gateway/runtime/internal" - "google.golang.org/grpc/codes" + "github.com/grpc-ecosystem/grpc-gateway/internal" "google.golang.org/grpc/grpclog" - "google.golang.org/grpc/status" ) +var errEmptyResponse = errors.New("empty response") + // ForwardResponseStream forwards the stream from gRPC server to REST client. func ForwardResponseStream(ctx context.Context, mux *ServeMux, marshaler Marshaler, w http.ResponseWriter, req *http.Request, recv func() (proto.Message, error), opts ...func(context.Context, http.ResponseWriter, proto.Message) error) { f, ok := w.(http.Flusher) @@ -53,18 +53,18 @@ func ForwardResponseStream(ctx context.Context, mux *ServeMux, marshaler Marshal return } if err != nil { - handleForwardResponseStreamError(wroteHeader, marshaler, w, err) + handleForwardResponseStreamError(ctx, wroteHeader, marshaler, w, req, mux, err) return } if err := handleForwardResponseOptions(ctx, w, resp, opts); err != nil { - handleForwardResponseStreamError(wroteHeader, marshaler, w, err) + handleForwardResponseStreamError(ctx, wroteHeader, marshaler, w, req, mux, err) return } - buf, err := marshaler.Marshal(streamChunk(resp, nil)) + buf, err := marshaler.Marshal(streamChunk(ctx, resp, mux.streamErrorHandler)) if err != nil { grpclog.Infof("Failed to marshal response chunk: %v", err) - handleForwardResponseStreamError(wroteHeader, marshaler, w, err) + handleForwardResponseStreamError(ctx, wroteHeader, marshaler, w, req, mux, err) return } if _, err = w.Write(buf); err != nil { @@ -121,7 +121,16 @@ func ForwardResponseMessage(ctx context.Context, mux *ServeMux, marshaler Marsha handleForwardResponseServerMetadata(w, mux, md) handleForwardResponseTrailerHeader(w, md) - w.Header().Set("Content-Type", marshaler.ContentType()) + + contentType := marshaler.ContentType() + // Check marshaler on run time in order to keep backwards compatability + // An interface param needs to be added to the ContentType() function on + // the Marshal interface to be able to remove this check + if httpBodyMarshaler, ok := marshaler.(*HTTPBodyMarshaler); ok { + contentType = httpBodyMarshaler.ContentTypeFromMessage(resp) + } + w.Header().Set("Content-Type", contentType) + if err := handleForwardResponseOptions(ctx, w, resp, opts); err != nil { HTTPError(ctx, mux, marshaler, w, req, err) return @@ -159,48 +168,42 @@ func handleForwardResponseOptions(ctx context.Context, w http.ResponseWriter, re return nil } -func handleForwardResponseStreamError(wroteHeader bool, marshaler Marshaler, w http.ResponseWriter, err error) { - buf, merr := marshaler.Marshal(streamChunk(nil, err)) +func handleForwardResponseStreamError(ctx context.Context, wroteHeader bool, marshaler Marshaler, w http.ResponseWriter, req *http.Request, mux *ServeMux, err error) { + serr := streamError(ctx, mux.streamErrorHandler, err) + if !wroteHeader { + w.WriteHeader(int(serr.HttpCode)) + } + buf, merr := marshaler.Marshal(errorChunk(serr)) if merr != nil { grpclog.Infof("Failed to marshal an error: %v", merr) return } - if !wroteHeader { - s, ok := status.FromError(err) - if !ok { - s = status.New(codes.Unknown, err.Error()) - } - w.WriteHeader(HTTPStatusFromCode(s.Code())) - } if _, werr := w.Write(buf); werr != nil { grpclog.Infof("Failed to notify error to client: %v", werr) return } } -func streamChunk(result proto.Message, err error) map[string]proto.Message { - if err != nil { - grpcCode := codes.Unknown - grpcMessage := err.Error() - var grpcDetails []*any.Any - if s, ok := status.FromError(err); ok { - grpcCode = s.Code() - grpcMessage = s.Message() - grpcDetails = s.Proto().GetDetails() - } - httpCode := HTTPStatusFromCode(grpcCode) - return map[string]proto.Message{ - "error": &internal.StreamError{ - GrpcCode: int32(grpcCode), - HttpCode: int32(httpCode), - Message: grpcMessage, - HttpStatus: http.StatusText(httpCode), - Details: grpcDetails, - }, - } - } +// streamChunk returns a chunk in a response stream for the given result. The +// given errHandler is used to render an error chunk if result is nil. +func streamChunk(ctx context.Context, result proto.Message, errHandler StreamErrorHandlerFunc) map[string]proto.Message { if result == nil { - return streamChunk(nil, fmt.Errorf("empty response")) + return errorChunk(streamError(ctx, errHandler, errEmptyResponse)) } return map[string]proto.Message{"result": result} } + +// streamError returns the payload for the final message in a response stream +// that represents the given err. +func streamError(ctx context.Context, errHandler StreamErrorHandlerFunc, err error) *StreamError { + serr := errHandler(ctx, err) + if serr != nil { + return serr + } + // TODO: log about misbehaving stream error handler? + return DefaultHTTPStreamErrorHandler(ctx, err) +} + +func errorChunk(err *StreamError) map[string]proto.Message { + return map[string]proto.Message{"error": (*internal.StreamError)(err)} +} diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/marshal_httpbodyproto.go b/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/marshal_httpbodyproto.go new file mode 100644 index 0000000000..f55285b5d6 --- /dev/null +++ b/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/marshal_httpbodyproto.go @@ -0,0 +1,43 @@ +package runtime + +import ( + "google.golang.org/genproto/googleapis/api/httpbody" +) + +// SetHTTPBodyMarshaler overwrite the default marshaler with the HTTPBodyMarshaler +func SetHTTPBodyMarshaler(serveMux *ServeMux) { + serveMux.marshalers.mimeMap[MIMEWildcard] = &HTTPBodyMarshaler{ + Marshaler: &JSONPb{OrigName: true}, + } +} + +// HTTPBodyMarshaler is a Marshaler which supports marshaling of a +// google.api.HttpBody message as the full response body if it is +// the actual message used as the response. If not, then this will +// simply fallback to the Marshaler specified as its default Marshaler. +type HTTPBodyMarshaler struct { + Marshaler +} + +// ContentType implementation to keep backwards compatability with marshal interface +func (h *HTTPBodyMarshaler) ContentType() string { + return h.ContentTypeFromMessage(nil) +} + +// ContentTypeFromMessage in case v is a google.api.HttpBody message it returns +// its specified content type otherwise fall back to the default Marshaler. +func (h *HTTPBodyMarshaler) ContentTypeFromMessage(v interface{}) string { + if httpBody, ok := v.(*httpbody.HttpBody); ok { + return httpBody.GetContentType() + } + return h.Marshaler.ContentType() +} + +// Marshal marshals "v" by returning the body bytes if v is a +// google.api.HttpBody message, otherwise it falls back to the default Marshaler. +func (h *HTTPBodyMarshaler) Marshal(v interface{}) ([]byte, error) { + if httpBody, ok := v.(*httpbody.HttpBody); ok { + return httpBody.Data, nil + } + return h.Marshaler.Marshal(v) +} diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/marshal_jsonpb.go b/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/marshal_jsonpb.go index f56072a6f1..f0de351b21 100644 --- a/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/marshal_jsonpb.go +++ b/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/marshal_jsonpb.go @@ -50,6 +50,11 @@ func (j *JSONPb) marshalTo(w io.Writer, v interface{}) error { return (*jsonpb.Marshaler)(j).Marshal(w, p) } +var ( + // protoMessageType is stored to prevent constant lookup of the same type at runtime. + protoMessageType = reflect.TypeOf((*proto.Message)(nil)).Elem() +) + // marshalNonProto marshals a non-message field of a protobuf message. // This function does not correctly marshals arbitrary data structure into JSON, // but it is only capable of marshaling non-message field values of protobuf, @@ -67,6 +72,40 @@ func (j *JSONPb) marshalNonProtoField(v interface{}) ([]byte, error) { rv = rv.Elem() } + if rv.Kind() == reflect.Slice { + if rv.IsNil() { + if j.EmitDefaults { + return []byte("[]"), nil + } + return []byte("null"), nil + } + + if rv.Type().Elem().Implements(protoMessageType) { + var buf bytes.Buffer + err := buf.WriteByte('[') + if err != nil { + return nil, err + } + for i := 0; i < rv.Len(); i++ { + if i != 0 { + err = buf.WriteByte(',') + if err != nil { + return nil, err + } + } + if err = (*jsonpb.Marshaler)(j).Marshal(&buf, rv.Index(i).Interface().(proto.Message)); err != nil { + return nil, err + } + } + err = buf.WriteByte(']') + if err != nil { + return nil, err + } + + return buf.Bytes(), nil + } + } + if rv.Kind() == reflect.Map { m := make(map[string]*json.RawMessage) for _, k := range rv.MapKeys() { @@ -112,7 +151,15 @@ func (d DecoderWrapper) Decode(v interface{}) error { // NewEncoder returns an Encoder which writes JSON stream into "w". func (j *JSONPb) NewEncoder(w io.Writer) Encoder { - return EncoderFunc(func(v interface{}) error { return j.marshalTo(w, v) }) + return EncoderFunc(func(v interface{}) error { + if err := j.marshalTo(w, v); err != nil { + return err + } + // mimic json.Encoder by adding a newline (makes output + // easier to read when it contains multiple encoded items) + _, err := w.Write(j.Delimiter()) + return err + }) } func unmarshalJSONPb(data []byte, v interface{}) error { @@ -125,7 +172,7 @@ func decodeJSONPb(d *json.Decoder, v interface{}) error { if !ok { return decodeNonProtoField(d, v) } - unmarshaler := &jsonpb.Unmarshaler{AllowUnknownFields: true} + unmarshaler := &jsonpb.Unmarshaler{AllowUnknownFields: allowUnknownFields} return unmarshaler.UnmarshalNext(d, p) } @@ -139,7 +186,7 @@ func decodeNonProtoField(d *json.Decoder, v interface{}) error { rv.Set(reflect.New(rv.Type().Elem())) } if rv.Type().ConvertibleTo(typeProtoMessage) { - unmarshaler := &jsonpb.Unmarshaler{AllowUnknownFields: true} + unmarshaler := &jsonpb.Unmarshaler{AllowUnknownFields: allowUnknownFields} return unmarshaler.UnmarshalNext(d, rv.Interface().(proto.Message)) } rv = rv.Elem() @@ -201,3 +248,15 @@ var typeProtoMessage = reflect.TypeOf((*proto.Message)(nil)).Elem() func (j *JSONPb) Delimiter() []byte { return []byte("\n") } + +// allowUnknownFields helps not to return an error when the destination +// is a struct and the input contains object keys which do not match any +// non-ignored, exported fields in the destination. +var allowUnknownFields = true + +// DisallowUnknownFields enables option in decoder (unmarshaller) to +// return an error when it finds an unknown field. This function must be +// called before using the JSON marshaller. +func DisallowUnknownFields() { + allowUnknownFields = false +} diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/mux.go b/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/mux.go index 463084a702..1da3a58854 100644 --- a/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/mux.go +++ b/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/mux.go @@ -4,6 +4,7 @@ import ( "context" "fmt" "net/http" + "net/textproto" "strings" "github.com/golang/protobuf/proto" @@ -15,17 +16,28 @@ import ( // A HandlerFunc handles a specific pair of path pattern and HTTP method. type HandlerFunc func(w http.ResponseWriter, r *http.Request, pathParams map[string]string) +// ErrUnknownURI is the error supplied to a custom ProtoErrorHandlerFunc when +// a request is received with a URI path that does not match any registered +// service method. +// +// Since gRPC servers return an "Unimplemented" code for requests with an +// unrecognized URI path, this error also has a gRPC "Unimplemented" code. +var ErrUnknownURI = status.Error(codes.Unimplemented, http.StatusText(http.StatusNotImplemented)) + // ServeMux is a request multiplexer for grpc-gateway. // It matches http requests to patterns and invokes the corresponding handler. type ServeMux struct { // handlers maps HTTP method to a list of handlers. - handlers map[string][]handler - forwardResponseOptions []func(context.Context, http.ResponseWriter, proto.Message) error - marshalers marshalerRegistry - incomingHeaderMatcher HeaderMatcherFunc - outgoingHeaderMatcher HeaderMatcherFunc - metadataAnnotators []func(context.Context, *http.Request) metadata.MD - protoErrorHandler ProtoErrorHandlerFunc + handlers map[string][]handler + forwardResponseOptions []func(context.Context, http.ResponseWriter, proto.Message) error + marshalers marshalerRegistry + incomingHeaderMatcher HeaderMatcherFunc + outgoingHeaderMatcher HeaderMatcherFunc + metadataAnnotators []func(context.Context, *http.Request) metadata.MD + streamErrorHandler StreamErrorHandlerFunc + protoErrorHandler ProtoErrorHandlerFunc + disablePathLengthFallback bool + lastMatchWins bool } // ServeMuxOption is an option that can be given to a ServeMux on construction. @@ -50,6 +62,7 @@ type HeaderMatcherFunc func(string) (string, bool) // keys (as specified by the IANA) to gRPC context with grpcgateway- prefix. HTTP headers that start with // 'Grpc-Metadata-' are mapped to gRPC metadata after removing prefix 'Grpc-Metadata-'. func DefaultHeaderMatcher(key string) (string, bool) { + key = textproto.CanonicalMIMEHeaderKey(key) if isPermanentHTTPHeader(key) { return MetadataPrefix + key, true } else if strings.HasPrefix(key, MetadataHeaderPrefix) { @@ -100,12 +113,43 @@ func WithProtoErrorHandler(fn ProtoErrorHandlerFunc) ServeMuxOption { } } +// WithDisablePathLengthFallback returns a ServeMuxOption for disable path length fallback. +func WithDisablePathLengthFallback() ServeMuxOption { + return func(serveMux *ServeMux) { + serveMux.disablePathLengthFallback = true + } +} + +// WithStreamErrorHandler returns a ServeMuxOption that will use the given custom stream +// error handler, which allows for customizing the error trailer for server-streaming +// calls. +// +// For stream errors that occur before any response has been written, the mux's +// ProtoErrorHandler will be invoked. However, once data has been written, the errors must +// be handled differently: they must be included in the response body. The response body's +// final message will include the error details returned by the stream error handler. +func WithStreamErrorHandler(fn StreamErrorHandlerFunc) ServeMuxOption { + return func(serveMux *ServeMux) { + serveMux.streamErrorHandler = fn + } +} + +// WithLastMatchWins returns a ServeMuxOption that will enable "last +// match wins" behavior, where if multiple path patterns match a +// request path, the last one defined in the .proto file will be used. +func WithLastMatchWins() ServeMuxOption { + return func(serveMux *ServeMux) { + serveMux.lastMatchWins = true + } +} + // NewServeMux returns a new ServeMux whose internal mapping is empty. func NewServeMux(opts ...ServeMuxOption) *ServeMux { serveMux := &ServeMux{ handlers: make(map[string][]handler), forwardResponseOptions: make([]func(context.Context, http.ResponseWriter, proto.Message) error, 0), marshalers: makeMarshalerMIMERegistry(), + streamErrorHandler: DefaultHTTPStreamErrorHandler, } for _, opt := range opts { @@ -139,7 +183,11 @@ func NewServeMux(opts ...ServeMuxOption) *ServeMux { // Handle associates "h" to the pair of HTTP method and path pattern. func (s *ServeMux) Handle(meth string, pat Pattern, h HandlerFunc) { - s.handlers[meth] = append(s.handlers[meth], handler{pat: pat, h: h}) + if s.lastMatchWins { + s.handlers[meth] = append([]handler{handler{pat: pat, h: h}}, s.handlers[meth]...) + } else { + s.handlers[meth] = append(s.handlers[meth], handler{pat: pat, h: h}) + } } // ServeHTTP dispatches the request to the first handler whose pattern matches to r.Method and r.Path. @@ -164,8 +212,7 @@ func (s *ServeMux) ServeHTTP(w http.ResponseWriter, r *http.Request) { if idx := strings.LastIndex(components[l-1], ":"); idx == 0 { if s.protoErrorHandler != nil { _, outboundMarshaler := MarshalerForRequest(s, r) - sterr := status.Error(codes.Unimplemented, http.StatusText(http.StatusNotImplemented)) - s.protoErrorHandler(ctx, s, outboundMarshaler, w, r, sterr) + s.protoErrorHandler(ctx, s, outboundMarshaler, w, r, ErrUnknownURI) } else { OtherErrorHandler(w, r, http.StatusText(http.StatusNotFound), http.StatusNotFound) } @@ -175,7 +222,7 @@ func (s *ServeMux) ServeHTTP(w http.ResponseWriter, r *http.Request) { components[l-1], verb = c[:idx], c[idx+1:] } - if override := r.Header.Get("X-HTTP-Method-Override"); override != "" && isPathLengthFallback(r) { + if override := r.Header.Get("X-HTTP-Method-Override"); override != "" && s.isPathLengthFallback(r) { r.Method = strings.ToUpper(override) if err := r.ParseForm(); err != nil { if s.protoErrorHandler != nil { @@ -209,7 +256,7 @@ func (s *ServeMux) ServeHTTP(w http.ResponseWriter, r *http.Request) { continue } // X-HTTP-Method-Override is optional. Always allow fallback to POST. - if isPathLengthFallback(r) { + if s.isPathLengthFallback(r) { if err := r.ParseForm(); err != nil { if s.protoErrorHandler != nil { _, outboundMarshaler := MarshalerForRequest(s, r) @@ -225,8 +272,7 @@ func (s *ServeMux) ServeHTTP(w http.ResponseWriter, r *http.Request) { } if s.protoErrorHandler != nil { _, outboundMarshaler := MarshalerForRequest(s, r) - sterr := status.Error(codes.Unimplemented, http.StatusText(http.StatusMethodNotAllowed)) - s.protoErrorHandler(ctx, s, outboundMarshaler, w, r, sterr) + s.protoErrorHandler(ctx, s, outboundMarshaler, w, r, ErrUnknownURI) } else { OtherErrorHandler(w, r, http.StatusText(http.StatusMethodNotAllowed), http.StatusMethodNotAllowed) } @@ -236,8 +282,7 @@ func (s *ServeMux) ServeHTTP(w http.ResponseWriter, r *http.Request) { if s.protoErrorHandler != nil { _, outboundMarshaler := MarshalerForRequest(s, r) - sterr := status.Error(codes.Unimplemented, http.StatusText(http.StatusNotImplemented)) - s.protoErrorHandler(ctx, s, outboundMarshaler, w, r, sterr) + s.protoErrorHandler(ctx, s, outboundMarshaler, w, r, ErrUnknownURI) } else { OtherErrorHandler(w, r, http.StatusText(http.StatusNotFound), http.StatusNotFound) } @@ -248,8 +293,8 @@ func (s *ServeMux) GetForwardResponseOptions() []func(context.Context, http.Resp return s.forwardResponseOptions } -func isPathLengthFallback(r *http.Request) bool { - return r.Method == "POST" && r.Header.Get("Content-Type") == "application/x-www-form-urlencoded" +func (s *ServeMux) isPathLengthFallback(r *http.Request) bool { + return !s.disablePathLengthFallback && r.Method == "POST" && r.Header.Get("Content-Type") == "application/x-www-form-urlencoded" } type handler struct { diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/pattern.go b/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/pattern.go index f16a84ad38..09053695da 100644 --- a/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/pattern.go +++ b/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/pattern.go @@ -35,14 +35,31 @@ type Pattern struct { tailLen int // verb is the VERB part of the path pattern. It is empty if the pattern does not have VERB part. verb string + // assumeColonVerb indicates whether a path suffix after a final + // colon may only be interpreted as a verb. + assumeColonVerb bool } +type patternOptions struct { + assumeColonVerb bool +} + +// PatternOpt is an option for creating Patterns. +type PatternOpt func(*patternOptions) + // NewPattern returns a new Pattern from the given definition values. // "ops" is a sequence of op codes. "pool" is a constant pool. // "verb" is the verb part of the pattern. It is empty if the pattern does not have the part. // "version" must be 1 for now. // It returns an error if the given definition is invalid. -func NewPattern(version int, ops []int, pool []string, verb string) (Pattern, error) { +func NewPattern(version int, ops []int, pool []string, verb string, opts ...PatternOpt) (Pattern, error) { + options := patternOptions{ + assumeColonVerb: true, + } + for _, o := range opts { + o(&options) + } + if version != 1 { grpclog.Infof("unsupported version: %d", version) return Pattern{}, ErrInvalidPattern @@ -122,12 +139,13 @@ func NewPattern(version int, ops []int, pool []string, verb string) (Pattern, er typedOps = append(typedOps, op) } return Pattern{ - ops: typedOps, - pool: pool, - vars: vars, - stacksize: maxstack, - tailLen: tailLen, - verb: verb, + ops: typedOps, + pool: pool, + vars: vars, + stacksize: maxstack, + tailLen: tailLen, + verb: verb, + assumeColonVerb: options.assumeColonVerb, }, nil } @@ -144,7 +162,16 @@ func MustPattern(p Pattern, err error) Pattern { // If otherwise, the function returns an error. func (p Pattern) Match(components []string, verb string) (map[string]string, error) { if p.verb != verb { - return nil, ErrNotMatch + if p.assumeColonVerb || p.verb != "" { + return nil, ErrNotMatch + } + if len(components) == 0 { + components = []string{":" + verb} + } else { + components = append([]string{}, components...) + components[len(components)-1] += ":" + verb + } + verb = "" } var pos int @@ -225,3 +252,11 @@ func (p Pattern) String() string { } return "/" + segs } + +// AssumeColonVerbOpt indicates whether a path suffix after a final +// colon may only be interpreted as a verb. +func AssumeColonVerbOpt(val bool) PatternOpt { + return PatternOpt(func(o *patternOptions) { + o.assumeColonVerb = val + }) +} diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/proto_errors.go b/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/proto_errors.go index 43fafca7c2..ca76324efb 100644 --- a/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/proto_errors.go +++ b/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/proto_errors.go @@ -1,15 +1,25 @@ package runtime import ( + "context" "io" "net/http" - "context" + "github.com/golang/protobuf/ptypes/any" + "github.com/grpc-ecosystem/grpc-gateway/internal" "google.golang.org/grpc/codes" "google.golang.org/grpc/grpclog" "google.golang.org/grpc/status" ) +// StreamErrorHandlerFunc accepts an error as a gRPC error generated via status package and translates it into a +// a proto struct used to represent error at the end of a stream. +type StreamErrorHandlerFunc func(context.Context, error) *StreamError + +// StreamError is the payload for the final message in a server stream in the event that the server returns an +// error after a response message has already been sent. +type StreamError internal.StreamError + // ProtoErrorHandlerFunc handles the error as a gRPC error generated via status package and replies to the request. type ProtoErrorHandlerFunc func(context.Context, *ServeMux, Marshaler, http.ResponseWriter, *http.Request, error) @@ -26,14 +36,23 @@ func DefaultHTTPProtoErrorHandler(ctx context.Context, mux *ServeMux, marshaler // return Internal when Marshal failed const fallback = `{"code": 13, "message": "failed to marshal error message"}` - w.Header().Del("Trailer") - w.Header().Set("Content-Type", marshaler.ContentType()) - s, ok := status.FromError(err) if !ok { s = status.New(codes.Unknown, err.Error()) } + w.Header().Del("Trailer") + + contentType := marshaler.ContentType() + // Check marshaler on run time in order to keep backwards compatability + // An interface param needs to be added to the ContentType() function on + // the Marshal interface to be able to remove this check + if httpBodyMarshaler, ok := marshaler.(*HTTPBodyMarshaler); ok { + pb := s.Proto() + contentType = httpBodyMarshaler.ContentTypeFromMessage(pb) + } + w.Header().Set("Content-Type", contentType) + buf, merr := marshaler.Marshal(s.Proto()) if merr != nil { grpclog.Infof("Failed to marshal error message %q: %v", s.Proto(), merr) @@ -59,3 +78,29 @@ func DefaultHTTPProtoErrorHandler(ctx context.Context, mux *ServeMux, marshaler handleForwardResponseTrailer(w, md) } + +// DefaultHTTPStreamErrorHandler converts the given err into a *StreamError via +// default logic. +// +// It extracts the gRPC status from err if possible. The fields of the status are +// used to populate the returned StreamError, and the HTTP status code is derived +// from the gRPC code via HTTPStatusFromCode. If the given err does not contain a +// gRPC status, an "Unknown" gRPC code is used and "Internal Server Error" HTTP code. +func DefaultHTTPStreamErrorHandler(_ context.Context, err error) *StreamError { + grpcCode := codes.Unknown + grpcMessage := err.Error() + var grpcDetails []*any.Any + if s, ok := status.FromError(err); ok { + grpcCode = s.Code() + grpcMessage = s.Message() + grpcDetails = s.Proto().GetDetails() + } + httpCode := HTTPStatusFromCode(grpcCode) + return &StreamError{ + GrpcCode: int32(grpcCode), + HttpCode: int32(httpCode), + Message: grpcMessage, + HttpStatus: http.StatusText(httpCode), + Details: grpcDetails, + } +} diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/query.go b/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/query.go index bb9359f17c..ee0207e461 100644 --- a/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/query.go +++ b/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/query.go @@ -15,15 +15,13 @@ import ( "google.golang.org/grpc/grpclog" ) +var valuesKeyRegexp = regexp.MustCompile("^(.*)\\[(.*)\\]$") + // PopulateQueryParameters populates "values" into "msg". // A value is ignored if its key starts with one of the elements in "filter". func PopulateQueryParameters(msg proto.Message, values url.Values, filter *utilities.DoubleArray) error { for key, values := range values { - re, err := regexp.Compile("^(.*)\\[(.*)\\]$") - if err != nil { - return err - } - match := re.FindStringSubmatch(key) + match := valuesKeyRegexp.FindStringSubmatch(key) if len(match) == 3 { key = match[1] values = append([]string{match[2]}, values...) @@ -202,103 +200,102 @@ func populateField(f reflect.Value, value string, props *proto.Properties) error i := f.Addr().Interface() // Handle protobuf well known types - type wkt interface { - XXX_WellKnownType() string + var name string + switch m := i.(type) { + case interface{ XXX_WellKnownType() string }: + name = m.XXX_WellKnownType() + case proto.Message: + const wktPrefix = "google.protobuf." + if fullName := proto.MessageName(m); strings.HasPrefix(fullName, wktPrefix) { + name = fullName[len(wktPrefix):] + } } - if wkt, ok := i.(wkt); ok { - switch wkt.XXX_WellKnownType() { - case "Timestamp": - if value == "null" { - f.Field(0).SetInt(0) - f.Field(1).SetInt(0) - return nil - } - - t, err := time.Parse(time.RFC3339Nano, value) - if err != nil { - return fmt.Errorf("bad Timestamp: %v", err) - } - f.Field(0).SetInt(int64(t.Unix())) - f.Field(1).SetInt(int64(t.Nanosecond())) + switch name { + case "Timestamp": + if value == "null" { + f.FieldByName("Seconds").SetInt(0) + f.FieldByName("Nanos").SetInt(0) return nil - case "Duration": - if value == "null" { - f.Field(0).SetInt(0) - f.Field(1).SetInt(0) - return nil - } - d, err := time.ParseDuration(value) - if err != nil { - return fmt.Errorf("bad Duration: %v", err) - } + } - ns := d.Nanoseconds() - s := ns / 1e9 - ns %= 1e9 - f.Field(0).SetInt(s) - f.Field(1).SetInt(ns) - return nil - case "DoubleValue": - fallthrough - case "FloatValue": - float64Val, err := strconv.ParseFloat(value, 64) - if err != nil { - return fmt.Errorf("bad DoubleValue: %s", value) - } - f.Field(0).SetFloat(float64Val) - return nil - case "Int64Value": - fallthrough - case "Int32Value": - int64Val, err := strconv.ParseInt(value, 10, 64) - if err != nil { - return fmt.Errorf("bad DoubleValue: %s", value) - } - f.Field(0).SetInt(int64Val) - return nil - case "UInt64Value": - fallthrough - case "UInt32Value": - uint64Val, err := strconv.ParseUint(value, 10, 64) - if err != nil { - return fmt.Errorf("bad DoubleValue: %s", value) - } - f.Field(0).SetUint(uint64Val) - return nil - case "BoolValue": - if value == "true" { - f.Field(0).SetBool(true) - } else if value == "false" { - f.Field(0).SetBool(false) - } else { - return fmt.Errorf("bad BoolValue: %s", value) - } - return nil - case "StringValue": - f.Field(0).SetString(value) - return nil - case "BytesValue": - bytesVal, err := base64.StdEncoding.DecodeString(value) - if err != nil { - return fmt.Errorf("bad BytesValue: %s", value) - } - f.Field(0).SetBytes(bytesVal) + t, err := time.Parse(time.RFC3339Nano, value) + if err != nil { + return fmt.Errorf("bad Timestamp: %v", err) + } + f.FieldByName("Seconds").SetInt(int64(t.Unix())) + f.FieldByName("Nanos").SetInt(int64(t.Nanosecond())) + return nil + case "Duration": + if value == "null" { + f.FieldByName("Seconds").SetInt(0) + f.FieldByName("Nanos").SetInt(0) return nil } - } + d, err := time.ParseDuration(value) + if err != nil { + return fmt.Errorf("bad Duration: %v", err) + } - // Handle google well known types - if gwkt, ok := i.(proto.Message); ok { - switch proto.MessageName(gwkt) { - case "google.protobuf.FieldMask": - p := f.Field(0) - for _, v := range strings.Split(value, ",") { - if v != "" { - p.Set(reflect.Append(p, reflect.ValueOf(v))) - } + ns := d.Nanoseconds() + s := ns / 1e9 + ns %= 1e9 + f.FieldByName("Seconds").SetInt(s) + f.FieldByName("Nanos").SetInt(ns) + return nil + case "DoubleValue": + fallthrough + case "FloatValue": + float64Val, err := strconv.ParseFloat(value, 64) + if err != nil { + return fmt.Errorf("bad DoubleValue: %s", value) + } + f.FieldByName("Value").SetFloat(float64Val) + return nil + case "Int64Value": + fallthrough + case "Int32Value": + int64Val, err := strconv.ParseInt(value, 10, 64) + if err != nil { + return fmt.Errorf("bad DoubleValue: %s", value) + } + f.FieldByName("Value").SetInt(int64Val) + return nil + case "UInt64Value": + fallthrough + case "UInt32Value": + uint64Val, err := strconv.ParseUint(value, 10, 64) + if err != nil { + return fmt.Errorf("bad DoubleValue: %s", value) + } + f.FieldByName("Value").SetUint(uint64Val) + return nil + case "BoolValue": + if value == "true" { + f.FieldByName("Value").SetBool(true) + } else if value == "false" { + f.FieldByName("Value").SetBool(false) + } else { + return fmt.Errorf("bad BoolValue: %s", value) + } + return nil + case "StringValue": + f.FieldByName("Value").SetString(value) + return nil + case "BytesValue": + bytesVal, err := base64.StdEncoding.DecodeString(value) + if err != nil { + return fmt.Errorf("bad BytesValue: %s", value) + } + f.FieldByName("Value").SetBytes(bytesVal) + return nil + case "FieldMask": + p := f.FieldByName("Paths") + for _, v := range strings.Split(value, ",") { + if v != "" { + p.Set(reflect.Append(p, reflect.ValueOf(v))) } - return nil } + return nil } // Handle Time and Duration stdlib types diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis/README.grpc-gateway b/vendor/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis/README.grpc-gateway new file mode 100644 index 0000000000..b7d1bea36c --- /dev/null +++ b/vendor/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis/README.grpc-gateway @@ -0,0 +1,23 @@ +Google APIs +============ + +Project: Google APIs +URL: https://github.com/google/googleapis +Revision: 3544ab16c3342d790b00764251e348705991ea4b +License: Apache License 2.0 + + +Imported Files +--------------- + +- google/api/annotations.proto +- google/api/http.proto +- google/api/httpbody.proto + + +Generated Files +---------------- + +They are generated from the .proto files by protoc-gen-go. +- google/api/annotations.pb.go +- google/api/http.pb.go diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis/google/api/httpbody.proto b/vendor/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis/google/api/httpbody.proto new file mode 100644 index 0000000000..4428515c12 --- /dev/null +++ b/vendor/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis/google/api/httpbody.proto @@ -0,0 +1,78 @@ +// Copyright 2018 Google LLC. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +syntax = "proto3"; + +package google.api; + +import "google/protobuf/any.proto"; + +option cc_enable_arenas = true; +option go_package = "google.golang.org/genproto/googleapis/api/httpbody;httpbody"; +option java_multiple_files = true; +option java_outer_classname = "HttpBodyProto"; +option java_package = "com.google.api"; +option objc_class_prefix = "GAPI"; + +// Message that represents an arbitrary HTTP body. It should only be used for +// payload formats that can't be represented as JSON, such as raw binary or +// an HTML page. +// +// +// This message can be used both in streaming and non-streaming API methods in +// the request as well as the response. +// +// It can be used as a top-level request field, which is convenient if one +// wants to extract parameters from either the URL or HTTP template into the +// request fields and also want access to the raw HTTP body. +// +// Example: +// +// message GetResourceRequest { +// // A unique request id. +// string request_id = 1; +// +// // The raw HTTP body is bound to this field. +// google.api.HttpBody http_body = 2; +// } +// +// service ResourceService { +// rpc GetResource(GetResourceRequest) returns (google.api.HttpBody); +// rpc UpdateResource(google.api.HttpBody) returns +// (google.protobuf.Empty); +// } +// +// Example with streaming methods: +// +// service CaldavService { +// rpc GetCalendar(stream google.api.HttpBody) +// returns (stream google.api.HttpBody); +// rpc UpdateCalendar(stream google.api.HttpBody) +// returns (stream google.api.HttpBody); +// } +// +// Use of this type only changes how the request and response bodies are +// handled, all other features will continue to work unchanged. +message HttpBody { + // The HTTP Content-Type header value specifying the content type of the body. + string content_type = 1; + + // The HTTP request/response body as raw binary. + bytes data = 2; + + // Application specific response metadata. Must be set in the first response + // for streaming APIs. + repeated google.protobuf.Any extensions = 3; +} \ No newline at end of file diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/utilities/BUILD.bazel b/vendor/github.com/grpc-ecosystem/grpc-gateway/utilities/BUILD.bazel index 58d291c373..7109d79323 100644 --- a/vendor/github.com/grpc-ecosystem/grpc-gateway/utilities/BUILD.bazel +++ b/vendor/github.com/grpc-ecosystem/grpc-gateway/utilities/BUILD.bazel @@ -7,14 +7,15 @@ go_library( srcs = [ "doc.go", "pattern.go", + "readerfactory.go", "trie.go", ], importpath = "github.com/grpc-ecosystem/grpc-gateway/utilities", ) go_test( - name = "go_default_xtest", + name = "go_default_test", size = "small", srcs = ["trie_test.go"], - deps = [":go_default_library"], + embed = [":go_default_library"], ) diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/utilities/readerfactory.go b/vendor/github.com/grpc-ecosystem/grpc-gateway/utilities/readerfactory.go new file mode 100644 index 0000000000..6dd3854665 --- /dev/null +++ b/vendor/github.com/grpc-ecosystem/grpc-gateway/utilities/readerfactory.go @@ -0,0 +1,20 @@ +package utilities + +import ( + "bytes" + "io" + "io/ioutil" +) + +// IOReaderFactory takes in an io.Reader and returns a function that will allow you to create a new reader that begins +// at the start of the stream +func IOReaderFactory(r io.Reader) (func() io.Reader, error) { + b, err := ioutil.ReadAll(r) + if err != nil { + return nil, err + } + + return func() io.Reader { + return bytes.NewReader(b) + }, nil +} diff --git a/vendor/golang.org/x/sys/unix/mkasm_darwin.go b/vendor/golang.org/x/sys/unix/mkasm_darwin.go deleted file mode 100644 index 4548b993db..0000000000 --- a/vendor/golang.org/x/sys/unix/mkasm_darwin.go +++ /dev/null @@ -1,61 +0,0 @@ -// Copyright 2018 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build ignore - -// mkasm_darwin.go generates assembly trampolines to call libSystem routines from Go. -//This program must be run after mksyscall.go. -package main - -import ( - "bytes" - "fmt" - "io/ioutil" - "log" - "os" - "strings" -) - -func main() { - in1, err := ioutil.ReadFile("syscall_darwin.go") - if err != nil { - log.Fatalf("can't open syscall_darwin.go: %s", err) - } - arch := os.Args[1] - in2, err := ioutil.ReadFile(fmt.Sprintf("syscall_darwin_%s.go", arch)) - if err != nil { - log.Fatalf("can't open syscall_darwin_%s.go: %s", arch, err) - } - in3, err := ioutil.ReadFile(fmt.Sprintf("zsyscall_darwin_%s.go", arch)) - if err != nil { - log.Fatalf("can't open zsyscall_darwin_%s.go: %s", arch, err) - } - in := string(in1) + string(in2) + string(in3) - - trampolines := map[string]bool{} - - var out bytes.Buffer - - fmt.Fprintf(&out, "// go run mkasm_darwin.go %s\n", strings.Join(os.Args[1:], " ")) - fmt.Fprintf(&out, "// Code generated by the command above; DO NOT EDIT.\n") - fmt.Fprintf(&out, "\n") - fmt.Fprintf(&out, "// +build go1.12\n") - fmt.Fprintf(&out, "\n") - fmt.Fprintf(&out, "#include \"textflag.h\"\n") - for _, line := range strings.Split(in, "\n") { - if !strings.HasPrefix(line, "func ") || !strings.HasSuffix(line, "_trampoline()") { - continue - } - fn := line[5 : len(line)-13] - if !trampolines[fn] { - trampolines[fn] = true - fmt.Fprintf(&out, "TEXT ·%s_trampoline(SB),NOSPLIT,$0-0\n", fn) - fmt.Fprintf(&out, "\tJMP\t%s(SB)\n", fn) - } - } - err = ioutil.WriteFile(fmt.Sprintf("zsyscall_darwin_%s.s", arch), out.Bytes(), 0644) - if err != nil { - log.Fatalf("can't write zsyscall_darwin_%s.s: %s", arch, err) - } -} diff --git a/vendor/golang.org/x/sys/unix/mkpost.go b/vendor/golang.org/x/sys/unix/mkpost.go deleted file mode 100644 index 9feddd00c4..0000000000 --- a/vendor/golang.org/x/sys/unix/mkpost.go +++ /dev/null @@ -1,106 +0,0 @@ -// Copyright 2016 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build ignore - -// mkpost processes the output of cgo -godefs to -// modify the generated types. It is used to clean up -// the sys API in an architecture specific manner. -// -// mkpost is run after cgo -godefs; see README.md. -package main - -import ( - "bytes" - "fmt" - "go/format" - "io/ioutil" - "log" - "os" - "regexp" -) - -func main() { - // Get the OS and architecture (using GOARCH_TARGET if it exists) - goos := os.Getenv("GOOS") - goarch := os.Getenv("GOARCH_TARGET") - if goarch == "" { - goarch = os.Getenv("GOARCH") - } - // Check that we are using the Docker-based build system if we should be. - if goos == "linux" { - if os.Getenv("GOLANG_SYS_BUILD") != "docker" { - os.Stderr.WriteString("In the Docker-based build system, mkpost should not be called directly.\n") - os.Stderr.WriteString("See README.md\n") - os.Exit(1) - } - } - - b, err := ioutil.ReadAll(os.Stdin) - if err != nil { - log.Fatal(err) - } - - // Intentionally export __val fields in Fsid and Sigset_t - valRegex := regexp.MustCompile(`type (Fsid|Sigset_t) struct {(\s+)X__val(\s+\S+\s+)}`) - b = valRegex.ReplaceAll(b, []byte("type $1 struct {${2}Val$3}")) - - // Intentionally export __fds_bits field in FdSet - fdSetRegex := regexp.MustCompile(`type (FdSet) struct {(\s+)X__fds_bits(\s+\S+\s+)}`) - b = fdSetRegex.ReplaceAll(b, []byte("type $1 struct {${2}Bits$3}")) - - // If we have empty Ptrace structs, we should delete them. Only s390x emits - // nonempty Ptrace structs. - ptraceRexexp := regexp.MustCompile(`type Ptrace((Psw|Fpregs|Per) struct {\s*})`) - b = ptraceRexexp.ReplaceAll(b, nil) - - // Replace the control_regs union with a blank identifier for now. - controlRegsRegex := regexp.MustCompile(`(Control_regs)\s+\[0\]uint64`) - b = controlRegsRegex.ReplaceAll(b, []byte("_ [0]uint64")) - - // Remove fields that are added by glibc - // Note that this is unstable as the identifers are private. - removeFieldsRegex := regexp.MustCompile(`X__glibc\S*`) - b = removeFieldsRegex.ReplaceAll(b, []byte("_")) - - // Convert [65]int8 to [65]byte in Utsname members to simplify - // conversion to string; see golang.org/issue/20753 - convertUtsnameRegex := regexp.MustCompile(`((Sys|Node|Domain)name|Release|Version|Machine)(\s+)\[(\d+)\]u?int8`) - b = convertUtsnameRegex.ReplaceAll(b, []byte("$1$3[$4]byte")) - - // Convert [1024]int8 to [1024]byte in Ptmget members - convertPtmget := regexp.MustCompile(`([SC]n)(\s+)\[(\d+)\]u?int8`) - b = convertPtmget.ReplaceAll(b, []byte("$1[$3]byte")) - - // Remove spare fields (e.g. in Statx_t) - spareFieldsRegex := regexp.MustCompile(`X__spare\S*`) - b = spareFieldsRegex.ReplaceAll(b, []byte("_")) - - // Remove cgo padding fields - removePaddingFieldsRegex := regexp.MustCompile(`Pad_cgo_\d+`) - b = removePaddingFieldsRegex.ReplaceAll(b, []byte("_")) - - // Remove padding, hidden, or unused fields - removeFieldsRegex = regexp.MustCompile(`\b(X_\S+|Padding)`) - b = removeFieldsRegex.ReplaceAll(b, []byte("_")) - - // Remove the first line of warning from cgo - b = b[bytes.IndexByte(b, '\n')+1:] - // Modify the command in the header to include: - // mkpost, our own warning, and a build tag. - replacement := fmt.Sprintf(`$1 | go run mkpost.go -// Code generated by the command above; see README.md. DO NOT EDIT. - -// +build %s,%s`, goarch, goos) - cgoCommandRegex := regexp.MustCompile(`(cgo -godefs .*)`) - b = cgoCommandRegex.ReplaceAll(b, []byte(replacement)) - - // gofmt - b, err = format.Source(b) - if err != nil { - log.Fatal(err) - } - - os.Stdout.Write(b) -} diff --git a/vendor/golang.org/x/sys/unix/mksyscall_aix_ppc.go b/vendor/golang.org/x/sys/unix/mksyscall_aix_ppc.go deleted file mode 100644 index f2c58fb7cc..0000000000 --- a/vendor/golang.org/x/sys/unix/mksyscall_aix_ppc.go +++ /dev/null @@ -1,404 +0,0 @@ -// Copyright 2019 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build ignore - -/* -This program reads a file containing function prototypes -(like syscall_aix.go) and generates system call bodies. -The prototypes are marked by lines beginning with "//sys" -and read like func declarations if //sys is replaced by func, but: - * The parameter lists must give a name for each argument. - This includes return parameters. - * The parameter lists must give a type for each argument: - the (x, y, z int) shorthand is not allowed. - * If the return parameter is an error number, it must be named err. - * If go func name needs to be different than its libc name, - * or the function is not in libc, name could be specified - * at the end, after "=" sign, like - //sys getsockopt(s int, level int, name int, val uintptr, vallen *_Socklen) (err error) = libsocket.getsockopt -*/ -package main - -import ( - "bufio" - "flag" - "fmt" - "os" - "regexp" - "strings" -) - -var ( - b32 = flag.Bool("b32", false, "32bit big-endian") - l32 = flag.Bool("l32", false, "32bit little-endian") - aix = flag.Bool("aix", false, "aix") - tags = flag.String("tags", "", "build tags") -) - -// cmdLine returns this programs's commandline arguments -func cmdLine() string { - return "go run mksyscall_aix_ppc.go " + strings.Join(os.Args[1:], " ") -} - -// buildTags returns build tags -func buildTags() string { - return *tags -} - -// Param is function parameter -type Param struct { - Name string - Type string -} - -// usage prints the program usage -func usage() { - fmt.Fprintf(os.Stderr, "usage: go run mksyscall_aix_ppc.go [-b32 | -l32] [-tags x,y] [file ...]\n") - os.Exit(1) -} - -// parseParamList parses parameter list and returns a slice of parameters -func parseParamList(list string) []string { - list = strings.TrimSpace(list) - if list == "" { - return []string{} - } - return regexp.MustCompile(`\s*,\s*`).Split(list, -1) -} - -// parseParam splits a parameter into name and type -func parseParam(p string) Param { - ps := regexp.MustCompile(`^(\S*) (\S*)$`).FindStringSubmatch(p) - if ps == nil { - fmt.Fprintf(os.Stderr, "malformed parameter: %s\n", p) - os.Exit(1) - } - return Param{ps[1], ps[2]} -} - -func main() { - flag.Usage = usage - flag.Parse() - if len(flag.Args()) <= 0 { - fmt.Fprintf(os.Stderr, "no files to parse provided\n") - usage() - } - - endianness := "" - if *b32 { - endianness = "big-endian" - } else if *l32 { - endianness = "little-endian" - } - - pack := "" - text := "" - cExtern := "/*\n#include \n#include \n" - for _, path := range flag.Args() { - file, err := os.Open(path) - if err != nil { - fmt.Fprintf(os.Stderr, err.Error()) - os.Exit(1) - } - s := bufio.NewScanner(file) - for s.Scan() { - t := s.Text() - t = strings.TrimSpace(t) - t = regexp.MustCompile(`\s+`).ReplaceAllString(t, ` `) - if p := regexp.MustCompile(`^package (\S+)$`).FindStringSubmatch(t); p != nil && pack == "" { - pack = p[1] - } - nonblock := regexp.MustCompile(`^\/\/sysnb `).FindStringSubmatch(t) - if regexp.MustCompile(`^\/\/sys `).FindStringSubmatch(t) == nil && nonblock == nil { - continue - } - - // Line must be of the form - // func Open(path string, mode int, perm int) (fd int, err error) - // Split into name, in params, out params. - f := regexp.MustCompile(`^\/\/sys(nb)? (\w+)\(([^()]*)\)\s*(?:\(([^()]+)\))?\s*(?:=\s*(?:(\w*)\.)?(\w*))?$`).FindStringSubmatch(t) - if f == nil { - fmt.Fprintf(os.Stderr, "%s:%s\nmalformed //sys declaration\n", path, t) - os.Exit(1) - } - funct, inps, outps, modname, sysname := f[2], f[3], f[4], f[5], f[6] - - // Split argument lists on comma. - in := parseParamList(inps) - out := parseParamList(outps) - - inps = strings.Join(in, ", ") - outps = strings.Join(out, ", ") - - // Try in vain to keep people from editing this file. - // The theory is that they jump into the middle of the file - // without reading the header. - text += "// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT\n\n" - - // Check if value return, err return available - errvar := "" - retvar := "" - rettype := "" - for _, param := range out { - p := parseParam(param) - if p.Type == "error" { - errvar = p.Name - } else { - retvar = p.Name - rettype = p.Type - } - } - - // System call name. - if sysname == "" { - sysname = funct - } - sysname = regexp.MustCompile(`([a-z])([A-Z])`).ReplaceAllString(sysname, `${1}_$2`) - sysname = strings.ToLower(sysname) // All libc functions are lowercase. - - cRettype := "" - if rettype == "unsafe.Pointer" { - cRettype = "uintptr_t" - } else if rettype == "uintptr" { - cRettype = "uintptr_t" - } else if regexp.MustCompile(`^_`).FindStringSubmatch(rettype) != nil { - cRettype = "uintptr_t" - } else if rettype == "int" { - cRettype = "int" - } else if rettype == "int32" { - cRettype = "int" - } else if rettype == "int64" { - cRettype = "long long" - } else if rettype == "uint32" { - cRettype = "unsigned int" - } else if rettype == "uint64" { - cRettype = "unsigned long long" - } else { - cRettype = "int" - } - if sysname == "exit" { - cRettype = "void" - } - - // Change p.Types to c - var cIn []string - for _, param := range in { - p := parseParam(param) - if regexp.MustCompile(`^\*`).FindStringSubmatch(p.Type) != nil { - cIn = append(cIn, "uintptr_t") - } else if p.Type == "string" { - cIn = append(cIn, "uintptr_t") - } else if regexp.MustCompile(`^\[\](.*)`).FindStringSubmatch(p.Type) != nil { - cIn = append(cIn, "uintptr_t", "size_t") - } else if p.Type == "unsafe.Pointer" { - cIn = append(cIn, "uintptr_t") - } else if p.Type == "uintptr" { - cIn = append(cIn, "uintptr_t") - } else if regexp.MustCompile(`^_`).FindStringSubmatch(p.Type) != nil { - cIn = append(cIn, "uintptr_t") - } else if p.Type == "int" { - cIn = append(cIn, "int") - } else if p.Type == "int32" { - cIn = append(cIn, "int") - } else if p.Type == "int64" { - cIn = append(cIn, "long long") - } else if p.Type == "uint32" { - cIn = append(cIn, "unsigned int") - } else if p.Type == "uint64" { - cIn = append(cIn, "unsigned long long") - } else { - cIn = append(cIn, "int") - } - } - - if funct != "fcntl" && funct != "FcntlInt" && funct != "readlen" && funct != "writelen" { - // Imports of system calls from libc - cExtern += fmt.Sprintf("%s %s", cRettype, sysname) - cIn := strings.Join(cIn, ", ") - cExtern += fmt.Sprintf("(%s);\n", cIn) - } - - // So file name. - if *aix { - if modname == "" { - modname = "libc.a/shr_64.o" - } else { - fmt.Fprintf(os.Stderr, "%s: only syscall using libc are available\n", funct) - os.Exit(1) - } - } - - strconvfunc := "C.CString" - - // Go function header. - if outps != "" { - outps = fmt.Sprintf(" (%s)", outps) - } - if text != "" { - text += "\n" - } - - text += fmt.Sprintf("func %s(%s)%s {\n", funct, strings.Join(in, ", "), outps) - - // Prepare arguments to Syscall. - var args []string - n := 0 - argN := 0 - for _, param := range in { - p := parseParam(param) - if regexp.MustCompile(`^\*`).FindStringSubmatch(p.Type) != nil { - args = append(args, "C.uintptr_t(uintptr(unsafe.Pointer("+p.Name+")))") - } else if p.Type == "string" && errvar != "" { - text += fmt.Sprintf("\t_p%d := uintptr(unsafe.Pointer(%s(%s)))\n", n, strconvfunc, p.Name) - args = append(args, fmt.Sprintf("C.uintptr_t(_p%d)", n)) - n++ - } else if p.Type == "string" { - fmt.Fprintf(os.Stderr, path+":"+funct+" uses string arguments, but has no error return\n") - text += fmt.Sprintf("\t_p%d := uintptr(unsafe.Pointer(%s(%s)))\n", n, strconvfunc, p.Name) - args = append(args, fmt.Sprintf("C.uintptr_t(_p%d)", n)) - n++ - } else if m := regexp.MustCompile(`^\[\](.*)`).FindStringSubmatch(p.Type); m != nil { - // Convert slice into pointer, length. - // Have to be careful not to take address of &a[0] if len == 0: - // pass nil in that case. - text += fmt.Sprintf("\tvar _p%d *%s\n", n, m[1]) - text += fmt.Sprintf("\tif len(%s) > 0 {\n\t\t_p%d = &%s[0]\n\t}\n", p.Name, n, p.Name) - args = append(args, fmt.Sprintf("C.uintptr_t(uintptr(unsafe.Pointer(_p%d)))", n)) - n++ - text += fmt.Sprintf("\tvar _p%d int\n", n) - text += fmt.Sprintf("\t_p%d = len(%s)\n", n, p.Name) - args = append(args, fmt.Sprintf("C.size_t(_p%d)", n)) - n++ - } else if p.Type == "int64" && endianness != "" { - if endianness == "big-endian" { - args = append(args, fmt.Sprintf("uintptr(%s>>32)", p.Name), fmt.Sprintf("uintptr(%s)", p.Name)) - } else { - args = append(args, fmt.Sprintf("uintptr(%s)", p.Name), fmt.Sprintf("uintptr(%s>>32)", p.Name)) - } - n++ - } else if p.Type == "bool" { - text += fmt.Sprintf("\tvar _p%d uint32\n", n) - text += fmt.Sprintf("\tif %s {\n\t\t_p%d = 1\n\t} else {\n\t\t_p%d = 0\n\t}\n", p.Name, n, n) - args = append(args, fmt.Sprintf("_p%d", n)) - } else if regexp.MustCompile(`^_`).FindStringSubmatch(p.Type) != nil { - args = append(args, fmt.Sprintf("C.uintptr_t(uintptr(%s))", p.Name)) - } else if p.Type == "unsafe.Pointer" { - args = append(args, fmt.Sprintf("C.uintptr_t(uintptr(%s))", p.Name)) - } else if p.Type == "int" { - if (argN == 2) && ((funct == "readlen") || (funct == "writelen")) { - args = append(args, fmt.Sprintf("C.size_t(%s)", p.Name)) - } else if argN == 0 && funct == "fcntl" { - args = append(args, fmt.Sprintf("C.uintptr_t(%s)", p.Name)) - } else if (argN == 2) && ((funct == "fcntl") || (funct == "FcntlInt")) { - args = append(args, fmt.Sprintf("C.uintptr_t(%s)", p.Name)) - } else { - args = append(args, fmt.Sprintf("C.int(%s)", p.Name)) - } - } else if p.Type == "int32" { - args = append(args, fmt.Sprintf("C.int(%s)", p.Name)) - } else if p.Type == "int64" { - args = append(args, fmt.Sprintf("C.longlong(%s)", p.Name)) - } else if p.Type == "uint32" { - args = append(args, fmt.Sprintf("C.uint(%s)", p.Name)) - } else if p.Type == "uint64" { - args = append(args, fmt.Sprintf("C.ulonglong(%s)", p.Name)) - } else if p.Type == "uintptr" { - args = append(args, fmt.Sprintf("C.uintptr_t(%s)", p.Name)) - } else { - args = append(args, fmt.Sprintf("C.int(%s)", p.Name)) - } - argN++ - } - - // Actual call. - arglist := strings.Join(args, ", ") - call := "" - if sysname == "exit" { - if errvar != "" { - call += "er :=" - } else { - call += "" - } - } else if errvar != "" { - call += "r0,er :=" - } else if retvar != "" { - call += "r0,_ :=" - } else { - call += "" - } - call += fmt.Sprintf("C.%s(%s)", sysname, arglist) - - // Assign return values. - body := "" - for i := 0; i < len(out); i++ { - p := parseParam(out[i]) - reg := "" - if p.Name == "err" { - reg = "e1" - } else { - reg = "r0" - } - if reg != "e1" { - body += fmt.Sprintf("\t%s = %s(%s)\n", p.Name, p.Type, reg) - } - } - - // verify return - if sysname != "exit" && errvar != "" { - if regexp.MustCompile(`^uintptr`).FindStringSubmatch(cRettype) != nil { - body += "\tif (uintptr(r0) ==^uintptr(0) && er != nil) {\n" - body += fmt.Sprintf("\t\t%s = er\n", errvar) - body += "\t}\n" - } else { - body += "\tif (r0 ==-1 && er != nil) {\n" - body += fmt.Sprintf("\t\t%s = er\n", errvar) - body += "\t}\n" - } - } else if errvar != "" { - body += "\tif (er != nil) {\n" - body += fmt.Sprintf("\t\t%s = er\n", errvar) - body += "\t}\n" - } - - text += fmt.Sprintf("\t%s\n", call) - text += body - - text += "\treturn\n" - text += "}\n" - } - if err := s.Err(); err != nil { - fmt.Fprintf(os.Stderr, err.Error()) - os.Exit(1) - } - file.Close() - } - imp := "" - if pack != "unix" { - imp = "import \"golang.org/x/sys/unix\"\n" - - } - fmt.Printf(srcTemplate, cmdLine(), buildTags(), pack, cExtern, imp, text) -} - -const srcTemplate = `// %s -// Code generated by the command above; see README.md. DO NOT EDIT. - -// +build %s - -package %s - - -%s -*/ -import "C" -import ( - "unsafe" -) - - -%s - -%s -` diff --git a/vendor/golang.org/x/sys/unix/mksyscall_aix_ppc64.go b/vendor/golang.org/x/sys/unix/mksyscall_aix_ppc64.go deleted file mode 100644 index 45b4429088..0000000000 --- a/vendor/golang.org/x/sys/unix/mksyscall_aix_ppc64.go +++ /dev/null @@ -1,602 +0,0 @@ -// Copyright 2019 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build ignore - -/* -This program reads a file containing function prototypes -(like syscall_aix.go) and generates system call bodies. -The prototypes are marked by lines beginning with "//sys" -and read like func declarations if //sys is replaced by func, but: - * The parameter lists must give a name for each argument. - This includes return parameters. - * The parameter lists must give a type for each argument: - the (x, y, z int) shorthand is not allowed. - * If the return parameter is an error number, it must be named err. - * If go func name needs to be different than its libc name, - * or the function is not in libc, name could be specified - * at the end, after "=" sign, like - //sys getsockopt(s int, level int, name int, val uintptr, vallen *_Socklen) (err error) = libsocket.getsockopt - - -This program will generate three files and handle both gc and gccgo implementation: - - zsyscall_aix_ppc64.go: the common part of each implementation (error handler, pointer creation) - - zsyscall_aix_ppc64_gc.go: gc part with //go_cgo_import_dynamic and a call to syscall6 - - zsyscall_aix_ppc64_gccgo.go: gccgo part with C function and conversion to C type. - - The generated code looks like this - -zsyscall_aix_ppc64.go -func asyscall(...) (n int, err error) { - // Pointer Creation - r1, e1 := callasyscall(...) - // Type Conversion - // Error Handler - return -} - -zsyscall_aix_ppc64_gc.go -//go:cgo_import_dynamic libc_asyscall asyscall "libc.a/shr_64.o" -//go:linkname libc_asyscall libc_asyscall -var asyscall syscallFunc - -func callasyscall(...) (r1 uintptr, e1 Errno) { - r1, _, e1 = syscall6(uintptr(unsafe.Pointer(&libc_asyscall)), "nb_args", ... ) - return -} - -zsyscall_aix_ppc64_ggcgo.go - -// int asyscall(...) - -import "C" - -func callasyscall(...) (r1 uintptr, e1 Errno) { - r1 = uintptr(C.asyscall(...)) - e1 = syscall.GetErrno() - return -} -*/ - -package main - -import ( - "bufio" - "flag" - "fmt" - "io/ioutil" - "os" - "regexp" - "strings" -) - -var ( - b32 = flag.Bool("b32", false, "32bit big-endian") - l32 = flag.Bool("l32", false, "32bit little-endian") - aix = flag.Bool("aix", false, "aix") - tags = flag.String("tags", "", "build tags") -) - -// cmdLine returns this programs's commandline arguments -func cmdLine() string { - return "go run mksyscall_aix_ppc64.go " + strings.Join(os.Args[1:], " ") -} - -// buildTags returns build tags -func buildTags() string { - return *tags -} - -// Param is function parameter -type Param struct { - Name string - Type string -} - -// usage prints the program usage -func usage() { - fmt.Fprintf(os.Stderr, "usage: go run mksyscall_aix_ppc64.go [-b32 | -l32] [-tags x,y] [file ...]\n") - os.Exit(1) -} - -// parseParamList parses parameter list and returns a slice of parameters -func parseParamList(list string) []string { - list = strings.TrimSpace(list) - if list == "" { - return []string{} - } - return regexp.MustCompile(`\s*,\s*`).Split(list, -1) -} - -// parseParam splits a parameter into name and type -func parseParam(p string) Param { - ps := regexp.MustCompile(`^(\S*) (\S*)$`).FindStringSubmatch(p) - if ps == nil { - fmt.Fprintf(os.Stderr, "malformed parameter: %s\n", p) - os.Exit(1) - } - return Param{ps[1], ps[2]} -} - -func main() { - flag.Usage = usage - flag.Parse() - if len(flag.Args()) <= 0 { - fmt.Fprintf(os.Stderr, "no files to parse provided\n") - usage() - } - - endianness := "" - if *b32 { - endianness = "big-endian" - } else if *l32 { - endianness = "little-endian" - } - - pack := "" - // GCCGO - textgccgo := "" - cExtern := "/*\n#include \n" - // GC - textgc := "" - dynimports := "" - linknames := "" - var vars []string - // COMMON - textcommon := "" - for _, path := range flag.Args() { - file, err := os.Open(path) - if err != nil { - fmt.Fprintf(os.Stderr, err.Error()) - os.Exit(1) - } - s := bufio.NewScanner(file) - for s.Scan() { - t := s.Text() - t = strings.TrimSpace(t) - t = regexp.MustCompile(`\s+`).ReplaceAllString(t, ` `) - if p := regexp.MustCompile(`^package (\S+)$`).FindStringSubmatch(t); p != nil && pack == "" { - pack = p[1] - } - nonblock := regexp.MustCompile(`^\/\/sysnb `).FindStringSubmatch(t) - if regexp.MustCompile(`^\/\/sys `).FindStringSubmatch(t) == nil && nonblock == nil { - continue - } - - // Line must be of the form - // func Open(path string, mode int, perm int) (fd int, err error) - // Split into name, in params, out params. - f := regexp.MustCompile(`^\/\/sys(nb)? (\w+)\(([^()]*)\)\s*(?:\(([^()]+)\))?\s*(?:=\s*(?:(\w*)\.)?(\w*))?$`).FindStringSubmatch(t) - if f == nil { - fmt.Fprintf(os.Stderr, "%s:%s\nmalformed //sys declaration\n", path, t) - os.Exit(1) - } - funct, inps, outps, modname, sysname := f[2], f[3], f[4], f[5], f[6] - - // Split argument lists on comma. - in := parseParamList(inps) - out := parseParamList(outps) - - inps = strings.Join(in, ", ") - outps = strings.Join(out, ", ") - - if sysname == "" { - sysname = funct - } - - onlyCommon := false - if funct == "readlen" || funct == "writelen" || funct == "FcntlInt" || funct == "FcntlFlock" { - // This function call another syscall which is already implemented. - // Therefore, the gc and gccgo part must not be generated. - onlyCommon = true - } - - // Try in vain to keep people from editing this file. - // The theory is that they jump into the middle of the file - // without reading the header. - - textcommon += "// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT\n\n" - if !onlyCommon { - textgccgo += "// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT\n\n" - textgc += "// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT\n\n" - } - - // Check if value return, err return available - errvar := "" - rettype := "" - for _, param := range out { - p := parseParam(param) - if p.Type == "error" { - errvar = p.Name - } else { - rettype = p.Type - } - } - - sysname = regexp.MustCompile(`([a-z])([A-Z])`).ReplaceAllString(sysname, `${1}_$2`) - sysname = strings.ToLower(sysname) // All libc functions are lowercase. - - // GCCGO Prototype return type - cRettype := "" - if rettype == "unsafe.Pointer" { - cRettype = "uintptr_t" - } else if rettype == "uintptr" { - cRettype = "uintptr_t" - } else if regexp.MustCompile(`^_`).FindStringSubmatch(rettype) != nil { - cRettype = "uintptr_t" - } else if rettype == "int" { - cRettype = "int" - } else if rettype == "int32" { - cRettype = "int" - } else if rettype == "int64" { - cRettype = "long long" - } else if rettype == "uint32" { - cRettype = "unsigned int" - } else if rettype == "uint64" { - cRettype = "unsigned long long" - } else { - cRettype = "int" - } - if sysname == "exit" { - cRettype = "void" - } - - // GCCGO Prototype arguments type - var cIn []string - for i, param := range in { - p := parseParam(param) - if regexp.MustCompile(`^\*`).FindStringSubmatch(p.Type) != nil { - cIn = append(cIn, "uintptr_t") - } else if p.Type == "string" { - cIn = append(cIn, "uintptr_t") - } else if regexp.MustCompile(`^\[\](.*)`).FindStringSubmatch(p.Type) != nil { - cIn = append(cIn, "uintptr_t", "size_t") - } else if p.Type == "unsafe.Pointer" { - cIn = append(cIn, "uintptr_t") - } else if p.Type == "uintptr" { - cIn = append(cIn, "uintptr_t") - } else if regexp.MustCompile(`^_`).FindStringSubmatch(p.Type) != nil { - cIn = append(cIn, "uintptr_t") - } else if p.Type == "int" { - if (i == 0 || i == 2) && funct == "fcntl" { - // These fcntl arguments needs to be uintptr to be able to call FcntlInt and FcntlFlock - cIn = append(cIn, "uintptr_t") - } else { - cIn = append(cIn, "int") - } - - } else if p.Type == "int32" { - cIn = append(cIn, "int") - } else if p.Type == "int64" { - cIn = append(cIn, "long long") - } else if p.Type == "uint32" { - cIn = append(cIn, "unsigned int") - } else if p.Type == "uint64" { - cIn = append(cIn, "unsigned long long") - } else { - cIn = append(cIn, "int") - } - } - - if !onlyCommon { - // GCCGO Prototype Generation - // Imports of system calls from libc - cExtern += fmt.Sprintf("%s %s", cRettype, sysname) - cIn := strings.Join(cIn, ", ") - cExtern += fmt.Sprintf("(%s);\n", cIn) - } - // GC Library name - if modname == "" { - modname = "libc.a/shr_64.o" - } else { - fmt.Fprintf(os.Stderr, "%s: only syscall using libc are available\n", funct) - os.Exit(1) - } - sysvarname := fmt.Sprintf("libc_%s", sysname) - - if !onlyCommon { - // GC Runtime import of function to allow cross-platform builds. - dynimports += fmt.Sprintf("//go:cgo_import_dynamic %s %s \"%s\"\n", sysvarname, sysname, modname) - // GC Link symbol to proc address variable. - linknames += fmt.Sprintf("//go:linkname %s %s\n", sysvarname, sysvarname) - // GC Library proc address variable. - vars = append(vars, sysvarname) - } - - strconvfunc := "BytePtrFromString" - strconvtype := "*byte" - - // Go function header. - if outps != "" { - outps = fmt.Sprintf(" (%s)", outps) - } - if textcommon != "" { - textcommon += "\n" - } - - textcommon += fmt.Sprintf("func %s(%s)%s {\n", funct, strings.Join(in, ", "), outps) - - // Prepare arguments tocall. - var argscommon []string // Arguments in the common part - var argscall []string // Arguments for call prototype - var argsgc []string // Arguments for gc call (with syscall6) - var argsgccgo []string // Arguments for gccgo call (with C.name_of_syscall) - n := 0 - argN := 0 - for _, param := range in { - p := parseParam(param) - if regexp.MustCompile(`^\*`).FindStringSubmatch(p.Type) != nil { - argscommon = append(argscommon, fmt.Sprintf("uintptr(unsafe.Pointer(%s))", p.Name)) - argscall = append(argscall, fmt.Sprintf("%s uintptr", p.Name)) - argsgc = append(argsgc, p.Name) - argsgccgo = append(argsgccgo, fmt.Sprintf("C.uintptr_t(%s)", p.Name)) - } else if p.Type == "string" && errvar != "" { - textcommon += fmt.Sprintf("\tvar _p%d %s\n", n, strconvtype) - textcommon += fmt.Sprintf("\t_p%d, %s = %s(%s)\n", n, errvar, strconvfunc, p.Name) - textcommon += fmt.Sprintf("\tif %s != nil {\n\t\treturn\n\t}\n", errvar) - - argscommon = append(argscommon, fmt.Sprintf("uintptr(unsafe.Pointer(_p%d))", n)) - argscall = append(argscall, fmt.Sprintf("_p%d uintptr ", n)) - argsgc = append(argsgc, fmt.Sprintf("_p%d", n)) - argsgccgo = append(argsgccgo, fmt.Sprintf("C.uintptr_t(_p%d)", n)) - n++ - } else if p.Type == "string" { - fmt.Fprintf(os.Stderr, path+":"+funct+" uses string arguments, but has no error return\n") - textcommon += fmt.Sprintf("\tvar _p%d %s\n", n, strconvtype) - textcommon += fmt.Sprintf("\t_p%d, %s = %s(%s)\n", n, errvar, strconvfunc, p.Name) - textcommon += fmt.Sprintf("\tif %s != nil {\n\t\treturn\n\t}\n", errvar) - - argscommon = append(argscommon, fmt.Sprintf("uintptr(unsafe.Pointer(_p%d))", n)) - argscall = append(argscall, fmt.Sprintf("_p%d uintptr", n)) - argsgc = append(argsgc, fmt.Sprintf("_p%d", n)) - argsgccgo = append(argsgccgo, fmt.Sprintf("C.uintptr_t(_p%d)", n)) - n++ - } else if m := regexp.MustCompile(`^\[\](.*)`).FindStringSubmatch(p.Type); m != nil { - // Convert slice into pointer, length. - // Have to be careful not to take address of &a[0] if len == 0: - // pass nil in that case. - textcommon += fmt.Sprintf("\tvar _p%d *%s\n", n, m[1]) - textcommon += fmt.Sprintf("\tif len(%s) > 0 {\n\t\t_p%d = &%s[0]\n\t}\n", p.Name, n, p.Name) - argscommon = append(argscommon, fmt.Sprintf("uintptr(unsafe.Pointer(_p%d))", n), fmt.Sprintf("len(%s)", p.Name)) - argscall = append(argscall, fmt.Sprintf("_p%d uintptr", n), fmt.Sprintf("_lenp%d int", n)) - argsgc = append(argsgc, fmt.Sprintf("_p%d", n), fmt.Sprintf("uintptr(_lenp%d)", n)) - argsgccgo = append(argsgccgo, fmt.Sprintf("C.uintptr_t(_p%d)", n), fmt.Sprintf("C.size_t(_lenp%d)", n)) - n++ - } else if p.Type == "int64" && endianness != "" { - fmt.Fprintf(os.Stderr, path+":"+funct+" uses int64 with 32 bits mode. Case not yet implemented\n") - } else if p.Type == "bool" { - fmt.Fprintf(os.Stderr, path+":"+funct+" uses bool. Case not yet implemented\n") - } else if regexp.MustCompile(`^_`).FindStringSubmatch(p.Type) != nil || p.Type == "unsafe.Pointer" { - argscommon = append(argscommon, fmt.Sprintf("uintptr(%s)", p.Name)) - argscall = append(argscall, fmt.Sprintf("%s uintptr", p.Name)) - argsgc = append(argsgc, p.Name) - argsgccgo = append(argsgccgo, fmt.Sprintf("C.uintptr_t(%s)", p.Name)) - } else if p.Type == "int" { - if (argN == 0 || argN == 2) && ((funct == "fcntl") || (funct == "FcntlInt") || (funct == "FcntlFlock")) { - // These fcntl arguments need to be uintptr to be able to call FcntlInt and FcntlFlock - argscommon = append(argscommon, fmt.Sprintf("uintptr(%s)", p.Name)) - argscall = append(argscall, fmt.Sprintf("%s uintptr", p.Name)) - argsgc = append(argsgc, p.Name) - argsgccgo = append(argsgccgo, fmt.Sprintf("C.uintptr_t(%s)", p.Name)) - - } else { - argscommon = append(argscommon, p.Name) - argscall = append(argscall, fmt.Sprintf("%s int", p.Name)) - argsgc = append(argsgc, fmt.Sprintf("uintptr(%s)", p.Name)) - argsgccgo = append(argsgccgo, fmt.Sprintf("C.int(%s)", p.Name)) - } - } else if p.Type == "int32" { - argscommon = append(argscommon, p.Name) - argscall = append(argscall, fmt.Sprintf("%s int32", p.Name)) - argsgc = append(argsgc, fmt.Sprintf("uintptr(%s)", p.Name)) - argsgccgo = append(argsgccgo, fmt.Sprintf("C.int(%s)", p.Name)) - } else if p.Type == "int64" { - argscommon = append(argscommon, p.Name) - argscall = append(argscall, fmt.Sprintf("%s int64", p.Name)) - argsgc = append(argsgc, fmt.Sprintf("uintptr(%s)", p.Name)) - argsgccgo = append(argsgccgo, fmt.Sprintf("C.longlong(%s)", p.Name)) - } else if p.Type == "uint32" { - argscommon = append(argscommon, p.Name) - argscall = append(argscall, fmt.Sprintf("%s uint32", p.Name)) - argsgc = append(argsgc, fmt.Sprintf("uintptr(%s)", p.Name)) - argsgccgo = append(argsgccgo, fmt.Sprintf("C.uint(%s)", p.Name)) - } else if p.Type == "uint64" { - argscommon = append(argscommon, p.Name) - argscall = append(argscall, fmt.Sprintf("%s uint64", p.Name)) - argsgc = append(argsgc, fmt.Sprintf("uintptr(%s)", p.Name)) - argsgccgo = append(argsgccgo, fmt.Sprintf("C.ulonglong(%s)", p.Name)) - } else if p.Type == "uintptr" { - argscommon = append(argscommon, p.Name) - argscall = append(argscall, fmt.Sprintf("%s uintptr", p.Name)) - argsgc = append(argsgc, p.Name) - argsgccgo = append(argsgccgo, fmt.Sprintf("C.uintptr_t(%s)", p.Name)) - } else { - argscommon = append(argscommon, fmt.Sprintf("int(%s)", p.Name)) - argscall = append(argscall, fmt.Sprintf("%s int", p.Name)) - argsgc = append(argsgc, fmt.Sprintf("uintptr(%s)", p.Name)) - argsgccgo = append(argsgccgo, fmt.Sprintf("C.int(%s)", p.Name)) - } - argN++ - } - nargs := len(argsgc) - - // COMMON function generation - argscommonlist := strings.Join(argscommon, ", ") - callcommon := fmt.Sprintf("call%s(%s)", sysname, argscommonlist) - ret := []string{"_", "_"} - body := "" - doErrno := false - for i := 0; i < len(out); i++ { - p := parseParam(out[i]) - reg := "" - if p.Name == "err" { - reg = "e1" - ret[1] = reg - doErrno = true - } else { - reg = "r0" - ret[0] = reg - } - if p.Type == "bool" { - reg = fmt.Sprintf("%s != 0", reg) - } - if reg != "e1" { - body += fmt.Sprintf("\t%s = %s(%s)\n", p.Name, p.Type, reg) - } - } - if ret[0] == "_" && ret[1] == "_" { - textcommon += fmt.Sprintf("\t%s\n", callcommon) - } else { - textcommon += fmt.Sprintf("\t%s, %s := %s\n", ret[0], ret[1], callcommon) - } - textcommon += body - - if doErrno { - textcommon += "\tif e1 != 0 {\n" - textcommon += "\t\terr = errnoErr(e1)\n" - textcommon += "\t}\n" - } - textcommon += "\treturn\n" - textcommon += "}\n" - - if onlyCommon { - continue - } - - // CALL Prototype - callProto := fmt.Sprintf("func call%s(%s) (r1 uintptr, e1 Errno) {\n", sysname, strings.Join(argscall, ", ")) - - // GC function generation - asm := "syscall6" - if nonblock != nil { - asm = "rawSyscall6" - } - - if len(argsgc) <= 6 { - for len(argsgc) < 6 { - argsgc = append(argsgc, "0") - } - } else { - fmt.Fprintf(os.Stderr, "%s: too many arguments to system call", funct) - os.Exit(1) - } - argsgclist := strings.Join(argsgc, ", ") - callgc := fmt.Sprintf("%s(uintptr(unsafe.Pointer(&%s)), %d, %s)", asm, sysvarname, nargs, argsgclist) - - textgc += callProto - textgc += fmt.Sprintf("\tr1, _, e1 = %s\n", callgc) - textgc += "\treturn\n}\n" - - // GCCGO function generation - argsgccgolist := strings.Join(argsgccgo, ", ") - callgccgo := fmt.Sprintf("C.%s(%s)", sysname, argsgccgolist) - textgccgo += callProto - textgccgo += fmt.Sprintf("\tr1 = uintptr(%s)\n", callgccgo) - textgccgo += "\te1 = syscall.GetErrno()\n" - textgccgo += "\treturn\n}\n" - } - if err := s.Err(); err != nil { - fmt.Fprintf(os.Stderr, err.Error()) - os.Exit(1) - } - file.Close() - } - imp := "" - if pack != "unix" { - imp = "import \"golang.org/x/sys/unix\"\n" - - } - - // Print zsyscall_aix_ppc64.go - err := ioutil.WriteFile("zsyscall_aix_ppc64.go", - []byte(fmt.Sprintf(srcTemplate1, cmdLine(), buildTags(), pack, imp, textcommon)), - 0644) - if err != nil { - fmt.Fprintf(os.Stderr, err.Error()) - os.Exit(1) - } - - // Print zsyscall_aix_ppc64_gc.go - vardecls := "\t" + strings.Join(vars, ",\n\t") - vardecls += " syscallFunc" - err = ioutil.WriteFile("zsyscall_aix_ppc64_gc.go", - []byte(fmt.Sprintf(srcTemplate2, cmdLine(), buildTags(), pack, imp, dynimports, linknames, vardecls, textgc)), - 0644) - if err != nil { - fmt.Fprintf(os.Stderr, err.Error()) - os.Exit(1) - } - - // Print zsyscall_aix_ppc64_gccgo.go - err = ioutil.WriteFile("zsyscall_aix_ppc64_gccgo.go", - []byte(fmt.Sprintf(srcTemplate3, cmdLine(), buildTags(), pack, cExtern, imp, textgccgo)), - 0644) - if err != nil { - fmt.Fprintf(os.Stderr, err.Error()) - os.Exit(1) - } -} - -const srcTemplate1 = `// %s -// Code generated by the command above; see README.md. DO NOT EDIT. - -// +build %s - -package %s - -import ( - "unsafe" -) - - -%s - -%s -` -const srcTemplate2 = `// %s -// Code generated by the command above; see README.md. DO NOT EDIT. - -// +build %s -// +build !gccgo - -package %s - -import ( - "unsafe" -) -%s -%s -%s -type syscallFunc uintptr - -var ( -%s -) - -// Implemented in runtime/syscall_aix.go. -func rawSyscall6(trap, nargs, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err Errno) -func syscall6(trap, nargs, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err Errno) - -%s -` -const srcTemplate3 = `// %s -// Code generated by the command above; see README.md. DO NOT EDIT. - -// +build %s -// +build gccgo - -package %s - -%s -*/ -import "C" -import ( - "syscall" -) - - -%s - -%s -` diff --git a/vendor/golang.org/x/sys/unix/mksyscall_solaris.go b/vendor/golang.org/x/sys/unix/mksyscall_solaris.go deleted file mode 100644 index 3d864738b6..0000000000 --- a/vendor/golang.org/x/sys/unix/mksyscall_solaris.go +++ /dev/null @@ -1,335 +0,0 @@ -// Copyright 2019 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build ignore - -/* - This program reads a file containing function prototypes - (like syscall_solaris.go) and generates system call bodies. - The prototypes are marked by lines beginning with "//sys" - and read like func declarations if //sys is replaced by func, but: - * The parameter lists must give a name for each argument. - This includes return parameters. - * The parameter lists must give a type for each argument: - the (x, y, z int) shorthand is not allowed. - * If the return parameter is an error number, it must be named err. - * If go func name needs to be different than its libc name, - * or the function is not in libc, name could be specified - * at the end, after "=" sign, like - //sys getsockopt(s int, level int, name int, val uintptr, vallen *_Socklen) (err error) = libsocket.getsockopt -*/ - -package main - -import ( - "bufio" - "flag" - "fmt" - "os" - "regexp" - "strings" -) - -var ( - b32 = flag.Bool("b32", false, "32bit big-endian") - l32 = flag.Bool("l32", false, "32bit little-endian") - tags = flag.String("tags", "", "build tags") -) - -// cmdLine returns this programs's commandline arguments -func cmdLine() string { - return "go run mksyscall_solaris.go " + strings.Join(os.Args[1:], " ") -} - -// buildTags returns build tags -func buildTags() string { - return *tags -} - -// Param is function parameter -type Param struct { - Name string - Type string -} - -// usage prints the program usage -func usage() { - fmt.Fprintf(os.Stderr, "usage: go run mksyscall_solaris.go [-b32 | -l32] [-tags x,y] [file ...]\n") - os.Exit(1) -} - -// parseParamList parses parameter list and returns a slice of parameters -func parseParamList(list string) []string { - list = strings.TrimSpace(list) - if list == "" { - return []string{} - } - return regexp.MustCompile(`\s*,\s*`).Split(list, -1) -} - -// parseParam splits a parameter into name and type -func parseParam(p string) Param { - ps := regexp.MustCompile(`^(\S*) (\S*)$`).FindStringSubmatch(p) - if ps == nil { - fmt.Fprintf(os.Stderr, "malformed parameter: %s\n", p) - os.Exit(1) - } - return Param{ps[1], ps[2]} -} - -func main() { - flag.Usage = usage - flag.Parse() - if len(flag.Args()) <= 0 { - fmt.Fprintf(os.Stderr, "no files to parse provided\n") - usage() - } - - endianness := "" - if *b32 { - endianness = "big-endian" - } else if *l32 { - endianness = "little-endian" - } - - pack := "" - text := "" - dynimports := "" - linknames := "" - var vars []string - for _, path := range flag.Args() { - file, err := os.Open(path) - if err != nil { - fmt.Fprintf(os.Stderr, err.Error()) - os.Exit(1) - } - s := bufio.NewScanner(file) - for s.Scan() { - t := s.Text() - t = strings.TrimSpace(t) - t = regexp.MustCompile(`\s+`).ReplaceAllString(t, ` `) - if p := regexp.MustCompile(`^package (\S+)$`).FindStringSubmatch(t); p != nil && pack == "" { - pack = p[1] - } - nonblock := regexp.MustCompile(`^\/\/sysnb `).FindStringSubmatch(t) - if regexp.MustCompile(`^\/\/sys `).FindStringSubmatch(t) == nil && nonblock == nil { - continue - } - - // Line must be of the form - // func Open(path string, mode int, perm int) (fd int, err error) - // Split into name, in params, out params. - f := regexp.MustCompile(`^\/\/sys(nb)? (\w+)\(([^()]*)\)\s*(?:\(([^()]+)\))?\s*(?:=\s*(?:(\w*)\.)?(\w*))?$`).FindStringSubmatch(t) - if f == nil { - fmt.Fprintf(os.Stderr, "%s:%s\nmalformed //sys declaration\n", path, t) - os.Exit(1) - } - funct, inps, outps, modname, sysname := f[2], f[3], f[4], f[5], f[6] - - // Split argument lists on comma. - in := parseParamList(inps) - out := parseParamList(outps) - - inps = strings.Join(in, ", ") - outps = strings.Join(out, ", ") - - // Try in vain to keep people from editing this file. - // The theory is that they jump into the middle of the file - // without reading the header. - text += "// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT\n\n" - - // So file name. - if modname == "" { - modname = "libc" - } - - // System call name. - if sysname == "" { - sysname = funct - } - - // System call pointer variable name. - sysvarname := fmt.Sprintf("proc%s", sysname) - - strconvfunc := "BytePtrFromString" - strconvtype := "*byte" - - sysname = strings.ToLower(sysname) // All libc functions are lowercase. - - // Runtime import of function to allow cross-platform builds. - dynimports += fmt.Sprintf("//go:cgo_import_dynamic libc_%s %s \"%s.so\"\n", sysname, sysname, modname) - // Link symbol to proc address variable. - linknames += fmt.Sprintf("//go:linkname %s libc_%s\n", sysvarname, sysname) - // Library proc address variable. - vars = append(vars, sysvarname) - - // Go function header. - outlist := strings.Join(out, ", ") - if outlist != "" { - outlist = fmt.Sprintf(" (%s)", outlist) - } - if text != "" { - text += "\n" - } - text += fmt.Sprintf("func %s(%s)%s {\n", funct, strings.Join(in, ", "), outlist) - - // Check if err return available - errvar := "" - for _, param := range out { - p := parseParam(param) - if p.Type == "error" { - errvar = p.Name - continue - } - } - - // Prepare arguments to Syscall. - var args []string - n := 0 - for _, param := range in { - p := parseParam(param) - if regexp.MustCompile(`^\*`).FindStringSubmatch(p.Type) != nil { - args = append(args, "uintptr(unsafe.Pointer("+p.Name+"))") - } else if p.Type == "string" && errvar != "" { - text += fmt.Sprintf("\tvar _p%d %s\n", n, strconvtype) - text += fmt.Sprintf("\t_p%d, %s = %s(%s)\n", n, errvar, strconvfunc, p.Name) - text += fmt.Sprintf("\tif %s != nil {\n\t\treturn\n\t}\n", errvar) - args = append(args, fmt.Sprintf("uintptr(unsafe.Pointer(_p%d))", n)) - n++ - } else if p.Type == "string" { - fmt.Fprintf(os.Stderr, path+":"+funct+" uses string arguments, but has no error return\n") - text += fmt.Sprintf("\tvar _p%d %s\n", n, strconvtype) - text += fmt.Sprintf("\t_p%d, _ = %s(%s)\n", n, strconvfunc, p.Name) - args = append(args, fmt.Sprintf("uintptr(unsafe.Pointer(_p%d))", n)) - n++ - } else if s := regexp.MustCompile(`^\[\](.*)`).FindStringSubmatch(p.Type); s != nil { - // Convert slice into pointer, length. - // Have to be careful not to take address of &a[0] if len == 0: - // pass nil in that case. - text += fmt.Sprintf("\tvar _p%d *%s\n", n, s[1]) - text += fmt.Sprintf("\tif len(%s) > 0 {\n\t\t_p%d = &%s[0]\n\t}\n", p.Name, n, p.Name) - args = append(args, fmt.Sprintf("uintptr(unsafe.Pointer(_p%d))", n), fmt.Sprintf("uintptr(len(%s))", p.Name)) - n++ - } else if p.Type == "int64" && endianness != "" { - if endianness == "big-endian" { - args = append(args, fmt.Sprintf("uintptr(%s>>32)", p.Name), fmt.Sprintf("uintptr(%s)", p.Name)) - } else { - args = append(args, fmt.Sprintf("uintptr(%s)", p.Name), fmt.Sprintf("uintptr(%s>>32)", p.Name)) - } - } else if p.Type == "bool" { - text += fmt.Sprintf("\tvar _p%d uint32\n", n) - text += fmt.Sprintf("\tif %s {\n\t\t_p%d = 1\n\t} else {\n\t\t_p%d = 0\n\t}\n", p.Name, n, n) - args = append(args, fmt.Sprintf("uintptr(_p%d)", n)) - n++ - } else { - args = append(args, fmt.Sprintf("uintptr(%s)", p.Name)) - } - } - nargs := len(args) - - // Determine which form to use; pad args with zeros. - asm := "sysvicall6" - if nonblock != nil { - asm = "rawSysvicall6" - } - if len(args) <= 6 { - for len(args) < 6 { - args = append(args, "0") - } - } else { - fmt.Fprintf(os.Stderr, "%s: too many arguments to system call\n", path) - os.Exit(1) - } - - // Actual call. - arglist := strings.Join(args, ", ") - call := fmt.Sprintf("%s(uintptr(unsafe.Pointer(&%s)), %d, %s)", asm, sysvarname, nargs, arglist) - - // Assign return values. - body := "" - ret := []string{"_", "_", "_"} - doErrno := false - for i := 0; i < len(out); i++ { - p := parseParam(out[i]) - reg := "" - if p.Name == "err" { - reg = "e1" - ret[2] = reg - doErrno = true - } else { - reg = fmt.Sprintf("r%d", i) - ret[i] = reg - } - if p.Type == "bool" { - reg = fmt.Sprintf("%d != 0", reg) - } - if p.Type == "int64" && endianness != "" { - // 64-bit number in r1:r0 or r0:r1. - if i+2 > len(out) { - fmt.Fprintf(os.Stderr, "%s: not enough registers for int64 return\n", path) - os.Exit(1) - } - if endianness == "big-endian" { - reg = fmt.Sprintf("int64(r%d)<<32 | int64(r%d)", i, i+1) - } else { - reg = fmt.Sprintf("int64(r%d)<<32 | int64(r%d)", i+1, i) - } - ret[i] = fmt.Sprintf("r%d", i) - ret[i+1] = fmt.Sprintf("r%d", i+1) - } - if reg != "e1" { - body += fmt.Sprintf("\t%s = %s(%s)\n", p.Name, p.Type, reg) - } - } - if ret[0] == "_" && ret[1] == "_" && ret[2] == "_" { - text += fmt.Sprintf("\t%s\n", call) - } else { - text += fmt.Sprintf("\t%s, %s, %s := %s\n", ret[0], ret[1], ret[2], call) - } - text += body - - if doErrno { - text += "\tif e1 != 0 {\n" - text += "\t\terr = e1\n" - text += "\t}\n" - } - text += "\treturn\n" - text += "}\n" - } - if err := s.Err(); err != nil { - fmt.Fprintf(os.Stderr, err.Error()) - os.Exit(1) - } - file.Close() - } - imp := "" - if pack != "unix" { - imp = "import \"golang.org/x/sys/unix\"\n" - - } - vardecls := "\t" + strings.Join(vars, ",\n\t") - vardecls += " syscallFunc" - fmt.Printf(srcTemplate, cmdLine(), buildTags(), pack, imp, dynimports, linknames, vardecls, text) -} - -const srcTemplate = `// %s -// Code generated by the command above; see README.md. DO NOT EDIT. - -// +build %s - -package %s - -import ( - "syscall" - "unsafe" -) -%s -%s -%s -var ( -%s -) - -%s -` diff --git a/vendor/golang.org/x/sys/unix/mksysnum.go b/vendor/golang.org/x/sys/unix/mksysnum.go deleted file mode 100644 index 07f8960ff3..0000000000 --- a/vendor/golang.org/x/sys/unix/mksysnum.go +++ /dev/null @@ -1,190 +0,0 @@ -// Copyright 2018 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build ignore - -// Generate system call table for DragonFly, NetBSD, -// FreeBSD, OpenBSD or Darwin from master list -// (for example, /usr/src/sys/kern/syscalls.master or -// sys/syscall.h). -package main - -import ( - "bufio" - "fmt" - "io" - "io/ioutil" - "net/http" - "os" - "regexp" - "strings" -) - -var ( - goos, goarch string -) - -// cmdLine returns this programs's commandline arguments -func cmdLine() string { - return "go run mksysnum.go " + strings.Join(os.Args[1:], " ") -} - -// buildTags returns build tags -func buildTags() string { - return fmt.Sprintf("%s,%s", goarch, goos) -} - -func checkErr(err error) { - if err != nil { - fmt.Fprintf(os.Stderr, "%v\n", err) - os.Exit(1) - } -} - -// source string and substring slice for regexp -type re struct { - str string // source string - sub []string // matched sub-string -} - -// Match performs regular expression match -func (r *re) Match(exp string) bool { - r.sub = regexp.MustCompile(exp).FindStringSubmatch(r.str) - if r.sub != nil { - return true - } - return false -} - -// fetchFile fetches a text file from URL -func fetchFile(URL string) io.Reader { - resp, err := http.Get(URL) - checkErr(err) - defer resp.Body.Close() - body, err := ioutil.ReadAll(resp.Body) - checkErr(err) - return strings.NewReader(string(body)) -} - -// readFile reads a text file from path -func readFile(path string) io.Reader { - file, err := os.Open(os.Args[1]) - checkErr(err) - return file -} - -func format(name, num, proto string) string { - name = strings.ToUpper(name) - // There are multiple entries for enosys and nosys, so comment them out. - nm := re{str: name} - if nm.Match(`^SYS_E?NOSYS$`) { - name = fmt.Sprintf("// %s", name) - } - if name == `SYS_SYS_EXIT` { - name = `SYS_EXIT` - } - return fmt.Sprintf(" %s = %s; // %s\n", name, num, proto) -} - -func main() { - // Get the OS (using GOOS_TARGET if it exist) - goos = os.Getenv("GOOS_TARGET") - if goos == "" { - goos = os.Getenv("GOOS") - } - // Get the architecture (using GOARCH_TARGET if it exists) - goarch = os.Getenv("GOARCH_TARGET") - if goarch == "" { - goarch = os.Getenv("GOARCH") - } - // Check if GOOS and GOARCH environment variables are defined - if goarch == "" || goos == "" { - fmt.Fprintf(os.Stderr, "GOARCH or GOOS not defined in environment\n") - os.Exit(1) - } - - file := strings.TrimSpace(os.Args[1]) - var syscalls io.Reader - if strings.HasPrefix(file, "https://") || strings.HasPrefix(file, "http://") { - // Download syscalls.master file - syscalls = fetchFile(file) - } else { - syscalls = readFile(file) - } - - var text, line string - s := bufio.NewScanner(syscalls) - for s.Scan() { - t := re{str: line} - if t.Match(`^(.*)\\$`) { - // Handle continuation - line = t.sub[1] - line += strings.TrimLeft(s.Text(), " \t") - } else { - // New line - line = s.Text() - } - t = re{str: line} - if t.Match(`\\$`) { - continue - } - t = re{str: line} - - switch goos { - case "dragonfly": - if t.Match(`^([0-9]+)\s+STD\s+({ \S+\s+(\w+).*)$`) { - num, proto := t.sub[1], t.sub[2] - name := fmt.Sprintf("SYS_%s", t.sub[3]) - text += format(name, num, proto) - } - case "freebsd": - if t.Match(`^([0-9]+)\s+\S+\s+(?:NO)?STD\s+({ \S+\s+(\w+).*)$`) { - num, proto := t.sub[1], t.sub[2] - name := fmt.Sprintf("SYS_%s", t.sub[3]) - text += format(name, num, proto) - } - case "openbsd": - if t.Match(`^([0-9]+)\s+STD\s+(NOLOCK\s+)?({ \S+\s+\*?(\w+).*)$`) { - num, proto, name := t.sub[1], t.sub[3], t.sub[4] - text += format(name, num, proto) - } - case "netbsd": - if t.Match(`^([0-9]+)\s+((STD)|(NOERR))\s+(RUMP\s+)?({\s+\S+\s*\*?\s*\|(\S+)\|(\S*)\|(\w+).*\s+})(\s+(\S+))?$`) { - num, proto, compat := t.sub[1], t.sub[6], t.sub[8] - name := t.sub[7] + "_" + t.sub[9] - if t.sub[11] != "" { - name = t.sub[7] + "_" + t.sub[11] - } - name = strings.ToUpper(name) - if compat == "" || compat == "13" || compat == "30" || compat == "50" { - text += fmt.Sprintf(" %s = %s; // %s\n", name, num, proto) - } - } - case "darwin": - if t.Match(`^#define\s+SYS_(\w+)\s+([0-9]+)`) { - name, num := t.sub[1], t.sub[2] - name = strings.ToUpper(name) - text += fmt.Sprintf(" SYS_%s = %s;\n", name, num) - } - default: - fmt.Fprintf(os.Stderr, "unrecognized GOOS=%s\n", goos) - os.Exit(1) - - } - } - err := s.Err() - checkErr(err) - - fmt.Printf(template, cmdLine(), buildTags(), text) -} - -const template = `// %s -// Code generated by the command above; see README.md. DO NOT EDIT. - -// +build %s - -package unix - -const( -%s)` diff --git a/vendor/golang.org/x/sys/unix/types_aix.go b/vendor/golang.org/x/sys/unix/types_aix.go deleted file mode 100644 index 25e834940d..0000000000 --- a/vendor/golang.org/x/sys/unix/types_aix.go +++ /dev/null @@ -1,236 +0,0 @@ -// Copyright 2018 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build ignore -// +build aix - -/* -Input to cgo -godefs. See also mkerrors.sh and mkall.sh -*/ - -// +godefs map struct_in_addr [4]byte /* in_addr */ -// +godefs map struct_in6_addr [16]byte /* in6_addr */ - -package unix - -/* -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include -#include -#include -#include - - -#include -#include - -enum { - sizeofPtr = sizeof(void*), -}; - -union sockaddr_all { - struct sockaddr s1; // this one gets used for fields - struct sockaddr_in s2; // these pad it out - struct sockaddr_in6 s3; - struct sockaddr_un s4; - struct sockaddr_dl s5; -}; - -struct sockaddr_any { - struct sockaddr addr; - char pad[sizeof(union sockaddr_all) - sizeof(struct sockaddr)]; -}; - -*/ -import "C" - -// Machine characteristics - -const ( - SizeofPtr = C.sizeofPtr - SizeofShort = C.sizeof_short - SizeofInt = C.sizeof_int - SizeofLong = C.sizeof_long - SizeofLongLong = C.sizeof_longlong - PathMax = C.PATH_MAX -) - -// Basic types - -type ( - _C_short C.short - _C_int C.int - _C_long C.long - _C_long_long C.longlong -) - -type off64 C.off64_t -type off C.off_t -type Mode_t C.mode_t - -// Time - -type Timespec C.struct_timespec - -type StTimespec C.struct_st_timespec - -type Timeval C.struct_timeval - -type Timeval32 C.struct_timeval32 - -type Timex C.struct_timex - -type Time_t C.time_t - -type Tms C.struct_tms - -type Utimbuf C.struct_utimbuf - -type Timezone C.struct_timezone - -// Processes - -type Rusage C.struct_rusage - -type Rlimit C.struct_rlimit64 - -type Pid_t C.pid_t - -type _Gid_t C.gid_t - -type dev_t C.dev_t - -// Files - -type Stat_t C.struct_stat - -type StatxTimestamp C.struct_statx_timestamp - -type Statx_t C.struct_statx - -type Dirent C.struct_dirent - -// Sockets - -type RawSockaddrInet4 C.struct_sockaddr_in - -type RawSockaddrInet6 C.struct_sockaddr_in6 - -type RawSockaddrUnix C.struct_sockaddr_un - -type RawSockaddr C.struct_sockaddr - -type RawSockaddrAny C.struct_sockaddr_any - -type _Socklen C.socklen_t - -type Cmsghdr C.struct_cmsghdr - -type ICMPv6Filter C.struct_icmp6_filter - -type Iovec C.struct_iovec - -type IPMreq C.struct_ip_mreq - -type IPv6Mreq C.struct_ipv6_mreq - -type IPv6MTUInfo C.struct_ip6_mtuinfo - -type Linger C.struct_linger - -type Msghdr C.struct_msghdr - -const ( - SizeofSockaddrInet4 = C.sizeof_struct_sockaddr_in - SizeofSockaddrInet6 = C.sizeof_struct_sockaddr_in6 - SizeofSockaddrAny = C.sizeof_struct_sockaddr_any - SizeofSockaddrUnix = C.sizeof_struct_sockaddr_un - SizeofLinger = C.sizeof_struct_linger - SizeofIPMreq = C.sizeof_struct_ip_mreq - SizeofIPv6Mreq = C.sizeof_struct_ipv6_mreq - SizeofIPv6MTUInfo = C.sizeof_struct_ip6_mtuinfo - SizeofMsghdr = C.sizeof_struct_msghdr - SizeofCmsghdr = C.sizeof_struct_cmsghdr - SizeofICMPv6Filter = C.sizeof_struct_icmp6_filter -) - -// Routing and interface messages - -const ( - SizeofIfMsghdr = C.sizeof_struct_if_msghdr -) - -type IfMsgHdr C.struct_if_msghdr - -// Misc - -type FdSet C.fd_set - -type Utsname C.struct_utsname - -type Ustat_t C.struct_ustat - -type Sigset_t C.sigset_t - -const ( - AT_FDCWD = C.AT_FDCWD - AT_REMOVEDIR = C.AT_REMOVEDIR - AT_SYMLINK_NOFOLLOW = C.AT_SYMLINK_NOFOLLOW -) - -// Terminal handling - -type Termios C.struct_termios - -type Termio C.struct_termio - -type Winsize C.struct_winsize - -//poll - -type PollFd struct { - Fd int32 - Events uint16 - Revents uint16 -} - -const ( - POLLERR = C.POLLERR - POLLHUP = C.POLLHUP - POLLIN = C.POLLIN - POLLNVAL = C.POLLNVAL - POLLOUT = C.POLLOUT - POLLPRI = C.POLLPRI - POLLRDBAND = C.POLLRDBAND - POLLRDNORM = C.POLLRDNORM - POLLWRBAND = C.POLLWRBAND - POLLWRNORM = C.POLLWRNORM -) - -//flock_t - -type Flock_t C.struct_flock64 - -// Statfs - -type Fsid_t C.struct_fsid_t -type Fsid64_t C.struct_fsid64_t - -type Statfs_t C.struct_statfs - -const RNDGETENTCNT = 0x80045200 diff --git a/vendor/golang.org/x/sys/unix/types_darwin.go b/vendor/golang.org/x/sys/unix/types_darwin.go deleted file mode 100644 index 9fd2aaa6a2..0000000000 --- a/vendor/golang.org/x/sys/unix/types_darwin.go +++ /dev/null @@ -1,277 +0,0 @@ -// Copyright 2009 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build ignore - -/* -Input to cgo -godefs. See README.md -*/ - -// +godefs map struct_in_addr [4]byte /* in_addr */ -// +godefs map struct_in6_addr [16]byte /* in6_addr */ - -package unix - -/* -#define __DARWIN_UNIX03 0 -#define KERNEL -#define _DARWIN_USE_64_BIT_INODE -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -enum { - sizeofPtr = sizeof(void*), -}; - -union sockaddr_all { - struct sockaddr s1; // this one gets used for fields - struct sockaddr_in s2; // these pad it out - struct sockaddr_in6 s3; - struct sockaddr_un s4; - struct sockaddr_dl s5; -}; - -struct sockaddr_any { - struct sockaddr addr; - char pad[sizeof(union sockaddr_all) - sizeof(struct sockaddr)]; -}; - -*/ -import "C" - -// Machine characteristics - -const ( - SizeofPtr = C.sizeofPtr - SizeofShort = C.sizeof_short - SizeofInt = C.sizeof_int - SizeofLong = C.sizeof_long - SizeofLongLong = C.sizeof_longlong -) - -// Basic types - -type ( - _C_short C.short - _C_int C.int - _C_long C.long - _C_long_long C.longlong -) - -// Time - -type Timespec C.struct_timespec - -type Timeval C.struct_timeval - -type Timeval32 C.struct_timeval32 - -// Processes - -type Rusage C.struct_rusage - -type Rlimit C.struct_rlimit - -type _Gid_t C.gid_t - -// Files - -type Stat_t C.struct_stat64 - -type Statfs_t C.struct_statfs64 - -type Flock_t C.struct_flock - -type Fstore_t C.struct_fstore - -type Radvisory_t C.struct_radvisory - -type Fbootstraptransfer_t C.struct_fbootstraptransfer - -type Log2phys_t C.struct_log2phys - -type Fsid C.struct_fsid - -type Dirent C.struct_dirent - -// Sockets - -type RawSockaddrInet4 C.struct_sockaddr_in - -type RawSockaddrInet6 C.struct_sockaddr_in6 - -type RawSockaddrUnix C.struct_sockaddr_un - -type RawSockaddrDatalink C.struct_sockaddr_dl - -type RawSockaddr C.struct_sockaddr - -type RawSockaddrAny C.struct_sockaddr_any - -type _Socklen C.socklen_t - -type Linger C.struct_linger - -type Iovec C.struct_iovec - -type IPMreq C.struct_ip_mreq - -type IPv6Mreq C.struct_ipv6_mreq - -type Msghdr C.struct_msghdr - -type Cmsghdr C.struct_cmsghdr - -type Inet4Pktinfo C.struct_in_pktinfo - -type Inet6Pktinfo C.struct_in6_pktinfo - -type IPv6MTUInfo C.struct_ip6_mtuinfo - -type ICMPv6Filter C.struct_icmp6_filter - -const ( - SizeofSockaddrInet4 = C.sizeof_struct_sockaddr_in - SizeofSockaddrInet6 = C.sizeof_struct_sockaddr_in6 - SizeofSockaddrAny = C.sizeof_struct_sockaddr_any - SizeofSockaddrUnix = C.sizeof_struct_sockaddr_un - SizeofSockaddrDatalink = C.sizeof_struct_sockaddr_dl - SizeofLinger = C.sizeof_struct_linger - SizeofIPMreq = C.sizeof_struct_ip_mreq - SizeofIPv6Mreq = C.sizeof_struct_ipv6_mreq - SizeofMsghdr = C.sizeof_struct_msghdr - SizeofCmsghdr = C.sizeof_struct_cmsghdr - SizeofInet4Pktinfo = C.sizeof_struct_in_pktinfo - SizeofInet6Pktinfo = C.sizeof_struct_in6_pktinfo - SizeofIPv6MTUInfo = C.sizeof_struct_ip6_mtuinfo - SizeofICMPv6Filter = C.sizeof_struct_icmp6_filter -) - -// Ptrace requests - -const ( - PTRACE_TRACEME = C.PT_TRACE_ME - PTRACE_CONT = C.PT_CONTINUE - PTRACE_KILL = C.PT_KILL -) - -// Events (kqueue, kevent) - -type Kevent_t C.struct_kevent - -// Select - -type FdSet C.fd_set - -// Routing and interface messages - -const ( - SizeofIfMsghdr = C.sizeof_struct_if_msghdr - SizeofIfData = C.sizeof_struct_if_data - SizeofIfaMsghdr = C.sizeof_struct_ifa_msghdr - SizeofIfmaMsghdr = C.sizeof_struct_ifma_msghdr - SizeofIfmaMsghdr2 = C.sizeof_struct_ifma_msghdr2 - SizeofRtMsghdr = C.sizeof_struct_rt_msghdr - SizeofRtMetrics = C.sizeof_struct_rt_metrics -) - -type IfMsghdr C.struct_if_msghdr - -type IfData C.struct_if_data - -type IfaMsghdr C.struct_ifa_msghdr - -type IfmaMsghdr C.struct_ifma_msghdr - -type IfmaMsghdr2 C.struct_ifma_msghdr2 - -type RtMsghdr C.struct_rt_msghdr - -type RtMetrics C.struct_rt_metrics - -// Berkeley packet filter - -const ( - SizeofBpfVersion = C.sizeof_struct_bpf_version - SizeofBpfStat = C.sizeof_struct_bpf_stat - SizeofBpfProgram = C.sizeof_struct_bpf_program - SizeofBpfInsn = C.sizeof_struct_bpf_insn - SizeofBpfHdr = C.sizeof_struct_bpf_hdr -) - -type BpfVersion C.struct_bpf_version - -type BpfStat C.struct_bpf_stat - -type BpfProgram C.struct_bpf_program - -type BpfInsn C.struct_bpf_insn - -type BpfHdr C.struct_bpf_hdr - -// Terminal handling - -type Termios C.struct_termios - -type Winsize C.struct_winsize - -// fchmodat-like syscalls. - -const ( - AT_FDCWD = C.AT_FDCWD - AT_REMOVEDIR = C.AT_REMOVEDIR - AT_SYMLINK_FOLLOW = C.AT_SYMLINK_FOLLOW - AT_SYMLINK_NOFOLLOW = C.AT_SYMLINK_NOFOLLOW -) - -// poll - -type PollFd C.struct_pollfd - -const ( - POLLERR = C.POLLERR - POLLHUP = C.POLLHUP - POLLIN = C.POLLIN - POLLNVAL = C.POLLNVAL - POLLOUT = C.POLLOUT - POLLPRI = C.POLLPRI - POLLRDBAND = C.POLLRDBAND - POLLRDNORM = C.POLLRDNORM - POLLWRBAND = C.POLLWRBAND - POLLWRNORM = C.POLLWRNORM -) - -// uname - -type Utsname C.struct_utsname diff --git a/vendor/golang.org/x/sys/unix/types_dragonfly.go b/vendor/golang.org/x/sys/unix/types_dragonfly.go deleted file mode 100644 index 3365dd79d0..0000000000 --- a/vendor/golang.org/x/sys/unix/types_dragonfly.go +++ /dev/null @@ -1,263 +0,0 @@ -// Copyright 2009 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build ignore - -/* -Input to cgo -godefs. See README.md -*/ - -// +godefs map struct_in_addr [4]byte /* in_addr */ -// +godefs map struct_in6_addr [16]byte /* in6_addr */ - -package unix - -/* -#define KERNEL -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -enum { - sizeofPtr = sizeof(void*), -}; - -union sockaddr_all { - struct sockaddr s1; // this one gets used for fields - struct sockaddr_in s2; // these pad it out - struct sockaddr_in6 s3; - struct sockaddr_un s4; - struct sockaddr_dl s5; -}; - -struct sockaddr_any { - struct sockaddr addr; - char pad[sizeof(union sockaddr_all) - sizeof(struct sockaddr)]; -}; - -*/ -import "C" - -// Machine characteristics - -const ( - SizeofPtr = C.sizeofPtr - SizeofShort = C.sizeof_short - SizeofInt = C.sizeof_int - SizeofLong = C.sizeof_long - SizeofLongLong = C.sizeof_longlong -) - -// Basic types - -type ( - _C_short C.short - _C_int C.int - _C_long C.long - _C_long_long C.longlong -) - -// Time - -type Timespec C.struct_timespec - -type Timeval C.struct_timeval - -// Processes - -type Rusage C.struct_rusage - -type Rlimit C.struct_rlimit - -type _Gid_t C.gid_t - -// Files - -type Stat_t C.struct_stat - -type Statfs_t C.struct_statfs - -type Flock_t C.struct_flock - -type Dirent C.struct_dirent - -type Fsid C.struct_fsid - -// File system limits - -const ( - PathMax = C.PATH_MAX -) - -// Sockets - -type RawSockaddrInet4 C.struct_sockaddr_in - -type RawSockaddrInet6 C.struct_sockaddr_in6 - -type RawSockaddrUnix C.struct_sockaddr_un - -type RawSockaddrDatalink C.struct_sockaddr_dl - -type RawSockaddr C.struct_sockaddr - -type RawSockaddrAny C.struct_sockaddr_any - -type _Socklen C.socklen_t - -type Linger C.struct_linger - -type Iovec C.struct_iovec - -type IPMreq C.struct_ip_mreq - -type IPv6Mreq C.struct_ipv6_mreq - -type Msghdr C.struct_msghdr - -type Cmsghdr C.struct_cmsghdr - -type Inet6Pktinfo C.struct_in6_pktinfo - -type IPv6MTUInfo C.struct_ip6_mtuinfo - -type ICMPv6Filter C.struct_icmp6_filter - -const ( - SizeofSockaddrInet4 = C.sizeof_struct_sockaddr_in - SizeofSockaddrInet6 = C.sizeof_struct_sockaddr_in6 - SizeofSockaddrAny = C.sizeof_struct_sockaddr_any - SizeofSockaddrUnix = C.sizeof_struct_sockaddr_un - SizeofSockaddrDatalink = C.sizeof_struct_sockaddr_dl - SizeofLinger = C.sizeof_struct_linger - SizeofIPMreq = C.sizeof_struct_ip_mreq - SizeofIPv6Mreq = C.sizeof_struct_ipv6_mreq - SizeofMsghdr = C.sizeof_struct_msghdr - SizeofCmsghdr = C.sizeof_struct_cmsghdr - SizeofInet6Pktinfo = C.sizeof_struct_in6_pktinfo - SizeofIPv6MTUInfo = C.sizeof_struct_ip6_mtuinfo - SizeofICMPv6Filter = C.sizeof_struct_icmp6_filter -) - -// Ptrace requests - -const ( - PTRACE_TRACEME = C.PT_TRACE_ME - PTRACE_CONT = C.PT_CONTINUE - PTRACE_KILL = C.PT_KILL -) - -// Events (kqueue, kevent) - -type Kevent_t C.struct_kevent - -// Select - -type FdSet C.fd_set - -// Routing and interface messages - -const ( - SizeofIfMsghdr = C.sizeof_struct_if_msghdr - SizeofIfData = C.sizeof_struct_if_data - SizeofIfaMsghdr = C.sizeof_struct_ifa_msghdr - SizeofIfmaMsghdr = C.sizeof_struct_ifma_msghdr - SizeofIfAnnounceMsghdr = C.sizeof_struct_if_announcemsghdr - SizeofRtMsghdr = C.sizeof_struct_rt_msghdr - SizeofRtMetrics = C.sizeof_struct_rt_metrics -) - -type IfMsghdr C.struct_if_msghdr - -type IfData C.struct_if_data - -type IfaMsghdr C.struct_ifa_msghdr - -type IfmaMsghdr C.struct_ifma_msghdr - -type IfAnnounceMsghdr C.struct_if_announcemsghdr - -type RtMsghdr C.struct_rt_msghdr - -type RtMetrics C.struct_rt_metrics - -// Berkeley packet filter - -const ( - SizeofBpfVersion = C.sizeof_struct_bpf_version - SizeofBpfStat = C.sizeof_struct_bpf_stat - SizeofBpfProgram = C.sizeof_struct_bpf_program - SizeofBpfInsn = C.sizeof_struct_bpf_insn - SizeofBpfHdr = C.sizeof_struct_bpf_hdr -) - -type BpfVersion C.struct_bpf_version - -type BpfStat C.struct_bpf_stat - -type BpfProgram C.struct_bpf_program - -type BpfInsn C.struct_bpf_insn - -type BpfHdr C.struct_bpf_hdr - -// Terminal handling - -type Termios C.struct_termios - -type Winsize C.struct_winsize - -// fchmodat-like syscalls. - -const ( - AT_FDCWD = C.AT_FDCWD - AT_SYMLINK_NOFOLLOW = C.AT_SYMLINK_NOFOLLOW -) - -// poll - -type PollFd C.struct_pollfd - -const ( - POLLERR = C.POLLERR - POLLHUP = C.POLLHUP - POLLIN = C.POLLIN - POLLNVAL = C.POLLNVAL - POLLOUT = C.POLLOUT - POLLPRI = C.POLLPRI - POLLRDBAND = C.POLLRDBAND - POLLRDNORM = C.POLLRDNORM - POLLWRBAND = C.POLLWRBAND - POLLWRNORM = C.POLLWRNORM -) - -// Uname - -type Utsname C.struct_utsname diff --git a/vendor/golang.org/x/sys/unix/types_freebsd.go b/vendor/golang.org/x/sys/unix/types_freebsd.go deleted file mode 100644 index 7470798951..0000000000 --- a/vendor/golang.org/x/sys/unix/types_freebsd.go +++ /dev/null @@ -1,356 +0,0 @@ -// Copyright 2009 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build ignore - -/* -Input to cgo -godefs. See README.md -*/ - -// +godefs map struct_in_addr [4]byte /* in_addr */ -// +godefs map struct_in6_addr [16]byte /* in6_addr */ - -package unix - -/* -#define _WANT_FREEBSD11_STAT 1 -#define _WANT_FREEBSD11_STATFS 1 -#define _WANT_FREEBSD11_DIRENT 1 -#define _WANT_FREEBSD11_KEVENT 1 - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -enum { - sizeofPtr = sizeof(void*), -}; - -union sockaddr_all { - struct sockaddr s1; // this one gets used for fields - struct sockaddr_in s2; // these pad it out - struct sockaddr_in6 s3; - struct sockaddr_un s4; - struct sockaddr_dl s5; -}; - -struct sockaddr_any { - struct sockaddr addr; - char pad[sizeof(union sockaddr_all) - sizeof(struct sockaddr)]; -}; - -// This structure is a duplicate of if_data on FreeBSD 8-STABLE. -// See /usr/include/net/if.h. -struct if_data8 { - u_char ifi_type; - u_char ifi_physical; - u_char ifi_addrlen; - u_char ifi_hdrlen; - u_char ifi_link_state; - u_char ifi_spare_char1; - u_char ifi_spare_char2; - u_char ifi_datalen; - u_long ifi_mtu; - u_long ifi_metric; - u_long ifi_baudrate; - u_long ifi_ipackets; - u_long ifi_ierrors; - u_long ifi_opackets; - u_long ifi_oerrors; - u_long ifi_collisions; - u_long ifi_ibytes; - u_long ifi_obytes; - u_long ifi_imcasts; - u_long ifi_omcasts; - u_long ifi_iqdrops; - u_long ifi_noproto; - u_long ifi_hwassist; -// FIXME: these are now unions, so maybe need to change definitions? -#undef ifi_epoch - time_t ifi_epoch; -#undef ifi_lastchange - struct timeval ifi_lastchange; -}; - -// This structure is a duplicate of if_msghdr on FreeBSD 8-STABLE. -// See /usr/include/net/if.h. -struct if_msghdr8 { - u_short ifm_msglen; - u_char ifm_version; - u_char ifm_type; - int ifm_addrs; - int ifm_flags; - u_short ifm_index; - struct if_data8 ifm_data; -}; -*/ -import "C" - -// Machine characteristics - -const ( - SizeofPtr = C.sizeofPtr - SizeofShort = C.sizeof_short - SizeofInt = C.sizeof_int - SizeofLong = C.sizeof_long - SizeofLongLong = C.sizeof_longlong -) - -// Basic types - -type ( - _C_short C.short - _C_int C.int - _C_long C.long - _C_long_long C.longlong -) - -// Time - -type Timespec C.struct_timespec - -type Timeval C.struct_timeval - -// Processes - -type Rusage C.struct_rusage - -type Rlimit C.struct_rlimit - -type _Gid_t C.gid_t - -// Files - -const ( - _statfsVersion = C.STATFS_VERSION - _dirblksiz = C.DIRBLKSIZ -) - -type Stat_t C.struct_stat - -type stat_freebsd11_t C.struct_freebsd11_stat - -type Statfs_t C.struct_statfs - -type statfs_freebsd11_t C.struct_freebsd11_statfs - -type Flock_t C.struct_flock - -type Dirent C.struct_dirent - -type dirent_freebsd11 C.struct_freebsd11_dirent - -type Fsid C.struct_fsid - -// File system limits - -const ( - PathMax = C.PATH_MAX -) - -// Advice to Fadvise - -const ( - FADV_NORMAL = C.POSIX_FADV_NORMAL - FADV_RANDOM = C.POSIX_FADV_RANDOM - FADV_SEQUENTIAL = C.POSIX_FADV_SEQUENTIAL - FADV_WILLNEED = C.POSIX_FADV_WILLNEED - FADV_DONTNEED = C.POSIX_FADV_DONTNEED - FADV_NOREUSE = C.POSIX_FADV_NOREUSE -) - -// Sockets - -type RawSockaddrInet4 C.struct_sockaddr_in - -type RawSockaddrInet6 C.struct_sockaddr_in6 - -type RawSockaddrUnix C.struct_sockaddr_un - -type RawSockaddrDatalink C.struct_sockaddr_dl - -type RawSockaddr C.struct_sockaddr - -type RawSockaddrAny C.struct_sockaddr_any - -type _Socklen C.socklen_t - -type Linger C.struct_linger - -type Iovec C.struct_iovec - -type IPMreq C.struct_ip_mreq - -type IPMreqn C.struct_ip_mreqn - -type IPv6Mreq C.struct_ipv6_mreq - -type Msghdr C.struct_msghdr - -type Cmsghdr C.struct_cmsghdr - -type Inet6Pktinfo C.struct_in6_pktinfo - -type IPv6MTUInfo C.struct_ip6_mtuinfo - -type ICMPv6Filter C.struct_icmp6_filter - -const ( - SizeofSockaddrInet4 = C.sizeof_struct_sockaddr_in - SizeofSockaddrInet6 = C.sizeof_struct_sockaddr_in6 - SizeofSockaddrAny = C.sizeof_struct_sockaddr_any - SizeofSockaddrUnix = C.sizeof_struct_sockaddr_un - SizeofSockaddrDatalink = C.sizeof_struct_sockaddr_dl - SizeofLinger = C.sizeof_struct_linger - SizeofIPMreq = C.sizeof_struct_ip_mreq - SizeofIPMreqn = C.sizeof_struct_ip_mreqn - SizeofIPv6Mreq = C.sizeof_struct_ipv6_mreq - SizeofMsghdr = C.sizeof_struct_msghdr - SizeofCmsghdr = C.sizeof_struct_cmsghdr - SizeofInet6Pktinfo = C.sizeof_struct_in6_pktinfo - SizeofIPv6MTUInfo = C.sizeof_struct_ip6_mtuinfo - SizeofICMPv6Filter = C.sizeof_struct_icmp6_filter -) - -// Ptrace requests - -const ( - PTRACE_TRACEME = C.PT_TRACE_ME - PTRACE_CONT = C.PT_CONTINUE - PTRACE_KILL = C.PT_KILL -) - -// Events (kqueue, kevent) - -type Kevent_t C.struct_kevent_freebsd11 - -// Select - -type FdSet C.fd_set - -// Routing and interface messages - -const ( - sizeofIfMsghdr = C.sizeof_struct_if_msghdr - SizeofIfMsghdr = C.sizeof_struct_if_msghdr8 - sizeofIfData = C.sizeof_struct_if_data - SizeofIfData = C.sizeof_struct_if_data8 - SizeofIfaMsghdr = C.sizeof_struct_ifa_msghdr - SizeofIfmaMsghdr = C.sizeof_struct_ifma_msghdr - SizeofIfAnnounceMsghdr = C.sizeof_struct_if_announcemsghdr - SizeofRtMsghdr = C.sizeof_struct_rt_msghdr - SizeofRtMetrics = C.sizeof_struct_rt_metrics -) - -type ifMsghdr C.struct_if_msghdr - -type IfMsghdr C.struct_if_msghdr8 - -type ifData C.struct_if_data - -type IfData C.struct_if_data8 - -type IfaMsghdr C.struct_ifa_msghdr - -type IfmaMsghdr C.struct_ifma_msghdr - -type IfAnnounceMsghdr C.struct_if_announcemsghdr - -type RtMsghdr C.struct_rt_msghdr - -type RtMetrics C.struct_rt_metrics - -// Berkeley packet filter - -const ( - SizeofBpfVersion = C.sizeof_struct_bpf_version - SizeofBpfStat = C.sizeof_struct_bpf_stat - SizeofBpfZbuf = C.sizeof_struct_bpf_zbuf - SizeofBpfProgram = C.sizeof_struct_bpf_program - SizeofBpfInsn = C.sizeof_struct_bpf_insn - SizeofBpfHdr = C.sizeof_struct_bpf_hdr - SizeofBpfZbufHeader = C.sizeof_struct_bpf_zbuf_header -) - -type BpfVersion C.struct_bpf_version - -type BpfStat C.struct_bpf_stat - -type BpfZbuf C.struct_bpf_zbuf - -type BpfProgram C.struct_bpf_program - -type BpfInsn C.struct_bpf_insn - -type BpfHdr C.struct_bpf_hdr - -type BpfZbufHeader C.struct_bpf_zbuf_header - -// Terminal handling - -type Termios C.struct_termios - -type Winsize C.struct_winsize - -// fchmodat-like syscalls. - -const ( - AT_FDCWD = C.AT_FDCWD - AT_REMOVEDIR = C.AT_REMOVEDIR - AT_SYMLINK_FOLLOW = C.AT_SYMLINK_FOLLOW - AT_SYMLINK_NOFOLLOW = C.AT_SYMLINK_NOFOLLOW -) - -// poll - -type PollFd C.struct_pollfd - -const ( - POLLERR = C.POLLERR - POLLHUP = C.POLLHUP - POLLIN = C.POLLIN - POLLINIGNEOF = C.POLLINIGNEOF - POLLNVAL = C.POLLNVAL - POLLOUT = C.POLLOUT - POLLPRI = C.POLLPRI - POLLRDBAND = C.POLLRDBAND - POLLRDNORM = C.POLLRDNORM - POLLWRBAND = C.POLLWRBAND - POLLWRNORM = C.POLLWRNORM -) - -// Capabilities - -type CapRights C.struct_cap_rights - -// Uname - -type Utsname C.struct_utsname diff --git a/vendor/golang.org/x/sys/unix/types_netbsd.go b/vendor/golang.org/x/sys/unix/types_netbsd.go deleted file mode 100644 index 2dd4f9542c..0000000000 --- a/vendor/golang.org/x/sys/unix/types_netbsd.go +++ /dev/null @@ -1,289 +0,0 @@ -// Copyright 2009 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build ignore - -/* -Input to cgo -godefs. See README.md -*/ - -// +godefs map struct_in_addr [4]byte /* in_addr */ -// +godefs map struct_in6_addr [16]byte /* in6_addr */ - -package unix - -/* -#define KERNEL -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -enum { - sizeofPtr = sizeof(void*), -}; - -union sockaddr_all { - struct sockaddr s1; // this one gets used for fields - struct sockaddr_in s2; // these pad it out - struct sockaddr_in6 s3; - struct sockaddr_un s4; - struct sockaddr_dl s5; -}; - -struct sockaddr_any { - struct sockaddr addr; - char pad[sizeof(union sockaddr_all) - sizeof(struct sockaddr)]; -}; - -*/ -import "C" - -// Machine characteristics - -const ( - SizeofPtr = C.sizeofPtr - SizeofShort = C.sizeof_short - SizeofInt = C.sizeof_int - SizeofLong = C.sizeof_long - SizeofLongLong = C.sizeof_longlong -) - -// Basic types - -type ( - _C_short C.short - _C_int C.int - _C_long C.long - _C_long_long C.longlong -) - -// Time - -type Timespec C.struct_timespec - -type Timeval C.struct_timeval - -// Processes - -type Rusage C.struct_rusage - -type Rlimit C.struct_rlimit - -type _Gid_t C.gid_t - -// Files - -type Stat_t C.struct_stat - -type Statfs_t C.struct_statfs - -type Flock_t C.struct_flock - -type Dirent C.struct_dirent - -type Fsid C.fsid_t - -// File system limits - -const ( - PathMax = C.PATH_MAX -) - -// Advice to Fadvise - -const ( - FADV_NORMAL = C.POSIX_FADV_NORMAL - FADV_RANDOM = C.POSIX_FADV_RANDOM - FADV_SEQUENTIAL = C.POSIX_FADV_SEQUENTIAL - FADV_WILLNEED = C.POSIX_FADV_WILLNEED - FADV_DONTNEED = C.POSIX_FADV_DONTNEED - FADV_NOREUSE = C.POSIX_FADV_NOREUSE -) - -// Sockets - -type RawSockaddrInet4 C.struct_sockaddr_in - -type RawSockaddrInet6 C.struct_sockaddr_in6 - -type RawSockaddrUnix C.struct_sockaddr_un - -type RawSockaddrDatalink C.struct_sockaddr_dl - -type RawSockaddr C.struct_sockaddr - -type RawSockaddrAny C.struct_sockaddr_any - -type _Socklen C.socklen_t - -type Linger C.struct_linger - -type Iovec C.struct_iovec - -type IPMreq C.struct_ip_mreq - -type IPv6Mreq C.struct_ipv6_mreq - -type Msghdr C.struct_msghdr - -type Cmsghdr C.struct_cmsghdr - -type Inet6Pktinfo C.struct_in6_pktinfo - -type IPv6MTUInfo C.struct_ip6_mtuinfo - -type ICMPv6Filter C.struct_icmp6_filter - -const ( - SizeofSockaddrInet4 = C.sizeof_struct_sockaddr_in - SizeofSockaddrInet6 = C.sizeof_struct_sockaddr_in6 - SizeofSockaddrAny = C.sizeof_struct_sockaddr_any - SizeofSockaddrUnix = C.sizeof_struct_sockaddr_un - SizeofSockaddrDatalink = C.sizeof_struct_sockaddr_dl - SizeofLinger = C.sizeof_struct_linger - SizeofIPMreq = C.sizeof_struct_ip_mreq - SizeofIPv6Mreq = C.sizeof_struct_ipv6_mreq - SizeofMsghdr = C.sizeof_struct_msghdr - SizeofCmsghdr = C.sizeof_struct_cmsghdr - SizeofInet6Pktinfo = C.sizeof_struct_in6_pktinfo - SizeofIPv6MTUInfo = C.sizeof_struct_ip6_mtuinfo - SizeofICMPv6Filter = C.sizeof_struct_icmp6_filter -) - -// Ptrace requests - -const ( - PTRACE_TRACEME = C.PT_TRACE_ME - PTRACE_CONT = C.PT_CONTINUE - PTRACE_KILL = C.PT_KILL -) - -// Events (kqueue, kevent) - -type Kevent_t C.struct_kevent - -// Select - -type FdSet C.fd_set - -// Routing and interface messages - -const ( - SizeofIfMsghdr = C.sizeof_struct_if_msghdr - SizeofIfData = C.sizeof_struct_if_data - SizeofIfaMsghdr = C.sizeof_struct_ifa_msghdr - SizeofIfAnnounceMsghdr = C.sizeof_struct_if_announcemsghdr - SizeofRtMsghdr = C.sizeof_struct_rt_msghdr - SizeofRtMetrics = C.sizeof_struct_rt_metrics -) - -type IfMsghdr C.struct_if_msghdr - -type IfData C.struct_if_data - -type IfaMsghdr C.struct_ifa_msghdr - -type IfAnnounceMsghdr C.struct_if_announcemsghdr - -type RtMsghdr C.struct_rt_msghdr - -type RtMetrics C.struct_rt_metrics - -type Mclpool C.struct_mclpool - -// Berkeley packet filter - -const ( - SizeofBpfVersion = C.sizeof_struct_bpf_version - SizeofBpfStat = C.sizeof_struct_bpf_stat - SizeofBpfProgram = C.sizeof_struct_bpf_program - SizeofBpfInsn = C.sizeof_struct_bpf_insn - SizeofBpfHdr = C.sizeof_struct_bpf_hdr -) - -type BpfVersion C.struct_bpf_version - -type BpfStat C.struct_bpf_stat - -type BpfProgram C.struct_bpf_program - -type BpfInsn C.struct_bpf_insn - -type BpfHdr C.struct_bpf_hdr - -type BpfTimeval C.struct_bpf_timeval - -// Terminal handling - -type Termios C.struct_termios - -type Winsize C.struct_winsize - -type Ptmget C.struct_ptmget - -// fchmodat-like syscalls. - -const ( - AT_FDCWD = C.AT_FDCWD - AT_SYMLINK_NOFOLLOW = C.AT_SYMLINK_NOFOLLOW -) - -// poll - -type PollFd C.struct_pollfd - -const ( - POLLERR = C.POLLERR - POLLHUP = C.POLLHUP - POLLIN = C.POLLIN - POLLNVAL = C.POLLNVAL - POLLOUT = C.POLLOUT - POLLPRI = C.POLLPRI - POLLRDBAND = C.POLLRDBAND - POLLRDNORM = C.POLLRDNORM - POLLWRBAND = C.POLLWRBAND - POLLWRNORM = C.POLLWRNORM -) - -// Sysctl - -type Sysctlnode C.struct_sysctlnode - -// Uname - -type Utsname C.struct_utsname - -// Clockinfo - -const SizeofClockinfo = C.sizeof_struct_clockinfo - -type Clockinfo C.struct_clockinfo diff --git a/vendor/golang.org/x/sys/unix/types_openbsd.go b/vendor/golang.org/x/sys/unix/types_openbsd.go deleted file mode 100644 index 4e5e57f9a6..0000000000 --- a/vendor/golang.org/x/sys/unix/types_openbsd.go +++ /dev/null @@ -1,276 +0,0 @@ -// Copyright 2009 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build ignore - -/* -Input to cgo -godefs. See README.md -*/ - -// +godefs map struct_in_addr [4]byte /* in_addr */ -// +godefs map struct_in6_addr [16]byte /* in6_addr */ - -package unix - -/* -#define KERNEL -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -enum { - sizeofPtr = sizeof(void*), -}; - -union sockaddr_all { - struct sockaddr s1; // this one gets used for fields - struct sockaddr_in s2; // these pad it out - struct sockaddr_in6 s3; - struct sockaddr_un s4; - struct sockaddr_dl s5; -}; - -struct sockaddr_any { - struct sockaddr addr; - char pad[sizeof(union sockaddr_all) - sizeof(struct sockaddr)]; -}; - -*/ -import "C" - -// Machine characteristics - -const ( - SizeofPtr = C.sizeofPtr - SizeofShort = C.sizeof_short - SizeofInt = C.sizeof_int - SizeofLong = C.sizeof_long - SizeofLongLong = C.sizeof_longlong -) - -// Basic types - -type ( - _C_short C.short - _C_int C.int - _C_long C.long - _C_long_long C.longlong -) - -// Time - -type Timespec C.struct_timespec - -type Timeval C.struct_timeval - -// Processes - -type Rusage C.struct_rusage - -type Rlimit C.struct_rlimit - -type _Gid_t C.gid_t - -// Files - -type Stat_t C.struct_stat - -type Statfs_t C.struct_statfs - -type Flock_t C.struct_flock - -type Dirent C.struct_dirent - -type Fsid C.fsid_t - -// File system limits - -const ( - PathMax = C.PATH_MAX -) - -// Sockets - -type RawSockaddrInet4 C.struct_sockaddr_in - -type RawSockaddrInet6 C.struct_sockaddr_in6 - -type RawSockaddrUnix C.struct_sockaddr_un - -type RawSockaddrDatalink C.struct_sockaddr_dl - -type RawSockaddr C.struct_sockaddr - -type RawSockaddrAny C.struct_sockaddr_any - -type _Socklen C.socklen_t - -type Linger C.struct_linger - -type Iovec C.struct_iovec - -type IPMreq C.struct_ip_mreq - -type IPv6Mreq C.struct_ipv6_mreq - -type Msghdr C.struct_msghdr - -type Cmsghdr C.struct_cmsghdr - -type Inet6Pktinfo C.struct_in6_pktinfo - -type IPv6MTUInfo C.struct_ip6_mtuinfo - -type ICMPv6Filter C.struct_icmp6_filter - -const ( - SizeofSockaddrInet4 = C.sizeof_struct_sockaddr_in - SizeofSockaddrInet6 = C.sizeof_struct_sockaddr_in6 - SizeofSockaddrAny = C.sizeof_struct_sockaddr_any - SizeofSockaddrUnix = C.sizeof_struct_sockaddr_un - SizeofSockaddrDatalink = C.sizeof_struct_sockaddr_dl - SizeofLinger = C.sizeof_struct_linger - SizeofIPMreq = C.sizeof_struct_ip_mreq - SizeofIPv6Mreq = C.sizeof_struct_ipv6_mreq - SizeofMsghdr = C.sizeof_struct_msghdr - SizeofCmsghdr = C.sizeof_struct_cmsghdr - SizeofInet6Pktinfo = C.sizeof_struct_in6_pktinfo - SizeofIPv6MTUInfo = C.sizeof_struct_ip6_mtuinfo - SizeofICMPv6Filter = C.sizeof_struct_icmp6_filter -) - -// Ptrace requests - -const ( - PTRACE_TRACEME = C.PT_TRACE_ME - PTRACE_CONT = C.PT_CONTINUE - PTRACE_KILL = C.PT_KILL -) - -// Events (kqueue, kevent) - -type Kevent_t C.struct_kevent - -// Select - -type FdSet C.fd_set - -// Routing and interface messages - -const ( - SizeofIfMsghdr = C.sizeof_struct_if_msghdr - SizeofIfData = C.sizeof_struct_if_data - SizeofIfaMsghdr = C.sizeof_struct_ifa_msghdr - SizeofIfAnnounceMsghdr = C.sizeof_struct_if_announcemsghdr - SizeofRtMsghdr = C.sizeof_struct_rt_msghdr - SizeofRtMetrics = C.sizeof_struct_rt_metrics -) - -type IfMsghdr C.struct_if_msghdr - -type IfData C.struct_if_data - -type IfaMsghdr C.struct_ifa_msghdr - -type IfAnnounceMsghdr C.struct_if_announcemsghdr - -type RtMsghdr C.struct_rt_msghdr - -type RtMetrics C.struct_rt_metrics - -type Mclpool C.struct_mclpool - -// Berkeley packet filter - -const ( - SizeofBpfVersion = C.sizeof_struct_bpf_version - SizeofBpfStat = C.sizeof_struct_bpf_stat - SizeofBpfProgram = C.sizeof_struct_bpf_program - SizeofBpfInsn = C.sizeof_struct_bpf_insn - SizeofBpfHdr = C.sizeof_struct_bpf_hdr -) - -type BpfVersion C.struct_bpf_version - -type BpfStat C.struct_bpf_stat - -type BpfProgram C.struct_bpf_program - -type BpfInsn C.struct_bpf_insn - -type BpfHdr C.struct_bpf_hdr - -type BpfTimeval C.struct_bpf_timeval - -// Terminal handling - -type Termios C.struct_termios - -type Winsize C.struct_winsize - -// fchmodat-like syscalls. - -const ( - AT_FDCWD = C.AT_FDCWD - AT_SYMLINK_NOFOLLOW = C.AT_SYMLINK_NOFOLLOW -) - -// poll - -type PollFd C.struct_pollfd - -const ( - POLLERR = C.POLLERR - POLLHUP = C.POLLHUP - POLLIN = C.POLLIN - POLLNVAL = C.POLLNVAL - POLLOUT = C.POLLOUT - POLLPRI = C.POLLPRI - POLLRDBAND = C.POLLRDBAND - POLLRDNORM = C.POLLRDNORM - POLLWRBAND = C.POLLWRBAND - POLLWRNORM = C.POLLWRNORM -) - -// Signal Sets - -type Sigset_t C.sigset_t - -// Uname - -type Utsname C.struct_utsname - -// Uvmexp - -const SizeofUvmexp = C.sizeof_struct_uvmexp - -type Uvmexp C.struct_uvmexp diff --git a/vendor/golang.org/x/sys/unix/types_solaris.go b/vendor/golang.org/x/sys/unix/types_solaris.go deleted file mode 100644 index 2b716f9348..0000000000 --- a/vendor/golang.org/x/sys/unix/types_solaris.go +++ /dev/null @@ -1,266 +0,0 @@ -// Copyright 2009 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build ignore - -/* -Input to cgo -godefs. See README.md -*/ - -// +godefs map struct_in_addr [4]byte /* in_addr */ -// +godefs map struct_in6_addr [16]byte /* in6_addr */ - -package unix - -/* -#define KERNEL -// These defines ensure that builds done on newer versions of Solaris are -// backwards-compatible with older versions of Solaris and -// OpenSolaris-based derivatives. -#define __USE_SUNOS_SOCKETS__ // msghdr -#define __USE_LEGACY_PROTOTYPES__ // iovec -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -enum { - sizeofPtr = sizeof(void*), -}; - -union sockaddr_all { - struct sockaddr s1; // this one gets used for fields - struct sockaddr_in s2; // these pad it out - struct sockaddr_in6 s3; - struct sockaddr_un s4; - struct sockaddr_dl s5; -}; - -struct sockaddr_any { - struct sockaddr addr; - char pad[sizeof(union sockaddr_all) - sizeof(struct sockaddr)]; -}; - -*/ -import "C" - -// Machine characteristics - -const ( - SizeofPtr = C.sizeofPtr - SizeofShort = C.sizeof_short - SizeofInt = C.sizeof_int - SizeofLong = C.sizeof_long - SizeofLongLong = C.sizeof_longlong - PathMax = C.PATH_MAX - MaxHostNameLen = C.MAXHOSTNAMELEN -) - -// Basic types - -type ( - _C_short C.short - _C_int C.int - _C_long C.long - _C_long_long C.longlong -) - -// Time - -type Timespec C.struct_timespec - -type Timeval C.struct_timeval - -type Timeval32 C.struct_timeval32 - -type Tms C.struct_tms - -type Utimbuf C.struct_utimbuf - -// Processes - -type Rusage C.struct_rusage - -type Rlimit C.struct_rlimit - -type _Gid_t C.gid_t - -// Files - -type Stat_t C.struct_stat - -type Flock_t C.struct_flock - -type Dirent C.struct_dirent - -// Filesystems - -type _Fsblkcnt_t C.fsblkcnt_t - -type Statvfs_t C.struct_statvfs - -// Sockets - -type RawSockaddrInet4 C.struct_sockaddr_in - -type RawSockaddrInet6 C.struct_sockaddr_in6 - -type RawSockaddrUnix C.struct_sockaddr_un - -type RawSockaddrDatalink C.struct_sockaddr_dl - -type RawSockaddr C.struct_sockaddr - -type RawSockaddrAny C.struct_sockaddr_any - -type _Socklen C.socklen_t - -type Linger C.struct_linger - -type Iovec C.struct_iovec - -type IPMreq C.struct_ip_mreq - -type IPv6Mreq C.struct_ipv6_mreq - -type Msghdr C.struct_msghdr - -type Cmsghdr C.struct_cmsghdr - -type Inet6Pktinfo C.struct_in6_pktinfo - -type IPv6MTUInfo C.struct_ip6_mtuinfo - -type ICMPv6Filter C.struct_icmp6_filter - -const ( - SizeofSockaddrInet4 = C.sizeof_struct_sockaddr_in - SizeofSockaddrInet6 = C.sizeof_struct_sockaddr_in6 - SizeofSockaddrAny = C.sizeof_struct_sockaddr_any - SizeofSockaddrUnix = C.sizeof_struct_sockaddr_un - SizeofSockaddrDatalink = C.sizeof_struct_sockaddr_dl - SizeofLinger = C.sizeof_struct_linger - SizeofIPMreq = C.sizeof_struct_ip_mreq - SizeofIPv6Mreq = C.sizeof_struct_ipv6_mreq - SizeofMsghdr = C.sizeof_struct_msghdr - SizeofCmsghdr = C.sizeof_struct_cmsghdr - SizeofInet6Pktinfo = C.sizeof_struct_in6_pktinfo - SizeofIPv6MTUInfo = C.sizeof_struct_ip6_mtuinfo - SizeofICMPv6Filter = C.sizeof_struct_icmp6_filter -) - -// Select - -type FdSet C.fd_set - -// Misc - -type Utsname C.struct_utsname - -type Ustat_t C.struct_ustat - -const ( - AT_FDCWD = C.AT_FDCWD - AT_SYMLINK_NOFOLLOW = C.AT_SYMLINK_NOFOLLOW - AT_SYMLINK_FOLLOW = C.AT_SYMLINK_FOLLOW - AT_REMOVEDIR = C.AT_REMOVEDIR - AT_EACCESS = C.AT_EACCESS -) - -// Routing and interface messages - -const ( - SizeofIfMsghdr = C.sizeof_struct_if_msghdr - SizeofIfData = C.sizeof_struct_if_data - SizeofIfaMsghdr = C.sizeof_struct_ifa_msghdr - SizeofRtMsghdr = C.sizeof_struct_rt_msghdr - SizeofRtMetrics = C.sizeof_struct_rt_metrics -) - -type IfMsghdr C.struct_if_msghdr - -type IfData C.struct_if_data - -type IfaMsghdr C.struct_ifa_msghdr - -type RtMsghdr C.struct_rt_msghdr - -type RtMetrics C.struct_rt_metrics - -// Berkeley packet filter - -const ( - SizeofBpfVersion = C.sizeof_struct_bpf_version - SizeofBpfStat = C.sizeof_struct_bpf_stat - SizeofBpfProgram = C.sizeof_struct_bpf_program - SizeofBpfInsn = C.sizeof_struct_bpf_insn - SizeofBpfHdr = C.sizeof_struct_bpf_hdr -) - -type BpfVersion C.struct_bpf_version - -type BpfStat C.struct_bpf_stat - -type BpfProgram C.struct_bpf_program - -type BpfInsn C.struct_bpf_insn - -type BpfTimeval C.struct_bpf_timeval - -type BpfHdr C.struct_bpf_hdr - -// Terminal handling - -type Termios C.struct_termios - -type Termio C.struct_termio - -type Winsize C.struct_winsize - -// poll - -type PollFd C.struct_pollfd - -const ( - POLLERR = C.POLLERR - POLLHUP = C.POLLHUP - POLLIN = C.POLLIN - POLLNVAL = C.POLLNVAL - POLLOUT = C.POLLOUT - POLLPRI = C.POLLPRI - POLLRDBAND = C.POLLRDBAND - POLLRDNORM = C.POLLRDNORM - POLLWRBAND = C.POLLWRBAND - POLLWRNORM = C.POLLWRNORM -) diff --git a/vendor/golang.org/x/text/unicode/bidi/gen_trieval.go b/vendor/golang.org/x/text/unicode/bidi/gen_trieval.go deleted file mode 100644 index 9cb9942894..0000000000 --- a/vendor/golang.org/x/text/unicode/bidi/gen_trieval.go +++ /dev/null @@ -1,64 +0,0 @@ -// Copyright 2015 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build ignore - -package main - -// Class is the Unicode BiDi class. Each rune has a single class. -type Class uint - -const ( - L Class = iota // LeftToRight - R // RightToLeft - EN // EuropeanNumber - ES // EuropeanSeparator - ET // EuropeanTerminator - AN // ArabicNumber - CS // CommonSeparator - B // ParagraphSeparator - S // SegmentSeparator - WS // WhiteSpace - ON // OtherNeutral - BN // BoundaryNeutral - NSM // NonspacingMark - AL // ArabicLetter - Control // Control LRO - PDI - - numClass - - LRO // LeftToRightOverride - RLO // RightToLeftOverride - LRE // LeftToRightEmbedding - RLE // RightToLeftEmbedding - PDF // PopDirectionalFormat - LRI // LeftToRightIsolate - RLI // RightToLeftIsolate - FSI // FirstStrongIsolate - PDI // PopDirectionalIsolate - - unknownClass = ^Class(0) -) - -var controlToClass = map[rune]Class{ - 0x202D: LRO, // LeftToRightOverride, - 0x202E: RLO, // RightToLeftOverride, - 0x202A: LRE, // LeftToRightEmbedding, - 0x202B: RLE, // RightToLeftEmbedding, - 0x202C: PDF, // PopDirectionalFormat, - 0x2066: LRI, // LeftToRightIsolate, - 0x2067: RLI, // RightToLeftIsolate, - 0x2068: FSI, // FirstStrongIsolate, - 0x2069: PDI, // PopDirectionalIsolate, -} - -// A trie entry has the following bits: -// 7..5 XOR mask for brackets -// 4 1: Bracket open, 0: Bracket close -// 3..0 Class type - -const ( - openMask = 0x10 - xorMaskShift = 5 -) diff --git a/vendor/golang.org/x/text/unicode/norm/triegen.go b/vendor/golang.org/x/text/unicode/norm/triegen.go deleted file mode 100644 index 45d711900d..0000000000 --- a/vendor/golang.org/x/text/unicode/norm/triegen.go +++ /dev/null @@ -1,117 +0,0 @@ -// Copyright 2011 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build ignore - -// Trie table generator. -// Used by make*tables tools to generate a go file with trie data structures -// for mapping UTF-8 to a 16-bit value. All but the last byte in a UTF-8 byte -// sequence are used to lookup offsets in the index table to be used for the -// next byte. The last byte is used to index into a table with 16-bit values. - -package main - -import ( - "fmt" - "io" -) - -const maxSparseEntries = 16 - -type normCompacter struct { - sparseBlocks [][]uint64 - sparseOffset []uint16 - sparseCount int - name string -} - -func mostFrequentStride(a []uint64) int { - counts := make(map[int]int) - var v int - for _, x := range a { - if stride := int(x) - v; v != 0 && stride >= 0 { - counts[stride]++ - } - v = int(x) - } - var maxs, maxc int - for stride, cnt := range counts { - if cnt > maxc || (cnt == maxc && stride < maxs) { - maxs, maxc = stride, cnt - } - } - return maxs -} - -func countSparseEntries(a []uint64) int { - stride := mostFrequentStride(a) - var v, count int - for _, tv := range a { - if int(tv)-v != stride { - if tv != 0 { - count++ - } - } - v = int(tv) - } - return count -} - -func (c *normCompacter) Size(v []uint64) (sz int, ok bool) { - if n := countSparseEntries(v); n <= maxSparseEntries { - return (n+1)*4 + 2, true - } - return 0, false -} - -func (c *normCompacter) Store(v []uint64) uint32 { - h := uint32(len(c.sparseOffset)) - c.sparseBlocks = append(c.sparseBlocks, v) - c.sparseOffset = append(c.sparseOffset, uint16(c.sparseCount)) - c.sparseCount += countSparseEntries(v) + 1 - return h -} - -func (c *normCompacter) Handler() string { - return c.name + "Sparse.lookup" -} - -func (c *normCompacter) Print(w io.Writer) (retErr error) { - p := func(f string, x ...interface{}) { - if _, err := fmt.Fprintf(w, f, x...); retErr == nil && err != nil { - retErr = err - } - } - - ls := len(c.sparseBlocks) - p("// %sSparseOffset: %d entries, %d bytes\n", c.name, ls, ls*2) - p("var %sSparseOffset = %#v\n\n", c.name, c.sparseOffset) - - ns := c.sparseCount - p("// %sSparseValues: %d entries, %d bytes\n", c.name, ns, ns*4) - p("var %sSparseValues = [%d]valueRange {", c.name, ns) - for i, b := range c.sparseBlocks { - p("\n// Block %#x, offset %#x", i, c.sparseOffset[i]) - var v int - stride := mostFrequentStride(b) - n := countSparseEntries(b) - p("\n{value:%#04x,lo:%#02x},", stride, uint8(n)) - for i, nv := range b { - if int(nv)-v != stride { - if v != 0 { - p(",hi:%#02x},", 0x80+i-1) - } - if nv != 0 { - p("\n{value:%#04x,lo:%#02x", nv, 0x80+i) - } - } - v = int(nv) - } - if v != 0 { - p(",hi:%#02x},", 0x80+len(b)-1) - } - } - p("\n}\n\n") - return -} diff --git a/vendor/golang.org/x/text/width/gen.go b/vendor/golang.org/x/text/width/gen.go deleted file mode 100644 index 092277e1f6..0000000000 --- a/vendor/golang.org/x/text/width/gen.go +++ /dev/null @@ -1,115 +0,0 @@ -// Copyright 2015 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build ignore - -// This program generates the trie for width operations. The generated table -// includes width category information as well as the normalization mappings. -package main - -import ( - "bytes" - "fmt" - "io" - "log" - "math" - "unicode/utf8" - - "golang.org/x/text/internal/gen" - "golang.org/x/text/internal/triegen" -) - -// See gen_common.go for flags. - -func main() { - gen.Init() - genTables() - genTests() - gen.Repackage("gen_trieval.go", "trieval.go", "width") - gen.Repackage("gen_common.go", "common_test.go", "width") -} - -func genTables() { - t := triegen.NewTrie("width") - // fold and inverse mappings. See mapComment for a description of the format - // of each entry. Add dummy value to make an index of 0 mean no mapping. - inverse := [][4]byte{{}} - mapping := map[[4]byte]int{[4]byte{}: 0} - - getWidthData(func(r rune, tag elem, alt rune) { - idx := 0 - if alt != 0 { - var buf [4]byte - buf[0] = byte(utf8.EncodeRune(buf[1:], alt)) - s := string(r) - buf[buf[0]] ^= s[len(s)-1] - var ok bool - if idx, ok = mapping[buf]; !ok { - idx = len(mapping) - if idx > math.MaxUint8 { - log.Fatalf("Index %d does not fit in a byte.", idx) - } - mapping[buf] = idx - inverse = append(inverse, buf) - } - } - t.Insert(r, uint64(tag|elem(idx))) - }) - - w := &bytes.Buffer{} - gen.WriteUnicodeVersion(w) - - sz, err := t.Gen(w) - if err != nil { - log.Fatal(err) - } - - sz += writeMappings(w, inverse) - - fmt.Fprintf(w, "// Total table size %d bytes (%dKiB)\n", sz, sz/1024) - - gen.WriteVersionedGoFile(*outputFile, "width", w.Bytes()) -} - -const inverseDataComment = ` -// inverseData contains 4-byte entries of the following format: -// <0 padding> -// The last byte of the UTF-8-encoded rune is xor-ed with the last byte of the -// UTF-8 encoding of the original rune. Mappings often have the following -// pattern: -// Ａ -> A (U+FF21 -> U+0041) -// Ｂ -> B (U+FF22 -> U+0042) -// ... -// By xor-ing the last byte the same entry can be shared by many mappings. This -// reduces the total number of distinct entries by about two thirds. -// The resulting entry for the aforementioned mappings is -// { 0x01, 0xE0, 0x00, 0x00 } -// Using this entry to map U+FF21 (UTF-8 [EF BC A1]), we get -// E0 ^ A1 = 41. -// Similarly, for U+FF22 (UTF-8 [EF BC A2]), we get -// E0 ^ A2 = 42. -// Note that because of the xor-ing, the byte sequence stored in the entry is -// not valid UTF-8.` - -func writeMappings(w io.Writer, data [][4]byte) int { - fmt.Fprintln(w, inverseDataComment) - fmt.Fprintf(w, "var inverseData = [%d][4]byte{\n", len(data)) - for _, x := range data { - fmt.Fprintf(w, "{ 0x%02x, 0x%02x, 0x%02x, 0x%02x },\n", x[0], x[1], x[2], x[3]) - } - fmt.Fprintln(w, "}") - return len(data) * 4 -} - -func genTests() { - w := &bytes.Buffer{} - fmt.Fprintf(w, "\nvar mapRunes = map[rune]struct{r rune; e elem}{\n") - getWidthData(func(r rune, tag elem, alt rune) { - if alt != 0 { - fmt.Fprintf(w, "\t0x%X: {0x%X, 0x%X},\n", r, alt, tag) - } - }) - fmt.Fprintln(w, "}") - gen.WriteGoFile("runes_test.go", "width", w.Bytes()) -} diff --git a/vendor/golang.org/x/text/width/gen_common.go b/vendor/golang.org/x/text/width/gen_common.go deleted file mode 100644 index 601e752684..0000000000 --- a/vendor/golang.org/x/text/width/gen_common.go +++ /dev/null @@ -1,96 +0,0 @@ -// Copyright 2015 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build ignore - -package main - -// This code is shared between the main code generator and the test code. - -import ( - "flag" - "log" - "strconv" - "strings" - - "golang.org/x/text/internal/gen" - "golang.org/x/text/internal/ucd" -) - -var ( - outputFile = flag.String("out", "tables.go", "output file") -) - -var typeMap = map[string]elem{ - "A": tagAmbiguous, - "N": tagNeutral, - "Na": tagNarrow, - "W": tagWide, - "F": tagFullwidth, - "H": tagHalfwidth, -} - -// getWidthData calls f for every entry for which it is defined. -// -// f may be called multiple times for the same rune. The last call to f is the -// correct value. f is not called for all runes. The default tag type is -// Neutral. -func getWidthData(f func(r rune, tag elem, alt rune)) { - // Set the default values for Unified Ideographs. In line with Annex 11, - // we encode full ranges instead of the defined runes in Unified_Ideograph. - for _, b := range []struct{ lo, hi rune }{ - {0x4E00, 0x9FFF}, // the CJK Unified Ideographs block, - {0x3400, 0x4DBF}, // the CJK Unified Ideographs Externsion A block, - {0xF900, 0xFAFF}, // the CJK Compatibility Ideographs block, - {0x20000, 0x2FFFF}, // the Supplementary Ideographic Plane, - {0x30000, 0x3FFFF}, // the Tertiary Ideographic Plane, - } { - for r := b.lo; r <= b.hi; r++ { - f(r, tagWide, 0) - } - } - - inverse := map[rune]rune{} - maps := map[string]bool{ - "": true, - "": true, - } - - // We cannot reuse package norm's decomposition, as we need an unexpanded - // decomposition. We make use of the opportunity to verify that the - // decomposition type is as expected. - ucd.Parse(gen.OpenUCDFile("UnicodeData.txt"), func(p *ucd.Parser) { - r := p.Rune(0) - s := strings.SplitN(p.String(ucd.DecompMapping), " ", 2) - if !maps[s[0]] { - return - } - x, err := strconv.ParseUint(s[1], 16, 32) - if err != nil { - log.Fatalf("Error parsing rune %q", s[1]) - } - if inverse[r] != 0 || inverse[rune(x)] != 0 { - log.Fatalf("Circular dependency in mapping between %U and %U", r, x) - } - inverse[r] = rune(x) - inverse[rune(x)] = r - }) - - // ; - ucd.Parse(gen.OpenUCDFile("EastAsianWidth.txt"), func(p *ucd.Parser) { - tag, ok := typeMap[p.String(1)] - if !ok { - log.Fatalf("Unknown width type %q", p.String(1)) - } - r := p.Rune(0) - alt, ok := inverse[r] - if tag == tagFullwidth || tag == tagHalfwidth && r != wonSign { - tag |= tagNeedsFold - if !ok { - log.Fatalf("Narrow or wide rune %U has no decomposition", r) - } - } - f(r, tag, alt) - }) -} diff --git a/vendor/golang.org/x/text/width/gen_trieval.go b/vendor/golang.org/x/text/width/gen_trieval.go deleted file mode 100644 index c17334aa61..0000000000 --- a/vendor/golang.org/x/text/width/gen_trieval.go +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright 2015 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build ignore - -package main - -// elem is an entry of the width trie. The high byte is used to encode the type -// of the rune. The low byte is used to store the index to a mapping entry in -// the inverseData array. -type elem uint16 - -const ( - tagNeutral elem = iota << typeShift - tagAmbiguous - tagWide - tagNarrow - tagFullwidth - tagHalfwidth -) - -const ( - numTypeBits = 3 - typeShift = 16 - numTypeBits - - // tagNeedsFold is true for all fullwidth and halfwidth runes except for - // the Won sign U+20A9. - tagNeedsFold = 0x1000 - - // The Korean Won sign is halfwidth, but SHOULD NOT be mapped to a wide - // variant. - wonSign rune = 0x20A9 -) diff --git a/vendor/golang.org/x/tools/go/gcexportdata/main.go b/vendor/golang.org/x/tools/go/gcexportdata/main.go deleted file mode 100644 index 2713dce64a..0000000000 --- a/vendor/golang.org/x/tools/go/gcexportdata/main.go +++ /dev/null @@ -1,99 +0,0 @@ -// Copyright 2017 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build ignore - -// The gcexportdata command is a diagnostic tool that displays the -// contents of gc export data files. -package main - -import ( - "flag" - "fmt" - "go/token" - "go/types" - "log" - "os" - - "golang.org/x/tools/go/gcexportdata" - "golang.org/x/tools/go/types/typeutil" -) - -var packageFlag = flag.String("package", "", "alternative package to print") - -func main() { - log.SetPrefix("gcexportdata: ") - log.SetFlags(0) - flag.Usage = func() { - fmt.Fprintln(os.Stderr, "usage: gcexportdata [-package path] file.a") - } - flag.Parse() - if flag.NArg() != 1 { - flag.Usage() - os.Exit(2) - } - filename := flag.Args()[0] - - f, err := os.Open(filename) - if err != nil { - log.Fatal(err) - } - - r, err := gcexportdata.NewReader(f) - if err != nil { - log.Fatalf("%s: %s", filename, err) - } - - // Decode the package. - const primary = "" - imports := make(map[string]*types.Package) - fset := token.NewFileSet() - pkg, err := gcexportdata.Read(r, fset, imports, primary) - if err != nil { - log.Fatalf("%s: %s", filename, err) - } - - // Optionally select an indirectly mentioned package. - if *packageFlag != "" { - pkg = imports[*packageFlag] - if pkg == nil { - fmt.Fprintf(os.Stderr, "export data file %s does not mention %s; has:\n", - filename, *packageFlag) - for p := range imports { - if p != primary { - fmt.Fprintf(os.Stderr, "\t%s\n", p) - } - } - os.Exit(1) - } - } - - // Print all package-level declarations, including non-exported ones. - fmt.Printf("package %s\n", pkg.Name()) - for _, imp := range pkg.Imports() { - fmt.Printf("import %q\n", imp.Path()) - } - qual := func(p *types.Package) string { - if pkg == p { - return "" - } - return p.Name() - } - scope := pkg.Scope() - for _, name := range scope.Names() { - obj := scope.Lookup(name) - fmt.Printf("%s: %s\n", - fset.Position(obj.Pos()), - types.ObjectString(obj, qual)) - - // For types, print each method. - if _, ok := obj.(*types.TypeName); ok { - for _, method := range typeutil.IntuitiveMethodSet(obj.Type(), nil) { - fmt.Printf("%s: %s\n", - fset.Position(method.Obj().Pos()), - types.SelectionString(method, qual)) - } - } - } -} diff --git a/vendor/golang.org/x/tools/imports/mkindex.go b/vendor/golang.org/x/tools/imports/mkindex.go deleted file mode 100644 index 755e2394f2..0000000000 --- a/vendor/golang.org/x/tools/imports/mkindex.go +++ /dev/null @@ -1,173 +0,0 @@ -// +build ignore - -// Copyright 2013 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// Command mkindex creates the file "pkgindex.go" containing an index of the Go -// standard library. The file is intended to be built as part of the imports -// package, so that the package may be used in environments where a GOROOT is -// not available (such as App Engine). -package main - -import ( - "bytes" - "fmt" - "go/ast" - "go/build" - "go/format" - "go/parser" - "go/token" - "io/ioutil" - "log" - "os" - "path" - "path/filepath" - "strings" -) - -var ( - pkgIndex = make(map[string][]pkg) - exports = make(map[string]map[string]bool) -) - -func main() { - // Don't use GOPATH. - ctx := build.Default - ctx.GOPATH = "" - - // Populate pkgIndex global from GOROOT. - for _, path := range ctx.SrcDirs() { - f, err := os.Open(path) - if err != nil { - log.Print(err) - continue - } - children, err := f.Readdir(-1) - f.Close() - if err != nil { - log.Print(err) - continue - } - for _, child := range children { - if child.IsDir() { - loadPkg(path, child.Name()) - } - } - } - // Populate exports global. - for _, ps := range pkgIndex { - for _, p := range ps { - e := loadExports(p.dir) - if e != nil { - exports[p.dir] = e - } - } - } - - // Construct source file. - var buf bytes.Buffer - fmt.Fprint(&buf, pkgIndexHead) - fmt.Fprintf(&buf, "var pkgIndexMaster = %#v\n", pkgIndex) - fmt.Fprintf(&buf, "var exportsMaster = %#v\n", exports) - src := buf.Bytes() - - // Replace main.pkg type name with pkg. - src = bytes.Replace(src, []byte("main.pkg"), []byte("pkg"), -1) - // Replace actual GOROOT with "/go". - src = bytes.Replace(src, []byte(ctx.GOROOT), []byte("/go"), -1) - // Add some line wrapping. - src = bytes.Replace(src, []byte("}, "), []byte("},\n"), -1) - src = bytes.Replace(src, []byte("true, "), []byte("true,\n"), -1) - - var err error - src, err = format.Source(src) - if err != nil { - log.Fatal(err) - } - - // Write out source file. - err = ioutil.WriteFile("pkgindex.go", src, 0644) - if err != nil { - log.Fatal(err) - } -} - -const pkgIndexHead = `package imports - -func init() { - pkgIndexOnce.Do(func() { - pkgIndex.m = pkgIndexMaster - }) - loadExports = func(dir string) map[string]bool { - return exportsMaster[dir] - } -} -` - -type pkg struct { - importpath string // full pkg import path, e.g. "net/http" - dir string // absolute file path to pkg directory e.g. "/usr/lib/go/src/fmt" -} - -var fset = token.NewFileSet() - -func loadPkg(root, importpath string) { - shortName := path.Base(importpath) - if shortName == "testdata" { - return - } - - dir := filepath.Join(root, importpath) - pkgIndex[shortName] = append(pkgIndex[shortName], pkg{ - importpath: importpath, - dir: dir, - }) - - pkgDir, err := os.Open(dir) - if err != nil { - return - } - children, err := pkgDir.Readdir(-1) - pkgDir.Close() - if err != nil { - return - } - for _, child := range children { - name := child.Name() - if name == "" { - continue - } - if c := name[0]; c == '.' || ('0' <= c && c <= '9') { - continue - } - if child.IsDir() { - loadPkg(root, filepath.Join(importpath, name)) - } - } -} - -func loadExports(dir string) map[string]bool { - exports := make(map[string]bool) - buildPkg, err := build.ImportDir(dir, 0) - if err != nil { - if strings.Contains(err.Error(), "no buildable Go source files in") { - return nil - } - log.Printf("could not import %q: %v", dir, err) - return nil - } - for _, file := range buildPkg.GoFiles { - f, err := parser.ParseFile(fset, filepath.Join(dir, file), nil, 0) - if err != nil { - log.Printf("could not parse %q: %v", file, err) - continue - } - for name := range f.Scope.Objects { - if ast.IsExported(name) { - exports[name] = true - } - } - } - return exports -} diff --git a/vendor/golang.org/x/tools/imports/mkstdlib.go b/vendor/golang.org/x/tools/imports/mkstdlib.go deleted file mode 100644 index 5059ad4d7d..0000000000 --- a/vendor/golang.org/x/tools/imports/mkstdlib.go +++ /dev/null @@ -1,112 +0,0 @@ -// +build ignore - -// mkstdlib generates the zstdlib.go file, containing the Go standard -// library API symbols. It's baked into the binary to avoid scanning -// GOPATH in the common case. -package main - -import ( - "bufio" - "bytes" - "fmt" - "go/format" - "io" - "io/ioutil" - "log" - "os" - "path/filepath" - "regexp" - "runtime" - "sort" - "strings" -) - -func mustOpen(name string) io.Reader { - f, err := os.Open(name) - if err != nil { - log.Fatal(err) - } - return f -} - -func api(base string) string { - return filepath.Join(runtime.GOROOT(), "api", base) -} - -var sym = regexp.MustCompile(`^pkg (\S+).*?, (?:var|func|type|const) ([A-Z]\w*)`) - -var unsafeSyms = map[string]bool{"Alignof": true, "ArbitraryType": true, "Offsetof": true, "Pointer": true, "Sizeof": true} - -func main() { - var buf bytes.Buffer - outf := func(format string, args ...interface{}) { - fmt.Fprintf(&buf, format, args...) - } - outf("// Code generated by mkstdlib.go. DO NOT EDIT.\n\n") - outf("package imports\n") - outf("var stdlib = map[string]map[string]bool{\n") - f := io.MultiReader( - mustOpen(api("go1.txt")), - mustOpen(api("go1.1.txt")), - mustOpen(api("go1.2.txt")), - mustOpen(api("go1.3.txt")), - mustOpen(api("go1.4.txt")), - mustOpen(api("go1.5.txt")), - mustOpen(api("go1.6.txt")), - mustOpen(api("go1.7.txt")), - mustOpen(api("go1.8.txt")), - mustOpen(api("go1.9.txt")), - mustOpen(api("go1.10.txt")), - mustOpen(api("go1.11.txt")), - mustOpen(api("go1.12.txt")), - ) - sc := bufio.NewScanner(f) - - pkgs := map[string]map[string]bool{ - "unsafe": unsafeSyms, - } - paths := []string{"unsafe"} - - for sc.Scan() { - l := sc.Text() - has := func(v string) bool { return strings.Contains(l, v) } - if has("struct, ") || has("interface, ") || has(", method (") { - continue - } - if m := sym.FindStringSubmatch(l); m != nil { - path, sym := m[1], m[2] - - if _, ok := pkgs[path]; !ok { - pkgs[path] = map[string]bool{} - paths = append(paths, path) - } - pkgs[path][sym] = true - } - } - if err := sc.Err(); err != nil { - log.Fatal(err) - } - sort.Strings(paths) - for _, path := range paths { - outf("\t%q: map[string]bool{\n", path) - pkg := pkgs[path] - var syms []string - for sym := range pkg { - syms = append(syms, sym) - } - sort.Strings(syms) - for _, sym := range syms { - outf("\t\t%q: true,\n", sym) - } - outf("},\n") - } - outf("}\n") - fmtbuf, err := format.Source(buf.Bytes()) - if err != nil { - log.Fatal(err) - } - err = ioutil.WriteFile("zstdlib.go", fmtbuf, 0666) - if err != nil { - log.Fatal(err) - } -} diff --git a/vendor/google.golang.org/appengine/appengine.go b/vendor/google.golang.org/appengine/appengine.go index 7952545493..0cca033d37 100644 --- a/vendor/google.golang.org/appengine/appengine.go +++ b/vendor/google.golang.org/appengine/appengine.go @@ -78,6 +78,12 @@ func IsAppEngine() bool { return internal.IsAppEngine() } +// IsSecondGen reports whether the App Engine app is running on the second generation +// runtimes (>= Go 1.11). +func IsSecondGen() bool { + return internal.IsSecondGen() +} + // NewContext returns a context for an in-flight HTTP request. // This function is cheap. func NewContext(req *http.Request) context.Context { diff --git a/vendor/google.golang.org/appengine/internal/api.go b/vendor/google.golang.org/appengine/internal/api.go index c95149525e..bbc1cb9c34 100644 --- a/vendor/google.golang.org/appengine/internal/api.go +++ b/vendor/google.golang.org/appengine/internal/api.go @@ -579,7 +579,10 @@ func logf(c *context, level int64, format string, args ...interface{}) { Level: &level, Message: &s, }) - log.Print(logLevelName[level] + ": " + s) + // Only duplicate log to stderr if not running on App Engine second generation + if !IsSecondGen() { + log.Print(logLevelName[level] + ": " + s) + } } // flushLog attempts to flush any pending logs to the appserver. diff --git a/vendor/google.golang.org/appengine/internal/identity.go b/vendor/google.golang.org/appengine/internal/identity.go index 6d89d63720..9b4134e425 100644 --- a/vendor/google.golang.org/appengine/internal/identity.go +++ b/vendor/google.golang.org/appengine/internal/identity.go @@ -31,9 +31,15 @@ func AppID(c netcontext.Context) string { // ../appengine.go. See that file for commentary. func IsStandard() bool { // appengineStandard will be true for first-gen runtimes (<= Go 1.9) but not - // second-gen (>= Go 1.11). Second-gen runtimes set $GAE_ENV so we use that - // to check if we're on a second-gen runtime. - return appengineStandard || os.Getenv("GAE_ENV") == "standard" + // second-gen (>= Go 1.11). + return appengineStandard || IsSecondGen() +} + +// IsStandard is the implementation of the wrapper function of the same name in +// ../appengine.go. See that file for commentary. +func IsSecondGen() bool { + // Second-gen runtimes set $GAE_ENV so we use that to check if we're on a second-gen runtime. + return os.Getenv("GAE_ENV") == "standard" } // IsFlex is the implementation of the wrapper function of the same name in diff --git a/vendor/google.golang.org/appengine/internal/main.go b/vendor/google.golang.org/appengine/internal/main.go index 49036163c2..1e765312fd 100644 --- a/vendor/google.golang.org/appengine/internal/main.go +++ b/vendor/google.golang.org/appengine/internal/main.go @@ -11,5 +11,6 @@ import ( ) func Main() { + MainPath = "" appengine_internal.Main() } diff --git a/vendor/google.golang.org/appengine/internal/main_common.go b/vendor/google.golang.org/appengine/internal/main_common.go new file mode 100644 index 0000000000..357dce4dd0 --- /dev/null +++ b/vendor/google.golang.org/appengine/internal/main_common.go @@ -0,0 +1,7 @@ +package internal + +// MainPath stores the file path of the main package. On App Engine Standard +// using Go version 1.9 and below, this will be unset. On App Engine Flex and +// App Engine Standard second-gen (Go 1.11 and above), this will be the +// filepath to package main. +var MainPath string diff --git a/vendor/google.golang.org/appengine/internal/main_vm.go b/vendor/google.golang.org/appengine/internal/main_vm.go index 822e784a45..ddb79a3338 100644 --- a/vendor/google.golang.org/appengine/internal/main_vm.go +++ b/vendor/google.golang.org/appengine/internal/main_vm.go @@ -12,9 +12,12 @@ import ( "net/http" "net/url" "os" + "path/filepath" + "runtime" ) func Main() { + MainPath = filepath.Dir(findMainPath()) installHealthChecker(http.DefaultServeMux) port := "8080" @@ -31,6 +34,24 @@ func Main() { } } +// Find the path to package main by looking at the root Caller. +func findMainPath() string { + pc := make([]uintptr, 100) + n := runtime.Callers(2, pc) + frames := runtime.CallersFrames(pc[:n]) + for { + frame, more := frames.Next() + // Tests won't have package main, instead they have testing.tRunner + if frame.Function == "main.main" || frame.Function == "testing.tRunner" { + return frame.File + } + if !more { + break + } + } + return "" +} + func installHealthChecker(mux *http.ServeMux) { // If no health check handler has been installed by this point, add a trivial one. const healthPath = "/_ah/health" diff --git a/vendor/google.golang.org/genproto/googleapis/api/annotations/annotations.pb.go b/vendor/google.golang.org/genproto/googleapis/api/annotations/annotations.pb.go index 9521b50e9e..bf2f703fff 100644 --- a/vendor/google.golang.org/genproto/googleapis/api/annotations/annotations.pb.go +++ b/vendor/google.golang.org/genproto/googleapis/api/annotations/annotations.pb.go @@ -1,12 +1,15 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: google/api/annotations.proto -package annotations // import "google.golang.org/genproto/googleapis/api/annotations" +package annotations -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" -import descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor" +import ( + fmt "fmt" + math "math" + + proto "github.com/golang/protobuf/proto" + descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -17,7 +20,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package var E_Http = &proto.ExtensionDesc{ ExtendedType: (*descriptor.MethodOptions)(nil), @@ -32,11 +35,9 @@ func init() { proto.RegisterExtension(E_Http) } -func init() { - proto.RegisterFile("google/api/annotations.proto", fileDescriptor_annotations_55609bb51d80951d) -} +func init() { proto.RegisterFile("google/api/annotations.proto", fileDescriptor_c591c5aa9fb79aab) } -var fileDescriptor_annotations_55609bb51d80951d = []byte{ +var fileDescriptor_c591c5aa9fb79aab = []byte{ // 208 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x49, 0xcf, 0xcf, 0x4f, 0xcf, 0x49, 0xd5, 0x4f, 0x2c, 0xc8, 0xd4, 0x4f, 0xcc, 0xcb, 0xcb, 0x2f, 0x49, 0x2c, 0xc9, 0xcc, diff --git a/vendor/google.golang.org/genproto/googleapis/api/annotations/client.pb.go b/vendor/google.golang.org/genproto/googleapis/api/annotations/client.pb.go new file mode 100644 index 0000000000..867fc0c3fa --- /dev/null +++ b/vendor/google.golang.org/genproto/googleapis/api/annotations/client.pb.go @@ -0,0 +1,79 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// source: google/api/client.proto + +package annotations + +import ( + fmt "fmt" + math "math" + + proto "github.com/golang/protobuf/proto" + descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor" +) + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package + +var E_MethodSignature = &proto.ExtensionDesc{ + ExtendedType: (*descriptor.MethodOptions)(nil), + ExtensionType: ([]string)(nil), + Field: 1051, + Name: "google.api.method_signature", + Tag: "bytes,1051,rep,name=method_signature", + Filename: "google/api/client.proto", +} + +var E_DefaultHost = &proto.ExtensionDesc{ + ExtendedType: (*descriptor.ServiceOptions)(nil), + ExtensionType: (*string)(nil), + Field: 1049, + Name: "google.api.default_host", + Tag: "bytes,1049,opt,name=default_host", + Filename: "google/api/client.proto", +} + +var E_OauthScopes = &proto.ExtensionDesc{ + ExtendedType: (*descriptor.ServiceOptions)(nil), + ExtensionType: (*string)(nil), + Field: 1050, + Name: "google.api.oauth_scopes", + Tag: "bytes,1050,opt,name=oauth_scopes", + Filename: "google/api/client.proto", +} + +func init() { + proto.RegisterExtension(E_MethodSignature) + proto.RegisterExtension(E_DefaultHost) + proto.RegisterExtension(E_OauthScopes) +} + +func init() { proto.RegisterFile("google/api/client.proto", fileDescriptor_78f2c6f7c3a942c1) } + +var fileDescriptor_78f2c6f7c3a942c1 = []byte{ + // 262 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x90, 0x3f, 0x4f, 0xc3, 0x30, + 0x10, 0xc5, 0x55, 0x40, 0xa8, 0x75, 0x11, 0xa0, 0x2c, 0x20, 0x06, 0xc8, 0xd8, 0xc9, 0x1e, 0xd8, + 0xca, 0xd4, 0x76, 0xe0, 0x8f, 0x84, 0x88, 0x9a, 0x8d, 0x25, 0x72, 0x9d, 0xab, 0x63, 0x29, 0xf5, + 0x59, 0xf6, 0x85, 0xef, 0x02, 0x6c, 0x7c, 0x52, 0x54, 0xc7, 0x11, 0x48, 0x0c, 0x6c, 0x27, 0xbd, + 0xf7, 0xfb, 0x9d, 0xf4, 0xd8, 0x85, 0x46, 0xd4, 0x2d, 0x08, 0xe9, 0x8c, 0x50, 0xad, 0x01, 0x4b, + 0xdc, 0x79, 0x24, 0xcc, 0x58, 0x1f, 0x70, 0xe9, 0xcc, 0x55, 0x9e, 0x4a, 0x31, 0xd9, 0x74, 0x5b, + 0x51, 0x43, 0x50, 0xde, 0x38, 0x42, 0xdf, 0xb7, 0xe7, 0x4f, 0xec, 0x7c, 0x07, 0xd4, 0x60, 0x5d, + 0x05, 0xa3, 0xad, 0xa4, 0xce, 0x43, 0x76, 0xcd, 0x93, 0x62, 0xc0, 0xf8, 0x73, 0xac, 0xbc, 0x38, + 0x32, 0x68, 0xc3, 0xe5, 0xe7, 0x38, 0x3f, 0x9c, 0x4d, 0xd6, 0x67, 0x3d, 0x58, 0x0e, 0xdc, 0x7c, + 0xc5, 0x4e, 0x6a, 0xd8, 0xca, 0xae, 0xa5, 0xaa, 0xc1, 0x40, 0xd9, 0xcd, 0x1f, 0x4f, 0x09, 0xfe, + 0xcd, 0x28, 0x18, 0x44, 0xef, 0xe3, 0x7c, 0x34, 0x9b, 0xac, 0xa7, 0x89, 0x7a, 0xc0, 0x40, 0x7b, + 0x09, 0xca, 0x8e, 0x9a, 0x2a, 0x28, 0x74, 0x10, 0xfe, 0x97, 0x7c, 0x24, 0x49, 0xa4, 0xca, 0x08, + 0x2d, 0x0d, 0x3b, 0x55, 0xb8, 0xe3, 0x3f, 0x4b, 0x2c, 0xa7, 0xab, 0xb8, 0x51, 0xb1, 0x97, 0x14, + 0xa3, 0xd7, 0x45, 0x8a, 0x34, 0xb6, 0xd2, 0x6a, 0x8e, 0x5e, 0x0b, 0x0d, 0x36, 0xbe, 0x10, 0x7d, + 0x24, 0x9d, 0x09, 0x71, 0x5c, 0x69, 0x2d, 0x92, 0x8c, 0xbf, 0xee, 0x7e, 0xdd, 0x5f, 0x07, 0x47, + 0xf7, 0x8b, 0xe2, 0x71, 0x73, 0x1c, 0xa1, 0xdb, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0xcc, 0xc2, + 0xcf, 0x71, 0x90, 0x01, 0x00, 0x00, +} diff --git a/vendor/google.golang.org/genproto/googleapis/api/annotations/field_behavior.pb.go b/vendor/google.golang.org/genproto/googleapis/api/annotations/field_behavior.pb.go new file mode 100644 index 0000000000..31f87dd00d --- /dev/null +++ b/vendor/google.golang.org/genproto/googleapis/api/annotations/field_behavior.pb.go @@ -0,0 +1,122 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// source: google/api/field_behavior.proto + +package annotations + +import ( + fmt "fmt" + math "math" + + proto "github.com/golang/protobuf/proto" + descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor" +) + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package + +// An indicator of the behavior of a given field (for example, that a field +// is required in requests, or given as output but ignored as input). +// This **does not** change the behavior in protocol buffers itself; it only +// denotes the behavior and may affect how API tooling handles the field. +// +// Note: This enum **may** receive new values in the future. +type FieldBehavior int32 + +const ( + // Conventional default for enums. Do not use this. + FieldBehavior_FIELD_BEHAVIOR_UNSPECIFIED FieldBehavior = 0 + // Specifically denotes a field as optional. + // While all fields in protocol buffers are optional, this may be specified + // for emphasis if appropriate. + FieldBehavior_OPTIONAL FieldBehavior = 1 + // Denotes a field as required. + // This indicates that the field **must** be provided as part of the request, + // and failure to do so will cause an error (usually `INVALID_ARGUMENT`). + FieldBehavior_REQUIRED FieldBehavior = 2 + // Denotes a field as output only. + // This indicates that the field is provided in responses, but including the + // field in a request does nothing (the server *must* ignore it and + // *must not* throw an error as a result of the field's presence). + FieldBehavior_OUTPUT_ONLY FieldBehavior = 3 + // Denotes a field as input only. + // This indicates that the field is provided in requests, and the + // corresponding field is not included in output. + FieldBehavior_INPUT_ONLY FieldBehavior = 4 + // Denotes a field as immutable. + // This indicates that the field may be set once in a request to create a + // resource, but may not be changed thereafter. + FieldBehavior_IMMUTABLE FieldBehavior = 5 +) + +var FieldBehavior_name = map[int32]string{ + 0: "FIELD_BEHAVIOR_UNSPECIFIED", + 1: "OPTIONAL", + 2: "REQUIRED", + 3: "OUTPUT_ONLY", + 4: "INPUT_ONLY", + 5: "IMMUTABLE", +} + +var FieldBehavior_value = map[string]int32{ + "FIELD_BEHAVIOR_UNSPECIFIED": 0, + "OPTIONAL": 1, + "REQUIRED": 2, + "OUTPUT_ONLY": 3, + "INPUT_ONLY": 4, + "IMMUTABLE": 5, +} + +func (x FieldBehavior) String() string { + return proto.EnumName(FieldBehavior_name, int32(x)) +} + +func (FieldBehavior) EnumDescriptor() ([]byte, []int) { + return fileDescriptor_4648f18fd5079967, []int{0} +} + +var E_FieldBehavior = &proto.ExtensionDesc{ + ExtendedType: (*descriptor.FieldOptions)(nil), + ExtensionType: ([]FieldBehavior)(nil), + Field: 1052, + Name: "google.api.field_behavior", + Tag: "varint,1052,rep,name=field_behavior,enum=google.api.FieldBehavior", + Filename: "google/api/field_behavior.proto", +} + +func init() { + proto.RegisterEnum("google.api.FieldBehavior", FieldBehavior_name, FieldBehavior_value) + proto.RegisterExtension(E_FieldBehavior) +} + +func init() { proto.RegisterFile("google/api/field_behavior.proto", fileDescriptor_4648f18fd5079967) } + +var fileDescriptor_4648f18fd5079967 = []byte{ + // 303 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x90, 0x4f, 0x4f, 0xb3, 0x30, + 0x1c, 0xc7, 0x9f, 0xfd, 0x79, 0xcc, 0xac, 0x0e, 0x49, 0x4f, 0xba, 0x44, 0xdd, 0xd1, 0x78, 0x28, + 0x89, 0xde, 0xf4, 0x04, 0xae, 0xd3, 0x26, 0x8c, 0x56, 0x04, 0x13, 0xbd, 0x60, 0xb7, 0xb1, 0xda, + 0x64, 0xd2, 0x06, 0xd0, 0x8b, 0x6f, 0xc5, 0x93, 0xaf, 0xd4, 0xd0, 0x31, 0x85, 0x5b, 0xbf, 0xf9, + 0x7d, 0xfa, 0xeb, 0xe7, 0x5b, 0x70, 0x2a, 0x94, 0x12, 0xeb, 0xd4, 0xe1, 0x5a, 0x3a, 0x2b, 0x99, + 0xae, 0x97, 0xc9, 0x3c, 0x7d, 0xe5, 0x1f, 0x52, 0xe5, 0x48, 0xe7, 0xaa, 0x54, 0x10, 0x6c, 0x00, + 0xc4, 0xb5, 0x1c, 0x8d, 0x6b, 0xd8, 0x4c, 0xe6, 0xef, 0x2b, 0x67, 0x99, 0x16, 0x8b, 0x5c, 0xea, + 0x72, 0x4b, 0x9f, 0x7f, 0x82, 0xe1, 0xb4, 0xda, 0xe2, 0xd5, 0x4b, 0xe0, 0x09, 0x18, 0x4d, 0x09, + 0xf6, 0x27, 0x89, 0x87, 0xef, 0xdc, 0x47, 0x42, 0xc3, 0x24, 0x0e, 0x1e, 0x18, 0xbe, 0x21, 0x53, + 0x82, 0x27, 0xf6, 0x3f, 0xb8, 0x0f, 0x06, 0x94, 0x45, 0x84, 0x06, 0xae, 0x6f, 0x77, 0xaa, 0x14, + 0xe2, 0xfb, 0x98, 0x84, 0x78, 0x62, 0x77, 0xe1, 0x01, 0xd8, 0xa3, 0x71, 0xc4, 0xe2, 0x28, 0xa1, + 0x81, 0xff, 0x64, 0xf7, 0xa0, 0x05, 0x00, 0x09, 0x7e, 0x73, 0x1f, 0x0e, 0xc1, 0x2e, 0x99, 0xcd, + 0xe2, 0xc8, 0xf5, 0x7c, 0x6c, 0xff, 0xbf, 0x7a, 0x01, 0x56, 0xbb, 0x02, 0x3c, 0x46, 0xb5, 0xfd, + 0xd6, 0x18, 0x19, 0x3b, 0xaa, 0x4b, 0xa9, 0xb2, 0xe2, 0xf0, 0x6b, 0x30, 0xee, 0x9d, 0x59, 0x17, + 0x47, 0xe8, 0xaf, 0x23, 0x6a, 0xe9, 0x87, 0xc3, 0x55, 0x33, 0x7a, 0x1a, 0x58, 0x0b, 0xf5, 0xd6, + 0xc0, 0x3d, 0xd8, 0xe2, 0x59, 0xf5, 0x0c, 0xeb, 0x3c, 0xbb, 0x35, 0x21, 0xd4, 0x9a, 0x67, 0x02, + 0xa9, 0x5c, 0x38, 0x22, 0xcd, 0x8c, 0x84, 0xb3, 0x19, 0x71, 0x2d, 0x0b, 0xf3, 0xe9, 0x3c, 0xcb, + 0x54, 0xc9, 0x8d, 0xcf, 0x75, 0xe3, 0xfc, 0xdd, 0xed, 0xdf, 0xba, 0x8c, 0xcc, 0x77, 0xcc, 0xa5, + 0xcb, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xfc, 0x94, 0x57, 0x94, 0xa8, 0x01, 0x00, 0x00, +} diff --git a/vendor/google.golang.org/genproto/googleapis/api/annotations/http.pb.go b/vendor/google.golang.org/genproto/googleapis/api/annotations/http.pb.go index 1a8a27b655..a63870374d 100644 --- a/vendor/google.golang.org/genproto/googleapis/api/annotations/http.pb.go +++ b/vendor/google.golang.org/genproto/googleapis/api/annotations/http.pb.go @@ -1,11 +1,14 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: google/api/http.proto -package annotations // import "google.golang.org/genproto/googleapis/api/annotations" +package annotations -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + math "math" + + proto "github.com/golang/protobuf/proto" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -16,7 +19,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // Defines the HTTP configuration for an API service. It contains a list of // [HttpRule][google.api.HttpRule], each specifying the mapping of an RPC method @@ -26,7 +29,7 @@ type Http struct { // // **NOTE:** All service configuration rules follow "last one wins" order. Rules []*HttpRule `protobuf:"bytes,1,rep,name=rules,proto3" json:"rules,omitempty"` - // When set to true, URL path parmeters will be fully URI-decoded except in + // When set to true, URL path parameters will be fully URI-decoded except in // cases of single segment matches in reserved expansion, where "%2F" will be // left encoded. // @@ -42,16 +45,17 @@ func (m *Http) Reset() { *m = Http{} } func (m *Http) String() string { return proto.CompactTextString(m) } func (*Http) ProtoMessage() {} func (*Http) Descriptor() ([]byte, []int) { - return fileDescriptor_http_e457621dddd7365b, []int{0} + return fileDescriptor_ff9994be407cdcc9, []int{0} } + func (m *Http) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Http.Unmarshal(m, b) } func (m *Http) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Http.Marshal(b, m, deterministic) } -func (dst *Http) XXX_Merge(src proto.Message) { - xxx_messageInfo_Http.Merge(dst, src) +func (m *Http) XXX_Merge(src proto.Message) { + xxx_messageInfo_Http.Merge(m, src) } func (m *Http) XXX_Size() int { return xxx_messageInfo_Http.Size(m) @@ -76,94 +80,94 @@ func (m *Http) GetFullyDecodeReservedExpansion() bool { return false } -// `HttpRule` defines the mapping of an RPC method to one or more HTTP -// REST API methods. The mapping specifies how different portions of the RPC -// request message are mapped to URL path, URL query parameters, and -// HTTP request body. The mapping is typically specified as an -// `google.api.http` annotation on the RPC method, -// see "google/api/annotations.proto" for details. +// # gRPC Transcoding +// +// gRPC Transcoding is a feature for mapping between a gRPC method and one or +// more HTTP REST endpoints. It allows developers to build a single API service +// that supports both gRPC APIs and REST APIs. Many systems, including [Google +// APIs](https://github.com/googleapis/googleapis), +// [Cloud Endpoints](https://cloud.google.com/endpoints), [gRPC +// Gateway](https://github.com/grpc-ecosystem/grpc-gateway), +// and [Envoy](https://github.com/envoyproxy/envoy) proxy support this feature +// and use it for large scale production services. +// +// `HttpRule` defines the schema of the gRPC/REST mapping. The mapping specifies +// how different portions of the gRPC request message are mapped to the URL +// path, URL query parameters, and HTTP request body. It also controls how the +// gRPC response message is mapped to the HTTP response body. `HttpRule` is +// typically specified as an `google.api.http` annotation on the gRPC method. // -// The mapping consists of a field specifying the path template and -// method kind. The path template can refer to fields in the request -// message, as in the example below which describes a REST GET -// operation on a resource collection of messages: +// Each mapping specifies a URL path template and an HTTP method. The path +// template may refer to one or more fields in the gRPC request message, as long +// as each field is a non-repeated field with a primitive (non-message) type. +// The path template controls how fields of the request message are mapped to +// the URL path. // +// Example: // // service Messaging { // rpc GetMessage(GetMessageRequest) returns (Message) { -// option (google.api.http).get = "/v1/messages/{message_id}/{sub.subfield}"; +// option (google.api.http) = { +// get: "/v1/{name=messages/*}" +// }; // } // } // message GetMessageRequest { -// message SubMessage { -// string subfield = 1; -// } -// string message_id = 1; // mapped to the URL -// SubMessage sub = 2; // `sub.subfield` is url-mapped +// string name = 1; // Mapped to URL path. // } // message Message { -// string text = 1; // content of the resource +// string text = 1; // The resource content. // } // -// The same http annotation can alternatively be expressed inside the -// `GRPC API Configuration` YAML file. -// -// http: -// rules: -// - selector: .Messaging.GetMessage -// get: /v1/messages/{message_id}/{sub.subfield} -// -// This definition enables an automatic, bidrectional mapping of HTTP -// JSON to RPC. Example: +// This enables an HTTP REST to gRPC mapping as below: // -// HTTP | RPC +// HTTP | gRPC // -----|----- -// `GET /v1/messages/123456/foo` | `GetMessage(message_id: "123456" sub: SubMessage(subfield: "foo"))` -// -// In general, not only fields but also field paths can be referenced -// from a path pattern. Fields mapped to the path pattern cannot be -// repeated and must have a primitive (non-message) type. -// -// Any fields in the request message which are not bound by the path -// pattern automatically become (optional) HTTP query -// parameters. Assume the following definition of the request message: +// `GET /v1/messages/123456` | `GetMessage(name: "messages/123456")` // +// Any fields in the request message which are not bound by the path template +// automatically become HTTP query parameters if there is no HTTP request body. +// For example: // // service Messaging { // rpc GetMessage(GetMessageRequest) returns (Message) { -// option (google.api.http).get = "/v1/messages/{message_id}"; +// option (google.api.http) = { +// get:"/v1/messages/{message_id}" +// }; // } // } // message GetMessageRequest { // message SubMessage { // string subfield = 1; // } -// string message_id = 1; // mapped to the URL -// int64 revision = 2; // becomes a parameter -// SubMessage sub = 3; // `sub.subfield` becomes a parameter +// string message_id = 1; // Mapped to URL path. +// int64 revision = 2; // Mapped to URL query parameter `revision`. +// SubMessage sub = 3; // Mapped to URL query parameter `sub.subfield`. // } // -// // This enables a HTTP JSON to RPC mapping as below: // -// HTTP | RPC +// HTTP | gRPC // -----|----- -// `GET /v1/messages/123456?revision=2&sub.subfield=foo` | `GetMessage(message_id: "123456" revision: 2 sub: SubMessage(subfield: "foo"))` -// -// Note that fields which are mapped to HTTP parameters must have a -// primitive type or a repeated primitive type. Message types are not -// allowed. In the case of a repeated type, the parameter can be -// repeated in the URL, as in `...?param=A¶m=B`. -// -// For HTTP method kinds which allow a request body, the `body` field +// `GET /v1/messages/123456?revision=2&sub.subfield=foo` | +// `GetMessage(message_id: "123456" revision: 2 sub: SubMessage(subfield: +// "foo"))` +// +// Note that fields which are mapped to URL query parameters must have a +// primitive type or a repeated primitive type or a non-repeated message type. +// In the case of a repeated type, the parameter can be repeated in the URL +// as `...?param=A¶m=B`. In the case of a message type, each field of the +// message is mapped to a separate parameter, such as +// `...?foo.a=A&foo.b=B&foo.c=C`. +// +// For HTTP methods that allow a request body, the `body` field // specifies the mapping. Consider a REST update method on the // message resource collection: // -// // service Messaging { // rpc UpdateMessage(UpdateMessageRequest) returns (Message) { // option (google.api.http) = { -// put: "/v1/messages/{message_id}" +// patch: "/v1/messages/{message_id}" // body: "message" // }; // } @@ -173,14 +177,14 @@ func (m *Http) GetFullyDecodeReservedExpansion() bool { // Message message = 2; // mapped to the body // } // -// // The following HTTP JSON to RPC mapping is enabled, where the // representation of the JSON in the request body is determined by // protos JSON encoding: // -// HTTP | RPC +// HTTP | gRPC // -----|----- -// `PUT /v1/messages/123456 { "text": "Hi!" }` | `UpdateMessage(message_id: "123456" message { text: "Hi!" })` +// `PATCH /v1/messages/123456 { "text": "Hi!" }` | `UpdateMessage(message_id: +// "123456" message { text: "Hi!" })` // // The special name `*` can be used in the body mapping to define that // every field not bound by the path template should be mapped to the @@ -190,7 +194,7 @@ func (m *Http) GetFullyDecodeReservedExpansion() bool { // service Messaging { // rpc UpdateMessage(Message) returns (Message) { // option (google.api.http) = { -// put: "/v1/messages/{message_id}" +// patch: "/v1/messages/{message_id}" // body: "*" // }; // } @@ -203,13 +207,14 @@ func (m *Http) GetFullyDecodeReservedExpansion() bool { // // The following HTTP JSON to RPC mapping is enabled: // -// HTTP | RPC +// HTTP | gRPC // -----|----- -// `PUT /v1/messages/123456 { "text": "Hi!" }` | `UpdateMessage(message_id: "123456" text: "Hi!")` +// `PATCH /v1/messages/123456 { "text": "Hi!" }` | `UpdateMessage(message_id: +// "123456" text: "Hi!")` // // Note that when using `*` in the body mapping, it is not possible to // have HTTP parameters, as all fields not bound by the path end in -// the body. This makes this option more rarely used in practice of +// the body. This makes this option more rarely used in practice when // defining REST APIs. The common usage of `*` is in custom methods // which don't use the URL at all for transferring data. // @@ -231,32 +236,31 @@ func (m *Http) GetFullyDecodeReservedExpansion() bool { // string user_id = 2; // } // +// This enables the following two alternative HTTP JSON to RPC mappings: // -// This enables the following two alternative HTTP JSON to RPC -// mappings: -// -// HTTP | RPC +// HTTP | gRPC // -----|----- // `GET /v1/messages/123456` | `GetMessage(message_id: "123456")` -// `GET /v1/users/me/messages/123456` | `GetMessage(user_id: "me" message_id: "123456")` -// -// # Rules for HTTP mapping -// -// The rules for mapping HTTP path, query parameters, and body fields -// to the request message are as follows: -// -// 1. The `body` field specifies either `*` or a field path, or is -// omitted. If omitted, it indicates there is no HTTP request body. -// 2. Leaf fields (recursive expansion of nested messages in the -// request) can be classified into three types: -// (a) Matched in the URL template. -// (b) Covered by body (if body is `*`, everything except (a) fields; -// else everything under the body field) -// (c) All other fields. -// 3. URL query parameters found in the HTTP request are mapped to (c) fields. -// 4. Any body sent with an HTTP request can contain only (b) fields. -// -// The syntax of the path template is as follows: +// `GET /v1/users/me/messages/123456` | `GetMessage(user_id: "me" message_id: +// "123456")` +// +// ## Rules for HTTP mapping +// +// 1. Leaf request fields (recursive expansion nested messages in the request +// message) are classified into three categories: +// - Fields referred by the path template. They are passed via the URL path. +// - Fields referred by the [HttpRule.body][google.api.HttpRule.body]. They are passed via the HTTP +// request body. +// - All other fields are passed via the URL query parameters, and the +// parameter name is the field path in the request message. A repeated +// field can be represented as multiple query parameters under the same +// name. +// 2. If [HttpRule.body][google.api.HttpRule.body] is "*", there is no URL query parameter, all fields +// are passed via URL path and HTTP request body. +// 3. If [HttpRule.body][google.api.HttpRule.body] is omitted, there is no HTTP request body, all +// fields are passed via URL path and URL query parameters. +// +// ### Path template syntax // // Template = "/" Segments [ Verb ] ; // Segments = Segment { "/" Segment } ; @@ -265,36 +269,88 @@ func (m *Http) GetFullyDecodeReservedExpansion() bool { // FieldPath = IDENT { "." IDENT } ; // Verb = ":" LITERAL ; // -// The syntax `*` matches a single path segment. The syntax `**` matches zero -// or more path segments, which must be the last part of the path except the -// `Verb`. The syntax `LITERAL` matches literal text in the path. +// The syntax `*` matches a single URL path segment. The syntax `**` matches +// zero or more URL path segments, which must be the last part of the URL path +// except the `Verb`. // // The syntax `Variable` matches part of the URL path as specified by its // template. A variable template must not contain other variables. If a variable // matches a single path segment, its template may be omitted, e.g. `{var}` // is equivalent to `{var=*}`. // +// The syntax `LITERAL` matches literal text in the URL path. If the `LITERAL` +// contains any reserved character, such characters should be percent-encoded +// before the matching. +// // If a variable contains exactly one path segment, such as `"{var}"` or -// `"{var=*}"`, when such a variable is expanded into a URL path, all characters -// except `[-_.~0-9a-zA-Z]` are percent-encoded. Such variables show up in the -// Discovery Document as `{var}`. -// -// If a variable contains one or more path segments, such as `"{var=foo/*}"` -// or `"{var=**}"`, when such a variable is expanded into a URL path, all -// characters except `[-_.~/0-9a-zA-Z]` are percent-encoded. Such variables -// show up in the Discovery Document as `{+var}`. -// -// NOTE: While the single segment variable matches the semantics of -// [RFC 6570](https://tools.ietf.org/html/rfc6570) Section 3.2.2 -// Simple String Expansion, the multi segment variable **does not** match -// RFC 6570 Reserved Expansion. The reason is that the Reserved Expansion +// `"{var=*}"`, when such a variable is expanded into a URL path on the client +// side, all characters except `[-_.~0-9a-zA-Z]` are percent-encoded. The +// server side does the reverse decoding. Such variables show up in the +// [Discovery +// Document](https://developers.google.com/discovery/v1/reference/apis) as +// `{var}`. +// +// If a variable contains multiple path segments, such as `"{var=foo/*}"` +// or `"{var=**}"`, when such a variable is expanded into a URL path on the +// client side, all characters except `[-_.~/0-9a-zA-Z]` are percent-encoded. +// The server side does the reverse decoding, except "%2F" and "%2f" are left +// unchanged. Such variables show up in the +// [Discovery +// Document](https://developers.google.com/discovery/v1/reference/apis) as +// `{+var}`. +// +// ## Using gRPC API Service Configuration +// +// gRPC API Service Configuration (service config) is a configuration language +// for configuring a gRPC service to become a user-facing product. The +// service config is simply the YAML representation of the `google.api.Service` +// proto message. +// +// As an alternative to annotating your proto file, you can configure gRPC +// transcoding in your service config YAML files. You do this by specifying a +// `HttpRule` that maps the gRPC method to a REST endpoint, achieving the same +// effect as the proto annotation. This can be particularly useful if you +// have a proto that is reused in multiple services. Note that any transcoding +// specified in the service config will override any matching transcoding +// configuration in the proto. +// +// Example: +// +// http: +// rules: +// # Selects a gRPC method and applies HttpRule to it. +// - selector: example.v1.Messaging.GetMessage +// get: /v1/messages/{message_id}/{sub.subfield} +// +// ## Special notes +// +// When gRPC Transcoding is used to map a gRPC to JSON REST endpoints, the +// proto to JSON conversion must follow the [proto3 +// specification](https://developers.google.com/protocol-buffers/docs/proto3#json). +// +// While the single segment variable follows the semantics of +// [RFC 6570](https://tools.ietf.org/html/rfc6570) Section 3.2.2 Simple String +// Expansion, the multi segment variable **does not** follow RFC 6570 Section +// 3.2.3 Reserved Expansion. The reason is that the Reserved Expansion // does not expand special characters like `?` and `#`, which would lead -// to invalid URLs. +// to invalid URLs. As the result, gRPC Transcoding uses a custom encoding +// for multi segment variables. +// +// The path variables **must not** refer to any repeated or mapped field, +// because client libraries are not capable of handling such variable expansion. // -// NOTE: the field paths in variables and in the `body` must not refer to -// repeated fields or map fields. +// The path variables **must not** capture the leading "/" character. The reason +// is that the most common use case "{var}" does not capture the leading "/" +// character. For consistency, all path variables must share the same behavior. +// +// Repeated message fields must not be mapped to URL query parameters, because +// no client library can support such complicated mapping. +// +// If an API needs to use a JSON array for request or response body, it can map +// the request or response body to a repeated field. However, some gRPC +// Transcoding implementations may not support this feature. type HttpRule struct { - // Selects methods to which this rule applies. + // Selects a method to which this rule applies. // // Refer to [selector][google.api.DocumentationRule.selector] for syntax details. Selector string `protobuf:"bytes,1,opt,name=selector,proto3" json:"selector,omitempty"` @@ -310,14 +366,19 @@ type HttpRule struct { // *HttpRule_Patch // *HttpRule_Custom Pattern isHttpRule_Pattern `protobuf_oneof:"pattern"` - // The name of the request field whose value is mapped to the HTTP body, or - // `*` for mapping all fields not captured by the path pattern to the HTTP - // body. NOTE: the referred field must not be a repeated field and must be - // present at the top-level of request message type. + // The name of the request field whose value is mapped to the HTTP request + // body, or `*` for mapping all request fields not captured by the path + // pattern to the HTTP body, or omitted for not having any HTTP request body. + // + // NOTE: the referred field must be present at the top-level of the request + // message type. Body string `protobuf:"bytes,7,opt,name=body,proto3" json:"body,omitempty"` // Optional. The name of the response field whose value is mapped to the HTTP - // body of response. Other response fields are ignored. When - // not set, the response message will be used as HTTP body of response. + // response body. When omitted, the entire response message will be used + // as the HTTP response body. + // + // NOTE: The referred field must be present at the top-level of the response + // message type. ResponseBody string `protobuf:"bytes,12,opt,name=response_body,json=responseBody,proto3" json:"response_body,omitempty"` // Additional HTTP bindings for the selector. Nested bindings must // not contain an `additional_bindings` field themselves (that is, @@ -332,16 +393,17 @@ func (m *HttpRule) Reset() { *m = HttpRule{} } func (m *HttpRule) String() string { return proto.CompactTextString(m) } func (*HttpRule) ProtoMessage() {} func (*HttpRule) Descriptor() ([]byte, []int) { - return fileDescriptor_http_e457621dddd7365b, []int{1} + return fileDescriptor_ff9994be407cdcc9, []int{1} } + func (m *HttpRule) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_HttpRule.Unmarshal(m, b) } func (m *HttpRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_HttpRule.Marshal(b, m, deterministic) } -func (dst *HttpRule) XXX_Merge(src proto.Message) { - xxx_messageInfo_HttpRule.Merge(dst, src) +func (m *HttpRule) XXX_Merge(src proto.Message) { + xxx_messageInfo_HttpRule.Merge(m, src) } func (m *HttpRule) XXX_Size() int { return xxx_messageInfo_HttpRule.Size(m) @@ -469,9 +531,9 @@ func (m *HttpRule) GetAdditionalBindings() []*HttpRule { return nil } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*HttpRule) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _HttpRule_OneofMarshaler, _HttpRule_OneofUnmarshaler, _HttpRule_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*HttpRule) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*HttpRule_Get)(nil), (*HttpRule_Put)(nil), (*HttpRule_Post)(nil), @@ -481,124 +543,6 @@ func (*HttpRule) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) erro } } -func _HttpRule_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*HttpRule) - // pattern - switch x := m.Pattern.(type) { - case *HttpRule_Get: - b.EncodeVarint(2<<3 | proto.WireBytes) - b.EncodeStringBytes(x.Get) - case *HttpRule_Put: - b.EncodeVarint(3<<3 | proto.WireBytes) - b.EncodeStringBytes(x.Put) - case *HttpRule_Post: - b.EncodeVarint(4<<3 | proto.WireBytes) - b.EncodeStringBytes(x.Post) - case *HttpRule_Delete: - b.EncodeVarint(5<<3 | proto.WireBytes) - b.EncodeStringBytes(x.Delete) - case *HttpRule_Patch: - b.EncodeVarint(6<<3 | proto.WireBytes) - b.EncodeStringBytes(x.Patch) - case *HttpRule_Custom: - b.EncodeVarint(8<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.Custom); err != nil { - return err - } - case nil: - default: - return fmt.Errorf("HttpRule.Pattern has unexpected type %T", x) - } - return nil -} - -func _HttpRule_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*HttpRule) - switch tag { - case 2: // pattern.get - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeStringBytes() - m.Pattern = &HttpRule_Get{x} - return true, err - case 3: // pattern.put - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeStringBytes() - m.Pattern = &HttpRule_Put{x} - return true, err - case 4: // pattern.post - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeStringBytes() - m.Pattern = &HttpRule_Post{x} - return true, err - case 5: // pattern.delete - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeStringBytes() - m.Pattern = &HttpRule_Delete{x} - return true, err - case 6: // pattern.patch - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeStringBytes() - m.Pattern = &HttpRule_Patch{x} - return true, err - case 8: // pattern.custom - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(CustomHttpPattern) - err := b.DecodeMessage(msg) - m.Pattern = &HttpRule_Custom{msg} - return true, err - default: - return false, nil - } -} - -func _HttpRule_OneofSizer(msg proto.Message) (n int) { - m := msg.(*HttpRule) - // pattern - switch x := m.Pattern.(type) { - case *HttpRule_Get: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(len(x.Get))) - n += len(x.Get) - case *HttpRule_Put: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(len(x.Put))) - n += len(x.Put) - case *HttpRule_Post: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(len(x.Post))) - n += len(x.Post) - case *HttpRule_Delete: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(len(x.Delete))) - n += len(x.Delete) - case *HttpRule_Patch: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(len(x.Patch))) - n += len(x.Patch) - case *HttpRule_Custom: - s := proto.Size(x.Custom) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - // A custom pattern is used for defining custom HTTP verb. type CustomHttpPattern struct { // The name of this custom HTTP verb. @@ -614,16 +558,17 @@ func (m *CustomHttpPattern) Reset() { *m = CustomHttpPattern{} } func (m *CustomHttpPattern) String() string { return proto.CompactTextString(m) } func (*CustomHttpPattern) ProtoMessage() {} func (*CustomHttpPattern) Descriptor() ([]byte, []int) { - return fileDescriptor_http_e457621dddd7365b, []int{2} + return fileDescriptor_ff9994be407cdcc9, []int{2} } + func (m *CustomHttpPattern) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CustomHttpPattern.Unmarshal(m, b) } func (m *CustomHttpPattern) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_CustomHttpPattern.Marshal(b, m, deterministic) } -func (dst *CustomHttpPattern) XXX_Merge(src proto.Message) { - xxx_messageInfo_CustomHttpPattern.Merge(dst, src) +func (m *CustomHttpPattern) XXX_Merge(src proto.Message) { + xxx_messageInfo_CustomHttpPattern.Merge(m, src) } func (m *CustomHttpPattern) XXX_Size() int { return xxx_messageInfo_CustomHttpPattern.Size(m) @@ -654,9 +599,9 @@ func init() { proto.RegisterType((*CustomHttpPattern)(nil), "google.api.CustomHttpPattern") } -func init() { proto.RegisterFile("google/api/http.proto", fileDescriptor_http_e457621dddd7365b) } +func init() { proto.RegisterFile("google/api/http.proto", fileDescriptor_ff9994be407cdcc9) } -var fileDescriptor_http_e457621dddd7365b = []byte{ +var fileDescriptor_ff9994be407cdcc9 = []byte{ // 419 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0xc1, 0x8e, 0xd3, 0x30, 0x10, 0x86, 0x49, 0x9b, 0x76, 0xdb, 0xe9, 0x82, 0x84, 0x59, 0x90, 0x85, 0x40, 0x54, 0xe5, 0x52, diff --git a/vendor/google.golang.org/genproto/googleapis/api/annotations/resource.pb.go b/vendor/google.golang.org/genproto/googleapis/api/annotations/resource.pb.go new file mode 100644 index 0000000000..6aea4d701f --- /dev/null +++ b/vendor/google.golang.org/genproto/googleapis/api/annotations/resource.pb.go @@ -0,0 +1,441 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// source: google/api/resource.proto + +package annotations + +import ( + fmt "fmt" + math "math" + + proto "github.com/golang/protobuf/proto" + descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor" +) + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package + +// A description of the historical or future-looking state of the +// resource pattern. +type ResourceDescriptor_History int32 + +const ( + // The "unset" value. + ResourceDescriptor_HISTORY_UNSPECIFIED ResourceDescriptor_History = 0 + // The resource originally had one pattern and launched as such, and + // additional patterns were added later. + ResourceDescriptor_ORIGINALLY_SINGLE_PATTERN ResourceDescriptor_History = 1 + // The resource has one pattern, but the API owner expects to add more + // later. (This is the inverse of ORIGINALLY_SINGLE_PATTERN, and prevents + // that from being necessary once there are multiple patterns.) + ResourceDescriptor_FUTURE_MULTI_PATTERN ResourceDescriptor_History = 2 +) + +var ResourceDescriptor_History_name = map[int32]string{ + 0: "HISTORY_UNSPECIFIED", + 1: "ORIGINALLY_SINGLE_PATTERN", + 2: "FUTURE_MULTI_PATTERN", +} + +var ResourceDescriptor_History_value = map[string]int32{ + "HISTORY_UNSPECIFIED": 0, + "ORIGINALLY_SINGLE_PATTERN": 1, + "FUTURE_MULTI_PATTERN": 2, +} + +func (x ResourceDescriptor_History) String() string { + return proto.EnumName(ResourceDescriptor_History_name, int32(x)) +} + +func (ResourceDescriptor_History) EnumDescriptor() ([]byte, []int) { + return fileDescriptor_465e9122405d1bb5, []int{0, 0} +} + +// A simple descriptor of a resource type. +// +// ResourceDescriptor annotates a resource message (either by means of a +// protobuf annotation or use in the service config), and associates the +// resource's schema, the resource type, and the pattern of the resource name. +// +// Example: +// +// message Topic { +// // Indicates this message defines a resource schema. +// // Declares the resource type in the format of {service}/{kind}. +// // For Kubernetes resources, the format is {api group}/{kind}. +// option (google.api.resource) = { +// type: "pubsub.googleapis.com/Topic" +// name_descriptor: { +// pattern: "projects/{project}/topics/{topic}" +// parent_type: "cloudresourcemanager.googleapis.com/Project" +// parent_name_extractor: "projects/{project}" +// } +// }; +// } +// +// The ResourceDescriptor Yaml config will look like: +// +// resources: +// - type: "pubsub.googleapis.com/Topic" +// name_descriptor: +// - pattern: "projects/{project}/topics/{topic}" +// parent_type: "cloudresourcemanager.googleapis.com/Project" +// parent_name_extractor: "projects/{project}" +// +// Sometimes, resources have multiple patterns, typically because they can +// live under multiple parents. +// +// Example: +// +// message LogEntry { +// option (google.api.resource) = { +// type: "logging.googleapis.com/LogEntry" +// name_descriptor: { +// pattern: "projects/{project}/logs/{log}" +// parent_type: "cloudresourcemanager.googleapis.com/Project" +// parent_name_extractor: "projects/{project}" +// } +// name_descriptor: { +// pattern: "folders/{folder}/logs/{log}" +// parent_type: "cloudresourcemanager.googleapis.com/Folder" +// parent_name_extractor: "folders/{folder}" +// } +// name_descriptor: { +// pattern: "organizations/{organization}/logs/{log}" +// parent_type: "cloudresourcemanager.googleapis.com/Organization" +// parent_name_extractor: "organizations/{organization}" +// } +// name_descriptor: { +// pattern: "billingAccounts/{billing_account}/logs/{log}" +// parent_type: "billing.googleapis.com/BillingAccount" +// parent_name_extractor: "billingAccounts/{billing_account}" +// } +// }; +// } +// +// The ResourceDescriptor Yaml config will look like: +// +// resources: +// - type: 'logging.googleapis.com/LogEntry' +// name_descriptor: +// - pattern: "projects/{project}/logs/{log}" +// parent_type: "cloudresourcemanager.googleapis.com/Project" +// parent_name_extractor: "projects/{project}" +// - pattern: "folders/{folder}/logs/{log}" +// parent_type: "cloudresourcemanager.googleapis.com/Folder" +// parent_name_extractor: "folders/{folder}" +// - pattern: "organizations/{organization}/logs/{log}" +// parent_type: "cloudresourcemanager.googleapis.com/Organization" +// parent_name_extractor: "organizations/{organization}" +// - pattern: "billingAccounts/{billing_account}/logs/{log}" +// parent_type: "billing.googleapis.com/BillingAccount" +// parent_name_extractor: "billingAccounts/{billing_account}" +// +// For flexible resources, the resource name doesn't contain parent names, but +// the resource itself has parents for policy evaluation. +// +// Example: +// +// message Shelf { +// option (google.api.resource) = { +// type: "library.googleapis.com/Shelf" +// name_descriptor: { +// pattern: "shelves/{shelf}" +// parent_type: "cloudresourcemanager.googleapis.com/Project" +// } +// name_descriptor: { +// pattern: "shelves/{shelf}" +// parent_type: "cloudresourcemanager.googleapis.com/Folder" +// } +// }; +// } +// +// The ResourceDescriptor Yaml config will look like: +// +// resources: +// - type: 'library.googleapis.com/Shelf' +// name_descriptor: +// - pattern: "shelves/{shelf}" +// parent_type: "cloudresourcemanager.googleapis.com/Project" +// - pattern: "shelves/{shelf}" +// parent_type: "cloudresourcemanager.googleapis.com/Folder" +type ResourceDescriptor struct { + // The resource type. It must be in the format of + // {service_name}/{resource_type_kind}. The `resource_type_kind` must be + // singular and must not include version numbers. + // + // Example: `storage.googleapis.com/Bucket` + // + // The value of the resource_type_kind must follow the regular expression + // /[A-Za-z][a-zA-Z0-9]+/. It should start with an upper case character and + // should use PascalCase (UpperCamelCase). The maximum number of + // characters allowed for the `resource_type_kind` is 100. + Type string `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"` + // Optional. The relative resource name pattern associated with this resource + // type. The DNS prefix of the full resource name shouldn't be specified here. + // + // The path pattern must follow the syntax, which aligns with HTTP binding + // syntax: + // + // Template = Segment { "/" Segment } ; + // Segment = LITERAL | Variable ; + // Variable = "{" LITERAL "}" ; + // + // Examples: + // + // - "projects/{project}/topics/{topic}" + // - "projects/{project}/knowledgeBases/{knowledge_base}" + // + // The components in braces correspond to the IDs for each resource in the + // hierarchy. It is expected that, if multiple patterns are provided, + // the same component name (e.g. "project") refers to IDs of the same + // type of resource. + Pattern []string `protobuf:"bytes,2,rep,name=pattern,proto3" json:"pattern,omitempty"` + // Optional. The field on the resource that designates the resource name + // field. If omitted, this is assumed to be "name". + NameField string `protobuf:"bytes,3,opt,name=name_field,json=nameField,proto3" json:"name_field,omitempty"` + // Optional. The historical or future-looking state of the resource pattern. + // + // Example: + // + // // The InspectTemplate message originally only supported resource + // // names with organization, and project was added later. + // message InspectTemplate { + // option (google.api.resource) = { + // type: "dlp.googleapis.com/InspectTemplate" + // pattern: + // "organizations/{organization}/inspectTemplates/{inspect_template}" + // pattern: "projects/{project}/inspectTemplates/{inspect_template}" + // history: ORIGINALLY_SINGLE_PATTERN + // }; + // } + History ResourceDescriptor_History `protobuf:"varint,4,opt,name=history,proto3,enum=google.api.ResourceDescriptor_History" json:"history,omitempty"` + // The plural name used in the resource name, such as 'projects' for + // the name of 'projects/{project}'. It is the same concept of the `plural` + // field in k8s CRD spec + // https://kubernetes.io/docs/tasks/access-kubernetes-api/custom-resources/custom-resource-definitions/ + Plural string `protobuf:"bytes,5,opt,name=plural,proto3" json:"plural,omitempty"` + // The same concept of the `singular` field in k8s CRD spec + // https://kubernetes.io/docs/tasks/access-kubernetes-api/custom-resources/custom-resource-definitions/ + // Such as "project" for the `resourcemanager.googleapis.com/Project` type. + Singular string `protobuf:"bytes,6,opt,name=singular,proto3" json:"singular,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *ResourceDescriptor) Reset() { *m = ResourceDescriptor{} } +func (m *ResourceDescriptor) String() string { return proto.CompactTextString(m) } +func (*ResourceDescriptor) ProtoMessage() {} +func (*ResourceDescriptor) Descriptor() ([]byte, []int) { + return fileDescriptor_465e9122405d1bb5, []int{0} +} + +func (m *ResourceDescriptor) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_ResourceDescriptor.Unmarshal(m, b) +} +func (m *ResourceDescriptor) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_ResourceDescriptor.Marshal(b, m, deterministic) +} +func (m *ResourceDescriptor) XXX_Merge(src proto.Message) { + xxx_messageInfo_ResourceDescriptor.Merge(m, src) +} +func (m *ResourceDescriptor) XXX_Size() int { + return xxx_messageInfo_ResourceDescriptor.Size(m) +} +func (m *ResourceDescriptor) XXX_DiscardUnknown() { + xxx_messageInfo_ResourceDescriptor.DiscardUnknown(m) +} + +var xxx_messageInfo_ResourceDescriptor proto.InternalMessageInfo + +func (m *ResourceDescriptor) GetType() string { + if m != nil { + return m.Type + } + return "" +} + +func (m *ResourceDescriptor) GetPattern() []string { + if m != nil { + return m.Pattern + } + return nil +} + +func (m *ResourceDescriptor) GetNameField() string { + if m != nil { + return m.NameField + } + return "" +} + +func (m *ResourceDescriptor) GetHistory() ResourceDescriptor_History { + if m != nil { + return m.History + } + return ResourceDescriptor_HISTORY_UNSPECIFIED +} + +func (m *ResourceDescriptor) GetPlural() string { + if m != nil { + return m.Plural + } + return "" +} + +func (m *ResourceDescriptor) GetSingular() string { + if m != nil { + return m.Singular + } + return "" +} + +// Defines a proto annotation that describes a string field that refers to +// an API resource. +type ResourceReference struct { + // The resource type that the annotated field references. + // + // Example: + // + // message Subscription { + // string topic = 2 [(google.api.resource_reference) = { + // type: "pubsub.googleapis.com/Topic" + // }]; + // } + Type string `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"` + // The resource type of a child collection that the annotated field + // references. This is useful for annotating the `parent` field that + // doesn't have a fixed resource type. + // + // Example: + // + // message ListLogEntriesRequest { + // string parent = 1 [(google.api.resource_reference) = { + // child_type: "logging.googleapis.com/LogEntry" + // }; + // } + ChildType string `protobuf:"bytes,2,opt,name=child_type,json=childType,proto3" json:"child_type,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *ResourceReference) Reset() { *m = ResourceReference{} } +func (m *ResourceReference) String() string { return proto.CompactTextString(m) } +func (*ResourceReference) ProtoMessage() {} +func (*ResourceReference) Descriptor() ([]byte, []int) { + return fileDescriptor_465e9122405d1bb5, []int{1} +} + +func (m *ResourceReference) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_ResourceReference.Unmarshal(m, b) +} +func (m *ResourceReference) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_ResourceReference.Marshal(b, m, deterministic) +} +func (m *ResourceReference) XXX_Merge(src proto.Message) { + xxx_messageInfo_ResourceReference.Merge(m, src) +} +func (m *ResourceReference) XXX_Size() int { + return xxx_messageInfo_ResourceReference.Size(m) +} +func (m *ResourceReference) XXX_DiscardUnknown() { + xxx_messageInfo_ResourceReference.DiscardUnknown(m) +} + +var xxx_messageInfo_ResourceReference proto.InternalMessageInfo + +func (m *ResourceReference) GetType() string { + if m != nil { + return m.Type + } + return "" +} + +func (m *ResourceReference) GetChildType() string { + if m != nil { + return m.ChildType + } + return "" +} + +var E_ResourceReference = &proto.ExtensionDesc{ + ExtendedType: (*descriptor.FieldOptions)(nil), + ExtensionType: (*ResourceReference)(nil), + Field: 1055, + Name: "google.api.resource_reference", + Tag: "bytes,1055,opt,name=resource_reference", + Filename: "google/api/resource.proto", +} + +var E_ResourceDefinition = &proto.ExtensionDesc{ + ExtendedType: (*descriptor.FileOptions)(nil), + ExtensionType: ([]*ResourceDescriptor)(nil), + Field: 1053, + Name: "google.api.resource_definition", + Tag: "bytes,1053,rep,name=resource_definition", + Filename: "google/api/resource.proto", +} + +var E_Resource = &proto.ExtensionDesc{ + ExtendedType: (*descriptor.MessageOptions)(nil), + ExtensionType: (*ResourceDescriptor)(nil), + Field: 1053, + Name: "google.api.resource", + Tag: "bytes,1053,opt,name=resource", + Filename: "google/api/resource.proto", +} + +func init() { + proto.RegisterEnum("google.api.ResourceDescriptor_History", ResourceDescriptor_History_name, ResourceDescriptor_History_value) + proto.RegisterType((*ResourceDescriptor)(nil), "google.api.ResourceDescriptor") + proto.RegisterType((*ResourceReference)(nil), "google.api.ResourceReference") + proto.RegisterExtension(E_ResourceReference) + proto.RegisterExtension(E_ResourceDefinition) + proto.RegisterExtension(E_Resource) +} + +func init() { proto.RegisterFile("google/api/resource.proto", fileDescriptor_465e9122405d1bb5) } + +var fileDescriptor_465e9122405d1bb5 = []byte{ + // 490 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0xcd, 0x6e, 0xd3, 0x4c, + 0x14, 0xfd, 0x9c, 0xe4, 0xcb, 0xcf, 0xad, 0xa8, 0xda, 0x29, 0x02, 0xb7, 0x22, 0x60, 0x65, 0x81, + 0xb2, 0xb2, 0xa5, 0xb0, 0x0b, 0x1b, 0x52, 0xe2, 0xa4, 0x96, 0xd2, 0xc4, 0x9a, 0x38, 0x8b, 0x02, + 0x92, 0x35, 0x75, 0x26, 0xee, 0x48, 0xee, 0xcc, 0x68, 0xec, 0x2c, 0xf2, 0x30, 0x08, 0x89, 0x67, + 0xe0, 0xe1, 0x58, 0xa2, 0x8c, 0x7f, 0x88, 0x68, 0x84, 0xd8, 0xcd, 0xbd, 0xe7, 0xde, 0x73, 0x8e, + 0xcf, 0x95, 0xe1, 0x32, 0x16, 0x22, 0x4e, 0xa8, 0x43, 0x24, 0x73, 0x14, 0x4d, 0xc5, 0x56, 0x45, + 0xd4, 0x96, 0x4a, 0x64, 0x02, 0x41, 0x0e, 0xd9, 0x44, 0xb2, 0x2b, 0xab, 0x18, 0xd3, 0xc8, 0xfd, + 0x76, 0xe3, 0xac, 0x69, 0x1a, 0x29, 0x26, 0x33, 0xa1, 0xf2, 0xe9, 0xde, 0x8f, 0x1a, 0x20, 0x5c, + 0x10, 0x8c, 0x2b, 0x10, 0x21, 0x68, 0x64, 0x3b, 0x49, 0x4d, 0xc3, 0x32, 0xfa, 0x1d, 0xac, 0xdf, + 0xc8, 0x84, 0x96, 0x24, 0x59, 0x46, 0x15, 0x37, 0x6b, 0x56, 0xbd, 0xdf, 0xc1, 0x65, 0x89, 0xba, + 0x00, 0x9c, 0x3c, 0xd2, 0x70, 0xc3, 0x68, 0xb2, 0x36, 0xeb, 0x7a, 0xa7, 0xb3, 0xef, 0x4c, 0xf6, + 0x0d, 0xf4, 0x01, 0x5a, 0x0f, 0x2c, 0xcd, 0x84, 0xda, 0x99, 0x0d, 0xcb, 0xe8, 0x9f, 0x0e, 0xde, + 0xda, 0xbf, 0x3d, 0xda, 0x4f, 0xd5, 0xed, 0x9b, 0x7c, 0x1a, 0x97, 0x6b, 0xe8, 0x05, 0x34, 0x65, + 0xb2, 0x55, 0x24, 0x31, 0xff, 0xd7, 0xe4, 0x45, 0x85, 0xae, 0xa0, 0x9d, 0x32, 0x1e, 0x6f, 0x13, + 0xa2, 0xcc, 0xa6, 0x46, 0xaa, 0xba, 0xf7, 0x19, 0x5a, 0x05, 0x0f, 0x7a, 0x09, 0x17, 0x37, 0xde, + 0x32, 0x58, 0xe0, 0xbb, 0x70, 0x35, 0x5f, 0xfa, 0xee, 0x47, 0x6f, 0xe2, 0xb9, 0xe3, 0xb3, 0xff, + 0x50, 0x17, 0x2e, 0x17, 0xd8, 0x9b, 0x7a, 0xf3, 0xd1, 0x6c, 0x76, 0x17, 0x2e, 0xbd, 0xf9, 0x74, + 0xe6, 0x86, 0xfe, 0x28, 0x08, 0x5c, 0x3c, 0x3f, 0x33, 0x90, 0x09, 0xcf, 0x27, 0xab, 0x60, 0x85, + 0xdd, 0xf0, 0x76, 0x35, 0x0b, 0xbc, 0x0a, 0xa9, 0xf5, 0x26, 0x70, 0x5e, 0xfa, 0xc6, 0x74, 0x43, + 0x15, 0xe5, 0x11, 0x3d, 0x1a, 0x5a, 0x17, 0x20, 0x7a, 0x60, 0xc9, 0x3a, 0xd4, 0x48, 0x2d, 0x8f, + 0x46, 0x77, 0x82, 0x9d, 0xa4, 0xc3, 0x04, 0x50, 0x79, 0xbe, 0x50, 0x55, 0x44, 0xdd, 0x32, 0x9f, + 0xf2, 0x6e, 0xb6, 0x0e, 0x72, 0x21, 0x33, 0x26, 0x78, 0x6a, 0x7e, 0x6b, 0x5b, 0x46, 0xff, 0x64, + 0xd0, 0x3d, 0x96, 0x62, 0xe5, 0x06, 0x9f, 0xab, 0x3f, 0x5b, 0x43, 0x0e, 0x17, 0x95, 0xda, 0x9a, + 0x6e, 0x18, 0x67, 0x7b, 0x42, 0xf4, 0xea, 0x88, 0x5c, 0x42, 0x4b, 0xb5, 0xaf, 0x6d, 0xab, 0xde, + 0x3f, 0x19, 0xbc, 0xfe, 0xfb, 0xcd, 0x70, 0xf5, 0x1d, 0xe3, 0x8a, 0x78, 0xf8, 0x05, 0xda, 0x65, + 0x17, 0xbd, 0x79, 0x22, 0x72, 0x4b, 0xd3, 0x94, 0xc4, 0x87, 0x3a, 0xc6, 0x3f, 0xe8, 0x54, 0x8c, + 0xd7, 0x1c, 0x4e, 0x23, 0xf1, 0x78, 0x30, 0x7e, 0xfd, 0xac, 0x9c, 0xf7, 0xf7, 0x1a, 0xbe, 0xf1, + 0x69, 0x54, 0x80, 0xb1, 0x48, 0x08, 0x8f, 0x6d, 0xa1, 0x62, 0x27, 0xa6, 0x5c, 0x3b, 0x70, 0x72, + 0x88, 0x48, 0x96, 0xea, 0xbf, 0x88, 0x70, 0x2e, 0x32, 0xa2, 0xad, 0xbc, 0x3f, 0x78, 0xff, 0x34, + 0x8c, 0xef, 0xb5, 0xc6, 0x74, 0xe4, 0x7b, 0xf7, 0x4d, 0xbd, 0xf7, 0xee, 0x57, 0x00, 0x00, 0x00, + 0xff, 0xff, 0x75, 0x12, 0x53, 0xef, 0x7c, 0x03, 0x00, 0x00, +} diff --git a/vendor/google.golang.org/genproto/googleapis/api/distribution/distribution.pb.go b/vendor/google.golang.org/genproto/googleapis/api/distribution/distribution.pb.go index ea45969972..39ff34cfb0 100644 --- a/vendor/google.golang.org/genproto/googleapis/api/distribution/distribution.pb.go +++ b/vendor/google.golang.org/genproto/googleapis/api/distribution/distribution.pb.go @@ -1,12 +1,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: google/api/distribution.proto -package distribution // import "google.golang.org/genproto/googleapis/api/distribution" +package distribution -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" -import _ "google.golang.org/genproto/googleapis/api/annotations" +import ( + fmt "fmt" + math "math" + + proto "github.com/golang/protobuf/proto" + any "github.com/golang/protobuf/ptypes/any" + timestamp "github.com/golang/protobuf/ptypes/timestamp" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -17,31 +21,32 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package -// Distribution contains summary statistics for a population of values and, -// optionally, a histogram representing the distribution of those values across -// a specified set of histogram buckets. +// `Distribution` contains summary statistics for a population of values. It +// optionally contains a histogram representing the distribution of those values +// across a set of buckets. // // The summary statistics are the count, mean, sum of the squared deviation from // the mean, the minimum, and the maximum of the set of population of values. -// // The histogram is based on a sequence of buckets and gives a count of values -// that fall into each bucket. The boundaries of the buckets are given either -// explicitly or by specifying parameters for a method of computing them -// (buckets of fixed width or buckets of exponentially increasing width). +// that fall into each bucket. The boundaries of the buckets are given either +// explicitly or by formulas for buckets of fixed or exponentially increasing +// widths. // // Although it is not forbidden, it is generally a bad idea to include // non-finite values (infinities or NaNs) in the population of values, as this // will render the `mean` and `sum_of_squared_deviation` fields meaningless. type Distribution struct { - // The number of values in the population. Must be non-negative. + // The number of values in the population. Must be non-negative. This value + // must equal the sum of the values in `bucket_counts` if a histogram is + // provided. Count int64 `protobuf:"varint,1,opt,name=count,proto3" json:"count,omitempty"` // The arithmetic mean of the values in the population. If `count` is zero // then this field must be zero. Mean float64 `protobuf:"fixed64,2,opt,name=mean,proto3" json:"mean,omitempty"` // The sum of squared deviations from the mean of the values in the - // population. For values x_i this is: + // population. For values x_i this is: // // Sum[i=1..n]((x_i - mean)^2) // @@ -53,40 +58,47 @@ type Distribution struct { // If specified, contains the range of the population values. The field // must not be present if the `count` is zero. Range *Distribution_Range `protobuf:"bytes,4,opt,name=range,proto3" json:"range,omitempty"` - // Defines the histogram bucket boundaries. + // Defines the histogram bucket boundaries. If the distribution does not + // contain a histogram, then omit this field. BucketOptions *Distribution_BucketOptions `protobuf:"bytes,6,opt,name=bucket_options,json=bucketOptions,proto3" json:"bucket_options,omitempty"` - // If `bucket_options` is given, then the sum of the values in `bucket_counts` - // must equal the value in `count`. If `bucket_options` is not given, no - // `bucket_counts` fields may be given. + // The number of values in each bucket of the histogram, as described in + // `bucket_options`. If the distribution does not have a histogram, then omit + // this field. If there is a histogram, then the sum of the values in + // `bucket_counts` must equal the value in the `count` field of the + // distribution. // - // Bucket counts are given in order under the numbering scheme described - // above (the underflow bucket has number 0; the finite buckets, if any, - // have numbers 1 through N-2; the overflow bucket has number N-1). + // If present, `bucket_counts` should contain N values, where N is the number + // of buckets specified in `bucket_options`. If you supply fewer than N + // values, the remaining values are assumed to be 0. // - // The size of `bucket_counts` must be no greater than N as defined in - // `bucket_options`. - // - // Any suffix of trailing zero bucket_count fields may be omitted. - BucketCounts []int64 `protobuf:"varint,7,rep,packed,name=bucket_counts,json=bucketCounts,proto3" json:"bucket_counts,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + // The order of the values in `bucket_counts` follows the bucket numbering + // schemes described for the three bucket types. The first value must be the + // count for the underflow bucket (number 0). The next N-2 values are the + // counts for the finite buckets (number 1 through N-2). The N'th value in + // `bucket_counts` is the count for the overflow bucket (number N-1). + BucketCounts []int64 `protobuf:"varint,7,rep,packed,name=bucket_counts,json=bucketCounts,proto3" json:"bucket_counts,omitempty"` + // Must be in increasing order of `value` field. + Exemplars []*Distribution_Exemplar `protobuf:"bytes,10,rep,name=exemplars,proto3" json:"exemplars,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *Distribution) Reset() { *m = Distribution{} } func (m *Distribution) String() string { return proto.CompactTextString(m) } func (*Distribution) ProtoMessage() {} func (*Distribution) Descriptor() ([]byte, []int) { - return fileDescriptor_distribution_4362d2d5f4dd1b54, []int{0} + return fileDescriptor_0835ee0fd90bf943, []int{0} } + func (m *Distribution) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Distribution.Unmarshal(m, b) } func (m *Distribution) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Distribution.Marshal(b, m, deterministic) } -func (dst *Distribution) XXX_Merge(src proto.Message) { - xxx_messageInfo_Distribution.Merge(dst, src) +func (m *Distribution) XXX_Merge(src proto.Message) { + xxx_messageInfo_Distribution.Merge(m, src) } func (m *Distribution) XXX_Size() int { return xxx_messageInfo_Distribution.Size(m) @@ -139,6 +151,13 @@ func (m *Distribution) GetBucketCounts() []int64 { return nil } +func (m *Distribution) GetExemplars() []*Distribution_Exemplar { + if m != nil { + return m.Exemplars + } + return nil +} + // The range of the population values. type Distribution_Range struct { // The minimum of the population values. @@ -154,16 +173,17 @@ func (m *Distribution_Range) Reset() { *m = Distribution_Range{} } func (m *Distribution_Range) String() string { return proto.CompactTextString(m) } func (*Distribution_Range) ProtoMessage() {} func (*Distribution_Range) Descriptor() ([]byte, []int) { - return fileDescriptor_distribution_4362d2d5f4dd1b54, []int{0, 0} + return fileDescriptor_0835ee0fd90bf943, []int{0, 0} } + func (m *Distribution_Range) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Distribution_Range.Unmarshal(m, b) } func (m *Distribution_Range) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Distribution_Range.Marshal(b, m, deterministic) } -func (dst *Distribution_Range) XXX_Merge(src proto.Message) { - xxx_messageInfo_Distribution_Range.Merge(dst, src) +func (m *Distribution_Range) XXX_Merge(src proto.Message) { + xxx_messageInfo_Distribution_Range.Merge(m, src) } func (m *Distribution_Range) XXX_Size() int { return xxx_messageInfo_Distribution_Range.Size(m) @@ -188,29 +208,21 @@ func (m *Distribution_Range) GetMax() float64 { return 0 } -// A Distribution may optionally contain a histogram of the values in the -// population. The histogram is given in `bucket_counts` as counts of values -// that fall into one of a sequence of non-overlapping buckets. The sequence -// of buckets is described by `bucket_options`. -// -// A bucket specifies an inclusive lower bound and exclusive upper bound for -// the values that are counted for that bucket. The upper bound of a bucket -// is strictly greater than the lower bound. -// -// The sequence of N buckets for a Distribution consists of an underflow -// bucket (number 0), zero or more finite buckets (number 1 through N - 2) and -// an overflow bucket (number N - 1). The buckets are contiguous: the lower -// bound of bucket i (i > 0) is the same as the upper bound of bucket i - 1. -// The buckets span the whole range of finite values: lower bound of the -// underflow bucket is -infinity and the upper bound of the overflow bucket is -// +infinity. The finite buckets are so-called because both bounds are -// finite. -// -// `BucketOptions` describes bucket boundaries in one of three ways. Two -// describe the boundaries by giving parameters for a formula to generate -// boundaries and one gives the bucket boundaries explicitly. +// `BucketOptions` describes the bucket boundaries used to create a histogram +// for the distribution. The buckets can be in a linear sequence, an +// exponential sequence, or each bucket can be specified explicitly. +// `BucketOptions` does not include the number of values in each bucket. // -// If `bucket_boundaries` is not given, then no `bucket_counts` may be given. +// A bucket has an inclusive lower bound and exclusive upper bound for the +// values that are counted for that bucket. The upper bound of a bucket must +// be strictly greater than the lower bound. The sequence of N buckets for a +// distribution consists of an underflow bucket (number 0), zero or more +// finite buckets (number 1 through N - 2) and an overflow bucket (number N - +// 1). The buckets are contiguous: the lower bound of bucket i (i > 0) is the +// same as the upper bound of bucket i - 1. The buckets span the whole range +// of finite values: lower bound of the underflow bucket is -infinity and the +// upper bound of the overflow bucket is +infinity. The finite buckets are +// so-called because both bounds are finite. type Distribution_BucketOptions struct { // Exactly one of these three fields must be set. // @@ -228,16 +240,17 @@ func (m *Distribution_BucketOptions) Reset() { *m = Distribution_BucketO func (m *Distribution_BucketOptions) String() string { return proto.CompactTextString(m) } func (*Distribution_BucketOptions) ProtoMessage() {} func (*Distribution_BucketOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_distribution_4362d2d5f4dd1b54, []int{0, 1} + return fileDescriptor_0835ee0fd90bf943, []int{0, 1} } + func (m *Distribution_BucketOptions) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Distribution_BucketOptions.Unmarshal(m, b) } func (m *Distribution_BucketOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Distribution_BucketOptions.Marshal(b, m, deterministic) } -func (dst *Distribution_BucketOptions) XXX_Merge(src proto.Message) { - xxx_messageInfo_Distribution_BucketOptions.Merge(dst, src) +func (m *Distribution_BucketOptions) XXX_Merge(src proto.Message) { + xxx_messageInfo_Distribution_BucketOptions.Merge(m, src) } func (m *Distribution_BucketOptions) XXX_Size() int { return xxx_messageInfo_Distribution_BucketOptions.Size(m) @@ -298,105 +311,21 @@ func (m *Distribution_BucketOptions) GetExplicitBuckets() *Distribution_BucketOp return nil } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*Distribution_BucketOptions) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _Distribution_BucketOptions_OneofMarshaler, _Distribution_BucketOptions_OneofUnmarshaler, _Distribution_BucketOptions_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*Distribution_BucketOptions) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*Distribution_BucketOptions_LinearBuckets)(nil), (*Distribution_BucketOptions_ExponentialBuckets)(nil), (*Distribution_BucketOptions_ExplicitBuckets)(nil), } } -func _Distribution_BucketOptions_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*Distribution_BucketOptions) - // options - switch x := m.Options.(type) { - case *Distribution_BucketOptions_LinearBuckets: - b.EncodeVarint(1<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.LinearBuckets); err != nil { - return err - } - case *Distribution_BucketOptions_ExponentialBuckets: - b.EncodeVarint(2<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.ExponentialBuckets); err != nil { - return err - } - case *Distribution_BucketOptions_ExplicitBuckets: - b.EncodeVarint(3<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.ExplicitBuckets); err != nil { - return err - } - case nil: - default: - return fmt.Errorf("Distribution_BucketOptions.Options has unexpected type %T", x) - } - return nil -} - -func _Distribution_BucketOptions_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*Distribution_BucketOptions) - switch tag { - case 1: // options.linear_buckets - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(Distribution_BucketOptions_Linear) - err := b.DecodeMessage(msg) - m.Options = &Distribution_BucketOptions_LinearBuckets{msg} - return true, err - case 2: // options.exponential_buckets - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(Distribution_BucketOptions_Exponential) - err := b.DecodeMessage(msg) - m.Options = &Distribution_BucketOptions_ExponentialBuckets{msg} - return true, err - case 3: // options.explicit_buckets - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(Distribution_BucketOptions_Explicit) - err := b.DecodeMessage(msg) - m.Options = &Distribution_BucketOptions_ExplicitBuckets{msg} - return true, err - default: - return false, nil - } -} - -func _Distribution_BucketOptions_OneofSizer(msg proto.Message) (n int) { - m := msg.(*Distribution_BucketOptions) - // options - switch x := m.Options.(type) { - case *Distribution_BucketOptions_LinearBuckets: - s := proto.Size(x.LinearBuckets) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *Distribution_BucketOptions_ExponentialBuckets: - s := proto.Size(x.ExponentialBuckets) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *Distribution_BucketOptions_ExplicitBuckets: - s := proto.Size(x.ExplicitBuckets) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - -// Specify a sequence of buckets that all have the same width (except -// overflow and underflow). Each bucket represents a constant absolute -// uncertainty on the specific value in the bucket. +// Specifies a linear sequence of buckets that all have the same width +// (except overflow and underflow). Each bucket represents a constant +// absolute uncertainty on the specific value in the bucket. // -// Defines `num_finite_buckets + 2` (= N) buckets with these boundaries for -// bucket `i`: +// There are `num_finite_buckets + 2` (= N) buckets. Bucket `i` has the +// following boundaries: // // Upper bound (0 <= i < N-1): offset + (width * i). // Lower bound (1 <= i < N): offset + (width * (i - 1)). @@ -416,16 +345,17 @@ func (m *Distribution_BucketOptions_Linear) Reset() { *m = Distribution_ func (m *Distribution_BucketOptions_Linear) String() string { return proto.CompactTextString(m) } func (*Distribution_BucketOptions_Linear) ProtoMessage() {} func (*Distribution_BucketOptions_Linear) Descriptor() ([]byte, []int) { - return fileDescriptor_distribution_4362d2d5f4dd1b54, []int{0, 1, 0} + return fileDescriptor_0835ee0fd90bf943, []int{0, 1, 0} } + func (m *Distribution_BucketOptions_Linear) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Distribution_BucketOptions_Linear.Unmarshal(m, b) } func (m *Distribution_BucketOptions_Linear) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Distribution_BucketOptions_Linear.Marshal(b, m, deterministic) } -func (dst *Distribution_BucketOptions_Linear) XXX_Merge(src proto.Message) { - xxx_messageInfo_Distribution_BucketOptions_Linear.Merge(dst, src) +func (m *Distribution_BucketOptions_Linear) XXX_Merge(src proto.Message) { + xxx_messageInfo_Distribution_BucketOptions_Linear.Merge(m, src) } func (m *Distribution_BucketOptions_Linear) XXX_Size() int { return xxx_messageInfo_Distribution_BucketOptions_Linear.Size(m) @@ -457,12 +387,12 @@ func (m *Distribution_BucketOptions_Linear) GetOffset() float64 { return 0 } -// Specify a sequence of buckets that have a width that is proportional to -// the value of the lower bound. Each bucket represents a constant relative -// uncertainty on a specific value in the bucket. +// Specifies an exponential sequence of buckets that have a width that is +// proportional to the value of the lower bound. Each bucket represents a +// constant relative uncertainty on a specific value in the bucket. // -// Defines `num_finite_buckets + 2` (= N) buckets with these boundaries for -// bucket i: +// There are `num_finite_buckets + 2` (= N) buckets. Bucket `i` has the +// following boundaries: // // Upper bound (0 <= i < N-1): scale * (growth_factor ^ i). // Lower bound (1 <= i < N): scale * (growth_factor ^ (i - 1)). @@ -484,16 +414,17 @@ func (m *Distribution_BucketOptions_Exponential) Reset() { func (m *Distribution_BucketOptions_Exponential) String() string { return proto.CompactTextString(m) } func (*Distribution_BucketOptions_Exponential) ProtoMessage() {} func (*Distribution_BucketOptions_Exponential) Descriptor() ([]byte, []int) { - return fileDescriptor_distribution_4362d2d5f4dd1b54, []int{0, 1, 1} + return fileDescriptor_0835ee0fd90bf943, []int{0, 1, 1} } + func (m *Distribution_BucketOptions_Exponential) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Distribution_BucketOptions_Exponential.Unmarshal(m, b) } func (m *Distribution_BucketOptions_Exponential) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Distribution_BucketOptions_Exponential.Marshal(b, m, deterministic) } -func (dst *Distribution_BucketOptions_Exponential) XXX_Merge(src proto.Message) { - xxx_messageInfo_Distribution_BucketOptions_Exponential.Merge(dst, src) +func (m *Distribution_BucketOptions_Exponential) XXX_Merge(src proto.Message) { + xxx_messageInfo_Distribution_BucketOptions_Exponential.Merge(m, src) } func (m *Distribution_BucketOptions_Exponential) XXX_Size() int { return xxx_messageInfo_Distribution_BucketOptions_Exponential.Size(m) @@ -525,17 +456,17 @@ func (m *Distribution_BucketOptions_Exponential) GetScale() float64 { return 0 } -// A set of buckets with arbitrary widths. +// Specifies a set of buckets with arbitrary widths. // -// Defines `size(bounds) + 1` (= N) buckets with these boundaries for -// bucket i: +// There are `size(bounds) + 1` (= N) buckets. Bucket `i` has the following +// boundaries: // // Upper bound (0 <= i < N-1): bounds[i] // Lower bound (1 <= i < N); bounds[i - 1] // -// There must be at least one element in `bounds`. If `bounds` has only one -// element, there are no finite buckets, and that single element is the -// common boundary of the overflow and underflow buckets. +// The `bounds` field must contain at least one element. If `bounds` has +// only one element, then there are no finite buckets, and that single +// element is the common boundary of the overflow and underflow buckets. type Distribution_BucketOptions_Explicit struct { // The values must be monotonically increasing. Bounds []float64 `protobuf:"fixed64,1,rep,packed,name=bounds,proto3" json:"bounds,omitempty"` @@ -548,16 +479,17 @@ func (m *Distribution_BucketOptions_Explicit) Reset() { *m = Distributio func (m *Distribution_BucketOptions_Explicit) String() string { return proto.CompactTextString(m) } func (*Distribution_BucketOptions_Explicit) ProtoMessage() {} func (*Distribution_BucketOptions_Explicit) Descriptor() ([]byte, []int) { - return fileDescriptor_distribution_4362d2d5f4dd1b54, []int{0, 1, 2} + return fileDescriptor_0835ee0fd90bf943, []int{0, 1, 2} } + func (m *Distribution_BucketOptions_Explicit) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Distribution_BucketOptions_Explicit.Unmarshal(m, b) } func (m *Distribution_BucketOptions_Explicit) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Distribution_BucketOptions_Explicit.Marshal(b, m, deterministic) } -func (dst *Distribution_BucketOptions_Explicit) XXX_Merge(src proto.Message) { - xxx_messageInfo_Distribution_BucketOptions_Explicit.Merge(dst, src) +func (m *Distribution_BucketOptions_Explicit) XXX_Merge(src proto.Message) { + xxx_messageInfo_Distribution_BucketOptions_Explicit.Merge(m, src) } func (m *Distribution_BucketOptions_Explicit) XXX_Size() int { return xxx_messageInfo_Distribution_BucketOptions_Explicit.Size(m) @@ -575,6 +507,80 @@ func (m *Distribution_BucketOptions_Explicit) GetBounds() []float64 { return nil } +// Exemplars are example points that may be used to annotate aggregated +// distribution values. They are metadata that gives information about a +// particular value added to a Distribution bucket, such as a trace ID that +// was active when a value was added. They may contain further information, +// such as a example values and timestamps, origin, etc. +type Distribution_Exemplar struct { + // Value of the exemplar point. This value determines to which bucket the + // exemplar belongs. + Value float64 `protobuf:"fixed64,1,opt,name=value,proto3" json:"value,omitempty"` + // The observation (sampling) time of the above value. + Timestamp *timestamp.Timestamp `protobuf:"bytes,2,opt,name=timestamp,proto3" json:"timestamp,omitempty"` + // Contextual information about the example value. Examples are: + // + // Trace: type.googleapis.com/google.monitoring.v3.SpanContext + // + // Literal string: type.googleapis.com/google.protobuf.StringValue + // + // Labels dropped during aggregation: + // type.googleapis.com/google.monitoring.v3.DroppedLabels + // + // There may be only a single attachment of any given message type in a + // single exemplar, and this is enforced by the system. + Attachments []*any.Any `protobuf:"bytes,3,rep,name=attachments,proto3" json:"attachments,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Distribution_Exemplar) Reset() { *m = Distribution_Exemplar{} } +func (m *Distribution_Exemplar) String() string { return proto.CompactTextString(m) } +func (*Distribution_Exemplar) ProtoMessage() {} +func (*Distribution_Exemplar) Descriptor() ([]byte, []int) { + return fileDescriptor_0835ee0fd90bf943, []int{0, 2} +} + +func (m *Distribution_Exemplar) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_Distribution_Exemplar.Unmarshal(m, b) +} +func (m *Distribution_Exemplar) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_Distribution_Exemplar.Marshal(b, m, deterministic) +} +func (m *Distribution_Exemplar) XXX_Merge(src proto.Message) { + xxx_messageInfo_Distribution_Exemplar.Merge(m, src) +} +func (m *Distribution_Exemplar) XXX_Size() int { + return xxx_messageInfo_Distribution_Exemplar.Size(m) +} +func (m *Distribution_Exemplar) XXX_DiscardUnknown() { + xxx_messageInfo_Distribution_Exemplar.DiscardUnknown(m) +} + +var xxx_messageInfo_Distribution_Exemplar proto.InternalMessageInfo + +func (m *Distribution_Exemplar) GetValue() float64 { + if m != nil { + return m.Value + } + return 0 +} + +func (m *Distribution_Exemplar) GetTimestamp() *timestamp.Timestamp { + if m != nil { + return m.Timestamp + } + return nil +} + +func (m *Distribution_Exemplar) GetAttachments() []*any.Any { + if m != nil { + return m.Attachments + } + return nil +} + func init() { proto.RegisterType((*Distribution)(nil), "google.api.Distribution") proto.RegisterType((*Distribution_Range)(nil), "google.api.Distribution.Range") @@ -582,45 +588,51 @@ func init() { proto.RegisterType((*Distribution_BucketOptions_Linear)(nil), "google.api.Distribution.BucketOptions.Linear") proto.RegisterType((*Distribution_BucketOptions_Exponential)(nil), "google.api.Distribution.BucketOptions.Exponential") proto.RegisterType((*Distribution_BucketOptions_Explicit)(nil), "google.api.Distribution.BucketOptions.Explicit") -} - -func init() { - proto.RegisterFile("google/api/distribution.proto", fileDescriptor_distribution_4362d2d5f4dd1b54) -} - -var fileDescriptor_distribution_4362d2d5f4dd1b54 = []byte{ - // 522 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0x5d, 0x6b, 0xd4, 0x40, - 0x14, 0xdd, 0x34, 0xfb, 0xa1, 0x77, 0x3f, 0x5c, 0xc7, 0x2a, 0x21, 0xa8, 0x2c, 0x2d, 0xc8, 0x82, - 0x9a, 0x85, 0x55, 0xf0, 0xc1, 0xb7, 0x6d, 0x2d, 0xfb, 0xa0, 0xb4, 0x8c, 0xe0, 0x83, 0x08, 0x61, - 0x36, 0x99, 0xa4, 0xa3, 0xc9, 0x4c, 0xcc, 0x4c, 0xda, 0xfd, 0x01, 0xfe, 0x29, 0xff, 0x9d, 0xe4, - 0x4e, 0xb6, 0x4d, 0x11, 0x61, 0x7d, 0x9b, 0x73, 0xef, 0x99, 0x73, 0xce, 0xbd, 0x64, 0x02, 0xcf, - 0x52, 0xa5, 0xd2, 0x8c, 0x2f, 0x58, 0x21, 0x16, 0xb1, 0xd0, 0xa6, 0x14, 0x9b, 0xca, 0x08, 0x25, - 0x83, 0xa2, 0x54, 0x46, 0x11, 0xb0, 0xed, 0x80, 0x15, 0xc2, 0x7f, 0xda, 0xa2, 0x32, 0x29, 0x95, - 0x61, 0x35, 0x51, 0x5b, 0xe6, 0xd1, 0xaf, 0x01, 0x8c, 0x4e, 0x5b, 0x02, 0xe4, 0x10, 0x7a, 0x91, - 0xaa, 0xa4, 0xf1, 0x9c, 0x99, 0x33, 0x77, 0xa9, 0x05, 0x84, 0x40, 0x37, 0xe7, 0x4c, 0x7a, 0x07, - 0x33, 0x67, 0xee, 0x50, 0x3c, 0x93, 0x77, 0xe0, 0xe9, 0x2a, 0x0f, 0x55, 0x12, 0xea, 0x9f, 0x15, - 0x2b, 0x79, 0x1c, 0xc6, 0xfc, 0x4a, 0xa0, 0xba, 0xe7, 0x22, 0xef, 0xb1, 0xae, 0xf2, 0xf3, 0xe4, - 0xb3, 0xed, 0x9e, 0xee, 0x9a, 0xe4, 0x2d, 0xf4, 0x4a, 0x26, 0x53, 0xee, 0x75, 0x67, 0xce, 0x7c, - 0xb8, 0x7c, 0x1e, 0xdc, 0xa6, 0x0d, 0xda, 0x59, 0x02, 0x5a, 0xb3, 0xa8, 0x25, 0x93, 0x4f, 0x30, - 0xd9, 0x54, 0xd1, 0x0f, 0x6e, 0x42, 0x55, 0xe0, 0x04, 0x5e, 0x1f, 0xaf, 0xbf, 0xf8, 0xe7, 0xf5, - 0x15, 0xd2, 0xcf, 0x2d, 0x9b, 0x8e, 0x37, 0x6d, 0x48, 0x8e, 0xa1, 0x29, 0x84, 0x38, 0xa1, 0xf6, - 0x06, 0x33, 0x77, 0xee, 0xd2, 0x91, 0x2d, 0x9e, 0x60, 0xcd, 0x7f, 0x09, 0x3d, 0xcc, 0x40, 0xa6, - 0xe0, 0xe6, 0x42, 0xe2, 0x4e, 0x1c, 0x5a, 0x1f, 0xb1, 0xc2, 0xb6, 0xcd, 0x42, 0xea, 0xa3, 0xff, - 0xbb, 0x0b, 0xe3, 0x3b, 0x96, 0xe4, 0x0b, 0x4c, 0x32, 0x21, 0x39, 0x2b, 0x43, 0xab, 0xaa, 0x51, - 0x60, 0xb8, 0x7c, 0xbd, 0x5f, 0xe4, 0xe0, 0x23, 0x5e, 0x5e, 0x77, 0xe8, 0xd8, 0xca, 0xd8, 0xae, - 0x26, 0x1c, 0x1e, 0xf1, 0x6d, 0xa1, 0x24, 0x97, 0x46, 0xb0, 0xec, 0x46, 0xfc, 0x00, 0xc5, 0x97, - 0x7b, 0x8a, 0x7f, 0xb8, 0x55, 0x58, 0x77, 0x28, 0x69, 0x09, 0xee, 0x6c, 0xbe, 0xc1, 0x94, 0x6f, - 0x8b, 0x4c, 0x44, 0xc2, 0xdc, 0x78, 0xb8, 0xe8, 0xb1, 0xd8, 0xdf, 0x03, 0xaf, 0xaf, 0x3b, 0xf4, - 0xc1, 0x4e, 0xaa, 0x51, 0xf7, 0x63, 0xe8, 0xdb, 0xf9, 0xc8, 0x2b, 0x20, 0xb2, 0xca, 0xc3, 0x44, - 0x48, 0x61, 0xf8, 0x9d, 0x55, 0xf5, 0xe8, 0x54, 0x56, 0xf9, 0x19, 0x36, 0x76, 0xa9, 0x0e, 0xa1, - 0x77, 0x2d, 0x62, 0x73, 0xd9, 0xac, 0xde, 0x02, 0xf2, 0x04, 0xfa, 0x2a, 0x49, 0x34, 0x37, 0xcd, - 0xa7, 0xd7, 0x20, 0xff, 0x0a, 0x86, 0xad, 0x41, 0xff, 0xd3, 0xea, 0x18, 0xc6, 0x69, 0xa9, 0xae, - 0xcd, 0x65, 0x98, 0xb0, 0xc8, 0xa8, 0xb2, 0xb1, 0x1c, 0xd9, 0xe2, 0x19, 0xd6, 0xea, 0x3c, 0x3a, - 0x62, 0x19, 0x6f, 0x8c, 0x2d, 0xf0, 0x8f, 0xe0, 0xde, 0x6e, 0xf8, 0x3a, 0xdb, 0x46, 0x55, 0x32, - 0xae, 0x8d, 0xdc, 0x3a, 0x9b, 0x45, 0xab, 0xfb, 0x30, 0x68, 0x3e, 0xe5, 0xd5, 0x77, 0x98, 0x44, - 0x2a, 0x6f, 0x6d, 0x75, 0xf5, 0xb0, 0xbd, 0xd6, 0x8b, 0xfa, 0xad, 0x5e, 0x38, 0x5f, 0x4f, 0x1a, - 0x42, 0xaa, 0x32, 0x26, 0xd3, 0x40, 0x95, 0xe9, 0x22, 0xe5, 0x12, 0x5f, 0xf2, 0xc2, 0xb6, 0x58, - 0x21, 0xf4, 0x5f, 0x7f, 0x85, 0xf7, 0x6d, 0xb0, 0xe9, 0x23, 0xff, 0xcd, 0x9f, 0x00, 0x00, 0x00, - 0xff, 0xff, 0x62, 0xb4, 0xef, 0x6b, 0x44, 0x04, 0x00, 0x00, + proto.RegisterType((*Distribution_Exemplar)(nil), "google.api.Distribution.Exemplar") +} + +func init() { proto.RegisterFile("google/api/distribution.proto", fileDescriptor_0835ee0fd90bf943) } + +var fileDescriptor_0835ee0fd90bf943 = []byte{ + // 631 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xed, 0x6a, 0xd4, 0x40, + 0x14, 0x6d, 0x9a, 0xdd, 0x6d, 0x7b, 0xb7, 0x5b, 0xeb, 0x58, 0x25, 0x06, 0xd4, 0xb5, 0x05, 0x59, + 0x50, 0xb3, 0xb0, 0x8a, 0x0a, 0xfe, 0x90, 0x6e, 0x3f, 0xac, 0xa0, 0xb4, 0x8c, 0xe2, 0x0f, 0x11, + 0xc2, 0x6c, 0x76, 0x92, 0x0e, 0x26, 0x33, 0x69, 0x32, 0x69, 0xb7, 0xaf, 0xe1, 0x23, 0xf8, 0x16, + 0xbe, 0x8a, 0x4f, 0x23, 0xf3, 0x91, 0x6e, 0x6a, 0x29, 0xd4, 0x7f, 0xb9, 0xf7, 0x9c, 0x7b, 0xce, + 0xbd, 0x73, 0x67, 0x02, 0x0f, 0x12, 0x21, 0x92, 0x94, 0x0e, 0x49, 0xce, 0x86, 0x53, 0x56, 0xca, + 0x82, 0x4d, 0x2a, 0xc9, 0x04, 0x0f, 0xf2, 0x42, 0x48, 0x81, 0xc0, 0xc0, 0x01, 0xc9, 0x99, 0x7f, + 0xdf, 0x52, 0x35, 0x32, 0xa9, 0xe2, 0x21, 0xe1, 0xe7, 0x86, 0xe6, 0x3f, 0xfa, 0x17, 0x92, 0x2c, + 0xa3, 0xa5, 0x24, 0x59, 0x6e, 0x08, 0x9b, 0x7f, 0x96, 0x61, 0x75, 0xb7, 0x21, 0x8f, 0x36, 0xa0, + 0x1d, 0x89, 0x8a, 0x4b, 0xcf, 0xe9, 0x3b, 0x03, 0x17, 0x9b, 0x00, 0x21, 0x68, 0x65, 0x94, 0x70, + 0x6f, 0xb1, 0xef, 0x0c, 0x1c, 0xac, 0xbf, 0xd1, 0x6b, 0xf0, 0xca, 0x2a, 0x0b, 0x45, 0x1c, 0x96, + 0x27, 0x15, 0x29, 0xe8, 0x34, 0x9c, 0xd2, 0x53, 0x46, 0x94, 0x8a, 0xe7, 0x6a, 0xde, 0xdd, 0xb2, + 0xca, 0x0e, 0xe3, 0xcf, 0x06, 0xdd, 0xad, 0x41, 0xf4, 0x12, 0xda, 0x05, 0xe1, 0x09, 0xf5, 0x5a, + 0x7d, 0x67, 0xd0, 0x1d, 0x3d, 0x0c, 0xe6, 0xb3, 0x04, 0xcd, 0x5e, 0x02, 0xac, 0x58, 0xd8, 0x90, + 0xd1, 0x27, 0x58, 0x9b, 0x54, 0xd1, 0x0f, 0x2a, 0x43, 0x91, 0x2b, 0xb4, 0xf4, 0x3a, 0xba, 0xfc, + 0xc9, 0xb5, 0xe5, 0x63, 0x4d, 0x3f, 0x34, 0x6c, 0xdc, 0x9b, 0x34, 0x43, 0xb4, 0x05, 0x36, 0x11, + 0xea, 0x09, 0x4b, 0x6f, 0xa9, 0xef, 0x0e, 0x5c, 0xbc, 0x6a, 0x92, 0x3b, 0x3a, 0x87, 0xde, 0xc1, + 0x0a, 0x9d, 0xd1, 0x2c, 0x4f, 0x49, 0x51, 0x7a, 0xd0, 0x77, 0x07, 0xdd, 0xd1, 0xe3, 0x6b, 0xed, + 0xf6, 0x2c, 0x13, 0xcf, 0x6b, 0xfc, 0xa7, 0xd0, 0xd6, 0x43, 0xa0, 0x75, 0x70, 0x33, 0xc6, 0xf5, + 0xa1, 0x3a, 0x58, 0x7d, 0xea, 0x0c, 0x99, 0xd9, 0x13, 0x55, 0x9f, 0xfe, 0xef, 0x16, 0xf4, 0x2e, + 0xf5, 0x8c, 0xbe, 0xc2, 0x5a, 0xca, 0x38, 0x25, 0x45, 0x68, 0xda, 0x2a, 0xb5, 0x40, 0x77, 0xf4, + 0xfc, 0x66, 0x33, 0x07, 0x1f, 0x75, 0xf1, 0xc1, 0x02, 0xee, 0x19, 0x19, 0x83, 0x96, 0x88, 0xc2, + 0x1d, 0x3a, 0xcb, 0x05, 0xa7, 0x5c, 0x32, 0x92, 0x5e, 0x88, 0x2f, 0x6a, 0xf1, 0xd1, 0x0d, 0xc5, + 0xf7, 0xe6, 0x0a, 0x07, 0x0b, 0x18, 0x35, 0x04, 0x6b, 0x9b, 0xef, 0xb0, 0x4e, 0x67, 0x79, 0xca, + 0x22, 0x26, 0x2f, 0x3c, 0x5c, 0xed, 0x31, 0xbc, 0xb9, 0x87, 0x2e, 0x3f, 0x58, 0xc0, 0xb7, 0x6a, + 0x29, 0xab, 0xee, 0x4f, 0xa1, 0x63, 0xe6, 0x43, 0xcf, 0x00, 0xf1, 0x2a, 0x0b, 0x63, 0xc6, 0x99, + 0xa4, 0x97, 0x8e, 0xaa, 0x8d, 0xd7, 0x79, 0x95, 0xed, 0x6b, 0xa0, 0xee, 0x6a, 0x03, 0xda, 0x67, + 0x6c, 0x2a, 0x8f, 0xed, 0xd1, 0x9b, 0x00, 0xdd, 0x83, 0x8e, 0x88, 0xe3, 0x92, 0x4a, 0x7b, 0x77, + 0x6d, 0xe4, 0x9f, 0x42, 0xb7, 0x31, 0xe8, 0x7f, 0x5a, 0x6d, 0x41, 0x2f, 0x29, 0xc4, 0x99, 0x3c, + 0x0e, 0x63, 0x12, 0x49, 0x51, 0x58, 0xcb, 0x55, 0x93, 0xdc, 0xd7, 0x39, 0xd5, 0x4f, 0x19, 0x91, + 0x94, 0x5a, 0x63, 0x13, 0xf8, 0x9b, 0xb0, 0x5c, 0x0f, 0xaf, 0x7a, 0x9b, 0x88, 0x8a, 0x4f, 0x95, + 0x91, 0xab, 0x7a, 0x33, 0xd1, 0x78, 0x05, 0x96, 0xec, 0x5b, 0xf0, 0x7f, 0x3a, 0x8a, 0x6f, 0xae, + 0x9d, 0x52, 0x3c, 0x25, 0x69, 0x45, 0xed, 0x75, 0x33, 0x01, 0x7a, 0x03, 0x2b, 0x17, 0xaf, 0xdf, + 0xae, 0xda, 0xaf, 0xd7, 0x50, 0xff, 0x1f, 0x82, 0x2f, 0x35, 0x03, 0xcf, 0xc9, 0xe8, 0x15, 0x74, + 0x89, 0x94, 0x24, 0x3a, 0xce, 0x28, 0xd7, 0x2b, 0x54, 0x0f, 0x61, 0xe3, 0x4a, 0xed, 0x36, 0x3f, + 0xc7, 0x4d, 0xe2, 0xf8, 0x04, 0xd6, 0x22, 0x91, 0x35, 0x56, 0x3d, 0xbe, 0xdd, 0xdc, 0xf5, 0x91, + 0x2a, 0x3c, 0x72, 0xbe, 0xed, 0x58, 0x42, 0x22, 0x52, 0xc2, 0x93, 0x40, 0x14, 0xc9, 0x30, 0xa1, + 0x5c, 0xcb, 0x0e, 0x0d, 0x44, 0x72, 0x56, 0x5e, 0xf9, 0x13, 0xbe, 0x6d, 0x06, 0xbf, 0x16, 0x5b, + 0xef, 0xb7, 0x8f, 0x3e, 0x4c, 0x3a, 0xba, 0xec, 0xc5, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x89, + 0xf1, 0xc2, 0x23, 0x3f, 0x05, 0x00, 0x00, } diff --git a/vendor/google.golang.org/genproto/googleapis/api/httpbody/httpbody.pb.go b/vendor/google.golang.org/genproto/googleapis/api/httpbody/httpbody.pb.go new file mode 100644 index 0000000000..5b6c587a96 --- /dev/null +++ b/vendor/google.golang.org/genproto/googleapis/api/httpbody/httpbody.pb.go @@ -0,0 +1,146 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// source: google/api/httpbody.proto + +package httpbody + +import ( + fmt "fmt" + math "math" + + proto "github.com/golang/protobuf/proto" + any "github.com/golang/protobuf/ptypes/any" +) + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package + +// Message that represents an arbitrary HTTP body. It should only be used for +// payload formats that can't be represented as JSON, such as raw binary or +// an HTML page. +// +// +// This message can be used both in streaming and non-streaming API methods in +// the request as well as the response. +// +// It can be used as a top-level request field, which is convenient if one +// wants to extract parameters from either the URL or HTTP template into the +// request fields and also want access to the raw HTTP body. +// +// Example: +// +// message GetResourceRequest { +// // A unique request id. +// string request_id = 1; +// +// // The raw HTTP body is bound to this field. +// google.api.HttpBody http_body = 2; +// } +// +// service ResourceService { +// rpc GetResource(GetResourceRequest) returns (google.api.HttpBody); +// rpc UpdateResource(google.api.HttpBody) returns +// (google.protobuf.Empty); +// } +// +// Example with streaming methods: +// +// service CaldavService { +// rpc GetCalendar(stream google.api.HttpBody) +// returns (stream google.api.HttpBody); +// rpc UpdateCalendar(stream google.api.HttpBody) +// returns (stream google.api.HttpBody); +// } +// +// Use of this type only changes how the request and response bodies are +// handled, all other features will continue to work unchanged. +type HttpBody struct { + // The HTTP Content-Type header value specifying the content type of the body. + ContentType string `protobuf:"bytes,1,opt,name=content_type,json=contentType,proto3" json:"content_type,omitempty"` + // The HTTP request/response body as raw binary. + Data []byte `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"` + // Application specific response metadata. Must be set in the first response + // for streaming APIs. + Extensions []*any.Any `protobuf:"bytes,3,rep,name=extensions,proto3" json:"extensions,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *HttpBody) Reset() { *m = HttpBody{} } +func (m *HttpBody) String() string { return proto.CompactTextString(m) } +func (*HttpBody) ProtoMessage() {} +func (*HttpBody) Descriptor() ([]byte, []int) { + return fileDescriptor_09ea2ecaa32a0070, []int{0} +} + +func (m *HttpBody) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_HttpBody.Unmarshal(m, b) +} +func (m *HttpBody) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_HttpBody.Marshal(b, m, deterministic) +} +func (m *HttpBody) XXX_Merge(src proto.Message) { + xxx_messageInfo_HttpBody.Merge(m, src) +} +func (m *HttpBody) XXX_Size() int { + return xxx_messageInfo_HttpBody.Size(m) +} +func (m *HttpBody) XXX_DiscardUnknown() { + xxx_messageInfo_HttpBody.DiscardUnknown(m) +} + +var xxx_messageInfo_HttpBody proto.InternalMessageInfo + +func (m *HttpBody) GetContentType() string { + if m != nil { + return m.ContentType + } + return "" +} + +func (m *HttpBody) GetData() []byte { + if m != nil { + return m.Data + } + return nil +} + +func (m *HttpBody) GetExtensions() []*any.Any { + if m != nil { + return m.Extensions + } + return nil +} + +func init() { + proto.RegisterType((*HttpBody)(nil), "google.api.HttpBody") +} + +func init() { proto.RegisterFile("google/api/httpbody.proto", fileDescriptor_09ea2ecaa32a0070) } + +var fileDescriptor_09ea2ecaa32a0070 = []byte{ + // 229 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x8f, 0x31, 0x4f, 0xc3, 0x30, + 0x10, 0x85, 0xe5, 0xb6, 0x42, 0x70, 0x2d, 0x0c, 0x16, 0x43, 0x60, 0x0a, 0x4c, 0x99, 0x6c, 0x09, + 0xd8, 0x3a, 0x35, 0x0b, 0xb0, 0x45, 0x11, 0x13, 0x0b, 0x72, 0x1a, 0xe3, 0x46, 0x2a, 0x77, 0xa7, + 0xe6, 0x10, 0xf8, 0xef, 0xf0, 0x2b, 0x19, 0x11, 0x69, 0x2c, 0xe8, 0xf6, 0xe4, 0xef, 0x3d, 0xbf, + 0x77, 0x70, 0x11, 0x88, 0xc2, 0xd6, 0x5b, 0xc7, 0x9d, 0xdd, 0x88, 0x70, 0x43, 0x6d, 0x34, 0xbc, + 0x23, 0x21, 0x0d, 0x7b, 0x64, 0x1c, 0x77, 0x97, 0xc9, 0x36, 0x90, 0xe6, 0xfd, 0xd5, 0x3a, 0x1c, + 0x6d, 0xd7, 0x1f, 0x70, 0xfc, 0x20, 0xc2, 0x25, 0xb5, 0x51, 0x5f, 0xc1, 0x62, 0x4d, 0x28, 0x1e, + 0xe5, 0x45, 0x22, 0xfb, 0x4c, 0xe5, 0xaa, 0x38, 0xa9, 0xe7, 0xe3, 0xdb, 0x53, 0x64, 0xaf, 0x35, + 0xcc, 0x5a, 0x27, 0x2e, 0x9b, 0xe4, 0xaa, 0x58, 0xd4, 0x83, 0xd6, 0x77, 0x00, 0xfe, 0x53, 0x3c, + 0xf6, 0x1d, 0x61, 0x9f, 0x4d, 0xf3, 0x69, 0x31, 0xbf, 0x39, 0x37, 0x63, 0x7d, 0xaa, 0x34, 0x2b, + 0x8c, 0xf5, 0x3f, 0x5f, 0xb9, 0x81, 0xb3, 0x35, 0xbd, 0x99, 0xbf, 0x95, 0xe5, 0x69, 0x1a, 0x52, + 0xfd, 0x66, 0x2a, 0xf5, 0xbc, 0x1c, 0x61, 0xa0, 0xad, 0xc3, 0x60, 0x68, 0x17, 0x6c, 0xf0, 0x38, + 0xfc, 0x68, 0xf7, 0xc8, 0x71, 0xd7, 0x1f, 0x1c, 0xbf, 0x4c, 0xe2, 0x5b, 0xa9, 0xaf, 0xc9, 0xec, + 0x7e, 0x55, 0x3d, 0x36, 0x47, 0x43, 0xe2, 0xf6, 0x27, 0x00, 0x00, 0xff, 0xff, 0x78, 0xb9, 0x16, + 0x2b, 0x2d, 0x01, 0x00, 0x00, +} diff --git a/vendor/google.golang.org/genproto/googleapis/api/label/label.pb.go b/vendor/google.golang.org/genproto/googleapis/api/label/label.pb.go index cae68236f6..8ecced45cd 100644 --- a/vendor/google.golang.org/genproto/googleapis/api/label/label.pb.go +++ b/vendor/google.golang.org/genproto/googleapis/api/label/label.pb.go @@ -1,11 +1,14 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: google/api/label.proto -package label // import "google.golang.org/genproto/googleapis/api/label" +package label -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + math "math" + + proto "github.com/golang/protobuf/proto" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -16,7 +19,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // Value types that can be used as label values. type LabelDescriptor_ValueType int32 @@ -35,6 +38,7 @@ var LabelDescriptor_ValueType_name = map[int32]string{ 1: "BOOL", 2: "INT64", } + var LabelDescriptor_ValueType_value = map[string]int32{ "STRING": 0, "BOOL": 1, @@ -44,8 +48,9 @@ var LabelDescriptor_ValueType_value = map[string]int32{ func (x LabelDescriptor_ValueType) String() string { return proto.EnumName(LabelDescriptor_ValueType_name, int32(x)) } + func (LabelDescriptor_ValueType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_label_7ab1ab74ef036f1c, []int{0, 0} + return fileDescriptor_f372a463e25ba151, []int{0, 0} } // A description of a label. @@ -65,16 +70,17 @@ func (m *LabelDescriptor) Reset() { *m = LabelDescriptor{} } func (m *LabelDescriptor) String() string { return proto.CompactTextString(m) } func (*LabelDescriptor) ProtoMessage() {} func (*LabelDescriptor) Descriptor() ([]byte, []int) { - return fileDescriptor_label_7ab1ab74ef036f1c, []int{0} + return fileDescriptor_f372a463e25ba151, []int{0} } + func (m *LabelDescriptor) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_LabelDescriptor.Unmarshal(m, b) } func (m *LabelDescriptor) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_LabelDescriptor.Marshal(b, m, deterministic) } -func (dst *LabelDescriptor) XXX_Merge(src proto.Message) { - xxx_messageInfo_LabelDescriptor.Merge(dst, src) +func (m *LabelDescriptor) XXX_Merge(src proto.Message) { + xxx_messageInfo_LabelDescriptor.Merge(m, src) } func (m *LabelDescriptor) XXX_Size() int { return xxx_messageInfo_LabelDescriptor.Size(m) @@ -107,13 +113,13 @@ func (m *LabelDescriptor) GetDescription() string { } func init() { - proto.RegisterType((*LabelDescriptor)(nil), "google.api.LabelDescriptor") proto.RegisterEnum("google.api.LabelDescriptor_ValueType", LabelDescriptor_ValueType_name, LabelDescriptor_ValueType_value) + proto.RegisterType((*LabelDescriptor)(nil), "google.api.LabelDescriptor") } -func init() { proto.RegisterFile("google/api/label.proto", fileDescriptor_label_7ab1ab74ef036f1c) } +func init() { proto.RegisterFile("google/api/label.proto", fileDescriptor_f372a463e25ba151) } -var fileDescriptor_label_7ab1ab74ef036f1c = []byte{ +var fileDescriptor_f372a463e25ba151 = []byte{ // 252 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x4b, 0xcf, 0xcf, 0x4f, 0xcf, 0x49, 0xd5, 0x4f, 0x2c, 0xc8, 0xd4, 0xcf, 0x49, 0x4c, 0x4a, 0xcd, 0xd1, 0x2b, 0x28, 0xca, diff --git a/vendor/google.golang.org/genproto/googleapis/api/launch_stage.pb.go b/vendor/google.golang.org/genproto/googleapis/api/launch_stage.pb.go new file mode 100644 index 0000000000..208ff134bf --- /dev/null +++ b/vendor/google.golang.org/genproto/googleapis/api/launch_stage.pb.go @@ -0,0 +1,113 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// source: google/api/launch_stage.proto + +package api + +import ( + fmt "fmt" + math "math" + + proto "github.com/golang/protobuf/proto" +) + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package + +// The launch stage as defined by [Google Cloud Platform +// Launch Stages](http://cloud.google.com/terms/launch-stages). +type LaunchStage int32 + +const ( + // Do not use this default value. + LaunchStage_LAUNCH_STAGE_UNSPECIFIED LaunchStage = 0 + // Early Access features are limited to a closed group of testers. To use + // these features, you must sign up in advance and sign a Trusted Tester + // agreement (which includes confidentiality provisions). These features may + // be unstable, changed in backward-incompatible ways, and are not + // guaranteed to be released. + LaunchStage_EARLY_ACCESS LaunchStage = 1 + // Alpha is a limited availability test for releases before they are cleared + // for widespread use. By Alpha, all significant design issues are resolved + // and we are in the process of verifying functionality. Alpha customers + // need to apply for access, agree to applicable terms, and have their + // projects whitelisted. Alpha releases don’t have to be feature complete, + // no SLAs are provided, and there are no technical support obligations, but + // they will be far enough along that customers can actually use them in + // test environments or for limited-use tests -- just like they would in + // normal production cases. + LaunchStage_ALPHA LaunchStage = 2 + // Beta is the point at which we are ready to open a release for any + // customer to use. There are no SLA or technical support obligations in a + // Beta release. Products will be complete from a feature perspective, but + // may have some open outstanding issues. Beta releases are suitable for + // limited production use cases. + LaunchStage_BETA LaunchStage = 3 + // GA features are open to all developers and are considered stable and + // fully qualified for production use. + LaunchStage_GA LaunchStage = 4 + // Deprecated features are scheduled to be shut down and removed. For more + // information, see the “Deprecation Policy” section of our [Terms of + // Service](https://cloud.google.com/terms/) + // and the [Google Cloud Platform Subject to the Deprecation + // Policy](https://cloud.google.com/terms/deprecation) documentation. + LaunchStage_DEPRECATED LaunchStage = 5 +) + +var LaunchStage_name = map[int32]string{ + 0: "LAUNCH_STAGE_UNSPECIFIED", + 1: "EARLY_ACCESS", + 2: "ALPHA", + 3: "BETA", + 4: "GA", + 5: "DEPRECATED", +} + +var LaunchStage_value = map[string]int32{ + "LAUNCH_STAGE_UNSPECIFIED": 0, + "EARLY_ACCESS": 1, + "ALPHA": 2, + "BETA": 3, + "GA": 4, + "DEPRECATED": 5, +} + +func (x LaunchStage) String() string { + return proto.EnumName(LaunchStage_name, int32(x)) +} + +func (LaunchStage) EnumDescriptor() ([]byte, []int) { + return fileDescriptor_6b5f68b6c1cefff8, []int{0} +} + +func init() { + proto.RegisterEnum("google.api.LaunchStage", LaunchStage_name, LaunchStage_value) +} + +func init() { proto.RegisterFile("google/api/launch_stage.proto", fileDescriptor_6b5f68b6c1cefff8) } + +var fileDescriptor_6b5f68b6c1cefff8 = []byte{ + // 225 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x8f, 0xc1, 0x4a, 0xc3, 0x40, + 0x14, 0x45, 0x6d, 0x4c, 0x8b, 0x3e, 0xa5, 0x3c, 0x66, 0xe5, 0x42, 0x7f, 0x40, 0x30, 0x59, 0xb8, + 0x74, 0xf5, 0x32, 0x79, 0xa6, 0x81, 0x50, 0x86, 0x4e, 0xba, 0xb0, 0x9b, 0x30, 0x96, 0x30, 0x8e, + 0xc4, 0xcc, 0xd0, 0xd6, 0x1f, 0xf2, 0x4b, 0x25, 0x89, 0x60, 0xd7, 0xe7, 0xc0, 0x3d, 0x17, 0x1e, + 0xac, 0xf7, 0xb6, 0x6b, 0x53, 0x13, 0x5c, 0xda, 0x99, 0xef, 0x7e, 0xff, 0xd1, 0x1c, 0x4f, 0xc6, + 0xb6, 0x49, 0x38, 0xf8, 0x93, 0x17, 0x30, 0xe1, 0xc4, 0x04, 0xf7, 0xf8, 0x09, 0x37, 0xd5, 0x68, + 0xe8, 0x41, 0x10, 0xf7, 0x70, 0x57, 0xd1, 0x76, 0x2d, 0x57, 0x8d, 0xae, 0xa9, 0xe0, 0x66, 0xbb, + 0xd6, 0x8a, 0x65, 0xf9, 0x5a, 0x72, 0x8e, 0x17, 0x02, 0xe1, 0x96, 0x69, 0x53, 0xbd, 0x35, 0x24, + 0x25, 0x6b, 0x8d, 0x33, 0x71, 0x0d, 0x73, 0xaa, 0xd4, 0x8a, 0x30, 0x12, 0x57, 0x10, 0x67, 0x5c, + 0x13, 0x5e, 0x8a, 0x05, 0x44, 0x05, 0x61, 0x2c, 0x96, 0x00, 0x39, 0xab, 0x0d, 0x4b, 0xaa, 0x39, + 0xc7, 0x79, 0xb6, 0x83, 0xe5, 0xde, 0x7f, 0x25, 0xff, 0xeb, 0x19, 0x9e, 0x6d, 0xab, 0xa1, 0x4d, + 0xcd, 0x76, 0x4f, 0x7f, 0xdc, 0xfa, 0xce, 0xf4, 0x36, 0xf1, 0x07, 0x9b, 0xda, 0xb6, 0x1f, 0xcb, + 0xd3, 0x09, 0x99, 0xe0, 0x8e, 0xc3, 0xb7, 0x17, 0x13, 0xdc, 0x4f, 0x14, 0x17, 0xa4, 0xca, 0xf7, + 0xc5, 0x28, 0x3c, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x8e, 0xd5, 0x39, 0x1a, 0xfb, 0x00, 0x00, + 0x00, +} diff --git a/vendor/google.golang.org/genproto/googleapis/api/metric/metric.pb.go b/vendor/google.golang.org/genproto/googleapis/api/metric/metric.pb.go index f2ed888449..3fbf5a64cf 100644 --- a/vendor/google.golang.org/genproto/googleapis/api/metric/metric.pb.go +++ b/vendor/google.golang.org/genproto/googleapis/api/metric/metric.pb.go @@ -1,12 +1,17 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: google/api/metric.proto -package metric // import "google.golang.org/genproto/googleapis/api/metric" +package metric -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" -import label "google.golang.org/genproto/googleapis/api/label" +import ( + fmt "fmt" + math "math" + + proto "github.com/golang/protobuf/proto" + duration "github.com/golang/protobuf/ptypes/duration" + api "google.golang.org/genproto/googleapis/api" + label "google.golang.org/genproto/googleapis/api/label" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -17,7 +22,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // The kind of measurement. It describes how the data is reported. type MetricDescriptor_MetricKind int32 @@ -43,6 +48,7 @@ var MetricDescriptor_MetricKind_name = map[int32]string{ 2: "DELTA", 3: "CUMULATIVE", } + var MetricDescriptor_MetricKind_value = map[string]int32{ "METRIC_KIND_UNSPECIFIED": 0, "GAUGE": 1, @@ -53,8 +59,9 @@ var MetricDescriptor_MetricKind_value = map[string]int32{ func (x MetricDescriptor_MetricKind) String() string { return proto.EnumName(MetricDescriptor_MetricKind_name, int32(x)) } + func (MetricDescriptor_MetricKind) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_metric_18b95065d4b7f9c0, []int{0, 0} + return fileDescriptor_927eaac1a24f8abb, []int{0, 0} } // The value type of a metric. @@ -88,6 +95,7 @@ var MetricDescriptor_ValueType_name = map[int32]string{ 5: "DISTRIBUTION", 6: "MONEY", } + var MetricDescriptor_ValueType_value = map[string]int32{ "VALUE_TYPE_UNSPECIFIED": 0, "BOOL": 1, @@ -101,8 +109,9 @@ var MetricDescriptor_ValueType_value = map[string]int32{ func (x MetricDescriptor_ValueType) String() string { return proto.EnumName(MetricDescriptor_ValueType_name, int32(x)) } + func (MetricDescriptor_ValueType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_metric_18b95065d4b7f9c0, []int{0, 1} + return fileDescriptor_927eaac1a24f8abb, []int{0, 1} } // Defines a metric type and its schema. Once a metric descriptor is created, @@ -112,11 +121,12 @@ type MetricDescriptor struct { // The resource name of the metric descriptor. Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` // The metric type, including its DNS name prefix. The type is not - // URL-encoded. All user-defined custom metric types have the DNS name - // `custom.googleapis.com`. Metric types should use a natural hierarchical - // grouping. For example: + // URL-encoded. All user-defined metric types have the DNS name + // `custom.googleapis.com` or `external.googleapis.com`. Metric types should + // use a natural hierarchical grouping. For example: // // "custom.googleapis.com/invoice/paid/amount" + // "external.googleapis.com/prometheus/up" // "appengine.googleapis.com/http/server/response_latencies" Type string `protobuf:"bytes,8,opt,name=type,proto3" json:"type,omitempty"` // The set of labels that can be used to describe a specific @@ -204,26 +214,31 @@ type MetricDescriptor struct { // Use sentence case without an ending period, for example "Request count". // This field is optional but it is recommended to be set for any metrics // associated with user-visible concepts, such as Quota. - DisplayName string `protobuf:"bytes,7,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + DisplayName string `protobuf:"bytes,7,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"` + // Optional. Metadata which can be used to guide usage of the metric. + Metadata *MetricDescriptor_MetricDescriptorMetadata `protobuf:"bytes,10,opt,name=metadata,proto3" json:"metadata,omitempty"` + // Optional. The launch stage of the metric definition. + LaunchStage api.LaunchStage `protobuf:"varint,12,opt,name=launch_stage,json=launchStage,proto3,enum=google.api.LaunchStage" json:"launch_stage,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *MetricDescriptor) Reset() { *m = MetricDescriptor{} } func (m *MetricDescriptor) String() string { return proto.CompactTextString(m) } func (*MetricDescriptor) ProtoMessage() {} func (*MetricDescriptor) Descriptor() ([]byte, []int) { - return fileDescriptor_metric_18b95065d4b7f9c0, []int{0} + return fileDescriptor_927eaac1a24f8abb, []int{0} } + func (m *MetricDescriptor) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MetricDescriptor.Unmarshal(m, b) } func (m *MetricDescriptor) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_MetricDescriptor.Marshal(b, m, deterministic) } -func (dst *MetricDescriptor) XXX_Merge(src proto.Message) { - xxx_messageInfo_MetricDescriptor.Merge(dst, src) +func (m *MetricDescriptor) XXX_Merge(src proto.Message) { + xxx_messageInfo_MetricDescriptor.Merge(m, src) } func (m *MetricDescriptor) XXX_Size() int { return xxx_messageInfo_MetricDescriptor.Size(m) @@ -290,6 +305,88 @@ func (m *MetricDescriptor) GetDisplayName() string { return "" } +func (m *MetricDescriptor) GetMetadata() *MetricDescriptor_MetricDescriptorMetadata { + if m != nil { + return m.Metadata + } + return nil +} + +func (m *MetricDescriptor) GetLaunchStage() api.LaunchStage { + if m != nil { + return m.LaunchStage + } + return api.LaunchStage_LAUNCH_STAGE_UNSPECIFIED +} + +// Additional annotations that can be used to guide the usage of a metric. +type MetricDescriptor_MetricDescriptorMetadata struct { + // Deprecated. Please use the MetricDescriptor.launch_stage instead. + // The launch stage of the metric definition. + LaunchStage api.LaunchStage `protobuf:"varint,1,opt,name=launch_stage,json=launchStage,proto3,enum=google.api.LaunchStage" json:"launch_stage,omitempty"` // Deprecated: Do not use. + // The sampling period of metric data points. For metrics which are written + // periodically, consecutive data points are stored at this time interval, + // excluding data loss due to errors. Metrics with a higher granularity have + // a smaller sampling period. + SamplePeriod *duration.Duration `protobuf:"bytes,2,opt,name=sample_period,json=samplePeriod,proto3" json:"sample_period,omitempty"` + // The delay of data points caused by ingestion. Data points older than this + // age are guaranteed to be ingested and available to be read, excluding + // data loss due to errors. + IngestDelay *duration.Duration `protobuf:"bytes,3,opt,name=ingest_delay,json=ingestDelay,proto3" json:"ingest_delay,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *MetricDescriptor_MetricDescriptorMetadata) Reset() { + *m = MetricDescriptor_MetricDescriptorMetadata{} +} +func (m *MetricDescriptor_MetricDescriptorMetadata) String() string { return proto.CompactTextString(m) } +func (*MetricDescriptor_MetricDescriptorMetadata) ProtoMessage() {} +func (*MetricDescriptor_MetricDescriptorMetadata) Descriptor() ([]byte, []int) { + return fileDescriptor_927eaac1a24f8abb, []int{0, 0} +} + +func (m *MetricDescriptor_MetricDescriptorMetadata) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_MetricDescriptor_MetricDescriptorMetadata.Unmarshal(m, b) +} +func (m *MetricDescriptor_MetricDescriptorMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_MetricDescriptor_MetricDescriptorMetadata.Marshal(b, m, deterministic) +} +func (m *MetricDescriptor_MetricDescriptorMetadata) XXX_Merge(src proto.Message) { + xxx_messageInfo_MetricDescriptor_MetricDescriptorMetadata.Merge(m, src) +} +func (m *MetricDescriptor_MetricDescriptorMetadata) XXX_Size() int { + return xxx_messageInfo_MetricDescriptor_MetricDescriptorMetadata.Size(m) +} +func (m *MetricDescriptor_MetricDescriptorMetadata) XXX_DiscardUnknown() { + xxx_messageInfo_MetricDescriptor_MetricDescriptorMetadata.DiscardUnknown(m) +} + +var xxx_messageInfo_MetricDescriptor_MetricDescriptorMetadata proto.InternalMessageInfo + +// Deprecated: Do not use. +func (m *MetricDescriptor_MetricDescriptorMetadata) GetLaunchStage() api.LaunchStage { + if m != nil { + return m.LaunchStage + } + return api.LaunchStage_LAUNCH_STAGE_UNSPECIFIED +} + +func (m *MetricDescriptor_MetricDescriptorMetadata) GetSamplePeriod() *duration.Duration { + if m != nil { + return m.SamplePeriod + } + return nil +} + +func (m *MetricDescriptor_MetricDescriptorMetadata) GetIngestDelay() *duration.Duration { + if m != nil { + return m.IngestDelay + } + return nil +} + // A specific metric, identified by specifying values for all of the // labels of a [`MetricDescriptor`][google.api.MetricDescriptor]. type Metric struct { @@ -308,16 +405,17 @@ func (m *Metric) Reset() { *m = Metric{} } func (m *Metric) String() string { return proto.CompactTextString(m) } func (*Metric) ProtoMessage() {} func (*Metric) Descriptor() ([]byte, []int) { - return fileDescriptor_metric_18b95065d4b7f9c0, []int{1} + return fileDescriptor_927eaac1a24f8abb, []int{1} } + func (m *Metric) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Metric.Unmarshal(m, b) } func (m *Metric) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Metric.Marshal(b, m, deterministic) } -func (dst *Metric) XXX_Merge(src proto.Message) { - xxx_messageInfo_Metric.Merge(dst, src) +func (m *Metric) XXX_Merge(src proto.Message) { + xxx_messageInfo_Metric.Merge(m, src) } func (m *Metric) XXX_Size() int { return xxx_messageInfo_Metric.Size(m) @@ -343,47 +441,58 @@ func (m *Metric) GetLabels() map[string]string { } func init() { + proto.RegisterEnum("google.api.MetricDescriptor_MetricKind", MetricDescriptor_MetricKind_name, MetricDescriptor_MetricKind_value) + proto.RegisterEnum("google.api.MetricDescriptor_ValueType", MetricDescriptor_ValueType_name, MetricDescriptor_ValueType_value) proto.RegisterType((*MetricDescriptor)(nil), "google.api.MetricDescriptor") + proto.RegisterType((*MetricDescriptor_MetricDescriptorMetadata)(nil), "google.api.MetricDescriptor.MetricDescriptorMetadata") proto.RegisterType((*Metric)(nil), "google.api.Metric") proto.RegisterMapType((map[string]string)(nil), "google.api.Metric.LabelsEntry") - proto.RegisterEnum("google.api.MetricDescriptor_MetricKind", MetricDescriptor_MetricKind_name, MetricDescriptor_MetricKind_value) - proto.RegisterEnum("google.api.MetricDescriptor_ValueType", MetricDescriptor_ValueType_name, MetricDescriptor_ValueType_value) } -func init() { proto.RegisterFile("google/api/metric.proto", fileDescriptor_metric_18b95065d4b7f9c0) } - -var fileDescriptor_metric_18b95065d4b7f9c0 = []byte{ - // 506 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x53, 0x4d, 0x6f, 0xda, 0x40, - 0x10, 0xad, 0x3f, 0x70, 0xc3, 0x10, 0xa1, 0xd5, 0xaa, 0x4a, 0x2c, 0x22, 0x55, 0x94, 0x43, 0xcb, - 0x09, 0xa4, 0xa4, 0x4a, 0xbf, 0x4e, 0x80, 0xb7, 0xd4, 0x8a, 0xb1, 0x91, 0x63, 0x23, 0xa5, 0x17, - 0xcb, 0x81, 0x95, 0x65, 0xc5, 0xd8, 0xae, 0x71, 0x22, 0xf9, 0x57, 0xf4, 0x17, 0xf4, 0xd2, 0x5f, - 0x5a, 0xed, 0xae, 0x03, 0x16, 0x95, 0x72, 0xe2, 0xed, 0x9b, 0x37, 0x6f, 0x67, 0x96, 0x67, 0x38, - 0x8f, 0xb2, 0x2c, 0x4a, 0xe8, 0x38, 0xcc, 0xe3, 0xf1, 0x96, 0x96, 0x45, 0xbc, 0x1e, 0xe5, 0x45, - 0x56, 0x66, 0x18, 0x44, 0x61, 0x14, 0xe6, 0x71, 0xef, 0xac, 0x21, 0x4a, 0xc2, 0x7b, 0x9a, 0x08, - 0xcd, 0xe0, 0x8f, 0x0a, 0x68, 0xc1, 0x9b, 0x0c, 0xba, 0x5b, 0x17, 0x71, 0x5e, 0x66, 0x05, 0xc6, - 0xa0, 0xa6, 0xe1, 0x96, 0xea, 0x52, 0x5f, 0x1a, 0xb6, 0x5d, 0x8e, 0x19, 0x57, 0x56, 0x39, 0xd5, - 0x4f, 0x04, 0xc7, 0x30, 0xbe, 0x02, 0x8d, 0x7b, 0xed, 0x74, 0xb9, 0xaf, 0x0c, 0x3b, 0x97, 0x17, - 0xa3, 0xc3, 0x8d, 0x23, 0x8b, 0x55, 0x0e, 0xa6, 0x6e, 0x2d, 0xc5, 0x3f, 0xa0, 0x23, 0xa6, 0x0c, - 0x1e, 0xe2, 0x74, 0xa3, 0x2b, 0x7d, 0x69, 0xd8, 0xbd, 0xfc, 0xd0, 0xec, 0x3c, 0x9e, 0xa7, 0x26, - 0x6e, 0xe2, 0x74, 0xe3, 0xc2, 0x76, 0x8f, 0x31, 0x01, 0x78, 0x0a, 0x93, 0x47, 0x1a, 0xf0, 0xc1, - 0x54, 0x6e, 0xf4, 0xfe, 0x45, 0xa3, 0x15, 0x93, 0x7b, 0x55, 0x4e, 0xdd, 0xf6, 0xd3, 0x33, 0x64, - 0x9b, 0x3d, 0xa6, 0x71, 0xa9, 0xb7, 0xc4, 0x66, 0x0c, 0xe3, 0x3e, 0x74, 0x36, 0x75, 0x5b, 0x9c, - 0xa5, 0xba, 0xc6, 0x4b, 0x4d, 0x0a, 0xbf, 0x83, 0xd3, 0x4d, 0xbc, 0xcb, 0x93, 0xb0, 0x0a, 0xf8, - 0x5b, 0xbd, 0xae, 0x25, 0x82, 0xb3, 0xc3, 0x2d, 0x1d, 0x38, 0x00, 0x87, 0xc9, 0xf1, 0x05, 0x9c, - 0x2f, 0x88, 0xe7, 0x9a, 0xb3, 0xe0, 0xc6, 0xb4, 0x8d, 0xc0, 0xb7, 0x6f, 0x97, 0x64, 0x66, 0x7e, - 0x37, 0x89, 0x81, 0x5e, 0xe1, 0x36, 0xb4, 0xe6, 0x13, 0x7f, 0x4e, 0x90, 0xc4, 0xa0, 0x41, 0x2c, - 0x6f, 0x82, 0x64, 0xdc, 0x05, 0x98, 0xf9, 0x0b, 0xdf, 0x9a, 0x78, 0xe6, 0x8a, 0x20, 0x65, 0xf0, - 0x0b, 0xda, 0xfb, 0x0d, 0x70, 0x0f, 0xce, 0x56, 0x13, 0xcb, 0x27, 0x81, 0x77, 0xb7, 0x24, 0x47, - 0x76, 0x27, 0xa0, 0x4e, 0x1d, 0xc7, 0x12, 0x6e, 0xa6, 0xed, 0x5d, 0x7f, 0x44, 0x32, 0x06, 0xd0, - 0x0c, 0xc7, 0x9f, 0x5a, 0x04, 0x29, 0x0c, 0xdf, 0x7a, 0xae, 0x69, 0xcf, 0x91, 0x8a, 0x11, 0x9c, - 0x1a, 0x26, 0x3b, 0x4d, 0x7d, 0xcf, 0x74, 0x6c, 0xd4, 0x62, 0x4d, 0x0b, 0xc7, 0x26, 0x77, 0x48, - 0x1b, 0xfc, 0x96, 0x40, 0x13, 0x4b, 0xec, 0x13, 0xa0, 0x34, 0x12, 0x70, 0x7d, 0x94, 0x80, 0xb7, - 0xff, 0x3f, 0xbf, 0x08, 0xc2, 0x8e, 0xa4, 0x65, 0x51, 0x3d, 0x87, 0xa0, 0xf7, 0x05, 0x3a, 0x0d, - 0x1a, 0x23, 0x50, 0x1e, 0x68, 0x55, 0xe7, 0x8d, 0x41, 0xfc, 0x06, 0x5a, 0xfc, 0x1f, 0xd2, 0x65, - 0xce, 0x89, 0xc3, 0x57, 0xf9, 0xb3, 0x34, 0x0d, 0xa0, 0xbb, 0xce, 0xb6, 0x8d, 0x7b, 0xa6, 0x1d, - 0x71, 0xd1, 0x92, 0x05, 0x7a, 0x29, 0xfd, 0xfc, 0x54, 0x97, 0xa2, 0x2c, 0x09, 0xd3, 0x68, 0x94, - 0x15, 0xd1, 0x38, 0xa2, 0x29, 0x8f, 0xfb, 0x58, 0x94, 0xc2, 0x3c, 0xde, 0x35, 0x3e, 0x97, 0x6f, - 0xe2, 0xe7, 0xaf, 0xac, 0xce, 0x27, 0x4b, 0xf3, 0x5e, 0xe3, 0xd2, 0xab, 0x7f, 0x01, 0x00, 0x00, - 0xff, 0xff, 0x18, 0x04, 0x05, 0x82, 0x58, 0x03, 0x00, 0x00, +func init() { proto.RegisterFile("google/api/metric.proto", fileDescriptor_927eaac1a24f8abb) } + +var fileDescriptor_927eaac1a24f8abb = []byte{ + // 661 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0xdd, 0x6e, 0xd3, 0x30, + 0x14, 0x26, 0xe9, 0xcf, 0xd6, 0x93, 0x32, 0x45, 0x16, 0xda, 0x42, 0x27, 0xa6, 0xd2, 0x0b, 0xe8, + 0x55, 0x2b, 0x6d, 0x30, 0x60, 0xa0, 0x49, 0xed, 0x12, 0x4a, 0xb4, 0x36, 0x2d, 0x59, 0x32, 0x69, + 0xdc, 0x44, 0x5e, 0x63, 0x42, 0xb4, 0x34, 0x09, 0x49, 0x3a, 0xa9, 0x4f, 0xc0, 0x25, 0xef, 0xc0, + 0x53, 0xf1, 0x38, 0xc8, 0x76, 0xda, 0x66, 0x45, 0x54, 0x5c, 0xe5, 0xf8, 0xfb, 0xbe, 0xf3, 0xd9, + 0xc7, 0x3e, 0x27, 0x70, 0xe0, 0x45, 0x91, 0x17, 0x90, 0x2e, 0x8e, 0xfd, 0xee, 0x8c, 0x64, 0x89, + 0x3f, 0xed, 0xc4, 0x49, 0x94, 0x45, 0x08, 0x38, 0xd1, 0xc1, 0xb1, 0xdf, 0xd8, 0x2f, 0x88, 0x02, + 0x7c, 0x4b, 0x02, 0xae, 0x69, 0x3c, 0x7b, 0x80, 0xcf, 0xc3, 0xe9, 0x37, 0x27, 0xcd, 0xb0, 0x47, + 0x72, 0xfa, 0x28, 0xa7, 0xd9, 0xea, 0x76, 0xfe, 0xb5, 0xeb, 0xce, 0x13, 0x9c, 0xf9, 0x51, 0xc8, + 0xf9, 0xd6, 0x8f, 0x1d, 0x90, 0x47, 0x6c, 0x4f, 0x95, 0xa4, 0xd3, 0xc4, 0x8f, 0xb3, 0x28, 0x41, + 0x08, 0xca, 0x21, 0x9e, 0x11, 0x45, 0x68, 0x0a, 0xed, 0x9a, 0xc9, 0x62, 0x8a, 0x65, 0x8b, 0x98, + 0x28, 0xbb, 0x1c, 0xa3, 0x31, 0x3a, 0x81, 0x2a, 0x3b, 0x4a, 0xaa, 0x88, 0xcd, 0x52, 0x5b, 0x3a, + 0x3e, 0xec, 0xac, 0x0f, 0xdc, 0x19, 0x52, 0x66, 0x6d, 0x6a, 0xe6, 0x52, 0xf4, 0x09, 0x24, 0x5e, + 0xa4, 0x73, 0xe7, 0x87, 0xae, 0x52, 0x6a, 0x0a, 0xed, 0xbd, 0xe3, 0x97, 0xc5, 0xcc, 0xcd, 0xf3, + 0xe4, 0xc0, 0xa5, 0x1f, 0xba, 0x26, 0xcc, 0x56, 0x31, 0xd2, 0x00, 0xee, 0x71, 0x30, 0x27, 0x0e, + 0x3b, 0x58, 0x99, 0x19, 0xbd, 0xd8, 0x6a, 0x74, 0x4d, 0xe5, 0xd6, 0x22, 0x26, 0x66, 0xed, 0x7e, + 0x19, 0xd2, 0xca, 0xe6, 0xa1, 0x9f, 0x29, 0x15, 0x5e, 0x19, 0x8d, 0x51, 0x13, 0x24, 0x37, 0x4f, + 0xf3, 0xa3, 0x50, 0xa9, 0x32, 0xaa, 0x08, 0xa1, 0xe7, 0x50, 0x77, 0xfd, 0x34, 0x0e, 0xf0, 0xc2, + 0x61, 0x77, 0xb5, 0x93, 0x4b, 0x38, 0x66, 0xd0, 0x2b, 0xfb, 0x0c, 0xbb, 0x33, 0x92, 0x61, 0x17, + 0x67, 0x58, 0x81, 0xa6, 0xd0, 0x96, 0x8e, 0x5f, 0xff, 0x47, 0x99, 0x6b, 0x60, 0x94, 0x27, 0x9b, + 0x2b, 0x1b, 0x74, 0x06, 0xf5, 0xe2, 0x23, 0x2b, 0x75, 0x56, 0xf4, 0xc1, 0xc3, 0x7b, 0xa7, 0xfc, + 0x15, 0xa5, 0x4d, 0x29, 0x58, 0x2f, 0x1a, 0xbf, 0x05, 0x50, 0xfe, 0xb5, 0x05, 0x3a, 0xdf, 0x30, + 0x16, 0xb6, 0x1a, 0xf7, 0x45, 0x45, 0x78, 0x60, 0x8e, 0xce, 0xe1, 0x71, 0x8a, 0x67, 0x71, 0x40, + 0x9c, 0x98, 0x24, 0x7e, 0xe4, 0x2a, 0x22, 0x2b, 0xf8, 0xe9, 0xd2, 0x60, 0xd9, 0x7f, 0x1d, 0x35, + 0xef, 0x3f, 0xb3, 0xce, 0xf5, 0x13, 0x26, 0x47, 0x1f, 0xa0, 0xee, 0x87, 0x1e, 0x49, 0x33, 0xc7, + 0x25, 0x01, 0x5e, 0xb0, 0xb6, 0xd8, 0x9a, 0x2e, 0x71, 0xb9, 0x4a, 0xd5, 0xad, 0x31, 0xc0, 0xba, + 0x47, 0xd0, 0x21, 0x1c, 0x8c, 0x34, 0xcb, 0xd4, 0x2f, 0x9c, 0x4b, 0xdd, 0x50, 0x1d, 0xdb, 0xb8, + 0x9a, 0x68, 0x17, 0xfa, 0x47, 0x5d, 0x53, 0xe5, 0x47, 0xa8, 0x06, 0x95, 0x41, 0xcf, 0x1e, 0x68, + 0xb2, 0x40, 0x43, 0x55, 0x1b, 0x5a, 0x3d, 0x59, 0x44, 0x7b, 0x00, 0x17, 0xf6, 0xc8, 0x1e, 0xf6, + 0x2c, 0xfd, 0x5a, 0x93, 0x4b, 0xad, 0xef, 0x50, 0x5b, 0xf5, 0x0a, 0x6a, 0xc0, 0xfe, 0x75, 0x6f, + 0x68, 0x6b, 0x8e, 0x75, 0x33, 0xd1, 0x36, 0xec, 0x76, 0xa1, 0xdc, 0x1f, 0x8f, 0x87, 0xdc, 0x4d, + 0x37, 0xac, 0xd3, 0x57, 0xb2, 0x88, 0x00, 0xaa, 0xea, 0xd8, 0xee, 0x0f, 0x35, 0xb9, 0x44, 0xe3, + 0x2b, 0xcb, 0xd4, 0x8d, 0x81, 0x5c, 0x46, 0x32, 0xd4, 0x55, 0x9d, 0xae, 0xfa, 0xb6, 0xa5, 0x8f, + 0x0d, 0xb9, 0x42, 0x93, 0x46, 0x63, 0x43, 0xbb, 0x91, 0xab, 0xad, 0x9f, 0x02, 0x54, 0x79, 0x11, + 0xab, 0x59, 0x2b, 0x15, 0x66, 0xed, 0x74, 0x63, 0xd6, 0x8e, 0xfe, 0x6e, 0x25, 0x3e, 0x72, 0xa9, + 0x16, 0x66, 0xc9, 0x62, 0x39, 0x6e, 0x8d, 0x77, 0x20, 0x15, 0x60, 0x24, 0x43, 0xe9, 0x8e, 0x2c, + 0xf2, 0xc9, 0xa6, 0x21, 0x7a, 0x02, 0x15, 0x36, 0x0b, 0xec, 0xc5, 0x6a, 0x26, 0x5f, 0x9c, 0x89, + 0x6f, 0x85, 0xbe, 0x03, 0x7b, 0xd3, 0x68, 0x56, 0xd8, 0xa7, 0x2f, 0xf1, 0x8d, 0x26, 0xf4, 0x35, + 0x26, 0xc2, 0x97, 0x37, 0x39, 0xe5, 0x45, 0x01, 0x0e, 0xbd, 0x4e, 0x94, 0x78, 0x5d, 0x8f, 0x84, + 0xec, 0xad, 0xba, 0x9c, 0xc2, 0xb1, 0x9f, 0x16, 0xfe, 0x6b, 0xef, 0xf9, 0xe7, 0x97, 0x58, 0x1e, + 0xf4, 0x26, 0xfa, 0x6d, 0x95, 0x49, 0x4f, 0xfe, 0x04, 0x00, 0x00, 0xff, 0xff, 0x7b, 0x9a, 0x6a, + 0xfb, 0x01, 0x05, 0x00, 0x00, } diff --git a/vendor/google.golang.org/genproto/googleapis/api/monitoredres/monitored_resource.pb.go b/vendor/google.golang.org/genproto/googleapis/api/monitoredres/monitored_resource.pb.go index 653c7ae4a8..d2ffbd4e0a 100644 --- a/vendor/google.golang.org/genproto/googleapis/api/monitoredres/monitored_resource.pb.go +++ b/vendor/google.golang.org/genproto/googleapis/api/monitoredres/monitored_resource.pb.go @@ -1,13 +1,17 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: google/api/monitored_resource.proto -package monitoredres // import "google.golang.org/genproto/googleapis/api/monitoredres" +package monitoredres -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" -import _struct "github.com/golang/protobuf/ptypes/struct" -import label "google.golang.org/genproto/googleapis/api/label" +import ( + fmt "fmt" + math "math" + + proto "github.com/golang/protobuf/proto" + _struct "github.com/golang/protobuf/ptypes/struct" + api "google.golang.org/genproto/googleapis/api" + label "google.golang.org/genproto/googleapis/api/label" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -18,7 +22,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // An object that describes the schema of a [MonitoredResource][google.api.MonitoredResource] object using a // type name and a set of labels. For example, the monitored resource @@ -52,26 +56,29 @@ type MonitoredResourceDescriptor struct { // Required. A set of labels used to describe instances of this monitored // resource type. For example, an individual Google Cloud SQL database is // identified by values for the labels `"database_id"` and `"zone"`. - Labels []*label.LabelDescriptor `protobuf:"bytes,4,rep,name=labels,proto3" json:"labels,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Labels []*label.LabelDescriptor `protobuf:"bytes,4,rep,name=labels,proto3" json:"labels,omitempty"` + // Optional. The launch stage of the monitored resource definition. + LaunchStage api.LaunchStage `protobuf:"varint,7,opt,name=launch_stage,json=launchStage,proto3,enum=google.api.LaunchStage" json:"launch_stage,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *MonitoredResourceDescriptor) Reset() { *m = MonitoredResourceDescriptor{} } func (m *MonitoredResourceDescriptor) String() string { return proto.CompactTextString(m) } func (*MonitoredResourceDescriptor) ProtoMessage() {} func (*MonitoredResourceDescriptor) Descriptor() ([]byte, []int) { - return fileDescriptor_monitored_resource_35ee91132be0d9ce, []int{0} + return fileDescriptor_6cd8bd738b08f2bf, []int{0} } + func (m *MonitoredResourceDescriptor) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MonitoredResourceDescriptor.Unmarshal(m, b) } func (m *MonitoredResourceDescriptor) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_MonitoredResourceDescriptor.Marshal(b, m, deterministic) } -func (dst *MonitoredResourceDescriptor) XXX_Merge(src proto.Message) { - xxx_messageInfo_MonitoredResourceDescriptor.Merge(dst, src) +func (m *MonitoredResourceDescriptor) XXX_Merge(src proto.Message) { + xxx_messageInfo_MonitoredResourceDescriptor.Merge(m, src) } func (m *MonitoredResourceDescriptor) XXX_Size() int { return xxx_messageInfo_MonitoredResourceDescriptor.Size(m) @@ -117,6 +124,13 @@ func (m *MonitoredResourceDescriptor) GetLabels() []*label.LabelDescriptor { return nil } +func (m *MonitoredResourceDescriptor) GetLaunchStage() api.LaunchStage { + if m != nil { + return m.LaunchStage + } + return api.LaunchStage_LAUNCH_STAGE_UNSPECIFIED +} + // An object representing a resource that can be used for monitoring, logging, // billing, or other purposes. Examples include virtual machine instances, // databases, and storage devices such as disks. The `type` field identifies a @@ -148,16 +162,17 @@ func (m *MonitoredResource) Reset() { *m = MonitoredResource{} } func (m *MonitoredResource) String() string { return proto.CompactTextString(m) } func (*MonitoredResource) ProtoMessage() {} func (*MonitoredResource) Descriptor() ([]byte, []int) { - return fileDescriptor_monitored_resource_35ee91132be0d9ce, []int{1} + return fileDescriptor_6cd8bd738b08f2bf, []int{1} } + func (m *MonitoredResource) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MonitoredResource.Unmarshal(m, b) } func (m *MonitoredResource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_MonitoredResource.Marshal(b, m, deterministic) } -func (dst *MonitoredResource) XXX_Merge(src proto.Message) { - xxx_messageInfo_MonitoredResource.Merge(dst, src) +func (m *MonitoredResource) XXX_Merge(src proto.Message) { + xxx_messageInfo_MonitoredResource.Merge(m, src) } func (m *MonitoredResource) XXX_Size() int { return xxx_messageInfo_MonitoredResource.Size(m) @@ -185,14 +200,13 @@ func (m *MonitoredResource) GetLabels() map[string]string { // Auxiliary metadata for a [MonitoredResource][google.api.MonitoredResource] object. // [MonitoredResource][google.api.MonitoredResource] objects contain the minimum set of information to // uniquely identify a monitored resource instance. There is some other useful -// auxiliary metadata. Google Stackdriver Monitoring & Logging uses an ingestion -// pipeline to extract metadata for cloud resources of all types , and stores +// auxiliary metadata. Monitoring and Logging use an ingestion +// pipeline to extract metadata for cloud resources of all types, and store // the metadata in this message. type MonitoredResourceMetadata struct { // Output only. Values for predefined system metadata labels. - // System labels are a kind of metadata extracted by Google Stackdriver. - // Stackdriver determines what system labels are useful and how to obtain - // their values. Some examples: "machine_image", "vpc", "subnet_id", + // System labels are a kind of metadata extracted by Google, including + // "machine_image", "vpc", "subnet_id", // "security_group", "name", etc. // System label values can be only strings, Boolean values, or a list of // strings. For example: @@ -212,16 +226,17 @@ func (m *MonitoredResourceMetadata) Reset() { *m = MonitoredResourceMeta func (m *MonitoredResourceMetadata) String() string { return proto.CompactTextString(m) } func (*MonitoredResourceMetadata) ProtoMessage() {} func (*MonitoredResourceMetadata) Descriptor() ([]byte, []int) { - return fileDescriptor_monitored_resource_35ee91132be0d9ce, []int{2} + return fileDescriptor_6cd8bd738b08f2bf, []int{2} } + func (m *MonitoredResourceMetadata) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MonitoredResourceMetadata.Unmarshal(m, b) } func (m *MonitoredResourceMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_MonitoredResourceMetadata.Marshal(b, m, deterministic) } -func (dst *MonitoredResourceMetadata) XXX_Merge(src proto.Message) { - xxx_messageInfo_MonitoredResourceMetadata.Merge(dst, src) +func (m *MonitoredResourceMetadata) XXX_Merge(src proto.Message) { + xxx_messageInfo_MonitoredResourceMetadata.Merge(m, src) } func (m *MonitoredResourceMetadata) XXX_Size() int { return xxx_messageInfo_MonitoredResourceMetadata.Size(m) @@ -255,35 +270,37 @@ func init() { } func init() { - proto.RegisterFile("google/api/monitored_resource.proto", fileDescriptor_monitored_resource_35ee91132be0d9ce) + proto.RegisterFile("google/api/monitored_resource.proto", fileDescriptor_6cd8bd738b08f2bf) } -var fileDescriptor_monitored_resource_35ee91132be0d9ce = []byte{ - // 415 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0x4d, 0xab, 0xd3, 0x40, - 0x14, 0x65, 0xd2, 0x0f, 0xf0, 0xa6, 0x7e, 0x0d, 0x52, 0x63, 0xea, 0xa2, 0xd6, 0x4d, 0xdd, 0x24, - 0xd0, 0x22, 0xf8, 0xb9, 0x68, 0x55, 0x44, 0xb0, 0x52, 0x22, 0xba, 0x70, 0x13, 0xa6, 0xc9, 0x18, - 0x82, 0x49, 0x26, 0xcc, 0x4c, 0x84, 0xfc, 0x1d, 0xc1, 0xdf, 0xe1, 0x5f, 0x72, 0xe9, 0x52, 0x32, - 0x33, 0x69, 0xd3, 0x97, 0xc7, 0x83, 0xb7, 0xbb, 0xf7, 0xdc, 0x73, 0xcf, 0x3d, 0x27, 0x43, 0xe0, - 0x71, 0xc2, 0x58, 0x92, 0x51, 0x9f, 0x94, 0xa9, 0x9f, 0xb3, 0x22, 0x95, 0x8c, 0xd3, 0x38, 0xe4, - 0x54, 0xb0, 0x8a, 0x47, 0xd4, 0x2b, 0x39, 0x93, 0x0c, 0x83, 0x26, 0x79, 0xa4, 0x4c, 0xdd, 0x69, - 0x67, 0x21, 0x23, 0x07, 0x9a, 0x69, 0x8e, 0xfb, 0xd0, 0xe0, 0xaa, 0x3b, 0x54, 0xdf, 0x7d, 0x21, - 0x79, 0x15, 0x49, 0x3d, 0x5d, 0xfc, 0x41, 0x30, 0xdb, 0xb5, 0xf2, 0x81, 0x51, 0x7f, 0x4b, 0x45, - 0xc4, 0xd3, 0x52, 0x32, 0x8e, 0x31, 0x0c, 0x0b, 0x92, 0x53, 0x67, 0x34, 0x47, 0xcb, 0x1b, 0x81, - 0xaa, 0x1b, 0x4c, 0xd6, 0x25, 0x75, 0x90, 0xc6, 0x9a, 0x1a, 0x3f, 0x82, 0x49, 0x9c, 0x8a, 0x32, - 0x23, 0x75, 0xa8, 0xf8, 0x96, 0x9a, 0xd9, 0x06, 0xfb, 0xd4, 0xac, 0xcd, 0xc1, 0x8e, 0x8d, 0x70, - 0xca, 0x0a, 0x67, 0x60, 0x18, 0x27, 0x08, 0xaf, 0x61, 0xac, 0x9c, 0x0b, 0x67, 0x38, 0x1f, 0x2c, - 0xed, 0xd5, 0xcc, 0x3b, 0xe5, 0xf3, 0x3e, 0x36, 0x93, 0x93, 0xb3, 0xc0, 0x50, 0x17, 0xbf, 0x11, - 0xdc, 0xed, 0x25, 0xb8, 0xd4, 0xe3, 0xe6, 0x28, 0x6f, 0x29, 0xf9, 0x27, 0x5d, 0xf9, 0x9e, 0x84, - 0x3e, 0x28, 0xde, 0x15, 0x92, 0xd7, 0xed, 0x31, 0xf7, 0x39, 0xd8, 0x1d, 0x18, 0xdf, 0x81, 0xc1, - 0x0f, 0x5a, 0x9b, 0x23, 0x4d, 0x89, 0xef, 0xc1, 0xe8, 0x27, 0xc9, 0xaa, 0xf6, 0x03, 0xe8, 0xe6, - 0x85, 0xf5, 0x0c, 0x2d, 0xfe, 0x22, 0x78, 0xd0, 0x3b, 0xb2, 0xa3, 0x92, 0xc4, 0x44, 0x12, 0xfc, - 0x0a, 0x6e, 0x8a, 0x5a, 0x48, 0x9a, 0x87, 0xc6, 0x62, 0xa3, 0x69, 0xaf, 0xee, 0xb7, 0x16, 0xdb, - 0xd7, 0xf3, 0x3e, 0xab, 0xd7, 0x0b, 0x26, 0x9a, 0xad, 0xcd, 0xe0, 0xaf, 0x60, 0x57, 0x82, 0xf2, - 0xf0, 0x2c, 0xde, 0xd3, 0x2b, 0xe3, 0xb5, 0x97, 0xbd, 0x2f, 0x82, 0xf2, 0x6e, 0x54, 0xa8, 0x8e, - 0x80, 0xfb, 0x1a, 0x6e, 0x5f, 0x18, 0x5f, 0x27, 0xf2, 0xb6, 0x86, 0x5b, 0x11, 0xcb, 0x3b, 0x36, - 0xb6, 0xd3, 0x9e, 0x8f, 0x7d, 0x13, 0x6c, 0x8f, 0xbe, 0xbd, 0x31, 0xac, 0x84, 0x65, 0xa4, 0x48, - 0x3c, 0xc6, 0x13, 0x3f, 0xa1, 0x85, 0x8a, 0xed, 0xeb, 0x11, 0x29, 0x53, 0x71, 0xfe, 0x3b, 0x70, - 0x2a, 0x5e, 0x76, 0x9b, 0x7f, 0x08, 0xfd, 0xb2, 0x86, 0xef, 0x37, 0xfb, 0x0f, 0x87, 0xb1, 0xda, - 0x5c, 0xff, 0x0f, 0x00, 0x00, 0xff, 0xff, 0x10, 0x16, 0x7c, 0xe9, 0x47, 0x03, 0x00, 0x00, +var fileDescriptor_6cd8bd738b08f2bf = []byte{ + // 448 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0x4d, 0x8b, 0xd4, 0x40, + 0x10, 0xa5, 0x67, 0x66, 0x57, 0xac, 0x8c, 0xab, 0x36, 0xb2, 0xc6, 0xac, 0x42, 0x1c, 0x2f, 0xe3, + 0x25, 0x81, 0x5d, 0x04, 0x5d, 0xf5, 0xb0, 0xab, 0x22, 0x82, 0x2b, 0x43, 0x16, 0x3d, 0x78, 0x09, + 0x3d, 0x49, 0x1b, 0x83, 0x49, 0x3a, 0x74, 0x77, 0x84, 0xfc, 0x1d, 0xc1, 0xff, 0xe7, 0x51, 0xf0, + 0x22, 0xfd, 0x91, 0x49, 0x62, 0x44, 0xf0, 0x56, 0xf5, 0xde, 0xab, 0xaa, 0xf7, 0xd2, 0x04, 0x1e, + 0x64, 0x8c, 0x65, 0x05, 0x0d, 0x49, 0x9d, 0x87, 0x25, 0xab, 0x72, 0xc9, 0x38, 0x4d, 0x63, 0x4e, + 0x05, 0x6b, 0x78, 0x42, 0x83, 0x9a, 0x33, 0xc9, 0x30, 0x18, 0x51, 0x40, 0xea, 0xdc, 0x3b, 0x1c, + 0x0c, 0x14, 0x64, 0x4b, 0x0b, 0xa3, 0xf1, 0xee, 0x8d, 0xf0, 0xa6, 0x4a, 0x3e, 0xc7, 0x42, 0x92, + 0xcc, 0xae, 0xf0, 0xee, 0x5a, 0x5a, 0x77, 0xdb, 0xe6, 0x53, 0x28, 0x24, 0x6f, 0x12, 0x69, 0xd8, + 0xd5, 0x2f, 0x04, 0x47, 0x17, 0xdd, 0xf5, 0xc8, 0x1e, 0x7f, 0x49, 0x45, 0xc2, 0xf3, 0x5a, 0x32, + 0x8e, 0x31, 0x2c, 0x2a, 0x52, 0x52, 0x77, 0xcf, 0x47, 0xeb, 0xab, 0x91, 0xae, 0x15, 0x26, 0xdb, + 0x9a, 0xba, 0xc8, 0x60, 0xaa, 0xc6, 0xf7, 0x61, 0x99, 0xe6, 0xa2, 0x2e, 0x48, 0x1b, 0x6b, 0xfd, + 0x4c, 0x73, 0x8e, 0xc5, 0xde, 0xa9, 0x31, 0x1f, 0x9c, 0xd4, 0x2e, 0xce, 0x59, 0xe5, 0xce, 0xad, + 0xa2, 0x87, 0xf0, 0x09, 0xec, 0xeb, 0x60, 0xc2, 0x5d, 0xf8, 0xf3, 0xb5, 0x73, 0x7c, 0x14, 0xf4, + 0xf1, 0x83, 0xb7, 0x8a, 0xe9, 0x9d, 0x45, 0x56, 0x8a, 0x4f, 0x61, 0x39, 0x4c, 0xed, 0x5e, 0xf1, + 0xd1, 0xfa, 0xe0, 0xf8, 0xf6, 0x78, 0x54, 0xf1, 0x97, 0x8a, 0x8e, 0x9c, 0xa2, 0x6f, 0x56, 0xdf, + 0x11, 0xdc, 0x9c, 0xa4, 0xff, 0x6b, 0xbe, 0xb3, 0x9d, 0xb5, 0x99, 0xb6, 0xf6, 0x70, 0xb8, 0x7f, + 0xb2, 0xc2, 0x98, 0x15, 0xaf, 0x2a, 0xc9, 0xdb, 0xce, 0xa8, 0xf7, 0x04, 0x9c, 0x01, 0x8c, 0x6f, + 0xc0, 0xfc, 0x0b, 0x6d, 0xed, 0x11, 0x55, 0xe2, 0x5b, 0xb0, 0xf7, 0x95, 0x14, 0x4d, 0xf7, 0xf1, + 0x4c, 0x73, 0x3a, 0x7b, 0x8c, 0x56, 0x3f, 0x10, 0xdc, 0x99, 0x1c, 0xb9, 0xa0, 0x92, 0xa4, 0x44, + 0x12, 0xfc, 0x0c, 0xae, 0x89, 0x56, 0x48, 0x5a, 0xc6, 0xd6, 0xa2, 0xda, 0xe9, 0xf4, 0x9f, 0xa0, + 0x7b, 0xf9, 0xe0, 0x52, 0xbf, 0x7c, 0xb4, 0x34, 0x6a, 0x63, 0x06, 0x7f, 0x00, 0xa7, 0x11, 0x94, + 0xc7, 0xa3, 0x78, 0x8f, 0xfe, 0x19, 0xaf, 0xbb, 0x1c, 0xbc, 0x17, 0x94, 0x0f, 0xa3, 0x42, 0xb3, + 0x03, 0xbc, 0xe7, 0x70, 0xfd, 0x0f, 0xfa, 0x7f, 0x22, 0x9f, 0xb7, 0x70, 0x90, 0xb0, 0x72, 0x60, + 0xe3, 0xfc, 0x70, 0xe2, 0x63, 0xa3, 0x82, 0x6d, 0xd0, 0xc7, 0x17, 0x56, 0x95, 0xb1, 0x82, 0x54, + 0x59, 0xc0, 0x78, 0x16, 0x66, 0xb4, 0xd2, 0xb1, 0x43, 0x43, 0x91, 0x3a, 0x17, 0xe3, 0x3f, 0x8d, + 0x53, 0xf1, 0x74, 0xd8, 0xfc, 0x44, 0xe8, 0xdb, 0x6c, 0xf1, 0xfa, 0x6c, 0xf3, 0x66, 0xbb, 0xaf, + 0x27, 0x4f, 0x7e, 0x07, 0x00, 0x00, 0xff, 0xff, 0x4b, 0xa6, 0xca, 0xf1, 0xa2, 0x03, 0x00, 0x00, } diff --git a/vendor/google.golang.org/genproto/googleapis/devtools/cloudtrace/v2/trace.pb.go b/vendor/google.golang.org/genproto/googleapis/devtools/cloudtrace/v2/trace.pb.go index d07082edcf..15e73796f8 100644 --- a/vendor/google.golang.org/genproto/googleapis/devtools/cloudtrace/v2/trace.pb.go +++ b/vendor/google.golang.org/genproto/googleapis/devtools/cloudtrace/v2/trace.pb.go @@ -1,15 +1,18 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: google/devtools/cloudtrace/v2/trace.proto -package cloudtrace // import "google.golang.org/genproto/googleapis/devtools/cloudtrace/v2" +package cloudtrace -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" -import timestamp "github.com/golang/protobuf/ptypes/timestamp" -import wrappers "github.com/golang/protobuf/ptypes/wrappers" -import _ "google.golang.org/genproto/googleapis/api/annotations" -import status "google.golang.org/genproto/googleapis/rpc/status" +import ( + fmt "fmt" + math "math" + + proto "github.com/golang/protobuf/proto" + timestamp "github.com/golang/protobuf/ptypes/timestamp" + wrappers "github.com/golang/protobuf/ptypes/wrappers" + _ "google.golang.org/genproto/googleapis/api/annotations" + status "google.golang.org/genproto/googleapis/rpc/status" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -20,7 +23,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // Indicates whether the message was sent or received. type Span_TimeEvent_MessageEvent_Type int32 @@ -39,6 +42,7 @@ var Span_TimeEvent_MessageEvent_Type_name = map[int32]string{ 1: "SENT", 2: "RECEIVED", } + var Span_TimeEvent_MessageEvent_Type_value = map[string]int32{ "TYPE_UNSPECIFIED": 0, "SENT": 1, @@ -48,8 +52,9 @@ var Span_TimeEvent_MessageEvent_Type_value = map[string]int32{ func (x Span_TimeEvent_MessageEvent_Type) String() string { return proto.EnumName(Span_TimeEvent_MessageEvent_Type_name, int32(x)) } + func (Span_TimeEvent_MessageEvent_Type) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_trace_fa9cb54dc45915f9, []int{0, 1, 1, 0} + return fileDescriptor_29869cc16dc8ce61, []int{0, 1, 1, 0} } // The relationship of the current span relative to the linked span: child, @@ -70,6 +75,7 @@ var Span_Link_Type_name = map[int32]string{ 1: "CHILD_LINKED_SPAN", 2: "PARENT_LINKED_SPAN", } + var Span_Link_Type_value = map[string]int32{ "TYPE_UNSPECIFIED": 0, "CHILD_LINKED_SPAN": 1, @@ -79,8 +85,9 @@ var Span_Link_Type_value = map[string]int32{ func (x Span_Link_Type) String() string { return proto.EnumName(Span_Link_Type_name, int32(x)) } + func (Span_Link_Type) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_trace_fa9cb54dc45915f9, []int{0, 3, 0} + return fileDescriptor_29869cc16dc8ce61, []int{0, 3, 0} } // A span represents a single operation within a trace. Spans can be @@ -150,16 +157,17 @@ func (m *Span) Reset() { *m = Span{} } func (m *Span) String() string { return proto.CompactTextString(m) } func (*Span) ProtoMessage() {} func (*Span) Descriptor() ([]byte, []int) { - return fileDescriptor_trace_fa9cb54dc45915f9, []int{0} + return fileDescriptor_29869cc16dc8ce61, []int{0} } + func (m *Span) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Span.Unmarshal(m, b) } func (m *Span) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Span.Marshal(b, m, deterministic) } -func (dst *Span) XXX_Merge(src proto.Message) { - xxx_messageInfo_Span.Merge(dst, src) +func (m *Span) XXX_Merge(src proto.Message) { + xxx_messageInfo_Span.Merge(m, src) } func (m *Span) XXX_Size() int { return xxx_messageInfo_Span.Size(m) @@ -285,16 +293,17 @@ func (m *Span_Attributes) Reset() { *m = Span_Attributes{} } func (m *Span_Attributes) String() string { return proto.CompactTextString(m) } func (*Span_Attributes) ProtoMessage() {} func (*Span_Attributes) Descriptor() ([]byte, []int) { - return fileDescriptor_trace_fa9cb54dc45915f9, []int{0, 0} + return fileDescriptor_29869cc16dc8ce61, []int{0, 0} } + func (m *Span_Attributes) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Span_Attributes.Unmarshal(m, b) } func (m *Span_Attributes) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Span_Attributes.Marshal(b, m, deterministic) } -func (dst *Span_Attributes) XXX_Merge(src proto.Message) { - xxx_messageInfo_Span_Attributes.Merge(dst, src) +func (m *Span_Attributes) XXX_Merge(src proto.Message) { + xxx_messageInfo_Span_Attributes.Merge(m, src) } func (m *Span_Attributes) XXX_Size() int { return xxx_messageInfo_Span_Attributes.Size(m) @@ -339,16 +348,17 @@ func (m *Span_TimeEvent) Reset() { *m = Span_TimeEvent{} } func (m *Span_TimeEvent) String() string { return proto.CompactTextString(m) } func (*Span_TimeEvent) ProtoMessage() {} func (*Span_TimeEvent) Descriptor() ([]byte, []int) { - return fileDescriptor_trace_fa9cb54dc45915f9, []int{0, 1} + return fileDescriptor_29869cc16dc8ce61, []int{0, 1} } + func (m *Span_TimeEvent) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Span_TimeEvent.Unmarshal(m, b) } func (m *Span_TimeEvent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Span_TimeEvent.Marshal(b, m, deterministic) } -func (dst *Span_TimeEvent) XXX_Merge(src proto.Message) { - xxx_messageInfo_Span_TimeEvent.Merge(dst, src) +func (m *Span_TimeEvent) XXX_Merge(src proto.Message) { + xxx_messageInfo_Span_TimeEvent.Merge(m, src) } func (m *Span_TimeEvent) XXX_Size() int { return xxx_messageInfo_Span_TimeEvent.Size(m) @@ -403,80 +413,14 @@ func (m *Span_TimeEvent) GetMessageEvent() *Span_TimeEvent_MessageEvent { return nil } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*Span_TimeEvent) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _Span_TimeEvent_OneofMarshaler, _Span_TimeEvent_OneofUnmarshaler, _Span_TimeEvent_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*Span_TimeEvent) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*Span_TimeEvent_Annotation_)(nil), (*Span_TimeEvent_MessageEvent_)(nil), } } -func _Span_TimeEvent_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*Span_TimeEvent) - // value - switch x := m.Value.(type) { - case *Span_TimeEvent_Annotation_: - b.EncodeVarint(2<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.Annotation); err != nil { - return err - } - case *Span_TimeEvent_MessageEvent_: - b.EncodeVarint(3<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.MessageEvent); err != nil { - return err - } - case nil: - default: - return fmt.Errorf("Span_TimeEvent.Value has unexpected type %T", x) - } - return nil -} - -func _Span_TimeEvent_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*Span_TimeEvent) - switch tag { - case 2: // value.annotation - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(Span_TimeEvent_Annotation) - err := b.DecodeMessage(msg) - m.Value = &Span_TimeEvent_Annotation_{msg} - return true, err - case 3: // value.message_event - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(Span_TimeEvent_MessageEvent) - err := b.DecodeMessage(msg) - m.Value = &Span_TimeEvent_MessageEvent_{msg} - return true, err - default: - return false, nil - } -} - -func _Span_TimeEvent_OneofSizer(msg proto.Message) (n int) { - m := msg.(*Span_TimeEvent) - // value - switch x := m.Value.(type) { - case *Span_TimeEvent_Annotation_: - s := proto.Size(x.Annotation) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *Span_TimeEvent_MessageEvent_: - s := proto.Size(x.MessageEvent) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - // Text annotation with a set of attributes. type Span_TimeEvent_Annotation struct { // A user-supplied message describing the event. The maximum length for @@ -494,16 +438,17 @@ func (m *Span_TimeEvent_Annotation) Reset() { *m = Span_TimeEvent_Annota func (m *Span_TimeEvent_Annotation) String() string { return proto.CompactTextString(m) } func (*Span_TimeEvent_Annotation) ProtoMessage() {} func (*Span_TimeEvent_Annotation) Descriptor() ([]byte, []int) { - return fileDescriptor_trace_fa9cb54dc45915f9, []int{0, 1, 0} + return fileDescriptor_29869cc16dc8ce61, []int{0, 1, 0} } + func (m *Span_TimeEvent_Annotation) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Span_TimeEvent_Annotation.Unmarshal(m, b) } func (m *Span_TimeEvent_Annotation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Span_TimeEvent_Annotation.Marshal(b, m, deterministic) } -func (dst *Span_TimeEvent_Annotation) XXX_Merge(src proto.Message) { - xxx_messageInfo_Span_TimeEvent_Annotation.Merge(dst, src) +func (m *Span_TimeEvent_Annotation) XXX_Merge(src proto.Message) { + xxx_messageInfo_Span_TimeEvent_Annotation.Merge(m, src) } func (m *Span_TimeEvent_Annotation) XXX_Size() int { return xxx_messageInfo_Span_TimeEvent_Annotation.Size(m) @@ -551,16 +496,17 @@ func (m *Span_TimeEvent_MessageEvent) Reset() { *m = Span_TimeEvent_Mess func (m *Span_TimeEvent_MessageEvent) String() string { return proto.CompactTextString(m) } func (*Span_TimeEvent_MessageEvent) ProtoMessage() {} func (*Span_TimeEvent_MessageEvent) Descriptor() ([]byte, []int) { - return fileDescriptor_trace_fa9cb54dc45915f9, []int{0, 1, 1} + return fileDescriptor_29869cc16dc8ce61, []int{0, 1, 1} } + func (m *Span_TimeEvent_MessageEvent) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Span_TimeEvent_MessageEvent.Unmarshal(m, b) } func (m *Span_TimeEvent_MessageEvent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Span_TimeEvent_MessageEvent.Marshal(b, m, deterministic) } -func (dst *Span_TimeEvent_MessageEvent) XXX_Merge(src proto.Message) { - xxx_messageInfo_Span_TimeEvent_MessageEvent.Merge(dst, src) +func (m *Span_TimeEvent_MessageEvent) XXX_Merge(src proto.Message) { + xxx_messageInfo_Span_TimeEvent_MessageEvent.Merge(m, src) } func (m *Span_TimeEvent_MessageEvent) XXX_Size() int { return xxx_messageInfo_Span_TimeEvent_MessageEvent.Size(m) @@ -620,16 +566,17 @@ func (m *Span_TimeEvents) Reset() { *m = Span_TimeEvents{} } func (m *Span_TimeEvents) String() string { return proto.CompactTextString(m) } func (*Span_TimeEvents) ProtoMessage() {} func (*Span_TimeEvents) Descriptor() ([]byte, []int) { - return fileDescriptor_trace_fa9cb54dc45915f9, []int{0, 2} + return fileDescriptor_29869cc16dc8ce61, []int{0, 2} } + func (m *Span_TimeEvents) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Span_TimeEvents.Unmarshal(m, b) } func (m *Span_TimeEvents) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Span_TimeEvents.Marshal(b, m, deterministic) } -func (dst *Span_TimeEvents) XXX_Merge(src proto.Message) { - xxx_messageInfo_Span_TimeEvents.Merge(dst, src) +func (m *Span_TimeEvents) XXX_Merge(src proto.Message) { + xxx_messageInfo_Span_TimeEvents.Merge(m, src) } func (m *Span_TimeEvents) XXX_Size() int { return xxx_messageInfo_Span_TimeEvents.Size(m) @@ -684,16 +631,17 @@ func (m *Span_Link) Reset() { *m = Span_Link{} } func (m *Span_Link) String() string { return proto.CompactTextString(m) } func (*Span_Link) ProtoMessage() {} func (*Span_Link) Descriptor() ([]byte, []int) { - return fileDescriptor_trace_fa9cb54dc45915f9, []int{0, 3} + return fileDescriptor_29869cc16dc8ce61, []int{0, 3} } + func (m *Span_Link) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Span_Link.Unmarshal(m, b) } func (m *Span_Link) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Span_Link.Marshal(b, m, deterministic) } -func (dst *Span_Link) XXX_Merge(src proto.Message) { - xxx_messageInfo_Span_Link.Merge(dst, src) +func (m *Span_Link) XXX_Merge(src proto.Message) { + xxx_messageInfo_Span_Link.Merge(m, src) } func (m *Span_Link) XXX_Size() int { return xxx_messageInfo_Span_Link.Size(m) @@ -749,16 +697,17 @@ func (m *Span_Links) Reset() { *m = Span_Links{} } func (m *Span_Links) String() string { return proto.CompactTextString(m) } func (*Span_Links) ProtoMessage() {} func (*Span_Links) Descriptor() ([]byte, []int) { - return fileDescriptor_trace_fa9cb54dc45915f9, []int{0, 4} + return fileDescriptor_29869cc16dc8ce61, []int{0, 4} } + func (m *Span_Links) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Span_Links.Unmarshal(m, b) } func (m *Span_Links) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Span_Links.Marshal(b, m, deterministic) } -func (dst *Span_Links) XXX_Merge(src proto.Message) { - xxx_messageInfo_Span_Links.Merge(dst, src) +func (m *Span_Links) XXX_Merge(src proto.Message) { + xxx_messageInfo_Span_Links.Merge(m, src) } func (m *Span_Links) XXX_Size() int { return xxx_messageInfo_Span_Links.Size(m) @@ -801,16 +750,17 @@ func (m *AttributeValue) Reset() { *m = AttributeValue{} } func (m *AttributeValue) String() string { return proto.CompactTextString(m) } func (*AttributeValue) ProtoMessage() {} func (*AttributeValue) Descriptor() ([]byte, []int) { - return fileDescriptor_trace_fa9cb54dc45915f9, []int{1} + return fileDescriptor_29869cc16dc8ce61, []int{1} } + func (m *AttributeValue) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_AttributeValue.Unmarshal(m, b) } func (m *AttributeValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_AttributeValue.Marshal(b, m, deterministic) } -func (dst *AttributeValue) XXX_Merge(src proto.Message) { - xxx_messageInfo_AttributeValue.Merge(dst, src) +func (m *AttributeValue) XXX_Merge(src proto.Message) { + xxx_messageInfo_AttributeValue.Merge(m, src) } func (m *AttributeValue) XXX_Size() int { return xxx_messageInfo_AttributeValue.Size(m) @@ -871,93 +821,15 @@ func (m *AttributeValue) GetBoolValue() bool { return false } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*AttributeValue) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _AttributeValue_OneofMarshaler, _AttributeValue_OneofUnmarshaler, _AttributeValue_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*AttributeValue) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*AttributeValue_StringValue)(nil), (*AttributeValue_IntValue)(nil), (*AttributeValue_BoolValue)(nil), } } -func _AttributeValue_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*AttributeValue) - // value - switch x := m.Value.(type) { - case *AttributeValue_StringValue: - b.EncodeVarint(1<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.StringValue); err != nil { - return err - } - case *AttributeValue_IntValue: - b.EncodeVarint(2<<3 | proto.WireVarint) - b.EncodeVarint(uint64(x.IntValue)) - case *AttributeValue_BoolValue: - t := uint64(0) - if x.BoolValue { - t = 1 - } - b.EncodeVarint(3<<3 | proto.WireVarint) - b.EncodeVarint(t) - case nil: - default: - return fmt.Errorf("AttributeValue.Value has unexpected type %T", x) - } - return nil -} - -func _AttributeValue_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*AttributeValue) - switch tag { - case 1: // value.string_value - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(TruncatableString) - err := b.DecodeMessage(msg) - m.Value = &AttributeValue_StringValue{msg} - return true, err - case 2: // value.int_value - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.Value = &AttributeValue_IntValue{int64(x)} - return true, err - case 3: // value.bool_value - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.Value = &AttributeValue_BoolValue{x != 0} - return true, err - default: - return false, nil - } -} - -func _AttributeValue_OneofSizer(msg proto.Message) (n int) { - m := msg.(*AttributeValue) - // value - switch x := m.Value.(type) { - case *AttributeValue_StringValue: - s := proto.Size(x.StringValue) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *AttributeValue_IntValue: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.IntValue)) - case *AttributeValue_BoolValue: - n += 1 // tag and wire - n += 1 - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - // A call stack appearing in a trace. type StackTrace struct { // Stack frames in this stack trace. A maximum of 128 frames are allowed. @@ -981,16 +853,17 @@ func (m *StackTrace) Reset() { *m = StackTrace{} } func (m *StackTrace) String() string { return proto.CompactTextString(m) } func (*StackTrace) ProtoMessage() {} func (*StackTrace) Descriptor() ([]byte, []int) { - return fileDescriptor_trace_fa9cb54dc45915f9, []int{2} + return fileDescriptor_29869cc16dc8ce61, []int{2} } + func (m *StackTrace) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StackTrace.Unmarshal(m, b) } func (m *StackTrace) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_StackTrace.Marshal(b, m, deterministic) } -func (dst *StackTrace) XXX_Merge(src proto.Message) { - xxx_messageInfo_StackTrace.Merge(dst, src) +func (m *StackTrace) XXX_Merge(src proto.Message) { + xxx_messageInfo_StackTrace.Merge(m, src) } func (m *StackTrace) XXX_Size() int { return xxx_messageInfo_StackTrace.Size(m) @@ -1045,16 +918,17 @@ func (m *StackTrace_StackFrame) Reset() { *m = StackTrace_StackFrame{} } func (m *StackTrace_StackFrame) String() string { return proto.CompactTextString(m) } func (*StackTrace_StackFrame) ProtoMessage() {} func (*StackTrace_StackFrame) Descriptor() ([]byte, []int) { - return fileDescriptor_trace_fa9cb54dc45915f9, []int{2, 0} + return fileDescriptor_29869cc16dc8ce61, []int{2, 0} } + func (m *StackTrace_StackFrame) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StackTrace_StackFrame.Unmarshal(m, b) } func (m *StackTrace_StackFrame) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_StackTrace_StackFrame.Marshal(b, m, deterministic) } -func (dst *StackTrace_StackFrame) XXX_Merge(src proto.Message) { - xxx_messageInfo_StackTrace_StackFrame.Merge(dst, src) +func (m *StackTrace_StackFrame) XXX_Merge(src proto.Message) { + xxx_messageInfo_StackTrace_StackFrame.Merge(m, src) } func (m *StackTrace_StackFrame) XXX_Size() int { return xxx_messageInfo_StackTrace_StackFrame.Size(m) @@ -1131,16 +1005,17 @@ func (m *StackTrace_StackFrames) Reset() { *m = StackTrace_StackFrames{} func (m *StackTrace_StackFrames) String() string { return proto.CompactTextString(m) } func (*StackTrace_StackFrames) ProtoMessage() {} func (*StackTrace_StackFrames) Descriptor() ([]byte, []int) { - return fileDescriptor_trace_fa9cb54dc45915f9, []int{2, 1} + return fileDescriptor_29869cc16dc8ce61, []int{2, 1} } + func (m *StackTrace_StackFrames) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StackTrace_StackFrames.Unmarshal(m, b) } func (m *StackTrace_StackFrames) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_StackTrace_StackFrames.Marshal(b, m, deterministic) } -func (dst *StackTrace_StackFrames) XXX_Merge(src proto.Message) { - xxx_messageInfo_StackTrace_StackFrames.Merge(dst, src) +func (m *StackTrace_StackFrames) XXX_Merge(src proto.Message) { + xxx_messageInfo_StackTrace_StackFrames.Merge(m, src) } func (m *StackTrace_StackFrames) XXX_Size() int { return xxx_messageInfo_StackTrace_StackFrames.Size(m) @@ -1182,16 +1057,17 @@ func (m *Module) Reset() { *m = Module{} } func (m *Module) String() string { return proto.CompactTextString(m) } func (*Module) ProtoMessage() {} func (*Module) Descriptor() ([]byte, []int) { - return fileDescriptor_trace_fa9cb54dc45915f9, []int{3} + return fileDescriptor_29869cc16dc8ce61, []int{3} } + func (m *Module) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Module.Unmarshal(m, b) } func (m *Module) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Module.Marshal(b, m, deterministic) } -func (dst *Module) XXX_Merge(src proto.Message) { - xxx_messageInfo_Module.Merge(dst, src) +func (m *Module) XXX_Merge(src proto.Message) { + xxx_messageInfo_Module.Merge(m, src) } func (m *Module) XXX_Size() int { return xxx_messageInfo_Module.Size(m) @@ -1238,16 +1114,17 @@ func (m *TruncatableString) Reset() { *m = TruncatableString{} } func (m *TruncatableString) String() string { return proto.CompactTextString(m) } func (*TruncatableString) ProtoMessage() {} func (*TruncatableString) Descriptor() ([]byte, []int) { - return fileDescriptor_trace_fa9cb54dc45915f9, []int{4} + return fileDescriptor_29869cc16dc8ce61, []int{4} } + func (m *TruncatableString) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TruncatableString.Unmarshal(m, b) } func (m *TruncatableString) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_TruncatableString.Marshal(b, m, deterministic) } -func (dst *TruncatableString) XXX_Merge(src proto.Message) { - xxx_messageInfo_TruncatableString.Merge(dst, src) +func (m *TruncatableString) XXX_Merge(src proto.Message) { + xxx_messageInfo_TruncatableString.Merge(m, src) } func (m *TruncatableString) XXX_Size() int { return xxx_messageInfo_TruncatableString.Size(m) @@ -1273,6 +1150,8 @@ func (m *TruncatableString) GetTruncatedByteCount() int32 { } func init() { + proto.RegisterEnum("google.devtools.cloudtrace.v2.Span_TimeEvent_MessageEvent_Type", Span_TimeEvent_MessageEvent_Type_name, Span_TimeEvent_MessageEvent_Type_value) + proto.RegisterEnum("google.devtools.cloudtrace.v2.Span_Link_Type", Span_Link_Type_name, Span_Link_Type_value) proto.RegisterType((*Span)(nil), "google.devtools.cloudtrace.v2.Span") proto.RegisterType((*Span_Attributes)(nil), "google.devtools.cloudtrace.v2.Span.Attributes") proto.RegisterMapType((map[string]*AttributeValue)(nil), "google.devtools.cloudtrace.v2.Span.Attributes.AttributeMapEntry") @@ -1288,15 +1167,13 @@ func init() { proto.RegisterType((*StackTrace_StackFrames)(nil), "google.devtools.cloudtrace.v2.StackTrace.StackFrames") proto.RegisterType((*Module)(nil), "google.devtools.cloudtrace.v2.Module") proto.RegisterType((*TruncatableString)(nil), "google.devtools.cloudtrace.v2.TruncatableString") - proto.RegisterEnum("google.devtools.cloudtrace.v2.Span_TimeEvent_MessageEvent_Type", Span_TimeEvent_MessageEvent_Type_name, Span_TimeEvent_MessageEvent_Type_value) - proto.RegisterEnum("google.devtools.cloudtrace.v2.Span_Link_Type", Span_Link_Type_name, Span_Link_Type_value) } func init() { - proto.RegisterFile("google/devtools/cloudtrace/v2/trace.proto", fileDescriptor_trace_fa9cb54dc45915f9) + proto.RegisterFile("google/devtools/cloudtrace/v2/trace.proto", fileDescriptor_29869cc16dc8ce61) } -var fileDescriptor_trace_fa9cb54dc45915f9 = []byte{ +var fileDescriptor_29869cc16dc8ce61 = []byte{ // 1425 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x57, 0x4b, 0x6f, 0xdb, 0xc6, 0x16, 0x36, 0xf5, 0xd6, 0x91, 0x6c, 0xc8, 0x13, 0x3b, 0x56, 0x94, 0xe4, 0x26, 0xd7, 0xf7, 0x16, diff --git a/vendor/google.golang.org/genproto/googleapis/devtools/cloudtrace/v2/tracing.pb.go b/vendor/google.golang.org/genproto/googleapis/devtools/cloudtrace/v2/tracing.pb.go index 6e6925cab4..d13f13aa94 100644 --- a/vendor/google.golang.org/genproto/googleapis/devtools/cloudtrace/v2/tracing.pb.go +++ b/vendor/google.golang.org/genproto/googleapis/devtools/cloudtrace/v2/tracing.pb.go @@ -1,18 +1,20 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: google/devtools/cloudtrace/v2/tracing.proto -package cloudtrace // import "google.golang.org/genproto/googleapis/devtools/cloudtrace/v2" - -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" -import empty "github.com/golang/protobuf/ptypes/empty" -import _ "github.com/golang/protobuf/ptypes/timestamp" -import _ "google.golang.org/genproto/googleapis/api/annotations" +package cloudtrace import ( - context "golang.org/x/net/context" + context "context" + fmt "fmt" + math "math" + + proto "github.com/golang/protobuf/proto" + empty "github.com/golang/protobuf/ptypes/empty" + _ "github.com/golang/protobuf/ptypes/timestamp" + _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" ) // Reference imports to suppress errors if they are not otherwise used. @@ -24,7 +26,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // The request message for the `BatchWriteSpans` method. type BatchWriteSpansRequest struct { @@ -43,16 +45,17 @@ func (m *BatchWriteSpansRequest) Reset() { *m = BatchWriteSpansRequest{} func (m *BatchWriteSpansRequest) String() string { return proto.CompactTextString(m) } func (*BatchWriteSpansRequest) ProtoMessage() {} func (*BatchWriteSpansRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_tracing_18786c49399bd83d, []int{0} + return fileDescriptor_d1f9b588db05fdc6, []int{0} } + func (m *BatchWriteSpansRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BatchWriteSpansRequest.Unmarshal(m, b) } func (m *BatchWriteSpansRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_BatchWriteSpansRequest.Marshal(b, m, deterministic) } -func (dst *BatchWriteSpansRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_BatchWriteSpansRequest.Merge(dst, src) +func (m *BatchWriteSpansRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_BatchWriteSpansRequest.Merge(m, src) } func (m *BatchWriteSpansRequest) XXX_Size() int { return xxx_messageInfo_BatchWriteSpansRequest.Size(m) @@ -81,6 +84,40 @@ func init() { proto.RegisterType((*BatchWriteSpansRequest)(nil), "google.devtools.cloudtrace.v2.BatchWriteSpansRequest") } +func init() { + proto.RegisterFile("google/devtools/cloudtrace/v2/tracing.proto", fileDescriptor_d1f9b588db05fdc6) +} + +var fileDescriptor_d1f9b588db05fdc6 = []byte{ + // 404 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x52, 0xdd, 0x6a, 0xdb, 0x30, + 0x14, 0x46, 0xde, 0x0f, 0x4c, 0x1b, 0x0c, 0x04, 0x0b, 0xc1, 0xdb, 0x58, 0xe6, 0x0d, 0x96, 0x64, + 0x43, 0x02, 0x8f, 0x5d, 0x2c, 0x63, 0x37, 0x09, 0x23, 0xb7, 0x21, 0x19, 0x19, 0x8c, 0xdc, 0x28, + 0x8e, 0xa6, 0x69, 0xd8, 0x92, 0x67, 0x29, 0x86, 0x52, 0x7a, 0xd3, 0x9b, 0x3e, 0x40, 0xfb, 0x14, + 0xa5, 0xd0, 0xf7, 0xe8, 0x6d, 0x5f, 0xa1, 0x0f, 0x52, 0x24, 0xd9, 0x0d, 0x84, 0x34, 0xc9, 0x9d, + 0xce, 0x39, 0xdf, 0xf9, 0xce, 0xf7, 0x7d, 0x36, 0xfc, 0xc8, 0x95, 0xe2, 0x29, 0x23, 0x0b, 0x56, + 0x1a, 0xa5, 0x52, 0x4d, 0x92, 0x54, 0x2d, 0x17, 0xa6, 0xa0, 0x09, 0x23, 0x65, 0x4c, 0xec, 0x43, + 0x48, 0x8e, 0xf3, 0x42, 0x19, 0x85, 0x5e, 0x7b, 0x30, 0xae, 0xc1, 0x78, 0x05, 0xc6, 0x65, 0x1c, + 0xbe, 0xaa, 0xb8, 0x68, 0x2e, 0x08, 0x95, 0x52, 0x19, 0x6a, 0x84, 0x92, 0xda, 0x2f, 0x87, 0x9d, + 0xdd, 0x97, 0x58, 0x05, 0x7d, 0x59, 0x41, 0x5d, 0x35, 0x5f, 0xfe, 0x21, 0x2c, 0xcb, 0xcd, 0x41, + 0x35, 0x7c, 0xb3, 0x3e, 0x34, 0x22, 0x63, 0xda, 0xd0, 0x2c, 0xf7, 0x80, 0x88, 0xc3, 0x46, 0x9f, + 0x9a, 0xe4, 0xef, 0xaf, 0x42, 0x18, 0x36, 0xc9, 0xa9, 0xd4, 0x63, 0xf6, 0x7f, 0xc9, 0xb4, 0x41, + 0x08, 0x3e, 0x94, 0x34, 0x63, 0x4d, 0xd0, 0x02, 0xed, 0x27, 0x63, 0xf7, 0x46, 0x5f, 0xe1, 0x23, + 0x6d, 0x31, 0xcd, 0xa0, 0xf5, 0xa0, 0xfd, 0x34, 0x7e, 0x87, 0xb7, 0x7a, 0xc4, 0x96, 0x6f, 0xec, + 0x37, 0xe2, 0xcb, 0x00, 0x3e, 0xfb, 0x69, 0x07, 0x13, 0x56, 0x94, 0x22, 0x61, 0xe8, 0x0c, 0xc0, + 0xe7, 0x6b, 0xa7, 0xd1, 0x97, 0x1d, 0x84, 0x9b, 0xa5, 0x86, 0x8d, 0x7a, 0xad, 0xb6, 0x89, 0x7f, + 0xd8, 0x0c, 0xa2, 0xf8, 0xf8, 0xfa, 0xe6, 0x34, 0xf8, 0x14, 0x7d, 0xb0, 0x99, 0x1d, 0x5a, 0x07, + 0xdf, 0xf3, 0x42, 0xfd, 0x63, 0x89, 0xd1, 0xa4, 0x7b, 0xe4, 0x53, 0xd4, 0xbd, 0xf9, 0x1d, 0x69, + 0x0f, 0x74, 0xd1, 0x09, 0x80, 0x70, 0x50, 0x30, 0xea, 0x4f, 0xa0, 0x7d, 0x2c, 0x86, 0xfb, 0x80, + 0x22, 0xe2, 0xc4, 0x74, 0xa2, 0xf7, 0x9b, 0xc4, 0x54, 0x5a, 0xac, 0x2a, 0x17, 0x57, 0x0f, 0x74, + 0xfb, 0x17, 0x00, 0xbe, 0x4d, 0x54, 0xb6, 0x9d, 0xbb, 0xef, 0x42, 0x15, 0x92, 0x8f, 0xac, 0xf5, + 0x11, 0xf8, 0x3d, 0xac, 0xe0, 0x5c, 0xa5, 0x54, 0x72, 0xac, 0x0a, 0x4e, 0x38, 0x93, 0x2e, 0x18, + 0xe2, 0x47, 0x34, 0x17, 0xfa, 0x9e, 0x1f, 0xeb, 0xdb, 0xaa, 0x3a, 0x0f, 0x5e, 0x0c, 0x3d, 0xd3, + 0xc0, 0xf6, 0xb0, 0xfb, 0x76, 0x78, 0x1a, 0x5f, 0xd5, 0xfd, 0x99, 0xeb, 0xcf, 0x5c, 0x7f, 0x36, + 0x8d, 0xe7, 0x8f, 0xdd, 0x8d, 0xcf, 0xb7, 0x01, 0x00, 0x00, 0xff, 0xff, 0xbd, 0x94, 0x51, 0x1d, + 0x25, 0x03, 0x00, 0x00, +} + // Reference imports to suppress errors if they are not otherwise used. var _ context.Context var _ grpc.ClientConn @@ -135,6 +172,17 @@ type TraceServiceServer interface { CreateSpan(context.Context, *Span) (*Span, error) } +// UnimplementedTraceServiceServer can be embedded to have forward compatible implementations. +type UnimplementedTraceServiceServer struct { +} + +func (*UnimplementedTraceServiceServer) BatchWriteSpans(ctx context.Context, req *BatchWriteSpansRequest) (*empty.Empty, error) { + return nil, status.Errorf(codes.Unimplemented, "method BatchWriteSpans not implemented") +} +func (*UnimplementedTraceServiceServer) CreateSpan(ctx context.Context, req *Span) (*Span, error) { + return nil, status.Errorf(codes.Unimplemented, "method CreateSpan not implemented") +} + func RegisterTraceServiceServer(s *grpc.Server, srv TraceServiceServer) { s.RegisterService(&_TraceService_serviceDesc, srv) } @@ -191,37 +239,3 @@ var _TraceService_serviceDesc = grpc.ServiceDesc{ Streams: []grpc.StreamDesc{}, Metadata: "google/devtools/cloudtrace/v2/tracing.proto", } - -func init() { - proto.RegisterFile("google/devtools/cloudtrace/v2/tracing.proto", fileDescriptor_tracing_18786c49399bd83d) -} - -var fileDescriptor_tracing_18786c49399bd83d = []byte{ - // 404 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x52, 0xdd, 0x6a, 0xdb, 0x30, - 0x14, 0x46, 0xde, 0x0f, 0x4c, 0x1b, 0x0c, 0x04, 0x0b, 0xc1, 0xdb, 0x58, 0xe6, 0x0d, 0x96, 0x64, - 0x43, 0x02, 0x8f, 0x5d, 0x2c, 0x63, 0x37, 0x09, 0x23, 0xb7, 0x21, 0x19, 0x19, 0x8c, 0xdc, 0x28, - 0x8e, 0xa6, 0x69, 0xd8, 0x92, 0x67, 0x29, 0x86, 0x52, 0x7a, 0xd3, 0x9b, 0x3e, 0x40, 0xfb, 0x14, - 0xa5, 0xd0, 0xf7, 0xe8, 0x6d, 0x5f, 0xa1, 0x0f, 0x52, 0x24, 0xd9, 0x0d, 0x84, 0x34, 0xc9, 0x9d, - 0xce, 0x39, 0xdf, 0xf9, 0xce, 0xf7, 0x7d, 0x36, 0xfc, 0xc8, 0x95, 0xe2, 0x29, 0x23, 0x0b, 0x56, - 0x1a, 0xa5, 0x52, 0x4d, 0x92, 0x54, 0x2d, 0x17, 0xa6, 0xa0, 0x09, 0x23, 0x65, 0x4c, 0xec, 0x43, - 0x48, 0x8e, 0xf3, 0x42, 0x19, 0x85, 0x5e, 0x7b, 0x30, 0xae, 0xc1, 0x78, 0x05, 0xc6, 0x65, 0x1c, - 0xbe, 0xaa, 0xb8, 0x68, 0x2e, 0x08, 0x95, 0x52, 0x19, 0x6a, 0x84, 0x92, 0xda, 0x2f, 0x87, 0x9d, - 0xdd, 0x97, 0x58, 0x05, 0x7d, 0x59, 0x41, 0x5d, 0x35, 0x5f, 0xfe, 0x21, 0x2c, 0xcb, 0xcd, 0x41, - 0x35, 0x7c, 0xb3, 0x3e, 0x34, 0x22, 0x63, 0xda, 0xd0, 0x2c, 0xf7, 0x80, 0x88, 0xc3, 0x46, 0x9f, - 0x9a, 0xe4, 0xef, 0xaf, 0x42, 0x18, 0x36, 0xc9, 0xa9, 0xd4, 0x63, 0xf6, 0x7f, 0xc9, 0xb4, 0x41, - 0x08, 0x3e, 0x94, 0x34, 0x63, 0x4d, 0xd0, 0x02, 0xed, 0x27, 0x63, 0xf7, 0x46, 0x5f, 0xe1, 0x23, - 0x6d, 0x31, 0xcd, 0xa0, 0xf5, 0xa0, 0xfd, 0x34, 0x7e, 0x87, 0xb7, 0x7a, 0xc4, 0x96, 0x6f, 0xec, - 0x37, 0xe2, 0xcb, 0x00, 0x3e, 0xfb, 0x69, 0x07, 0x13, 0x56, 0x94, 0x22, 0x61, 0xe8, 0x0c, 0xc0, - 0xe7, 0x6b, 0xa7, 0xd1, 0x97, 0x1d, 0x84, 0x9b, 0xa5, 0x86, 0x8d, 0x7a, 0xad, 0xb6, 0x89, 0x7f, - 0xd8, 0x0c, 0xa2, 0xf8, 0xf8, 0xfa, 0xe6, 0x34, 0xf8, 0x14, 0x7d, 0xb0, 0x99, 0x1d, 0x5a, 0x07, - 0xdf, 0xf3, 0x42, 0xfd, 0x63, 0x89, 0xd1, 0xa4, 0x7b, 0xe4, 0x53, 0xd4, 0xbd, 0xf9, 0x1d, 0x69, - 0x0f, 0x74, 0xd1, 0x09, 0x80, 0x70, 0x50, 0x30, 0xea, 0x4f, 0xa0, 0x7d, 0x2c, 0x86, 0xfb, 0x80, - 0x22, 0xe2, 0xc4, 0x74, 0xa2, 0xf7, 0x9b, 0xc4, 0x54, 0x5a, 0xac, 0x2a, 0x17, 0x57, 0x0f, 0x74, - 0xfb, 0x17, 0x00, 0xbe, 0x4d, 0x54, 0xb6, 0x9d, 0xbb, 0xef, 0x42, 0x15, 0x92, 0x8f, 0xac, 0xf5, - 0x11, 0xf8, 0x3d, 0xac, 0xe0, 0x5c, 0xa5, 0x54, 0x72, 0xac, 0x0a, 0x4e, 0x38, 0x93, 0x2e, 0x18, - 0xe2, 0x47, 0x34, 0x17, 0xfa, 0x9e, 0x1f, 0xeb, 0xdb, 0xaa, 0x3a, 0x0f, 0x5e, 0x0c, 0x3d, 0xd3, - 0xc0, 0xf6, 0xb0, 0xfb, 0x76, 0x78, 0x1a, 0x5f, 0xd5, 0xfd, 0x99, 0xeb, 0xcf, 0x5c, 0x7f, 0x36, - 0x8d, 0xe7, 0x8f, 0xdd, 0x8d, 0xcf, 0xb7, 0x01, 0x00, 0x00, 0xff, 0xff, 0xbd, 0x94, 0x51, 0x1d, - 0x25, 0x03, 0x00, 0x00, -} diff --git a/vendor/google.golang.org/genproto/googleapis/monitoring/v3/alert.pb.go b/vendor/google.golang.org/genproto/googleapis/monitoring/v3/alert.pb.go index d134a3cb9c..7c65153b26 100644 --- a/vendor/google.golang.org/genproto/googleapis/monitoring/v3/alert.pb.go +++ b/vendor/google.golang.org/genproto/googleapis/monitoring/v3/alert.pb.go @@ -1,14 +1,17 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: google/monitoring/v3/alert.proto -package monitoring // import "google.golang.org/genproto/googleapis/monitoring/v3" +package monitoring -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" -import duration "github.com/golang/protobuf/ptypes/duration" -import wrappers "github.com/golang/protobuf/ptypes/wrappers" -import _ "google.golang.org/genproto/googleapis/api/annotations" +import ( + fmt "fmt" + math "math" + + proto "github.com/golang/protobuf/proto" + duration "github.com/golang/protobuf/ptypes/duration" + wrappers "github.com/golang/protobuf/ptypes/wrappers" + status "google.golang.org/genproto/googleapis/rpc/status" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -19,7 +22,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // Operators for combining conditions. type AlertPolicy_ConditionCombinerType int32 @@ -47,6 +50,7 @@ var AlertPolicy_ConditionCombinerType_name = map[int32]string{ 2: "OR", 3: "AND_WITH_MATCHING_RESOURCE", } + var AlertPolicy_ConditionCombinerType_value = map[string]int32{ "COMBINE_UNSPECIFIED": 0, "AND": 1, @@ -57,8 +61,9 @@ var AlertPolicy_ConditionCombinerType_value = map[string]int32{ func (x AlertPolicy_ConditionCombinerType) String() string { return proto.EnumName(AlertPolicy_ConditionCombinerType_name, int32(x)) } + func (AlertPolicy_ConditionCombinerType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_alert_9e390b6dbd40ea14, []int{0, 0} + return fileDescriptor_014ef0e1a0f00a00, []int{0, 0} } // A description of the conditions under which some aspect of your system is @@ -110,6 +115,9 @@ type AlertPolicy struct { // field should always be populated on List and Get operations, unless // a field projection has been specified that strips it out. Enabled *wrappers.BoolValue `protobuf:"bytes,17,opt,name=enabled,proto3" json:"enabled,omitempty"` + // Read-only description of how the alert policy is invalid. OK if the alert + // policy is valid. If not OK, the alert policy will not generate incidents. + Validity *status.Status `protobuf:"bytes,18,opt,name=validity,proto3" json:"validity,omitempty"` // Identifies the notification channels to which notifications should be sent // when incidents are opened or closed or when new violations occur on // an already opened incident. Each element of this array corresponds to @@ -136,16 +144,17 @@ func (m *AlertPolicy) Reset() { *m = AlertPolicy{} } func (m *AlertPolicy) String() string { return proto.CompactTextString(m) } func (*AlertPolicy) ProtoMessage() {} func (*AlertPolicy) Descriptor() ([]byte, []int) { - return fileDescriptor_alert_9e390b6dbd40ea14, []int{0} + return fileDescriptor_014ef0e1a0f00a00, []int{0} } + func (m *AlertPolicy) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_AlertPolicy.Unmarshal(m, b) } func (m *AlertPolicy) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_AlertPolicy.Marshal(b, m, deterministic) } -func (dst *AlertPolicy) XXX_Merge(src proto.Message) { - xxx_messageInfo_AlertPolicy.Merge(dst, src) +func (m *AlertPolicy) XXX_Merge(src proto.Message) { + xxx_messageInfo_AlertPolicy.Merge(m, src) } func (m *AlertPolicy) XXX_Size() int { return xxx_messageInfo_AlertPolicy.Size(m) @@ -205,6 +214,13 @@ func (m *AlertPolicy) GetEnabled() *wrappers.BoolValue { return nil } +func (m *AlertPolicy) GetValidity() *status.Status { + if m != nil { + return m.Validity + } + return nil +} + func (m *AlertPolicy) GetNotificationChannels() []string { if m != nil { return m.NotificationChannels @@ -247,16 +263,17 @@ func (m *AlertPolicy_Documentation) Reset() { *m = AlertPolicy_Documenta func (m *AlertPolicy_Documentation) String() string { return proto.CompactTextString(m) } func (*AlertPolicy_Documentation) ProtoMessage() {} func (*AlertPolicy_Documentation) Descriptor() ([]byte, []int) { - return fileDescriptor_alert_9e390b6dbd40ea14, []int{0, 0} + return fileDescriptor_014ef0e1a0f00a00, []int{0, 0} } + func (m *AlertPolicy_Documentation) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_AlertPolicy_Documentation.Unmarshal(m, b) } func (m *AlertPolicy_Documentation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_AlertPolicy_Documentation.Marshal(b, m, deterministic) } -func (dst *AlertPolicy_Documentation) XXX_Merge(src proto.Message) { - xxx_messageInfo_AlertPolicy_Documentation.Merge(dst, src) +func (m *AlertPolicy_Documentation) XXX_Merge(src proto.Message) { + xxx_messageInfo_AlertPolicy_Documentation.Merge(m, src) } func (m *AlertPolicy_Documentation) XXX_Size() int { return xxx_messageInfo_AlertPolicy_Documentation.Size(m) @@ -330,16 +347,17 @@ func (m *AlertPolicy_Condition) Reset() { *m = AlertPolicy_Condition{} } func (m *AlertPolicy_Condition) String() string { return proto.CompactTextString(m) } func (*AlertPolicy_Condition) ProtoMessage() {} func (*AlertPolicy_Condition) Descriptor() ([]byte, []int) { - return fileDescriptor_alert_9e390b6dbd40ea14, []int{0, 1} + return fileDescriptor_014ef0e1a0f00a00, []int{0, 1} } + func (m *AlertPolicy_Condition) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_AlertPolicy_Condition.Unmarshal(m, b) } func (m *AlertPolicy_Condition) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_AlertPolicy_Condition.Marshal(b, m, deterministic) } -func (dst *AlertPolicy_Condition) XXX_Merge(src proto.Message) { - xxx_messageInfo_AlertPolicy_Condition.Merge(dst, src) +func (m *AlertPolicy_Condition) XXX_Merge(src proto.Message) { + xxx_messageInfo_AlertPolicy_Condition.Merge(m, src) } func (m *AlertPolicy_Condition) XXX_Size() int { return xxx_messageInfo_AlertPolicy_Condition.Size(m) @@ -401,80 +419,14 @@ func (m *AlertPolicy_Condition) GetConditionAbsent() *AlertPolicy_Condition_Metr return nil } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*AlertPolicy_Condition) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _AlertPolicy_Condition_OneofMarshaler, _AlertPolicy_Condition_OneofUnmarshaler, _AlertPolicy_Condition_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*AlertPolicy_Condition) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*AlertPolicy_Condition_ConditionThreshold)(nil), (*AlertPolicy_Condition_ConditionAbsent)(nil), } } -func _AlertPolicy_Condition_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*AlertPolicy_Condition) - // condition - switch x := m.Condition.(type) { - case *AlertPolicy_Condition_ConditionThreshold: - b.EncodeVarint(1<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.ConditionThreshold); err != nil { - return err - } - case *AlertPolicy_Condition_ConditionAbsent: - b.EncodeVarint(2<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.ConditionAbsent); err != nil { - return err - } - case nil: - default: - return fmt.Errorf("AlertPolicy_Condition.Condition has unexpected type %T", x) - } - return nil -} - -func _AlertPolicy_Condition_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*AlertPolicy_Condition) - switch tag { - case 1: // condition.condition_threshold - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(AlertPolicy_Condition_MetricThreshold) - err := b.DecodeMessage(msg) - m.Condition = &AlertPolicy_Condition_ConditionThreshold{msg} - return true, err - case 2: // condition.condition_absent - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(AlertPolicy_Condition_MetricAbsence) - err := b.DecodeMessage(msg) - m.Condition = &AlertPolicy_Condition_ConditionAbsent{msg} - return true, err - default: - return false, nil - } -} - -func _AlertPolicy_Condition_OneofSizer(msg proto.Message) (n int) { - m := msg.(*AlertPolicy_Condition) - // condition - switch x := m.Condition.(type) { - case *AlertPolicy_Condition_ConditionThreshold: - s := proto.Size(x.ConditionThreshold) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *AlertPolicy_Condition_ConditionAbsent: - s := proto.Size(x.ConditionAbsent) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - // Specifies how many time series must fail a predicate to trigger a // condition. If not specified, then a `{count: 1}` trigger is used. type AlertPolicy_Condition_Trigger struct { @@ -493,16 +445,17 @@ func (m *AlertPolicy_Condition_Trigger) Reset() { *m = AlertPolicy_Condi func (m *AlertPolicy_Condition_Trigger) String() string { return proto.CompactTextString(m) } func (*AlertPolicy_Condition_Trigger) ProtoMessage() {} func (*AlertPolicy_Condition_Trigger) Descriptor() ([]byte, []int) { - return fileDescriptor_alert_9e390b6dbd40ea14, []int{0, 1, 0} + return fileDescriptor_014ef0e1a0f00a00, []int{0, 1, 0} } + func (m *AlertPolicy_Condition_Trigger) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_AlertPolicy_Condition_Trigger.Unmarshal(m, b) } func (m *AlertPolicy_Condition_Trigger) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_AlertPolicy_Condition_Trigger.Marshal(b, m, deterministic) } -func (dst *AlertPolicy_Condition_Trigger) XXX_Merge(src proto.Message) { - xxx_messageInfo_AlertPolicy_Condition_Trigger.Merge(dst, src) +func (m *AlertPolicy_Condition_Trigger) XXX_Merge(src proto.Message) { + xxx_messageInfo_AlertPolicy_Condition_Trigger.Merge(m, src) } func (m *AlertPolicy_Condition_Trigger) XXX_Size() int { return xxx_messageInfo_AlertPolicy_Condition_Trigger.Size(m) @@ -550,70 +503,14 @@ func (m *AlertPolicy_Condition_Trigger) GetPercent() float64 { return 0 } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*AlertPolicy_Condition_Trigger) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _AlertPolicy_Condition_Trigger_OneofMarshaler, _AlertPolicy_Condition_Trigger_OneofUnmarshaler, _AlertPolicy_Condition_Trigger_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*AlertPolicy_Condition_Trigger) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*AlertPolicy_Condition_Trigger_Count)(nil), (*AlertPolicy_Condition_Trigger_Percent)(nil), } } -func _AlertPolicy_Condition_Trigger_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*AlertPolicy_Condition_Trigger) - // type - switch x := m.Type.(type) { - case *AlertPolicy_Condition_Trigger_Count: - b.EncodeVarint(1<<3 | proto.WireVarint) - b.EncodeVarint(uint64(x.Count)) - case *AlertPolicy_Condition_Trigger_Percent: - b.EncodeVarint(2<<3 | proto.WireFixed64) - b.EncodeFixed64(math.Float64bits(x.Percent)) - case nil: - default: - return fmt.Errorf("AlertPolicy_Condition_Trigger.Type has unexpected type %T", x) - } - return nil -} - -func _AlertPolicy_Condition_Trigger_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*AlertPolicy_Condition_Trigger) - switch tag { - case 1: // type.count - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.Type = &AlertPolicy_Condition_Trigger_Count{int32(x)} - return true, err - case 2: // type.percent - if wire != proto.WireFixed64 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed64() - m.Type = &AlertPolicy_Condition_Trigger_Percent{math.Float64frombits(x)} - return true, err - default: - return false, nil - } -} - -func _AlertPolicy_Condition_Trigger_OneofSizer(msg proto.Message) (n int) { - m := msg.(*AlertPolicy_Condition_Trigger) - // type - switch x := m.Type.(type) { - case *AlertPolicy_Condition_Trigger_Count: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.Count)) - case *AlertPolicy_Condition_Trigger_Percent: - n += 1 // tag and wire - n += 8 - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - // A condition type that compares a collection of time series // against a threshold. type AlertPolicy_Condition_MetricThreshold struct { @@ -636,8 +533,10 @@ type AlertPolicy_Condition_MetricThreshold struct { // are applied in the order specified. // // This field is similar to the one in the - // [`MetricService.ListTimeSeries` request](/monitoring/api/ref_v3/rest/v3/projects.timeSeries/list). - // It is advisable to use the `ListTimeSeries` method when debugging this field. + // [`MetricService.ListTimeSeries` + // request](/monitoring/api/ref_v3/rest/v3/projects.timeSeries/list). It + // is advisable to use the `ListTimeSeries` method when debugging this + // field. Aggregations []*Aggregation `protobuf:"bytes,8,rep,name=aggregations,proto3" json:"aggregations,omitempty"` // A [filter](/monitoring/api/v3/filters) that identifies a time // series that should be used as the denominator of a ratio that will be @@ -645,11 +544,7 @@ type AlertPolicy_Condition_MetricThreshold struct { // the time series specified by the `filter` field will be used as the // numerator. // - // The filter is similar to the one that is specified in the - // [`MetricService.ListTimeSeries` - // request](/monitoring/api/ref_v3/rest/v3/projects.timeSeries/list) (that - // call is useful to verify the time series that will be retrieved / - // processed) and must specify the metric type and optionally may contain + // The filter must specify the metric type and optionally may contain // restrictions on resource type, resource labels, and metric labels. // This field may not exceed 2048 Unicode characters in length. DenominatorFilter string `protobuf:"bytes,9,opt,name=denominator_filter,json=denominatorFilter,proto3" json:"denominator_filter,omitempty"` @@ -663,12 +558,6 @@ type AlertPolicy_Condition_MetricThreshold struct { // When computing ratios, the `aggregations` and // `denominator_aggregations` fields must use the same alignment period // and produce time series that have the same periodicity and labels. - // - // This field is similar to the one in the - // [`MetricService.ListTimeSeries` - // request](/monitoring/api/ref_v3/rest/v3/projects.timeSeries/list). It - // is advisable to use the `ListTimeSeries` method when debugging this - // field. DenominatorAggregations []*Aggregation `protobuf:"bytes,10,rep,name=denominator_aggregations,json=denominatorAggregations,proto3" json:"denominator_aggregations,omitempty"` // The comparison to apply between the time series (indicated by `filter` // and `aggregation`) and the threshold (indicated by `threshold_value`). @@ -706,16 +595,17 @@ func (m *AlertPolicy_Condition_MetricThreshold) Reset() { *m = AlertPoli func (m *AlertPolicy_Condition_MetricThreshold) String() string { return proto.CompactTextString(m) } func (*AlertPolicy_Condition_MetricThreshold) ProtoMessage() {} func (*AlertPolicy_Condition_MetricThreshold) Descriptor() ([]byte, []int) { - return fileDescriptor_alert_9e390b6dbd40ea14, []int{0, 1, 1} + return fileDescriptor_014ef0e1a0f00a00, []int{0, 1, 1} } + func (m *AlertPolicy_Condition_MetricThreshold) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_AlertPolicy_Condition_MetricThreshold.Unmarshal(m, b) } func (m *AlertPolicy_Condition_MetricThreshold) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_AlertPolicy_Condition_MetricThreshold.Marshal(b, m, deterministic) } -func (dst *AlertPolicy_Condition_MetricThreshold) XXX_Merge(src proto.Message) { - xxx_messageInfo_AlertPolicy_Condition_MetricThreshold.Merge(dst, src) +func (m *AlertPolicy_Condition_MetricThreshold) XXX_Merge(src proto.Message) { + xxx_messageInfo_AlertPolicy_Condition_MetricThreshold.Merge(m, src) } func (m *AlertPolicy_Condition_MetricThreshold) XXX_Size() int { return xxx_messageInfo_AlertPolicy_Condition_MetricThreshold.Size(m) @@ -807,8 +697,10 @@ type AlertPolicy_Condition_MetricAbsence struct { // are applied in the order specified. // // This field is similar to the - // one in the [`MetricService.ListTimeSeries` request](/monitoring/api/ref_v3/rest/v3/projects.timeSeries/list). - // It is advisable to use the `ListTimeSeries` method when debugging this field. + // one in the [`MetricService.ListTimeSeries` + // request](/monitoring/api/ref_v3/rest/v3/projects.timeSeries/list). It + // is advisable to use the `ListTimeSeries` method when debugging this + // field. Aggregations []*Aggregation `protobuf:"bytes,5,rep,name=aggregations,proto3" json:"aggregations,omitempty"` // The amount of time that a time series must fail to report new // data to be considered failing. Currently, only values that @@ -831,16 +723,17 @@ func (m *AlertPolicy_Condition_MetricAbsence) Reset() { *m = AlertPolicy func (m *AlertPolicy_Condition_MetricAbsence) String() string { return proto.CompactTextString(m) } func (*AlertPolicy_Condition_MetricAbsence) ProtoMessage() {} func (*AlertPolicy_Condition_MetricAbsence) Descriptor() ([]byte, []int) { - return fileDescriptor_alert_9e390b6dbd40ea14, []int{0, 1, 2} + return fileDescriptor_014ef0e1a0f00a00, []int{0, 1, 2} } + func (m *AlertPolicy_Condition_MetricAbsence) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_AlertPolicy_Condition_MetricAbsence.Unmarshal(m, b) } func (m *AlertPolicy_Condition_MetricAbsence) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_AlertPolicy_Condition_MetricAbsence.Marshal(b, m, deterministic) } -func (dst *AlertPolicy_Condition_MetricAbsence) XXX_Merge(src proto.Message) { - xxx_messageInfo_AlertPolicy_Condition_MetricAbsence.Merge(dst, src) +func (m *AlertPolicy_Condition_MetricAbsence) XXX_Merge(src proto.Message) { + xxx_messageInfo_AlertPolicy_Condition_MetricAbsence.Merge(m, src) } func (m *AlertPolicy_Condition_MetricAbsence) XXX_Size() int { return xxx_messageInfo_AlertPolicy_Condition_MetricAbsence.Size(m) @@ -880,6 +773,7 @@ func (m *AlertPolicy_Condition_MetricAbsence) GetTrigger() *AlertPolicy_Conditio } func init() { + proto.RegisterEnum("google.monitoring.v3.AlertPolicy_ConditionCombinerType", AlertPolicy_ConditionCombinerType_name, AlertPolicy_ConditionCombinerType_value) proto.RegisterType((*AlertPolicy)(nil), "google.monitoring.v3.AlertPolicy") proto.RegisterMapType((map[string]string)(nil), "google.monitoring.v3.AlertPolicy.UserLabelsEntry") proto.RegisterType((*AlertPolicy_Documentation)(nil), "google.monitoring.v3.AlertPolicy.Documentation") @@ -887,72 +781,71 @@ func init() { proto.RegisterType((*AlertPolicy_Condition_Trigger)(nil), "google.monitoring.v3.AlertPolicy.Condition.Trigger") proto.RegisterType((*AlertPolicy_Condition_MetricThreshold)(nil), "google.monitoring.v3.AlertPolicy.Condition.MetricThreshold") proto.RegisterType((*AlertPolicy_Condition_MetricAbsence)(nil), "google.monitoring.v3.AlertPolicy.Condition.MetricAbsence") - proto.RegisterEnum("google.monitoring.v3.AlertPolicy_ConditionCombinerType", AlertPolicy_ConditionCombinerType_name, AlertPolicy_ConditionCombinerType_value) } -func init() { - proto.RegisterFile("google/monitoring/v3/alert.proto", fileDescriptor_alert_9e390b6dbd40ea14) -} - -var fileDescriptor_alert_9e390b6dbd40ea14 = []byte{ - // 941 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0xeb, 0x6e, 0xe3, 0x44, - 0x14, 0xae, 0x93, 0xe6, 0x76, 0xd2, 0x36, 0xd9, 0xd9, 0xee, 0xae, 0x31, 0x68, 0x95, 0xae, 0x90, - 0x88, 0x40, 0x38, 0x22, 0x01, 0x71, 0x59, 0x81, 0x94, 0x5b, 0x37, 0x11, 0x24, 0xad, 0xa6, 0x69, - 0x91, 0x50, 0x25, 0xcb, 0x71, 0xa6, 0xae, 0x85, 0x3d, 0x63, 0x4d, 0xec, 0xa2, 0xbc, 0x0e, 0x3f, - 0x79, 0x14, 0x1e, 0x81, 0x7f, 0xbc, 0x02, 0xe2, 0x01, 0x90, 0xc7, 0x63, 0xc7, 0xe9, 0xa6, 0xbb, - 0x64, 0xf7, 0x5f, 0xce, 0x9c, 0xef, 0x7c, 0xe7, 0xf6, 0xcd, 0x38, 0xd0, 0xb0, 0x19, 0xb3, 0x5d, - 0xd2, 0xf2, 0x18, 0x75, 0x02, 0xc6, 0x1d, 0x6a, 0xb7, 0xee, 0x3a, 0x2d, 0xd3, 0x25, 0x3c, 0xd0, - 0x7d, 0xce, 0x02, 0x86, 0x8e, 0x63, 0x84, 0xbe, 0x46, 0xe8, 0x77, 0x1d, 0xed, 0x23, 0x19, 0x67, - 0xfa, 0x4e, 0xcb, 0xa4, 0x94, 0x05, 0x66, 0xe0, 0x30, 0xba, 0x8c, 0x63, 0xb4, 0x93, 0xad, 0xac, - 0x16, 0xf3, 0x3c, 0x46, 0x25, 0xe4, 0xd3, 0xad, 0x10, 0x2f, 0x8c, 0x89, 0x0c, 0x4e, 0x2c, 0xc6, - 0x17, 0x12, 0xfb, 0x5c, 0x62, 0x85, 0x35, 0x0f, 0x6f, 0x5a, 0x8b, 0x90, 0x0b, 0xd8, 0x43, 0xfe, - 0xdf, 0xb8, 0xe9, 0xfb, 0x84, 0xcb, 0x72, 0x5e, 0xfc, 0x5d, 0x83, 0x6a, 0x37, 0x6a, 0xe9, 0x9c, - 0xb9, 0x8e, 0xb5, 0x42, 0x08, 0xf6, 0xa9, 0xe9, 0x11, 0x55, 0x69, 0x28, 0xcd, 0x0a, 0x16, 0xbf, - 0xd1, 0x09, 0x1c, 0x2c, 0x9c, 0xa5, 0xef, 0x9a, 0x2b, 0x43, 0xf8, 0x72, 0xc2, 0x57, 0x95, 0x67, - 0xd3, 0x08, 0x72, 0x09, 0x87, 0x0b, 0x66, 0x85, 0x1e, 0xa1, 0x71, 0x91, 0xea, 0x61, 0x43, 0x69, - 0x56, 0xdb, 0x2d, 0x7d, 0xdb, 0x84, 0xf4, 0x4c, 0x42, 0x7d, 0x90, 0x0d, 0xc3, 0x9b, 0x2c, 0x08, - 0x43, 0x35, 0x5c, 0x12, 0x6e, 0xb8, 0xe6, 0x9c, 0xb8, 0x4b, 0xb5, 0xde, 0xc8, 0x37, 0xab, 0xed, - 0x2f, 0xde, 0x4e, 0x7a, 0xb9, 0x24, 0xfc, 0x27, 0x11, 0x33, 0xa4, 0x01, 0x5f, 0x61, 0x08, 0xd3, - 0x03, 0xf4, 0x23, 0x80, 0xc5, 0xe8, 0xc2, 0x11, 0x4b, 0x51, 0x0f, 0x04, 0xe5, 0x67, 0x6f, 0xa7, - 0xec, 0x27, 0x31, 0x38, 0x13, 0x8e, 0x2e, 0xa0, 0x6c, 0x31, 0x6f, 0xee, 0x50, 0xc2, 0xd5, 0x62, - 0x43, 0x69, 0x1e, 0xb5, 0xbf, 0xde, 0x81, 0xaa, 0x2f, 0x43, 0x67, 0x2b, 0x9f, 0xe0, 0x94, 0x08, - 0x7d, 0x09, 0x25, 0x42, 0xcd, 0xb9, 0x4b, 0x16, 0xea, 0x23, 0x31, 0x46, 0x2d, 0xe1, 0x4c, 0xb6, - 0xa8, 0xf7, 0x18, 0x73, 0xaf, 0x4c, 0x37, 0x24, 0x38, 0x81, 0xa2, 0x0e, 0x3c, 0xa1, 0x2c, 0x70, - 0x6e, 0x1c, 0x2b, 0x96, 0x89, 0x75, 0x6b, 0x52, 0x1a, 0x4d, 0xed, 0xa8, 0x91, 0x6f, 0x56, 0xf0, - 0x71, 0xd6, 0xd9, 0x97, 0x3e, 0x34, 0x81, 0x9a, 0xc5, 0x49, 0x56, 0x57, 0x2a, 0x88, 0x94, 0x1f, - 0x6f, 0x6f, 0x63, 0x22, 0x45, 0x88, 0x05, 0x16, 0x1f, 0x25, 0xc1, 0xb1, 0x1d, 0xd1, 0xdd, 0x93, - 0xa9, 0x5a, 0xdd, 0x85, 0xce, 0xdb, 0xb0, 0xb5, 0x53, 0x38, 0xdc, 0x90, 0x07, 0x52, 0xa1, 0x64, - 0x31, 0x1a, 0x10, 0x1a, 0x48, 0x81, 0x26, 0x26, 0xfa, 0x10, 0x2a, 0x9e, 0xe3, 0x11, 0x23, 0x58, - 0xf9, 0x89, 0x40, 0xcb, 0xd1, 0x41, 0x34, 0x5a, 0xed, 0xaf, 0x32, 0x54, 0xd2, 0xa1, 0xa7, 0x12, - 0x3f, 0x78, 0x83, 0xc4, 0x8b, 0xaf, 0x4b, 0x9c, 0xc2, 0xe3, 0x74, 0xf1, 0x46, 0x70, 0xcb, 0xc9, - 0xf2, 0x96, 0xb9, 0x0b, 0x51, 0x47, 0xb5, 0xfd, 0x72, 0x87, 0xad, 0xeb, 0x13, 0x12, 0x70, 0xc7, - 0x9a, 0x25, 0x14, 0xa3, 0x3d, 0x8c, 0x52, 0xe6, 0xf4, 0x14, 0xdd, 0x40, 0x7d, 0x9d, 0xcf, 0x9c, - 0x2f, 0xa3, 0xa6, 0x73, 0x22, 0xd9, 0xb7, 0xbb, 0x27, 0xeb, 0x46, 0xf1, 0x16, 0x19, 0xed, 0xe1, - 0x5a, 0x4a, 0x2a, 0xce, 0x02, 0x6d, 0x08, 0xa5, 0x19, 0x77, 0x6c, 0x9b, 0x70, 0xf4, 0x14, 0x0a, - 0x16, 0x0b, 0xe5, 0x70, 0x0b, 0xa3, 0x3d, 0x1c, 0x9b, 0x48, 0x83, 0x92, 0x4f, 0xb8, 0x95, 0x54, - 0xa0, 0x8c, 0xf6, 0x70, 0x72, 0xd0, 0x2b, 0xc2, 0x7e, 0x34, 0x73, 0xed, 0x9f, 0x3c, 0xd4, 0xee, - 0x35, 0x86, 0x9e, 0x42, 0xf1, 0xc6, 0x71, 0x03, 0xc2, 0xe5, 0x46, 0xa4, 0x85, 0x86, 0x70, 0x60, - 0xda, 0x36, 0x27, 0x76, 0xfc, 0x32, 0xaa, 0x65, 0x71, 0x09, 0x4f, 0x1e, 0x68, 0x6b, 0x8d, 0xc4, - 0x1b, 0x61, 0xe8, 0x73, 0x40, 0x0b, 0x42, 0x99, 0xe7, 0x50, 0x33, 0x60, 0xdc, 0x90, 0xa9, 0x2a, - 0x22, 0xd5, 0xa3, 0x8c, 0xe7, 0x34, 0xce, 0x7a, 0x0d, 0x6a, 0x16, 0xbe, 0x51, 0x01, 0xfc, 0xdf, - 0x0a, 0x9e, 0x65, 0x28, 0xba, 0xd9, 0x62, 0x06, 0xd1, 0xb3, 0xe2, 0xf9, 0x26, 0x77, 0x96, 0x8c, - 0xaa, 0xfb, 0xe2, 0x2d, 0x78, 0x40, 0xf5, 0xfd, 0x14, 0x27, 0x2e, 0x7e, 0x26, 0x0e, 0x7d, 0x02, - 0xb5, 0x54, 0x5a, 0xc6, 0x5d, 0x74, 0xc1, 0xd5, 0x42, 0x34, 0x71, 0x7c, 0x94, 0x1e, 0x8b, 0x6b, - 0x8f, 0xbe, 0x82, 0x72, 0xf2, 0xd2, 0x0b, 0xb1, 0x56, 0xdb, 0x1f, 0xbc, 0xf6, 0x48, 0x0c, 0x24, - 0x00, 0xa7, 0x50, 0x34, 0x81, 0x52, 0x10, 0x2f, 0x5b, 0x2d, 0x89, 0xa8, 0xce, 0x2e, 0x5a, 0x92, - 0x3a, 0xc1, 0x09, 0x87, 0xf6, 0xaf, 0x02, 0x87, 0x1b, 0x02, 0xcb, 0xac, 0x5c, 0x79, 0xe3, 0xca, - 0x0b, 0xef, 0xb6, 0xf2, 0x6c, 0xdb, 0xb9, 0x77, 0x6a, 0x3b, 0xff, 0xfe, 0x6d, 0xf7, 0xaa, 0x50, - 0x49, 0x6f, 0x91, 0xf6, 0x3d, 0xd4, 0xee, 0x7d, 0x6e, 0x50, 0x1d, 0xf2, 0xbf, 0x92, 0x95, 0x9c, - 0x40, 0xf4, 0x13, 0x1d, 0x43, 0x21, 0xde, 0x66, 0x7c, 0x11, 0x62, 0xe3, 0xbb, 0xdc, 0x37, 0xca, - 0x0b, 0x13, 0x9e, 0x6c, 0xfd, 0x1e, 0xa0, 0x67, 0xf0, 0xb8, 0x7f, 0x36, 0xe9, 0x8d, 0xa7, 0x43, - 0xe3, 0x72, 0x7a, 0x71, 0x3e, 0xec, 0x8f, 0x4f, 0xc7, 0xc3, 0x41, 0x7d, 0x0f, 0x95, 0x20, 0xdf, - 0x9d, 0x0e, 0xea, 0x0a, 0x2a, 0x42, 0xee, 0x0c, 0xd7, 0x73, 0xe8, 0x39, 0x68, 0xdd, 0xe9, 0xc0, - 0xf8, 0x79, 0x3c, 0x1b, 0x19, 0x93, 0xee, 0xac, 0x3f, 0x1a, 0x4f, 0x5f, 0x19, 0x78, 0x78, 0x71, - 0x76, 0x89, 0xfb, 0xc3, 0x7a, 0xbe, 0xf7, 0xbb, 0x02, 0xaa, 0xc5, 0xbc, 0xad, 0x2d, 0xf7, 0x20, - 0xee, 0x39, 0x1a, 0xde, 0xb9, 0xf2, 0xcb, 0x0f, 0x12, 0x63, 0x33, 0xd7, 0xa4, 0xb6, 0xce, 0xb8, - 0xdd, 0xb2, 0x09, 0x15, 0xa3, 0x6d, 0xc5, 0x2e, 0xd3, 0x77, 0x96, 0x9b, 0xff, 0x4c, 0x5e, 0xae, - 0xad, 0x3f, 0x72, 0xda, 0xab, 0x98, 0xa0, 0xef, 0xb2, 0x70, 0xa1, 0x4f, 0xd6, 0xa9, 0xae, 0x3a, - 0x7f, 0x26, 0xce, 0x6b, 0xe1, 0xbc, 0x5e, 0x3b, 0xaf, 0xaf, 0x3a, 0xf3, 0xa2, 0x48, 0xd2, 0xf9, - 0x2f, 0x00, 0x00, 0xff, 0xff, 0x66, 0xb5, 0x16, 0x64, 0x76, 0x09, 0x00, 0x00, +func init() { proto.RegisterFile("google/monitoring/v3/alert.proto", fileDescriptor_014ef0e1a0f00a00) } + +var fileDescriptor_014ef0e1a0f00a00 = []byte{ + // 965 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0xfd, 0x6e, 0xe3, 0x44, + 0x10, 0xaf, 0x93, 0xe6, 0x6b, 0xd2, 0x36, 0xb9, 0xbd, 0xde, 0xd5, 0x18, 0xe9, 0x94, 0x9e, 0x90, + 0x88, 0x40, 0x38, 0x22, 0x01, 0xf1, 0x71, 0x02, 0x29, 0x5f, 0xbd, 0x44, 0x90, 0xb4, 0xda, 0xa6, + 0x45, 0x42, 0x95, 0x2c, 0xc7, 0xde, 0xba, 0x16, 0xf6, 0xae, 0xb5, 0xb6, 0x8b, 0xf2, 0x18, 0xbc, + 0x02, 0x7f, 0xf2, 0x28, 0x3c, 0x02, 0x8f, 0x81, 0x78, 0x00, 0xe4, 0xf5, 0x47, 0x9c, 0x5e, 0x7a, + 0x47, 0x8e, 0xff, 0x32, 0x3b, 0xbf, 0xf9, 0xcd, 0xce, 0xcc, 0x6f, 0xd6, 0x81, 0x96, 0xc5, 0x98, + 0xe5, 0x90, 0x8e, 0xcb, 0xa8, 0x1d, 0x30, 0x6e, 0x53, 0xab, 0x73, 0xdf, 0xeb, 0xe8, 0x0e, 0xe1, + 0x81, 0xea, 0x71, 0x16, 0x30, 0x74, 0x1c, 0x23, 0xd4, 0x35, 0x42, 0xbd, 0xef, 0x29, 0xa7, 0x5b, + 0xe3, 0x0c, 0xe6, 0xba, 0x8c, 0xc6, 0x81, 0xca, 0x27, 0x5b, 0x21, 0x6e, 0x18, 0xe8, 0x81, 0xcd, + 0xa8, 0xc6, 0x89, 0xc1, 0xb8, 0x99, 0x60, 0x5f, 0x24, 0x58, 0x61, 0x2d, 0xc3, 0xdb, 0x8e, 0x19, + 0x72, 0x01, 0x7b, 0xcc, 0xff, 0x2b, 0xd7, 0x3d, 0x8f, 0x70, 0x3f, 0xf1, 0x9f, 0x24, 0x7e, 0xee, + 0x19, 0x1d, 0x3f, 0xd0, 0x83, 0x30, 0x71, 0xbc, 0xfc, 0xad, 0x09, 0xf5, 0x7e, 0x54, 0xcd, 0x05, + 0x73, 0x6c, 0x63, 0x85, 0x10, 0xec, 0x53, 0xdd, 0x25, 0xb2, 0xd4, 0x92, 0xda, 0x35, 0x2c, 0x7e, + 0xa3, 0x53, 0x38, 0x30, 0x6d, 0xdf, 0x73, 0xf4, 0x95, 0x26, 0x7c, 0x05, 0xe1, 0xab, 0x27, 0x67, + 0xf3, 0x08, 0x72, 0x05, 0x87, 0x26, 0x33, 0x42, 0x97, 0xd0, 0xf8, 0xf6, 0xf2, 0x61, 0x4b, 0x6a, + 0xd7, 0xbb, 0x1d, 0x75, 0x5b, 0x73, 0xd4, 0x5c, 0x42, 0x75, 0x94, 0x0f, 0xc3, 0x9b, 0x2c, 0x08, + 0x43, 0x3d, 0xf4, 0x09, 0xd7, 0x1c, 0x7d, 0x49, 0x1c, 0x5f, 0x6e, 0xb6, 0x8a, 0xed, 0x7a, 0xf7, + 0xf3, 0x77, 0x93, 0x5e, 0xf9, 0x84, 0xff, 0x28, 0x62, 0xc6, 0x34, 0xe0, 0x2b, 0x0c, 0x61, 0x76, + 0x80, 0x7e, 0x00, 0x30, 0x18, 0x35, 0xed, 0x28, 0x81, 0x2f, 0x1f, 0x08, 0xca, 0x4f, 0xdf, 0x4d, + 0x39, 0x4c, 0x63, 0x70, 0x2e, 0x1c, 0x5d, 0x42, 0xd5, 0x60, 0xee, 0xd2, 0xa6, 0x84, 0xcb, 0xe5, + 0x96, 0xd4, 0x3e, 0xea, 0x7e, 0xb5, 0x03, 0xd5, 0x30, 0x09, 0x5d, 0xac, 0x3c, 0x82, 0x33, 0x22, + 0xf4, 0x05, 0x54, 0x08, 0xd5, 0x97, 0x0e, 0x31, 0xe5, 0x27, 0xa2, 0x8d, 0x4a, 0xca, 0x99, 0x8e, + 0x57, 0x1d, 0x30, 0xe6, 0x5c, 0xeb, 0x4e, 0x48, 0x70, 0x0a, 0x45, 0x2a, 0x54, 0xef, 0x75, 0xc7, + 0x36, 0xed, 0x60, 0x25, 0x23, 0x11, 0x86, 0xd2, 0x30, 0xee, 0x19, 0xea, 0xa5, 0x98, 0x3a, 0xce, + 0x30, 0xa8, 0x07, 0xcf, 0x28, 0x0b, 0xec, 0x5b, 0xdb, 0x88, 0xf5, 0x66, 0xdc, 0xe9, 0x94, 0x46, + 0x5d, 0x3e, 0x6a, 0x15, 0xdb, 0x35, 0x7c, 0x9c, 0x77, 0x0e, 0x13, 0x1f, 0x9a, 0x41, 0xc3, 0xe0, + 0x24, 0x2f, 0x50, 0x19, 0x44, 0xae, 0x8f, 0xb6, 0x97, 0x3d, 0x4b, 0xd4, 0x8c, 0x05, 0x16, 0x1f, + 0xa5, 0xc1, 0xb1, 0x1d, 0xd1, 0x3d, 0xd0, 0xbb, 0x5c, 0xdf, 0x85, 0xce, 0xdd, 0xb0, 0x95, 0x33, + 0x38, 0xdc, 0x90, 0x13, 0x92, 0xa1, 0x62, 0x30, 0x1a, 0x10, 0x1a, 0x24, 0x82, 0x4e, 0x4d, 0xf4, + 0x21, 0xd4, 0x5c, 0xdb, 0x25, 0x5a, 0xb0, 0xf2, 0x52, 0x41, 0x57, 0xa3, 0x83, 0x68, 0x14, 0xca, + 0x5f, 0x55, 0xa8, 0x65, 0x43, 0xca, 0x56, 0xe2, 0xe0, 0x2d, 0x2b, 0x51, 0x7e, 0x73, 0x25, 0x28, + 0x3c, 0xcd, 0x84, 0xa2, 0x05, 0x77, 0x9c, 0xf8, 0x77, 0xcc, 0x31, 0xc5, 0x3d, 0xea, 0xdd, 0x57, + 0x3b, 0xa8, 0x44, 0x9d, 0x91, 0x80, 0xdb, 0xc6, 0x22, 0xa5, 0x98, 0xec, 0x61, 0x94, 0x31, 0x67, + 0xa7, 0xe8, 0x16, 0x9a, 0xeb, 0x7c, 0xfa, 0xd2, 0x8f, 0x8a, 0x2e, 0x88, 0x64, 0xdf, 0xec, 0x9e, + 0xac, 0x1f, 0xc5, 0x1b, 0x64, 0xb2, 0x87, 0x1b, 0x19, 0xa9, 0x38, 0x0b, 0x94, 0x31, 0x54, 0x16, + 0xdc, 0xb6, 0x2c, 0xc2, 0xd1, 0x73, 0x28, 0x19, 0x2c, 0x4c, 0x9a, 0x5b, 0x9a, 0xec, 0xe1, 0xd8, + 0x44, 0x0a, 0x54, 0x3c, 0xc2, 0x8d, 0xf4, 0x06, 0xd2, 0x64, 0x0f, 0xa7, 0x07, 0x83, 0x32, 0xec, + 0x47, 0x3d, 0x57, 0xfe, 0x2e, 0x42, 0xe3, 0x41, 0x61, 0xe8, 0x39, 0x94, 0x6f, 0x6d, 0x27, 0x20, + 0x3c, 0x99, 0x48, 0x62, 0xa1, 0x31, 0x1c, 0xe8, 0x96, 0xc5, 0x89, 0xa5, 0xc7, 0x4b, 0x5b, 0x15, + 0x4b, 0x7b, 0xfa, 0x48, 0x59, 0x6b, 0x24, 0xde, 0x08, 0x43, 0x9f, 0x01, 0x32, 0x09, 0x65, 0xae, + 0x4d, 0xf5, 0x80, 0x71, 0x2d, 0x49, 0x55, 0x13, 0xa9, 0x9e, 0xe4, 0x3c, 0x67, 0x71, 0xd6, 0x1b, + 0x90, 0xf3, 0xf0, 0x8d, 0x1b, 0xc0, 0x7f, 0xbd, 0xc1, 0x49, 0x8e, 0xa2, 0x9f, 0xbf, 0xcc, 0x28, + 0x7a, 0x86, 0x5c, 0x4f, 0xe7, 0xb6, 0xcf, 0xa8, 0xbc, 0x2f, 0xde, 0x8e, 0x47, 0x54, 0x3f, 0xcc, + 0x70, 0xe2, 0xa1, 0xc8, 0xc5, 0xa1, 0x8f, 0xa1, 0x91, 0x49, 0x4b, 0xbb, 0x8f, 0x1e, 0x04, 0xb9, + 0x14, 0x75, 0x1c, 0x1f, 0x65, 0xc7, 0xe2, 0x99, 0x40, 0x5f, 0x42, 0x35, 0xfd, 0x64, 0x08, 0xb1, + 0xd6, 0xbb, 0x1f, 0xbc, 0xf1, 0xa8, 0x8c, 0x12, 0x00, 0xce, 0xa0, 0x68, 0x06, 0x95, 0x20, 0x1e, + 0xb6, 0x5c, 0x11, 0x51, 0xbd, 0x5d, 0xb4, 0x94, 0xe8, 0x04, 0xa7, 0x1c, 0xca, 0x3f, 0x12, 0x1c, + 0x6e, 0x08, 0x2c, 0x37, 0x72, 0xe9, 0xad, 0x23, 0x2f, 0xbd, 0xdf, 0xc8, 0xf3, 0x65, 0x17, 0xde, + 0xab, 0xec, 0xe2, 0xff, 0x2f, 0x7b, 0x50, 0x87, 0x5a, 0xb6, 0x45, 0xca, 0x77, 0xd0, 0x78, 0xf0, + 0x79, 0x42, 0x4d, 0x28, 0xfe, 0x42, 0x56, 0x49, 0x07, 0xa2, 0x9f, 0xe8, 0x18, 0x4a, 0xf1, 0x34, + 0xe3, 0x45, 0x88, 0x8d, 0x6f, 0x0b, 0x5f, 0x4b, 0x2f, 0x75, 0x78, 0xb6, 0xf5, 0xfb, 0x81, 0x4e, + 0xe0, 0xe9, 0xf0, 0x7c, 0x36, 0x98, 0xce, 0xc7, 0xda, 0xd5, 0xfc, 0xf2, 0x62, 0x3c, 0x9c, 0x9e, + 0x4d, 0xc7, 0xa3, 0xe6, 0x1e, 0xaa, 0x40, 0xb1, 0x3f, 0x1f, 0x35, 0x25, 0x54, 0x86, 0xc2, 0x39, + 0x6e, 0x16, 0xd0, 0x0b, 0x50, 0xfa, 0xf3, 0x91, 0xf6, 0xd3, 0x74, 0x31, 0xd1, 0x66, 0xfd, 0xc5, + 0x70, 0x32, 0x9d, 0xbf, 0xd6, 0xf0, 0xf8, 0xf2, 0xfc, 0x0a, 0x0f, 0xc7, 0xcd, 0xe2, 0xe0, 0x77, + 0x09, 0x64, 0x83, 0xb9, 0x5b, 0x4b, 0x1e, 0x40, 0x5c, 0x73, 0xd4, 0xbc, 0x0b, 0xe9, 0xe7, 0xef, + 0x13, 0x8c, 0xc5, 0x1c, 0x9d, 0x5a, 0x2a, 0xe3, 0x56, 0xc7, 0x22, 0x54, 0xb4, 0xb6, 0x13, 0xbb, + 0x74, 0xcf, 0xf6, 0x37, 0xff, 0xe2, 0xbc, 0x5a, 0x5b, 0x7f, 0x14, 0x94, 0xd7, 0x31, 0xc1, 0xd0, + 0x61, 0xa1, 0xa9, 0xce, 0xd6, 0xa9, 0xae, 0x7b, 0x7f, 0xa6, 0xce, 0x1b, 0xe1, 0xbc, 0x59, 0x3b, + 0x6f, 0xae, 0x7b, 0xcb, 0xb2, 0x48, 0xd2, 0xfb, 0x37, 0x00, 0x00, 0xff, 0xff, 0x41, 0x91, 0x1a, + 0x51, 0xa1, 0x09, 0x00, 0x00, } diff --git a/vendor/google.golang.org/genproto/googleapis/monitoring/v3/alert_service.pb.go b/vendor/google.golang.org/genproto/googleapis/monitoring/v3/alert_service.pb.go index ad711c9155..aed183eac4 100644 --- a/vendor/google.golang.org/genproto/googleapis/monitoring/v3/alert_service.pb.go +++ b/vendor/google.golang.org/genproto/googleapis/monitoring/v3/alert_service.pb.go @@ -1,18 +1,20 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: google/monitoring/v3/alert_service.proto -package monitoring // import "google.golang.org/genproto/googleapis/monitoring/v3" - -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" -import empty "github.com/golang/protobuf/ptypes/empty" -import _ "google.golang.org/genproto/googleapis/api/annotations" -import field_mask "google.golang.org/genproto/protobuf/field_mask" +package monitoring import ( - context "golang.org/x/net/context" + context "context" + fmt "fmt" + math "math" + + proto "github.com/golang/protobuf/proto" + empty "github.com/golang/protobuf/ptypes/empty" + _ "google.golang.org/genproto/googleapis/api/annotations" + field_mask "google.golang.org/genproto/protobuf/field_mask" grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" ) // Reference imports to suppress errors if they are not otherwise used. @@ -24,7 +26,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // The protocol for the `CreateAlertPolicy` request. type CreateAlertPolicyRequest struct { @@ -50,16 +52,17 @@ func (m *CreateAlertPolicyRequest) Reset() { *m = CreateAlertPolicyReque func (m *CreateAlertPolicyRequest) String() string { return proto.CompactTextString(m) } func (*CreateAlertPolicyRequest) ProtoMessage() {} func (*CreateAlertPolicyRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_alert_service_4a748eee76dab644, []int{0} + return fileDescriptor_c45362b2a456d1bf, []int{0} } + func (m *CreateAlertPolicyRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateAlertPolicyRequest.Unmarshal(m, b) } func (m *CreateAlertPolicyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_CreateAlertPolicyRequest.Marshal(b, m, deterministic) } -func (dst *CreateAlertPolicyRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_CreateAlertPolicyRequest.Merge(dst, src) +func (m *CreateAlertPolicyRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_CreateAlertPolicyRequest.Merge(m, src) } func (m *CreateAlertPolicyRequest) XXX_Size() int { return xxx_messageInfo_CreateAlertPolicyRequest.Size(m) @@ -99,16 +102,17 @@ func (m *GetAlertPolicyRequest) Reset() { *m = GetAlertPolicyRequest{} } func (m *GetAlertPolicyRequest) String() string { return proto.CompactTextString(m) } func (*GetAlertPolicyRequest) ProtoMessage() {} func (*GetAlertPolicyRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_alert_service_4a748eee76dab644, []int{1} + return fileDescriptor_c45362b2a456d1bf, []int{1} } + func (m *GetAlertPolicyRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetAlertPolicyRequest.Unmarshal(m, b) } func (m *GetAlertPolicyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_GetAlertPolicyRequest.Marshal(b, m, deterministic) } -func (dst *GetAlertPolicyRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetAlertPolicyRequest.Merge(dst, src) +func (m *GetAlertPolicyRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetAlertPolicyRequest.Merge(m, src) } func (m *GetAlertPolicyRequest) XXX_Size() int { return xxx_messageInfo_GetAlertPolicyRequest.Size(m) @@ -166,16 +170,17 @@ func (m *ListAlertPoliciesRequest) Reset() { *m = ListAlertPoliciesReque func (m *ListAlertPoliciesRequest) String() string { return proto.CompactTextString(m) } func (*ListAlertPoliciesRequest) ProtoMessage() {} func (*ListAlertPoliciesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_alert_service_4a748eee76dab644, []int{2} + return fileDescriptor_c45362b2a456d1bf, []int{2} } + func (m *ListAlertPoliciesRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ListAlertPoliciesRequest.Unmarshal(m, b) } func (m *ListAlertPoliciesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ListAlertPoliciesRequest.Marshal(b, m, deterministic) } -func (dst *ListAlertPoliciesRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_ListAlertPoliciesRequest.Merge(dst, src) +func (m *ListAlertPoliciesRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_ListAlertPoliciesRequest.Merge(m, src) } func (m *ListAlertPoliciesRequest) XXX_Size() int { return xxx_messageInfo_ListAlertPoliciesRequest.Size(m) @@ -238,16 +243,17 @@ func (m *ListAlertPoliciesResponse) Reset() { *m = ListAlertPoliciesResp func (m *ListAlertPoliciesResponse) String() string { return proto.CompactTextString(m) } func (*ListAlertPoliciesResponse) ProtoMessage() {} func (*ListAlertPoliciesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_alert_service_4a748eee76dab644, []int{3} + return fileDescriptor_c45362b2a456d1bf, []int{3} } + func (m *ListAlertPoliciesResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ListAlertPoliciesResponse.Unmarshal(m, b) } func (m *ListAlertPoliciesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ListAlertPoliciesResponse.Marshal(b, m, deterministic) } -func (dst *ListAlertPoliciesResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_ListAlertPoliciesResponse.Merge(dst, src) +func (m *ListAlertPoliciesResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_ListAlertPoliciesResponse.Merge(m, src) } func (m *ListAlertPoliciesResponse) XXX_Size() int { return xxx_messageInfo_ListAlertPoliciesResponse.Size(m) @@ -310,16 +316,17 @@ func (m *UpdateAlertPolicyRequest) Reset() { *m = UpdateAlertPolicyReque func (m *UpdateAlertPolicyRequest) String() string { return proto.CompactTextString(m) } func (*UpdateAlertPolicyRequest) ProtoMessage() {} func (*UpdateAlertPolicyRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_alert_service_4a748eee76dab644, []int{4} + return fileDescriptor_c45362b2a456d1bf, []int{4} } + func (m *UpdateAlertPolicyRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UpdateAlertPolicyRequest.Unmarshal(m, b) } func (m *UpdateAlertPolicyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_UpdateAlertPolicyRequest.Marshal(b, m, deterministic) } -func (dst *UpdateAlertPolicyRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_UpdateAlertPolicyRequest.Merge(dst, src) +func (m *UpdateAlertPolicyRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_UpdateAlertPolicyRequest.Merge(m, src) } func (m *UpdateAlertPolicyRequest) XXX_Size() int { return xxx_messageInfo_UpdateAlertPolicyRequest.Size(m) @@ -361,16 +368,17 @@ func (m *DeleteAlertPolicyRequest) Reset() { *m = DeleteAlertPolicyReque func (m *DeleteAlertPolicyRequest) String() string { return proto.CompactTextString(m) } func (*DeleteAlertPolicyRequest) ProtoMessage() {} func (*DeleteAlertPolicyRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_alert_service_4a748eee76dab644, []int{5} + return fileDescriptor_c45362b2a456d1bf, []int{5} } + func (m *DeleteAlertPolicyRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DeleteAlertPolicyRequest.Unmarshal(m, b) } func (m *DeleteAlertPolicyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_DeleteAlertPolicyRequest.Marshal(b, m, deterministic) } -func (dst *DeleteAlertPolicyRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_DeleteAlertPolicyRequest.Merge(dst, src) +func (m *DeleteAlertPolicyRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_DeleteAlertPolicyRequest.Merge(m, src) } func (m *DeleteAlertPolicyRequest) XXX_Size() int { return xxx_messageInfo_DeleteAlertPolicyRequest.Size(m) @@ -397,6 +405,60 @@ func init() { proto.RegisterType((*DeleteAlertPolicyRequest)(nil), "google.monitoring.v3.DeleteAlertPolicyRequest") } +func init() { + proto.RegisterFile("google/monitoring/v3/alert_service.proto", fileDescriptor_c45362b2a456d1bf) +} + +var fileDescriptor_c45362b2a456d1bf = []byte{ + // 722 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0xcf, 0x4f, 0x13, 0x4d, + 0x18, 0xce, 0xb6, 0xfc, 0x1c, 0x3e, 0xf8, 0xd2, 0xc9, 0xf7, 0xe1, 0xb2, 0x68, 0x52, 0x6b, 0x50, + 0x02, 0xb2, 0x93, 0xb4, 0x27, 0x21, 0x9a, 0x50, 0x50, 0x38, 0x48, 0xd2, 0x14, 0xe5, 0x60, 0x48, + 0x9a, 0xa1, 0x7d, 0xbb, 0x8c, 0x6c, 0x77, 0xd6, 0x9d, 0x29, 0x58, 0x0c, 0x17, 0x6f, 0x9a, 0x18, + 0x0f, 0x9e, 0x3d, 0x78, 0xc4, 0x93, 0x7f, 0x07, 0x47, 0xbd, 0x79, 0xf6, 0x0f, 0x31, 0x3b, 0xbb, + 0x65, 0xb7, 0x74, 0x37, 0xac, 0xde, 0x3a, 0xf3, 0x3e, 0x33, 0xcf, 0x33, 0xcf, 0xfb, 0xbc, 0x5b, + 0xb4, 0x68, 0x71, 0x6e, 0xd9, 0x40, 0x3a, 0xdc, 0x61, 0x92, 0x7b, 0xcc, 0xb1, 0xc8, 0x71, 0x85, + 0x50, 0x1b, 0x3c, 0xd9, 0x10, 0xe0, 0x1d, 0xb3, 0x26, 0x98, 0xae, 0xc7, 0x25, 0xc7, 0xff, 0x05, + 0x48, 0x33, 0x42, 0x9a, 0xc7, 0x15, 0xe3, 0x66, 0x78, 0x9e, 0xba, 0x8c, 0x50, 0xc7, 0xe1, 0x92, + 0x4a, 0xc6, 0x1d, 0x11, 0x9c, 0x31, 0x8a, 0xe9, 0xb7, 0x87, 0x88, 0xf9, 0x10, 0xa1, 0x56, 0x07, + 0xdd, 0x36, 0x81, 0x8e, 0x2b, 0x7b, 0x57, 0x8e, 0x5f, 0x16, 0xdb, 0x0c, 0xec, 0x56, 0xa3, 0x43, + 0xc5, 0x51, 0x88, 0xb8, 0x11, 0xa3, 0x6f, 0xda, 0x0c, 0x9c, 0xf0, 0xde, 0x92, 0x44, 0xfa, 0x86, + 0x07, 0x54, 0xc2, 0xba, 0x4f, 0x56, 0xe3, 0x36, 0x6b, 0xf6, 0xea, 0xf0, 0xaa, 0x0b, 0x42, 0x62, + 0x8c, 0x46, 0x1c, 0xda, 0x01, 0x3d, 0x5f, 0xd4, 0x16, 0x27, 0xeb, 0xea, 0x37, 0xde, 0x44, 0xff, + 0x04, 0x8f, 0x76, 0x15, 0x54, 0xcf, 0x15, 0xb5, 0xc5, 0xa9, 0xf2, 0x6d, 0x33, 0xe9, 0xd1, 0x66, + 0xfc, 0xce, 0x29, 0x1a, 0x2d, 0x4a, 0xcb, 0xe8, 0xff, 0x2d, 0x90, 0xd9, 0x28, 0x4b, 0x9f, 0x35, + 0xa4, 0x3f, 0x65, 0x22, 0x06, 0x67, 0x20, 0xae, 0x1e, 0x18, 0x89, 0x69, 0x9c, 0x45, 0x63, 0x6d, + 0x66, 0x4b, 0xf0, 0xf4, 0x51, 0xb5, 0x1b, 0xae, 0xf0, 0x1c, 0x9a, 0xe0, 0x5e, 0x0b, 0xbc, 0xc6, + 0x41, 0x4f, 0x1f, 0x53, 0x95, 0x71, 0xb5, 0xae, 0xf6, 0xf0, 0x3c, 0x9a, 0x74, 0xa9, 0x05, 0x0d, + 0xc1, 0x4e, 0x41, 0xbd, 0x69, 0xb4, 0x3e, 0xe1, 0x6f, 0xec, 0xb2, 0x53, 0xc0, 0xb7, 0x10, 0x52, + 0x45, 0xc9, 0x8f, 0xc0, 0x09, 0xa5, 0x29, 0xf8, 0x33, 0x7f, 0xa3, 0xf4, 0x41, 0x43, 0x73, 0x09, + 0xfa, 0x84, 0xcb, 0x1d, 0x01, 0x78, 0x1b, 0xcd, 0xc4, 0x0c, 0x63, 0x20, 0xf4, 0x7c, 0x31, 0x9f, + 0xcd, 0xb2, 0x69, 0x1a, 0xbf, 0x11, 0xdf, 0x45, 0xff, 0x3a, 0xf0, 0x5a, 0x36, 0x62, 0x5a, 0x72, + 0x4a, 0xcb, 0xb4, 0xbf, 0x5d, 0xbb, 0xd4, 0xe3, 0xfb, 0xf5, 0xdc, 0x6d, 0x25, 0xf7, 0x74, 0x0d, + 0x4d, 0x75, 0x55, 0x4d, 0xa5, 0x23, 0x6c, 0x9f, 0xd1, 0xd7, 0xd2, 0x0f, 0x90, 0xf9, 0xc4, 0x0f, + 0xd0, 0x0e, 0x15, 0x47, 0x75, 0x14, 0xc0, 0xfd, 0xdf, 0x43, 0xcd, 0xcf, 0xff, 0x55, 0xf3, 0x4d, + 0xa4, 0x6f, 0x82, 0x0d, 0x59, 0x23, 0x57, 0xfe, 0x39, 0x8e, 0x70, 0x0c, 0xba, 0x1b, 0x4c, 0x1b, + 0xfe, 0xa2, 0xa1, 0xc2, 0x90, 0xed, 0xd8, 0x4c, 0x16, 0x93, 0x96, 0x1f, 0x83, 0x64, 0xc6, 0x07, + 0xfd, 0x2c, 0x2d, 0xbf, 0xfd, 0xf1, 0xeb, 0x53, 0x6e, 0x01, 0xdf, 0xf1, 0x27, 0xf4, 0x8d, 0x2f, + 0xf0, 0xa1, 0xeb, 0xf1, 0x97, 0xd0, 0x94, 0x82, 0x2c, 0x9d, 0x91, 0xc1, 0x96, 0x7d, 0xd4, 0xd0, + 0xcc, 0x60, 0xd0, 0xf1, 0x72, 0x32, 0x61, 0xe2, 0x38, 0x18, 0xd7, 0x5b, 0x5b, 0x5a, 0x51, 0x7a, + 0xee, 0xe1, 0x85, 0x24, 0x3d, 0x83, 0x72, 0xc8, 0xd2, 0x99, 0x72, 0x6d, 0x68, 0xe0, 0xd3, 0x5c, + 0x4b, 0xfb, 0x32, 0x64, 0xd1, 0xf5, 0x40, 0xe9, 0xaa, 0x94, 0xb2, 0xf8, 0xb4, 0x3a, 0x10, 0x2b, + 0xfc, 0x5e, 0x43, 0x85, 0xa1, 0x84, 0xa4, 0x69, 0x4c, 0x8b, 0x92, 0x31, 0x3b, 0x14, 0xea, 0xc7, + 0xfe, 0x27, 0xb3, 0x6f, 0xd8, 0x52, 0x46, 0xc3, 0xbe, 0x69, 0xa8, 0x30, 0x34, 0x4d, 0x69, 0x62, + 0xd2, 0xc6, 0x2e, 0x8b, 0x61, 0xdb, 0x4a, 0x57, 0xb5, 0x5c, 0x56, 0xba, 0xe2, 0x86, 0x98, 0xd7, + 0x89, 0x1c, 0xf4, 0xcf, 0x38, 0xd7, 0x2e, 0xd6, 0xe7, 0x62, 0x44, 0x01, 0x35, 0x75, 0x99, 0x30, + 0x9b, 0xbc, 0xf3, 0x7d, 0xfd, 0x9d, 0x76, 0x28, 0xa5, 0x2b, 0x56, 0x09, 0x39, 0x39, 0x39, 0xb9, + 0x52, 0x25, 0xb4, 0x2b, 0x0f, 0x49, 0xd3, 0xe6, 0xdd, 0xd6, 0x8a, 0x6b, 0x53, 0xd9, 0xe6, 0x5e, + 0xe7, 0xfe, 0x75, 0xf0, 0x88, 0xeb, 0x0f, 0xa0, 0xa6, 0x07, 0xb4, 0x55, 0x3d, 0xd7, 0x90, 0xde, + 0xe4, 0x9d, 0x44, 0x7b, 0xaa, 0x05, 0xe5, 0x4f, 0x38, 0xf0, 0x35, 0xbf, 0x8d, 0x35, 0xed, 0xc5, + 0xa3, 0x10, 0x6a, 0x71, 0x9b, 0x3a, 0x96, 0xc9, 0x3d, 0x8b, 0x58, 0xe0, 0xa8, 0x26, 0x93, 0x88, + 0x71, 0xf0, 0xaf, 0x74, 0x2d, 0x5a, 0x7d, 0xcd, 0x19, 0x5b, 0xc1, 0x05, 0x1b, 0xfe, 0x23, 0xcd, + 0x9d, 0x88, 0x71, 0xaf, 0x72, 0xd1, 0x2f, 0xee, 0xab, 0xe2, 0x7e, 0x54, 0xdc, 0xdf, 0xab, 0x1c, + 0x8c, 0x29, 0x92, 0xca, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0x84, 0xce, 0x66, 0xda, 0x0c, 0x08, + 0x00, 0x00, +} + // Reference imports to suppress errors if they are not otherwise used. var _ context.Context var _ grpc.ClientConn @@ -494,6 +556,26 @@ type AlertPolicyServiceServer interface { UpdateAlertPolicy(context.Context, *UpdateAlertPolicyRequest) (*AlertPolicy, error) } +// UnimplementedAlertPolicyServiceServer can be embedded to have forward compatible implementations. +type UnimplementedAlertPolicyServiceServer struct { +} + +func (*UnimplementedAlertPolicyServiceServer) ListAlertPolicies(ctx context.Context, req *ListAlertPoliciesRequest) (*ListAlertPoliciesResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method ListAlertPolicies not implemented") +} +func (*UnimplementedAlertPolicyServiceServer) GetAlertPolicy(ctx context.Context, req *GetAlertPolicyRequest) (*AlertPolicy, error) { + return nil, status.Errorf(codes.Unimplemented, "method GetAlertPolicy not implemented") +} +func (*UnimplementedAlertPolicyServiceServer) CreateAlertPolicy(ctx context.Context, req *CreateAlertPolicyRequest) (*AlertPolicy, error) { + return nil, status.Errorf(codes.Unimplemented, "method CreateAlertPolicy not implemented") +} +func (*UnimplementedAlertPolicyServiceServer) DeleteAlertPolicy(ctx context.Context, req *DeleteAlertPolicyRequest) (*empty.Empty, error) { + return nil, status.Errorf(codes.Unimplemented, "method DeleteAlertPolicy not implemented") +} +func (*UnimplementedAlertPolicyServiceServer) UpdateAlertPolicy(ctx context.Context, req *UpdateAlertPolicyRequest) (*AlertPolicy, error) { + return nil, status.Errorf(codes.Unimplemented, "method UpdateAlertPolicy not implemented") +} + func RegisterAlertPolicyServiceServer(s *grpc.Server, srv AlertPolicyServiceServer) { s.RegisterService(&_AlertPolicyService_serviceDesc, srv) } @@ -616,52 +698,3 @@ var _AlertPolicyService_serviceDesc = grpc.ServiceDesc{ Streams: []grpc.StreamDesc{}, Metadata: "google/monitoring/v3/alert_service.proto", } - -func init() { - proto.RegisterFile("google/monitoring/v3/alert_service.proto", fileDescriptor_alert_service_4a748eee76dab644) -} - -var fileDescriptor_alert_service_4a748eee76dab644 = []byte{ - // 656 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0x41, 0x6f, 0xd3, 0x4c, - 0x10, 0x95, 0x93, 0x36, 0x5f, 0xbb, 0xfd, 0x5a, 0x94, 0x15, 0x54, 0xae, 0x0b, 0x52, 0x30, 0x2a, - 0x54, 0xad, 0xb0, 0xa5, 0xf8, 0x04, 0x15, 0x48, 0xa4, 0x85, 0xf6, 0x40, 0xa5, 0x28, 0x85, 0x1e, - 0x50, 0xa4, 0x68, 0x93, 0x4c, 0xac, 0x25, 0x8e, 0xd7, 0x78, 0x37, 0x11, 0x29, 0xea, 0x85, 0x23, - 0x12, 0xe2, 0xc0, 0x99, 0x03, 0x47, 0x38, 0x20, 0x7e, 0x07, 0x57, 0xfe, 0x02, 0x3f, 0x04, 0x79, - 0xed, 0x34, 0x76, 0x6d, 0xab, 0x16, 0xb7, 0xcc, 0xce, 0xdb, 0x99, 0xb7, 0x6f, 0xde, 0x38, 0x68, - 0xdb, 0x66, 0xcc, 0x76, 0xc0, 0x1c, 0x31, 0x97, 0x0a, 0xe6, 0x53, 0xd7, 0x36, 0x27, 0x96, 0x49, - 0x1c, 0xf0, 0x45, 0x87, 0x83, 0x3f, 0xa1, 0x3d, 0x30, 0x3c, 0x9f, 0x09, 0x86, 0xaf, 0x87, 0x48, - 0x63, 0x8e, 0x34, 0x26, 0x96, 0x76, 0x33, 0xba, 0x4f, 0x3c, 0x6a, 0x12, 0xd7, 0x65, 0x82, 0x08, - 0xca, 0x5c, 0x1e, 0xde, 0xd1, 0x6a, 0xf9, 0xd5, 0x23, 0xc4, 0x66, 0x84, 0x90, 0x51, 0x77, 0x3c, - 0x30, 0x61, 0xe4, 0x89, 0xe9, 0xa5, 0xeb, 0x17, 0xc9, 0x01, 0x05, 0xa7, 0xdf, 0x19, 0x11, 0x3e, - 0x0c, 0x11, 0xba, 0x40, 0xea, 0xbe, 0x0f, 0x44, 0xc0, 0x93, 0xa0, 0x66, 0x93, 0x39, 0xb4, 0x37, - 0x6d, 0xc1, 0x9b, 0x31, 0x70, 0x81, 0x31, 0x5a, 0x70, 0xc9, 0x08, 0xd4, 0x72, 0x4d, 0xd9, 0x5e, - 0x6e, 0xc9, 0xdf, 0xf8, 0x00, 0xfd, 0x1f, 0xbe, 0xcd, 0x93, 0x50, 0xb5, 0x54, 0x53, 0xb6, 0x57, - 0xea, 0xb7, 0x8d, 0xac, 0xb7, 0x19, 0xf1, 0x9a, 0x2b, 0x64, 0x1e, 0xe8, 0xbb, 0xe8, 0xc6, 0x21, - 0x88, 0x62, 0x2d, 0xf5, 0x2f, 0x0a, 0x52, 0x9f, 0x53, 0x1e, 0x83, 0x53, 0xe0, 0x97, 0x2f, 0x2c, - 0xc4, 0x38, 0xae, 0xa3, 0xca, 0x80, 0x3a, 0x02, 0x7c, 0x75, 0x51, 0x9e, 0x46, 0x11, 0xde, 0x40, - 0x4b, 0xcc, 0xef, 0x83, 0xdf, 0xe9, 0x4e, 0xd5, 0x8a, 0xcc, 0xfc, 0x27, 0xe3, 0xc6, 0x14, 0x6f, - 0xa2, 0x65, 0x8f, 0xd8, 0xd0, 0xe1, 0xf4, 0x0c, 0xe4, 0x9b, 0x16, 0x5b, 0x4b, 0xc1, 0xc1, 0x09, - 0x3d, 0x03, 0x7c, 0x0b, 0x21, 0x99, 0x14, 0x6c, 0x08, 0x6e, 0x44, 0x4d, 0xc2, 0x5f, 0x04, 0x07, - 0xfa, 0x47, 0x05, 0x6d, 0x64, 0xf0, 0xe3, 0x1e, 0x73, 0x39, 0xe0, 0x23, 0xb4, 0x16, 0x13, 0x8c, - 0x02, 0x57, 0xcb, 0xb5, 0x72, 0x31, 0xc9, 0x56, 0x49, 0xbc, 0x22, 0xbe, 0x8b, 0xae, 0xb9, 0xf0, - 0x56, 0x74, 0x62, 0x5c, 0x4a, 0x92, 0xcb, 0x6a, 0x70, 0xdc, 0xbc, 0xe0, 0x13, 0xe8, 0xf5, 0xd2, - 0xeb, 0x67, 0xcf, 0x74, 0x0f, 0xad, 0x8c, 0x65, 0x4e, 0x9a, 0x20, 0x1a, 0x9f, 0x36, 0xe3, 0x32, - 0xf3, 0x89, 0xf1, 0x2c, 0xf0, 0xc9, 0x31, 0xe1, 0xc3, 0x16, 0x0a, 0xe1, 0xc1, 0xef, 0xd4, 0xf0, - 0xcb, 0xff, 0x34, 0x7c, 0x03, 0xa9, 0x07, 0xe0, 0x40, 0x51, 0xcb, 0xd5, 0x7f, 0x54, 0x10, 0x8e, - 0x41, 0x4f, 0xc2, 0xa5, 0xc2, 0x5f, 0x15, 0x54, 0x4d, 0xc9, 0x8e, 0x8d, 0x6c, 0x32, 0x79, 0xfe, - 0xd1, 0xcc, 0xc2, 0xf8, 0x70, 0x9e, 0xfa, 0xee, 0xfb, 0xdf, 0x7f, 0x3e, 0x97, 0xb6, 0xf0, 0x9d, - 0x60, 0x11, 0xdf, 0x05, 0x04, 0x1f, 0x79, 0x3e, 0x7b, 0x0d, 0x3d, 0xc1, 0xcd, 0x9d, 0x73, 0x33, - 0x39, 0xb2, 0x4f, 0x0a, 0x5a, 0x4b, 0x1a, 0x1d, 0xef, 0x66, 0x37, 0xcc, 0x5c, 0x07, 0xed, 0x6a, - 0x69, 0xf5, 0xfb, 0x92, 0xcf, 0x3d, 0xbc, 0x95, 0xc5, 0x27, 0x49, 0xc7, 0xdc, 0x39, 0x97, 0xaa, - 0xa5, 0x16, 0x3e, 0x4f, 0xb5, 0xbc, 0x2f, 0x43, 0x11, 0x5e, 0x0f, 0x24, 0x2f, 0x4b, 0x2f, 0xa2, - 0xd3, 0xc3, 0x84, 0xad, 0xf0, 0x07, 0x05, 0x55, 0x53, 0x0e, 0xc9, 0xe3, 0x98, 0x67, 0x25, 0x6d, - 0x3d, 0x65, 0xea, 0xa7, 0xc1, 0x97, 0x71, 0x26, 0xd8, 0x4e, 0x41, 0xc1, 0x7e, 0x2a, 0xa8, 0x9a, - 0xda, 0xa6, 0x3c, 0x32, 0x79, 0x6b, 0x57, 0x44, 0xb0, 0x23, 0xc9, 0xab, 0x51, 0xaf, 0x4b, 0x5e, - 0x71, 0x41, 0x8c, 0xab, 0x48, 0x26, 0xf5, 0x6b, 0x7c, 0x53, 0x90, 0xda, 0x63, 0xa3, 0xcc, 0x96, - 0x8d, 0xaa, 0xec, 0x19, 0x2d, 0x51, 0x33, 0x90, 0xa6, 0xa9, 0xbc, 0x7a, 0x1c, 0x41, 0x6d, 0xe6, - 0x10, 0xd7, 0x36, 0x98, 0x6f, 0x9b, 0x36, 0xb8, 0x52, 0x38, 0x33, 0x4c, 0x11, 0x8f, 0xf2, 0xe4, - 0xbf, 0xd0, 0xde, 0x3c, 0xfa, 0x5e, 0xd2, 0x0e, 0xc3, 0x02, 0xfb, 0x0e, 0x1b, 0xf7, 0x8d, 0xe3, - 0x79, 0xc7, 0x53, 0xeb, 0xd7, 0x2c, 0xd9, 0x96, 0xc9, 0xf6, 0x3c, 0xd9, 0x3e, 0xb5, 0xba, 0x15, - 0xd9, 0xc4, 0xfa, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x6f, 0x1f, 0xe6, 0xf0, 0x47, 0x07, 0x00, 0x00, -} diff --git a/vendor/google.golang.org/genproto/googleapis/monitoring/v3/common.pb.go b/vendor/google.golang.org/genproto/googleapis/monitoring/v3/common.pb.go index d2792b520b..558c65234a 100644 --- a/vendor/google.golang.org/genproto/googleapis/monitoring/v3/common.pb.go +++ b/vendor/google.golang.org/genproto/googleapis/monitoring/v3/common.pb.go @@ -1,15 +1,17 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: google/monitoring/v3/common.proto -package monitoring // import "google.golang.org/genproto/googleapis/monitoring/v3" +package monitoring -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" -import duration "github.com/golang/protobuf/ptypes/duration" -import timestamp "github.com/golang/protobuf/ptypes/timestamp" -import _ "google.golang.org/genproto/googleapis/api/annotations" -import distribution "google.golang.org/genproto/googleapis/api/distribution" +import ( + fmt "fmt" + math "math" + + proto "github.com/golang/protobuf/proto" + duration "github.com/golang/protobuf/ptypes/duration" + timestamp "github.com/golang/protobuf/ptypes/timestamp" + distribution "google.golang.org/genproto/googleapis/api/distribution" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -20,7 +22,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // Specifies an ordering relationship on two arguments, here called left and // right. @@ -52,6 +54,7 @@ var ComparisonType_name = map[int32]string{ 5: "COMPARISON_EQ", 6: "COMPARISON_NE", } + var ComparisonType_value = map[string]int32{ "COMPARISON_UNSPECIFIED": 0, "COMPARISON_GT": 1, @@ -65,13 +68,15 @@ var ComparisonType_value = map[string]int32{ func (x ComparisonType) String() string { return proto.EnumName(ComparisonType_name, int32(x)) } + func (ComparisonType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_common_8becd78c7e1e8452, []int{0} + return fileDescriptor_013c57c1dcbb8d65, []int{0} } // The tier of service for a Workspace. Please see the -// [service tiers documentation](https://cloud.google.com/monitoring/workspaces/tiers) -// for more details. +// [service tiers +// documentation](https://cloud.google.com/monitoring/workspaces/tiers) for more +// details. type ServiceTier int32 // Deprecated: Do not use. const ( // An invalid sentinel value, used to indicate that a tier has not @@ -80,12 +85,14 @@ const ( // The Stackdriver Basic tier, a free tier of service that provides basic // features, a moderate allotment of logs, and access to built-in metrics. // A number of features are not available in this tier. For more details, - // see [the service tiers documentation](https://cloud.google.com/monitoring/workspaces/tiers). + // see [the service tiers + // documentation](https://cloud.google.com/monitoring/workspaces/tiers). ServiceTier_SERVICE_TIER_BASIC ServiceTier = 1 // The Stackdriver Premium tier, a higher, more expensive tier of service // that provides access to all Stackdriver features, lets you use Stackdriver // with AWS accounts, and has a larger allotments for logs and metrics. For - // more details, see [the service tiers documentation](https://cloud.google.com/monitoring/workspaces/tiers). + // more details, see [the service tiers + // documentation](https://cloud.google.com/monitoring/workspaces/tiers). ServiceTier_SERVICE_TIER_PREMIUM ServiceTier = 2 ) @@ -94,6 +101,7 @@ var ServiceTier_name = map[int32]string{ 1: "SERVICE_TIER_BASIC", 2: "SERVICE_TIER_PREMIUM", } + var ServiceTier_value = map[string]int32{ "SERVICE_TIER_UNSPECIFIED": 0, "SERVICE_TIER_BASIC": 1, @@ -103,8 +111,9 @@ var ServiceTier_value = map[string]int32{ func (x ServiceTier) String() string { return proto.EnumName(ServiceTier_name, int32(x)) } + func (ServiceTier) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_common_8becd78c7e1e8452, []int{1} + return fileDescriptor_013c57c1dcbb8d65, []int{1} } // The Aligner describes how to bring the data points in a single @@ -265,6 +274,7 @@ var Aggregation_Aligner_name = map[int32]string{ 21: "ALIGN_PERCENTILE_05", 23: "ALIGN_PERCENT_CHANGE", } + var Aggregation_Aligner_value = map[string]int32{ "ALIGN_NONE": 0, "ALIGN_DELTA": 1, @@ -290,8 +300,9 @@ var Aggregation_Aligner_value = map[string]int32{ func (x Aggregation_Aligner) String() string { return proto.EnumName(Aggregation_Aligner_name, int32(x)) } + func (Aggregation_Aligner) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_common_8becd78c7e1e8452, []int{2, 0} + return fileDescriptor_013c57c1dcbb8d65, []int{2, 0} } // A Reducer describes how to aggregate data points from multiple @@ -387,6 +398,7 @@ var Aggregation_Reducer_name = map[int32]string{ 11: "REDUCE_PERCENTILE_50", 12: "REDUCE_PERCENTILE_05", } + var Aggregation_Reducer_value = map[string]int32{ "REDUCE_NONE": 0, "REDUCE_MEAN": 1, @@ -407,8 +419,9 @@ var Aggregation_Reducer_value = map[string]int32{ func (x Aggregation_Reducer) String() string { return proto.EnumName(Aggregation_Reducer_name, int32(x)) } + func (Aggregation_Reducer) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_common_8becd78c7e1e8452, []int{2, 1} + return fileDescriptor_013c57c1dcbb8d65, []int{2, 1} } // A single strongly-typed value. @@ -431,16 +444,17 @@ func (m *TypedValue) Reset() { *m = TypedValue{} } func (m *TypedValue) String() string { return proto.CompactTextString(m) } func (*TypedValue) ProtoMessage() {} func (*TypedValue) Descriptor() ([]byte, []int) { - return fileDescriptor_common_8becd78c7e1e8452, []int{0} + return fileDescriptor_013c57c1dcbb8d65, []int{0} } + func (m *TypedValue) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TypedValue.Unmarshal(m, b) } func (m *TypedValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_TypedValue.Marshal(b, m, deterministic) } -func (dst *TypedValue) XXX_Merge(src proto.Message) { - xxx_messageInfo_TypedValue.Merge(dst, src) +func (m *TypedValue) XXX_Merge(src proto.Message) { + xxx_messageInfo_TypedValue.Merge(m, src) } func (m *TypedValue) XXX_Size() int { return xxx_messageInfo_TypedValue.Size(m) @@ -527,9 +541,9 @@ func (m *TypedValue) GetDistributionValue() *distribution.Distribution { return nil } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*TypedValue) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _TypedValue_OneofMarshaler, _TypedValue_OneofUnmarshaler, _TypedValue_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*TypedValue) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*TypedValue_BoolValue)(nil), (*TypedValue_Int64Value)(nil), (*TypedValue_DoubleValue)(nil), @@ -538,114 +552,23 @@ func (*TypedValue) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) er } } -func _TypedValue_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*TypedValue) - // value - switch x := m.Value.(type) { - case *TypedValue_BoolValue: - t := uint64(0) - if x.BoolValue { - t = 1 - } - b.EncodeVarint(1<<3 | proto.WireVarint) - b.EncodeVarint(t) - case *TypedValue_Int64Value: - b.EncodeVarint(2<<3 | proto.WireVarint) - b.EncodeVarint(uint64(x.Int64Value)) - case *TypedValue_DoubleValue: - b.EncodeVarint(3<<3 | proto.WireFixed64) - b.EncodeFixed64(math.Float64bits(x.DoubleValue)) - case *TypedValue_StringValue: - b.EncodeVarint(4<<3 | proto.WireBytes) - b.EncodeStringBytes(x.StringValue) - case *TypedValue_DistributionValue: - b.EncodeVarint(5<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.DistributionValue); err != nil { - return err - } - case nil: - default: - return fmt.Errorf("TypedValue.Value has unexpected type %T", x) - } - return nil -} - -func _TypedValue_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*TypedValue) - switch tag { - case 1: // value.bool_value - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.Value = &TypedValue_BoolValue{x != 0} - return true, err - case 2: // value.int64_value - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.Value = &TypedValue_Int64Value{int64(x)} - return true, err - case 3: // value.double_value - if wire != proto.WireFixed64 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed64() - m.Value = &TypedValue_DoubleValue{math.Float64frombits(x)} - return true, err - case 4: // value.string_value - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeStringBytes() - m.Value = &TypedValue_StringValue{x} - return true, err - case 5: // value.distribution_value - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(distribution.Distribution) - err := b.DecodeMessage(msg) - m.Value = &TypedValue_DistributionValue{msg} - return true, err - default: - return false, nil - } -} - -func _TypedValue_OneofSizer(msg proto.Message) (n int) { - m := msg.(*TypedValue) - // value - switch x := m.Value.(type) { - case *TypedValue_BoolValue: - n += 1 // tag and wire - n += 1 - case *TypedValue_Int64Value: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.Int64Value)) - case *TypedValue_DoubleValue: - n += 1 // tag and wire - n += 8 - case *TypedValue_StringValue: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(len(x.StringValue))) - n += len(x.StringValue) - case *TypedValue_DistributionValue: - s := proto.Size(x.DistributionValue) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - -// A time interval extending just after a start time through an end time. -// If the start time is the same as the end time, then the interval -// represents a single point in time. +// A closed time interval. It extends from the start time to the end time, and includes both: `[startTime, endTime]`. Valid time intervals depend on the [`MetricKind`](/monitoring/api/ref_v3/rest/v3/projects.metricDescriptors#MetricKind) of the metric value. In no case can the end time be earlier than the start time. +// +// * For a `GAUGE` metric, the `startTime` value is technically optional; if +// no value is specified, the start time defaults to the value of the +// end time, and the interval represents a single point in time. Such an +// interval is valid only for `GAUGE` metrics, which are point-in-time +// measurements. +// +// * For `DELTA` and `CUMULATIVE` metrics, the start time must be earlier +// than the end time. +// +// * In all cases, the start time of the next interval must be +// at least a microsecond after the end time of the previous interval. +// Because the interval is closed, if the start time of a new interval +// is the same as the end time of the previous interval, data written +// at the new start time could overwrite data written at the previous +// end time. type TimeInterval struct { // Required. The end of the time interval. EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"` @@ -662,16 +585,17 @@ func (m *TimeInterval) Reset() { *m = TimeInterval{} } func (m *TimeInterval) String() string { return proto.CompactTextString(m) } func (*TimeInterval) ProtoMessage() {} func (*TimeInterval) Descriptor() ([]byte, []int) { - return fileDescriptor_common_8becd78c7e1e8452, []int{1} + return fileDescriptor_013c57c1dcbb8d65, []int{1} } + func (m *TimeInterval) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TimeInterval.Unmarshal(m, b) } func (m *TimeInterval) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_TimeInterval.Marshal(b, m, deterministic) } -func (dst *TimeInterval) XXX_Merge(src proto.Message) { - xxx_messageInfo_TimeInterval.Merge(dst, src) +func (m *TimeInterval) XXX_Merge(src proto.Message) { + xxx_messageInfo_TimeInterval.Merge(m, src) } func (m *TimeInterval) XXX_Size() int { return xxx_messageInfo_TimeInterval.Size(m) @@ -760,16 +684,17 @@ func (m *Aggregation) Reset() { *m = Aggregation{} } func (m *Aggregation) String() string { return proto.CompactTextString(m) } func (*Aggregation) ProtoMessage() {} func (*Aggregation) Descriptor() ([]byte, []int) { - return fileDescriptor_common_8becd78c7e1e8452, []int{2} + return fileDescriptor_013c57c1dcbb8d65, []int{2} } + func (m *Aggregation) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Aggregation.Unmarshal(m, b) } func (m *Aggregation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Aggregation.Marshal(b, m, deterministic) } -func (dst *Aggregation) XXX_Merge(src proto.Message) { - xxx_messageInfo_Aggregation.Merge(dst, src) +func (m *Aggregation) XXX_Merge(src proto.Message) { + xxx_messageInfo_Aggregation.Merge(m, src) } func (m *Aggregation) XXX_Size() int { return xxx_messageInfo_Aggregation.Size(m) @@ -809,79 +734,77 @@ func (m *Aggregation) GetGroupByFields() []string { } func init() { - proto.RegisterType((*TypedValue)(nil), "google.monitoring.v3.TypedValue") - proto.RegisterType((*TimeInterval)(nil), "google.monitoring.v3.TimeInterval") - proto.RegisterType((*Aggregation)(nil), "google.monitoring.v3.Aggregation") proto.RegisterEnum("google.monitoring.v3.ComparisonType", ComparisonType_name, ComparisonType_value) proto.RegisterEnum("google.monitoring.v3.ServiceTier", ServiceTier_name, ServiceTier_value) proto.RegisterEnum("google.monitoring.v3.Aggregation_Aligner", Aggregation_Aligner_name, Aggregation_Aligner_value) proto.RegisterEnum("google.monitoring.v3.Aggregation_Reducer", Aggregation_Reducer_name, Aggregation_Reducer_value) + proto.RegisterType((*TypedValue)(nil), "google.monitoring.v3.TypedValue") + proto.RegisterType((*TimeInterval)(nil), "google.monitoring.v3.TimeInterval") + proto.RegisterType((*Aggregation)(nil), "google.monitoring.v3.Aggregation") } -func init() { - proto.RegisterFile("google/monitoring/v3/common.proto", fileDescriptor_common_8becd78c7e1e8452) -} - -var fileDescriptor_common_8becd78c7e1e8452 = []byte{ - // 957 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x95, 0xc1, 0x6e, 0xe3, 0x44, - 0x18, 0xc7, 0xe3, 0x64, 0xdb, 0x34, 0x9f, 0xdb, 0x66, 0x3a, 0xdb, 0xed, 0x86, 0x68, 0x61, 0xb3, - 0x45, 0x42, 0x61, 0x0f, 0x4e, 0xd5, 0x12, 0xa4, 0x0a, 0x09, 0xc9, 0x75, 0xa6, 0xad, 0xa5, 0xc4, - 0x09, 0x13, 0xa7, 0x54, 0x50, 0xc9, 0x72, 0x9a, 0x59, 0xcb, 0x52, 0xe2, 0xb1, 0x6c, 0xa7, 0x52, - 0x6f, 0xdc, 0x79, 0x07, 0x2e, 0xdc, 0xb8, 0xf1, 0x1a, 0x3c, 0x0c, 0x17, 0x5e, 0x00, 0x79, 0xc6, - 0x59, 0x3b, 0x21, 0x08, 0x8e, 0xdf, 0xef, 0xff, 0xff, 0xbe, 0x99, 0xf9, 0x8f, 0x35, 0x86, 0x77, - 0x1e, 0xe7, 0xde, 0x9c, 0x75, 0x16, 0x3c, 0xf0, 0x13, 0x1e, 0xf9, 0x81, 0xd7, 0x79, 0xba, 0xe8, - 0x3c, 0xf2, 0xc5, 0x82, 0x07, 0x5a, 0x18, 0xf1, 0x84, 0xe3, 0x63, 0x69, 0xd1, 0x72, 0x8b, 0xf6, - 0x74, 0xd1, 0x7c, 0x93, 0x35, 0xba, 0xa1, 0xdf, 0x71, 0x83, 0x80, 0x27, 0x6e, 0xe2, 0xf3, 0x20, - 0x96, 0x3d, 0xcd, 0x4f, 0x0b, 0xea, 0xcc, 0x8f, 0x93, 0xc8, 0x9f, 0x2e, 0x53, 0x3d, 0x93, 0x3f, - 0xcb, 0x64, 0x51, 0x4d, 0x97, 0x1f, 0x3a, 0xb3, 0x65, 0xe4, 0x16, 0xf4, 0xb7, 0x9b, 0x7a, 0xe2, - 0x2f, 0x58, 0x9c, 0xb8, 0x8b, 0x50, 0x1a, 0x4e, 0xff, 0x54, 0x00, 0xec, 0xe7, 0x90, 0xcd, 0xee, - 0xdc, 0xf9, 0x92, 0xe1, 0xb7, 0x00, 0x53, 0xce, 0xe7, 0xce, 0x53, 0x5a, 0x35, 0x94, 0x96, 0xd2, - 0xde, 0xbb, 0x2d, 0xd1, 0x5a, 0xca, 0xa4, 0xe1, 0x1d, 0xa8, 0x7e, 0x90, 0x7c, 0xfd, 0x55, 0xe6, - 0x28, 0xb7, 0x94, 0x76, 0xe5, 0xb6, 0x44, 0x41, 0x40, 0x69, 0xf9, 0x1c, 0xf6, 0x67, 0x7c, 0x39, - 0x9d, 0xb3, 0xcc, 0x53, 0x69, 0x29, 0x6d, 0xe5, 0xb6, 0x44, 0x55, 0x49, 0x3f, 0x9a, 0xd2, 0xc3, - 0x04, 0x5e, 0x66, 0x7a, 0xd1, 0x52, 0xda, 0xb5, 0xd4, 0x24, 0xa9, 0x34, 0x99, 0x80, 0x8b, 0x67, - 0xce, 0xac, 0x3b, 0x2d, 0xa5, 0xad, 0x9e, 0x37, 0xb4, 0x2c, 0x4d, 0x37, 0xf4, 0xb5, 0x5e, 0xc1, - 0x75, 0x5b, 0xa2, 0x47, 0xc5, 0x2e, 0x31, 0xea, 0xaa, 0x0a, 0x3b, 0xa2, 0xfb, 0xf4, 0x27, 0x05, - 0xf6, 0x6d, 0x7f, 0xc1, 0xcc, 0x20, 0x61, 0xd1, 0x93, 0x3b, 0xc7, 0x5d, 0xd8, 0x63, 0xc1, 0xcc, - 0x49, 0x83, 0x11, 0xc7, 0x51, 0xcf, 0x9b, 0xab, 0xd1, 0xab, 0xd4, 0x34, 0x7b, 0x95, 0x1a, 0xad, - 0xb2, 0x60, 0x96, 0x56, 0xf8, 0x12, 0x20, 0x4e, 0xdc, 0x28, 0x91, 0x8d, 0xca, 0x7f, 0x36, 0xd6, - 0x84, 0x3b, 0xad, 0x4f, 0xff, 0xaa, 0x82, 0xaa, 0x7b, 0x5e, 0xc4, 0x3c, 0x71, 0x55, 0xb8, 0x07, - 0xc8, 0x9d, 0xfb, 0x5e, 0xb0, 0x60, 0x41, 0xe2, 0x84, 0x2c, 0xf2, 0xf9, 0x2c, 0x1b, 0xf8, 0xc9, - 0x3f, 0x06, 0xf6, 0xb2, 0xfb, 0xa5, 0xf5, 0x8f, 0x2d, 0x23, 0xd1, 0x81, 0xbf, 0x07, 0x1c, 0xb2, - 0xc8, 0x89, 0x59, 0xe4, 0xb3, 0xd8, 0x11, 0x2a, 0x8b, 0xc4, 0x89, 0x0e, 0xcf, 0xbf, 0xd4, 0xb6, - 0x7d, 0x7a, 0x5a, 0x61, 0x13, 0x9a, 0x2e, 0x1b, 0x28, 0x0a, 0x59, 0x34, 0x16, 0x33, 0x32, 0x82, - 0x7f, 0x84, 0xe3, 0xc7, 0x88, 0xc7, 0xf1, 0x6a, 0x74, 0xc4, 0x66, 0xcb, 0x47, 0x16, 0x89, 0x2b, - 0xfb, 0x5f, 0xa3, 0xa9, 0x6c, 0xa0, 0x58, 0x8c, 0x91, 0xc3, 0x33, 0x86, 0xbf, 0x80, 0xba, 0x17, - 0xf1, 0x65, 0xe8, 0x4c, 0x9f, 0x9d, 0x0f, 0x3e, 0x9b, 0xcf, 0xe2, 0xc6, 0x4e, 0xab, 0xd2, 0xae, - 0xd1, 0x03, 0x81, 0xaf, 0x9e, 0xaf, 0x05, 0x3c, 0xfd, 0xb9, 0x02, 0xd5, 0xd5, 0x86, 0x0e, 0x01, - 0xf4, 0xbe, 0x79, 0x63, 0x39, 0xd6, 0xd0, 0x22, 0xa8, 0x84, 0xeb, 0xa0, 0xca, 0xba, 0x47, 0xfa, - 0xb6, 0x8e, 0x94, 0xdc, 0x40, 0x75, 0x9b, 0xa0, 0x32, 0x7e, 0x05, 0x47, 0xb2, 0x36, 0x2d, 0x9b, - 0xd0, 0xd1, 0xb0, 0x9f, 0xe2, 0x0a, 0x3e, 0x06, 0x94, 0xcd, 0x21, 0xf7, 0xb6, 0x33, 0xec, 0xf7, - 0x08, 0x45, 0x2f, 0xf0, 0x01, 0xd4, 0x24, 0x1d, 0x98, 0x16, 0x82, 0x42, 0xa9, 0xdf, 0x23, 0x35, - 0x1f, 0x3d, 0x20, 0xba, 0x85, 0xf6, 0xf3, 0xb5, 0x8d, 0xe1, 0xc4, 0xb2, 0xd1, 0x41, 0xee, 0x1f, - 0x4f, 0x06, 0xe8, 0x10, 0x23, 0xd8, 0xcf, 0x4a, 0xbb, 0xd7, 0x23, 0x77, 0xa8, 0x9e, 0xaf, 0x2a, - 0x3a, 0x1c, 0x9b, 0x4e, 0x08, 0x42, 0xf9, 0x16, 0x25, 0xbd, 0xd6, 0xfb, 0x63, 0x82, 0x1a, 0xf8, - 0x35, 0xbc, 0x94, 0xf8, 0x9a, 0xea, 0x86, 0x6d, 0x0e, 0x2d, 0xe9, 0x3f, 0xca, 0x85, 0x11, 0xa1, - 0x06, 0xb1, 0x6c, 0xb3, 0x4f, 0x9c, 0xcb, 0x4b, 0x84, 0xb7, 0x0b, 0x5d, 0xf4, 0x72, 0xab, 0xd0, - 0x3d, 0x43, 0xc7, 0x5b, 0x85, 0xb3, 0x2e, 0x7a, 0x85, 0x1b, 0x70, 0xbc, 0x26, 0x38, 0xc6, 0xad, - 0x6e, 0xdd, 0x10, 0xf4, 0xfa, 0xf4, 0xf7, 0x32, 0x54, 0x57, 0x37, 0x58, 0x07, 0x95, 0x92, 0xde, - 0xc4, 0x20, 0x85, 0xeb, 0xc8, 0x80, 0xc8, 0x48, 0x5c, 0xc7, 0x0a, 0x98, 0x16, 0x2a, 0x17, 0x6b, - 0xfd, 0x1e, 0x55, 0x0a, 0x75, 0x9a, 0xd9, 0x0b, 0x7c, 0x04, 0x07, 0xab, 0x5a, 0x86, 0xb6, 0x93, - 0xc6, 0x98, 0x21, 0x99, 0xf3, 0x6e, 0x1a, 0x58, 0x91, 0xc8, 0x5c, 0xaa, 0xf8, 0x04, 0xf0, 0x1a, - 0x96, 0x41, 0xd6, 0xd3, 0xb3, 0x64, 0x7c, 0x3d, 0xc9, 0xbd, 0x82, 0xb2, 0x1e, 0x65, 0xed, 0x5f, - 0x94, 0x2e, 0x82, 0xed, 0x4a, 0xf7, 0x0c, 0xa9, 0xdb, 0x95, 0xb3, 0x2e, 0xda, 0x7f, 0xff, 0x8b, - 0x02, 0x87, 0x06, 0x5f, 0x84, 0x6e, 0xe4, 0xc7, 0x3c, 0x48, 0xdf, 0x5c, 0xdc, 0x84, 0x13, 0x63, - 0x38, 0x18, 0xe9, 0xd4, 0x1c, 0x0f, 0x2d, 0x67, 0x62, 0x8d, 0x47, 0xc4, 0x30, 0xaf, 0x4d, 0xd2, - 0x43, 0xa5, 0x34, 0x84, 0x82, 0x76, 0x63, 0x23, 0x65, 0x13, 0xa5, 0x5f, 0xf6, 0x3a, 0xea, 0xdb, - 0xa8, 0xb2, 0x89, 0x88, 0x0c, 0xb4, 0x80, 0xc8, 0x77, 0x68, 0x67, 0x03, 0x59, 0x04, 0xed, 0xbe, - 0x77, 0x41, 0x1d, 0xb3, 0xe8, 0xc9, 0x7f, 0x64, 0xb6, 0xcf, 0x22, 0xfc, 0x06, 0x1a, 0x63, 0x42, - 0xef, 0x4c, 0x83, 0x38, 0xb6, 0x49, 0xe8, 0xc6, 0xf6, 0x4e, 0x00, 0xaf, 0xa9, 0x57, 0xfa, 0xd8, - 0x34, 0x90, 0x92, 0x9e, 0x7f, 0x8d, 0x8f, 0x28, 0x19, 0x98, 0x93, 0x01, 0x2a, 0x37, 0xcb, 0x0d, - 0xe5, 0xea, 0x57, 0x05, 0x1a, 0x8f, 0x7c, 0xb1, 0xf5, 0xc9, 0xb8, 0x52, 0x0d, 0xf1, 0xb3, 0x1c, - 0xa5, 0x4f, 0xdd, 0x48, 0xf9, 0xe1, 0xdb, 0xcc, 0xe4, 0xf1, 0xb9, 0x1b, 0x78, 0x1a, 0x8f, 0xbc, - 0x8e, 0xc7, 0x02, 0xf1, 0x10, 0x76, 0xa4, 0xe4, 0x86, 0x7e, 0xbc, 0xfe, 0xbf, 0xfd, 0x26, 0xaf, - 0x7e, 0x2b, 0x37, 0x6f, 0xe4, 0x00, 0x63, 0xce, 0x97, 0x33, 0x6d, 0x90, 0xaf, 0x75, 0x77, 0xf1, - 0xc7, 0x4a, 0x7c, 0x10, 0xe2, 0x43, 0x2e, 0x3e, 0xdc, 0x5d, 0x4c, 0x77, 0xc5, 0x22, 0x17, 0x7f, - 0x07, 0x00, 0x00, 0xff, 0xff, 0x8d, 0x78, 0xd9, 0x96, 0xd3, 0x07, 0x00, 0x00, +func init() { proto.RegisterFile("google/monitoring/v3/common.proto", fileDescriptor_013c57c1dcbb8d65) } + +var fileDescriptor_013c57c1dcbb8d65 = []byte{ + // 946 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x95, 0x41, 0x6f, 0xe2, 0xc6, + 0x1b, 0xc6, 0x31, 0x24, 0x21, 0xbc, 0x4e, 0xc2, 0x64, 0x36, 0x9b, 0xe5, 0x8f, 0xfe, 0xed, 0xb2, + 0xa9, 0x54, 0xd1, 0x3d, 0x98, 0x28, 0x29, 0x95, 0xa2, 0x4a, 0x95, 0x1c, 0x33, 0x49, 0x2c, 0x81, + 0xa1, 0x83, 0x49, 0xa3, 0x36, 0x92, 0x65, 0xc2, 0xac, 0x65, 0x09, 0x6c, 0x6b, 0x30, 0x91, 0x72, + 0xeb, 0xbd, 0xdf, 0xa1, 0x97, 0xde, 0x7a, 0xeb, 0xd7, 0xe8, 0x87, 0xe9, 0xa5, 0x5f, 0xa0, 0xf2, + 0x8c, 0xbd, 0x36, 0x94, 0xaa, 0x3d, 0xbe, 0xbf, 0xe7, 0x79, 0xdf, 0x99, 0x79, 0xc6, 0x1a, 0xc3, + 0x3b, 0x2f, 0x0c, 0xbd, 0x39, 0xeb, 0x2c, 0xc2, 0xc0, 0x8f, 0x43, 0xee, 0x07, 0x5e, 0xe7, 0xf9, + 0xb2, 0xf3, 0x14, 0x2e, 0x16, 0x61, 0xa0, 0x45, 0x3c, 0x8c, 0x43, 0x7c, 0x22, 0x2d, 0x5a, 0x6e, + 0xd1, 0x9e, 0x2f, 0x9b, 0x9f, 0xa4, 0x8d, 0x6e, 0xe4, 0x77, 0x66, 0xfe, 0x32, 0xe6, 0xfe, 0x74, + 0x15, 0xfb, 0x59, 0x53, 0xf3, 0xd3, 0x54, 0x16, 0xd5, 0x74, 0xf5, 0xa1, 0x33, 0x5b, 0x71, 0xb7, + 0xa0, 0xbf, 0xdd, 0xd4, 0x63, 0x7f, 0xc1, 0x96, 0xb1, 0xbb, 0x88, 0xa4, 0xe1, 0xec, 0x0f, 0x05, + 0xc0, 0x7e, 0x89, 0xd8, 0xec, 0xde, 0x9d, 0xaf, 0x18, 0x7e, 0x0b, 0x30, 0x0d, 0xc3, 0xb9, 0xf3, + 0x9c, 0x54, 0x0d, 0xa5, 0xa5, 0xb4, 0xf7, 0xef, 0x4a, 0xb4, 0x96, 0x30, 0x69, 0x78, 0x07, 0xaa, + 0x1f, 0xc4, 0x5f, 0x7d, 0x99, 0x3a, 0xca, 0x2d, 0xa5, 0x5d, 0xb9, 0x2b, 0x51, 0x10, 0x50, 0x5a, + 0x3e, 0x83, 0x83, 0x59, 0xb8, 0x9a, 0xce, 0x59, 0xea, 0xa9, 0xb4, 0x94, 0xb6, 0x72, 0x57, 0xa2, + 0xaa, 0xa4, 0x1f, 0x4d, 0xc9, 0x61, 0x02, 0x2f, 0x35, 0xed, 0xb4, 0x94, 0x76, 0x2d, 0x31, 0x49, + 0x2a, 0x4d, 0x26, 0xe0, 0xe2, 0x99, 0x53, 0xeb, 0x6e, 0x4b, 0x69, 0xab, 0x17, 0x0d, 0x2d, 0xcd, + 0xcb, 0x8d, 0x7c, 0xad, 0x57, 0x70, 0xdd, 0x95, 0xe8, 0x71, 0xb1, 0x4b, 0x8c, 0xba, 0xae, 0xc2, + 0xae, 0xe8, 0x3e, 0xfb, 0x51, 0x81, 0x03, 0xdb, 0x5f, 0x30, 0x33, 0x88, 0x19, 0x7f, 0x76, 0xe7, + 0xb8, 0x0b, 0xfb, 0x2c, 0x98, 0x39, 0x49, 0x30, 0xe2, 0x38, 0xea, 0x45, 0x33, 0x1b, 0x9d, 0xa5, + 0xa6, 0xd9, 0x59, 0x6a, 0xb4, 0xca, 0x82, 0x59, 0x52, 0xe1, 0x2b, 0x80, 0x65, 0xec, 0xf2, 0x58, + 0x36, 0x2a, 0xff, 0xda, 0x58, 0x13, 0xee, 0xa4, 0x3e, 0xfb, 0xb3, 0x0a, 0xaa, 0xee, 0x79, 0x9c, + 0x79, 0xe2, 0xaa, 0x70, 0x0f, 0x90, 0x3b, 0xf7, 0xbd, 0x60, 0xc1, 0x82, 0xd8, 0x89, 0x18, 0xf7, + 0xc3, 0x59, 0x3a, 0xf0, 0x7f, 0x7f, 0x1b, 0xd8, 0x4b, 0xef, 0x97, 0xd6, 0x3f, 0xb6, 0x8c, 0x44, + 0x07, 0xfe, 0x0e, 0x70, 0xc4, 0xb8, 0xb3, 0x64, 0xdc, 0x67, 0x4b, 0x47, 0xa8, 0x8c, 0x8b, 0x13, + 0x1d, 0x5d, 0x7c, 0xa1, 0x6d, 0xfb, 0xb8, 0xb4, 0xc2, 0x26, 0x34, 0x5d, 0x36, 0x50, 0x14, 0x31, + 0x3e, 0x16, 0x33, 0x52, 0x82, 0x7f, 0x80, 0x93, 0x27, 0x1e, 0x2e, 0x97, 0xd9, 0x68, 0xce, 0x66, + 0xab, 0x27, 0xc6, 0xc5, 0x95, 0xfd, 0xa7, 0xd1, 0x54, 0x36, 0x50, 0x2c, 0xc6, 0xc8, 0xe1, 0x29, + 0xc3, 0x9f, 0x43, 0xdd, 0xe3, 0xe1, 0x2a, 0x72, 0xa6, 0x2f, 0xce, 0x07, 0x9f, 0xcd, 0x67, 0xcb, + 0xc6, 0x6e, 0xab, 0xd2, 0xae, 0xd1, 0x43, 0x81, 0xaf, 0x5f, 0x6e, 0x04, 0x3c, 0xfb, 0xa9, 0x02, + 0xd5, 0x6c, 0x43, 0x47, 0x00, 0x7a, 0xdf, 0xbc, 0xb5, 0x1c, 0x6b, 0x68, 0x11, 0x54, 0xc2, 0x75, + 0x50, 0x65, 0xdd, 0x23, 0x7d, 0x5b, 0x47, 0x4a, 0x6e, 0xa0, 0xba, 0x4d, 0x50, 0x19, 0xbf, 0x86, + 0x63, 0x59, 0x9b, 0x96, 0x4d, 0xe8, 0x68, 0xd8, 0x4f, 0x70, 0x05, 0x9f, 0x00, 0x4a, 0xe7, 0x90, + 0x07, 0xdb, 0x19, 0xf6, 0x7b, 0x84, 0xa2, 0x1d, 0x7c, 0x08, 0x35, 0x49, 0x07, 0xa6, 0x85, 0xa0, + 0x50, 0xea, 0x0f, 0x48, 0xcd, 0x47, 0x0f, 0x88, 0x6e, 0xa1, 0x83, 0x7c, 0x6d, 0x63, 0x38, 0xb1, + 0x6c, 0x74, 0x98, 0xfb, 0xc7, 0x93, 0x01, 0x3a, 0xc2, 0x08, 0x0e, 0xd2, 0xd2, 0xee, 0xf5, 0xc8, + 0x3d, 0xaa, 0xe7, 0xab, 0x8a, 0x0e, 0xc7, 0xa6, 0x13, 0x82, 0x50, 0xbe, 0x45, 0x49, 0x6f, 0xf4, + 0xfe, 0x98, 0xa0, 0x06, 0x7e, 0x03, 0xaf, 0x24, 0xbe, 0xa1, 0xba, 0x61, 0x9b, 0x43, 0x4b, 0xfa, + 0x8f, 0x73, 0x61, 0x44, 0xa8, 0x41, 0x2c, 0xdb, 0xec, 0x13, 0xe7, 0xea, 0x0a, 0xe1, 0xed, 0x42, + 0x17, 0xbd, 0xda, 0x2a, 0x74, 0xcf, 0xd1, 0xc9, 0x56, 0xe1, 0xbc, 0x8b, 0x5e, 0xe3, 0x06, 0x9c, + 0xac, 0x09, 0x8e, 0x71, 0xa7, 0x5b, 0xb7, 0x04, 0xbd, 0x39, 0xfb, 0xad, 0x0c, 0xd5, 0xec, 0x06, + 0xeb, 0xa0, 0x52, 0xd2, 0x9b, 0x18, 0xa4, 0x70, 0x1d, 0x29, 0x10, 0x19, 0x89, 0xeb, 0xc8, 0x80, + 0x69, 0xa1, 0x72, 0xb1, 0xd6, 0x1f, 0x50, 0xa5, 0x50, 0x27, 0x99, 0xed, 0xe0, 0x63, 0x38, 0xcc, + 0x6a, 0x19, 0xda, 0x6e, 0x12, 0x63, 0x8a, 0x64, 0xce, 0x7b, 0x49, 0x60, 0x45, 0x22, 0x73, 0xa9, + 0xe2, 0x53, 0xc0, 0x6b, 0x58, 0x06, 0x59, 0x4f, 0xce, 0x92, 0xf2, 0xf5, 0x24, 0xf7, 0x0b, 0xca, + 0x7a, 0x94, 0xb5, 0x7f, 0x50, 0xba, 0x08, 0xb6, 0x2b, 0xdd, 0x73, 0xa4, 0x6e, 0x57, 0xce, 0xbb, + 0xe8, 0xe0, 0xfd, 0xcf, 0x0a, 0x1c, 0x19, 0xe1, 0x22, 0x72, 0xb9, 0xbf, 0x0c, 0x83, 0xe4, 0xcd, + 0xc5, 0x4d, 0x38, 0x35, 0x86, 0x83, 0x91, 0x4e, 0xcd, 0xf1, 0xd0, 0x72, 0x26, 0xd6, 0x78, 0x44, + 0x0c, 0xf3, 0xc6, 0x24, 0x3d, 0x54, 0x4a, 0x42, 0x28, 0x68, 0xb7, 0x36, 0x52, 0x36, 0x51, 0xf2, + 0x65, 0xaf, 0xa3, 0xbe, 0x8d, 0x2a, 0x9b, 0x88, 0xc8, 0x40, 0x0b, 0x88, 0x7c, 0x8b, 0x76, 0x37, + 0x90, 0x45, 0xd0, 0xde, 0x7b, 0x17, 0xd4, 0x31, 0xe3, 0xcf, 0xfe, 0x13, 0xb3, 0x7d, 0xc6, 0xf1, + 0xff, 0xa1, 0x31, 0x26, 0xf4, 0xde, 0x34, 0x88, 0x63, 0x9b, 0x84, 0x6e, 0x6c, 0xef, 0x14, 0xf0, + 0x9a, 0x7a, 0xad, 0x8f, 0x4d, 0x03, 0x29, 0xc9, 0xf9, 0xd7, 0xf8, 0x88, 0x92, 0x81, 0x39, 0x19, + 0xa0, 0x72, 0xb3, 0xdc, 0x50, 0xae, 0x7f, 0x51, 0xa0, 0xf1, 0x14, 0x2e, 0xb6, 0x3e, 0x19, 0xd7, + 0xaa, 0x21, 0x7e, 0x87, 0xa3, 0xe4, 0xa9, 0x1b, 0x29, 0xdf, 0x7f, 0x93, 0x9a, 0xbc, 0x70, 0xee, + 0x06, 0x9e, 0x16, 0x72, 0xaf, 0xe3, 0xb1, 0x40, 0x3c, 0x84, 0x1d, 0x29, 0xb9, 0x91, 0xbf, 0x5c, + 0xff, 0xa3, 0x7e, 0x9d, 0x57, 0xbf, 0x96, 0x9b, 0xb7, 0x72, 0x80, 0x31, 0x0f, 0x57, 0x33, 0x6d, + 0x90, 0xaf, 0x75, 0x7f, 0xf9, 0x7b, 0x26, 0x3e, 0x0a, 0xf1, 0x31, 0x17, 0x1f, 0xef, 0x2f, 0xa7, + 0x7b, 0x62, 0x91, 0xcb, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0xf5, 0x70, 0xc6, 0x75, 0xb5, 0x07, + 0x00, 0x00, } diff --git a/vendor/google.golang.org/genproto/googleapis/monitoring/v3/dropped_labels.pb.go b/vendor/google.golang.org/genproto/googleapis/monitoring/v3/dropped_labels.pb.go index 04fe182437..a0f3f699b7 100644 --- a/vendor/google.golang.org/genproto/googleapis/monitoring/v3/dropped_labels.pb.go +++ b/vendor/google.golang.org/genproto/googleapis/monitoring/v3/dropped_labels.pb.go @@ -1,12 +1,14 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: google/monitoring/v3/dropped_labels.proto -package monitoring // import "google.golang.org/genproto/googleapis/monitoring/v3" +package monitoring -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" -import _ "google.golang.org/genproto/googleapis/api/annotations" +import ( + fmt "fmt" + math "math" + + proto "github.com/golang/protobuf/proto" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -17,7 +19,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // A set of (label, value) pairs which were dropped during aggregation, attached // to google.api.Distribution.Exemplars in google.api.Distribution values during @@ -46,16 +48,17 @@ func (m *DroppedLabels) Reset() { *m = DroppedLabels{} } func (m *DroppedLabels) String() string { return proto.CompactTextString(m) } func (*DroppedLabels) ProtoMessage() {} func (*DroppedLabels) Descriptor() ([]byte, []int) { - return fileDescriptor_dropped_labels_bce6164464203600, []int{0} + return fileDescriptor_15749142c06d7f43, []int{0} } + func (m *DroppedLabels) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DroppedLabels.Unmarshal(m, b) } func (m *DroppedLabels) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_DroppedLabels.Marshal(b, m, deterministic) } -func (dst *DroppedLabels) XXX_Merge(src proto.Message) { - xxx_messageInfo_DroppedLabels.Merge(dst, src) +func (m *DroppedLabels) XXX_Merge(src proto.Message) { + xxx_messageInfo_DroppedLabels.Merge(m, src) } func (m *DroppedLabels) XXX_Size() int { return xxx_messageInfo_DroppedLabels.Size(m) @@ -79,23 +82,22 @@ func init() { } func init() { - proto.RegisterFile("google/monitoring/v3/dropped_labels.proto", fileDescriptor_dropped_labels_bce6164464203600) + proto.RegisterFile("google/monitoring/v3/dropped_labels.proto", fileDescriptor_15749142c06d7f43) } -var fileDescriptor_dropped_labels_bce6164464203600 = []byte{ - // 219 bytes of a gzipped FileDescriptorProto +var fileDescriptor_15749142c06d7f43 = []byte{ + // 199 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0x4c, 0xcf, 0xcf, 0x4f, 0xcf, 0x49, 0xd5, 0xcf, 0xcd, 0xcf, 0xcb, 0x2c, 0xc9, 0x2f, 0xca, 0xcc, 0x4b, 0xd7, 0x2f, 0x33, 0xd6, 0x4f, 0x29, 0xca, 0x2f, 0x28, 0x48, 0x4d, 0x89, 0xcf, 0x49, 0x4c, 0x4a, 0xcd, 0x29, 0xd6, - 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x81, 0x28, 0xd5, 0x43, 0x28, 0xd5, 0x2b, 0x33, 0x96, - 0x92, 0x81, 0x1a, 0x90, 0x58, 0x90, 0xa9, 0x9f, 0x98, 0x97, 0x97, 0x5f, 0x92, 0x58, 0x92, 0x99, - 0x9f, 0x07, 0xd5, 0xa3, 0xd4, 0xcf, 0xc8, 0xc5, 0xeb, 0x02, 0x31, 0xcc, 0x07, 0x6c, 0x96, 0x90, - 0x0b, 0x17, 0x2b, 0xd8, 0x54, 0x09, 0x46, 0x05, 0x66, 0x0d, 0x6e, 0x23, 0x3d, 0x3d, 0x6c, 0xa6, - 0xea, 0xa1, 0xe8, 0xd1, 0x03, 0x53, 0xae, 0x79, 0x25, 0x45, 0x95, 0x41, 0x10, 0xcd, 0x52, 0x16, - 0x5c, 0x5c, 0x08, 0x41, 0x21, 0x01, 0x2e, 0xe6, 0xec, 0xd4, 0x4a, 0x09, 0x46, 0x05, 0x46, 0x0d, - 0xce, 0x20, 0x10, 0x53, 0x48, 0x84, 0x8b, 0xb5, 0x2c, 0x31, 0xa7, 0x34, 0x55, 0x82, 0x09, 0x2c, - 0x06, 0xe1, 0x58, 0x31, 0x59, 0x30, 0x3a, 0x39, 0x44, 0xd9, 0x41, 0x6d, 0x4c, 0xcf, 0xcf, 0x49, - 0xcc, 0x4b, 0xd7, 0xcb, 0x2f, 0x4a, 0xd7, 0x4f, 0x4f, 0xcd, 0x03, 0xbb, 0x57, 0x1f, 0x22, 0x95, - 0x58, 0x90, 0x59, 0x8c, 0x1a, 0x22, 0xd6, 0x08, 0x5e, 0x12, 0x1b, 0x58, 0xa9, 0x31, 0x20, 0x00, - 0x00, 0xff, 0xff, 0x7e, 0x29, 0xf8, 0x00, 0x3b, 0x01, 0x00, 0x00, + 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x81, 0x28, 0xd5, 0x43, 0x28, 0xd5, 0x2b, 0x33, 0x56, + 0xea, 0x67, 0xe4, 0xe2, 0x75, 0x81, 0x28, 0xf7, 0x01, 0xab, 0x16, 0x72, 0xe1, 0x62, 0x05, 0xeb, + 0x93, 0x60, 0x54, 0x60, 0xd6, 0xe0, 0x36, 0xd2, 0xd3, 0xc3, 0xa6, 0x4f, 0x0f, 0x45, 0x8f, 0x1e, + 0x98, 0x72, 0xcd, 0x2b, 0x29, 0xaa, 0x0c, 0x82, 0x68, 0x96, 0xb2, 0xe0, 0xe2, 0x42, 0x08, 0x0a, + 0x09, 0x70, 0x31, 0x67, 0xa7, 0x56, 0x4a, 0x30, 0x2a, 0x30, 0x6a, 0x70, 0x06, 0x81, 0x98, 0x42, + 0x22, 0x5c, 0xac, 0x65, 0x89, 0x39, 0xa5, 0xa9, 0x12, 0x4c, 0x60, 0x31, 0x08, 0xc7, 0x8a, 0xc9, + 0x82, 0xd1, 0xc9, 0x21, 0xca, 0x0e, 0x6a, 0x63, 0x7a, 0x7e, 0x4e, 0x62, 0x5e, 0xba, 0x5e, 0x7e, + 0x51, 0xba, 0x7e, 0x7a, 0x6a, 0x1e, 0xd8, 0x17, 0xfa, 0x10, 0xa9, 0xc4, 0x82, 0xcc, 0x62, 0x54, + 0x3f, 0x5b, 0x23, 0x78, 0x49, 0x6c, 0x60, 0xa5, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x97, + 0xe6, 0x1c, 0x2d, 0x1d, 0x01, 0x00, 0x00, } diff --git a/vendor/google.golang.org/genproto/googleapis/monitoring/v3/group.pb.go b/vendor/google.golang.org/genproto/googleapis/monitoring/v3/group.pb.go index e4f6948a7b..6ac567171b 100644 --- a/vendor/google.golang.org/genproto/googleapis/monitoring/v3/group.pb.go +++ b/vendor/google.golang.org/genproto/googleapis/monitoring/v3/group.pb.go @@ -1,11 +1,14 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: google/monitoring/v3/group.proto -package monitoring // import "google.golang.org/genproto/googleapis/monitoring/v3" +package monitoring -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + math "math" + + proto "github.com/golang/protobuf/proto" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -16,7 +19,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // The description of a dynamic collection of monitored resources. Each group // has a filter that is matched against monitored resources and their associated @@ -57,7 +60,8 @@ type Group struct { // The format is `"projects/{project_id_or_number}/groups/{group_id}"`. // For groups with no parent, `parentName` is the empty string, `""`. ParentName string `protobuf:"bytes,3,opt,name=parent_name,json=parentName,proto3" json:"parent_name,omitempty"` - // The filter used to determine which monitored resources belong to this group. + // The filter used to determine which monitored resources belong to this + // group. Filter string `protobuf:"bytes,5,opt,name=filter,proto3" json:"filter,omitempty"` // If true, the members of this group are considered to be a cluster. // The system can perform additional analysis on groups that are clusters. @@ -71,16 +75,17 @@ func (m *Group) Reset() { *m = Group{} } func (m *Group) String() string { return proto.CompactTextString(m) } func (*Group) ProtoMessage() {} func (*Group) Descriptor() ([]byte, []int) { - return fileDescriptor_group_da6702aeb6854c5f, []int{0} + return fileDescriptor_907e30c1f087271d, []int{0} } + func (m *Group) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Group.Unmarshal(m, b) } func (m *Group) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Group.Marshal(b, m, deterministic) } -func (dst *Group) XXX_Merge(src proto.Message) { - xxx_messageInfo_Group.Merge(dst, src) +func (m *Group) XXX_Merge(src proto.Message) { + xxx_messageInfo_Group.Merge(m, src) } func (m *Group) XXX_Size() int { return xxx_messageInfo_Group.Size(m) @@ -130,11 +135,9 @@ func init() { proto.RegisterType((*Group)(nil), "google.monitoring.v3.Group") } -func init() { - proto.RegisterFile("google/monitoring/v3/group.proto", fileDescriptor_group_da6702aeb6854c5f) -} +func init() { proto.RegisterFile("google/monitoring/v3/group.proto", fileDescriptor_907e30c1f087271d) } -var fileDescriptor_group_da6702aeb6854c5f = []byte{ +var fileDescriptor_907e30c1f087271d = []byte{ // 261 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0xcf, 0x4a, 0x2b, 0x31, 0x14, 0x87, 0x49, 0xef, 0xed, 0x60, 0x4f, 0x5d, 0x0d, 0x22, 0x83, 0x20, 0x8e, 0xae, 0xba, 0xca, diff --git a/vendor/google.golang.org/genproto/googleapis/monitoring/v3/group_service.pb.go b/vendor/google.golang.org/genproto/googleapis/monitoring/v3/group_service.pb.go index d17da9a79d..13eb1f6afc 100644 --- a/vendor/google.golang.org/genproto/googleapis/monitoring/v3/group_service.pb.go +++ b/vendor/google.golang.org/genproto/googleapis/monitoring/v3/group_service.pb.go @@ -1,18 +1,20 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: google/monitoring/v3/group_service.proto -package monitoring // import "google.golang.org/genproto/googleapis/monitoring/v3" - -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" -import empty "github.com/golang/protobuf/ptypes/empty" -import _ "google.golang.org/genproto/googleapis/api/annotations" -import monitoredres "google.golang.org/genproto/googleapis/api/monitoredres" +package monitoring import ( - context "golang.org/x/net/context" + context "context" + fmt "fmt" + math "math" + + proto "github.com/golang/protobuf/proto" + empty "github.com/golang/protobuf/ptypes/empty" + _ "google.golang.org/genproto/googleapis/api/annotations" + monitoredres "google.golang.org/genproto/googleapis/api/monitoredres" grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" ) // Reference imports to suppress errors if they are not otherwise used. @@ -24,16 +26,16 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // The `ListGroup` request. type ListGroupsRequest struct { // The project whose groups are to be listed. The format is // `"projects/{project_id_or_number}"`. Name string `protobuf:"bytes,7,opt,name=name,proto3" json:"name,omitempty"` - // An optional filter consisting of a single group name. The filters limit the - // groups returned based on their parent-child relationship with the specified - // group. If no filter is specified, all groups are returned. + // An optional filter consisting of a single group name. The filters limit + // the groups returned based on their parent-child relationship with the + // specified group. If no filter is specified, all groups are returned. // // Types that are valid to be assigned to Filter: // *ListGroupsRequest_ChildrenOfGroup @@ -55,16 +57,17 @@ func (m *ListGroupsRequest) Reset() { *m = ListGroupsRequest{} } func (m *ListGroupsRequest) String() string { return proto.CompactTextString(m) } func (*ListGroupsRequest) ProtoMessage() {} func (*ListGroupsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_group_service_c051ad810375e8ee, []int{0} + return fileDescriptor_21ad21d0ed55c55a, []int{0} } + func (m *ListGroupsRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ListGroupsRequest.Unmarshal(m, b) } func (m *ListGroupsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ListGroupsRequest.Marshal(b, m, deterministic) } -func (dst *ListGroupsRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_ListGroupsRequest.Merge(dst, src) +func (m *ListGroupsRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_ListGroupsRequest.Merge(m, src) } func (m *ListGroupsRequest) XXX_Size() int { return xxx_messageInfo_ListGroupsRequest.Size(m) @@ -146,87 +149,15 @@ func (m *ListGroupsRequest) GetPageToken() string { return "" } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*ListGroupsRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _ListGroupsRequest_OneofMarshaler, _ListGroupsRequest_OneofUnmarshaler, _ListGroupsRequest_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*ListGroupsRequest) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*ListGroupsRequest_ChildrenOfGroup)(nil), (*ListGroupsRequest_AncestorsOfGroup)(nil), (*ListGroupsRequest_DescendantsOfGroup)(nil), } } -func _ListGroupsRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*ListGroupsRequest) - // filter - switch x := m.Filter.(type) { - case *ListGroupsRequest_ChildrenOfGroup: - b.EncodeVarint(2<<3 | proto.WireBytes) - b.EncodeStringBytes(x.ChildrenOfGroup) - case *ListGroupsRequest_AncestorsOfGroup: - b.EncodeVarint(3<<3 | proto.WireBytes) - b.EncodeStringBytes(x.AncestorsOfGroup) - case *ListGroupsRequest_DescendantsOfGroup: - b.EncodeVarint(4<<3 | proto.WireBytes) - b.EncodeStringBytes(x.DescendantsOfGroup) - case nil: - default: - return fmt.Errorf("ListGroupsRequest.Filter has unexpected type %T", x) - } - return nil -} - -func _ListGroupsRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*ListGroupsRequest) - switch tag { - case 2: // filter.children_of_group - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeStringBytes() - m.Filter = &ListGroupsRequest_ChildrenOfGroup{x} - return true, err - case 3: // filter.ancestors_of_group - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeStringBytes() - m.Filter = &ListGroupsRequest_AncestorsOfGroup{x} - return true, err - case 4: // filter.descendants_of_group - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeStringBytes() - m.Filter = &ListGroupsRequest_DescendantsOfGroup{x} - return true, err - default: - return false, nil - } -} - -func _ListGroupsRequest_OneofSizer(msg proto.Message) (n int) { - m := msg.(*ListGroupsRequest) - // filter - switch x := m.Filter.(type) { - case *ListGroupsRequest_ChildrenOfGroup: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(len(x.ChildrenOfGroup))) - n += len(x.ChildrenOfGroup) - case *ListGroupsRequest_AncestorsOfGroup: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(len(x.AncestorsOfGroup))) - n += len(x.AncestorsOfGroup) - case *ListGroupsRequest_DescendantsOfGroup: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(len(x.DescendantsOfGroup))) - n += len(x.DescendantsOfGroup) - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - // The `ListGroups` response. type ListGroupsResponse struct { // The groups that match the specified filters. @@ -244,16 +175,17 @@ func (m *ListGroupsResponse) Reset() { *m = ListGroupsResponse{} } func (m *ListGroupsResponse) String() string { return proto.CompactTextString(m) } func (*ListGroupsResponse) ProtoMessage() {} func (*ListGroupsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_group_service_c051ad810375e8ee, []int{1} + return fileDescriptor_21ad21d0ed55c55a, []int{1} } + func (m *ListGroupsResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ListGroupsResponse.Unmarshal(m, b) } func (m *ListGroupsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ListGroupsResponse.Marshal(b, m, deterministic) } -func (dst *ListGroupsResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_ListGroupsResponse.Merge(dst, src) +func (m *ListGroupsResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_ListGroupsResponse.Merge(m, src) } func (m *ListGroupsResponse) XXX_Size() int { return xxx_messageInfo_ListGroupsResponse.Size(m) @@ -292,16 +224,17 @@ func (m *GetGroupRequest) Reset() { *m = GetGroupRequest{} } func (m *GetGroupRequest) String() string { return proto.CompactTextString(m) } func (*GetGroupRequest) ProtoMessage() {} func (*GetGroupRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_group_service_c051ad810375e8ee, []int{2} + return fileDescriptor_21ad21d0ed55c55a, []int{2} } + func (m *GetGroupRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupRequest.Unmarshal(m, b) } func (m *GetGroupRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_GetGroupRequest.Marshal(b, m, deterministic) } -func (dst *GetGroupRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetGroupRequest.Merge(dst, src) +func (m *GetGroupRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetGroupRequest.Merge(m, src) } func (m *GetGroupRequest) XXX_Size() int { return xxx_messageInfo_GetGroupRequest.Size(m) @@ -338,16 +271,17 @@ func (m *CreateGroupRequest) Reset() { *m = CreateGroupRequest{} } func (m *CreateGroupRequest) String() string { return proto.CompactTextString(m) } func (*CreateGroupRequest) ProtoMessage() {} func (*CreateGroupRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_group_service_c051ad810375e8ee, []int{3} + return fileDescriptor_21ad21d0ed55c55a, []int{3} } + func (m *CreateGroupRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateGroupRequest.Unmarshal(m, b) } func (m *CreateGroupRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_CreateGroupRequest.Marshal(b, m, deterministic) } -func (dst *CreateGroupRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_CreateGroupRequest.Merge(dst, src) +func (m *CreateGroupRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_CreateGroupRequest.Merge(m, src) } func (m *CreateGroupRequest) XXX_Size() int { return xxx_messageInfo_CreateGroupRequest.Size(m) @@ -395,16 +329,17 @@ func (m *UpdateGroupRequest) Reset() { *m = UpdateGroupRequest{} } func (m *UpdateGroupRequest) String() string { return proto.CompactTextString(m) } func (*UpdateGroupRequest) ProtoMessage() {} func (*UpdateGroupRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_group_service_c051ad810375e8ee, []int{4} + return fileDescriptor_21ad21d0ed55c55a, []int{4} } + func (m *UpdateGroupRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UpdateGroupRequest.Unmarshal(m, b) } func (m *UpdateGroupRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_UpdateGroupRequest.Marshal(b, m, deterministic) } -func (dst *UpdateGroupRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_UpdateGroupRequest.Merge(dst, src) +func (m *UpdateGroupRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_UpdateGroupRequest.Merge(m, src) } func (m *UpdateGroupRequest) XXX_Size() int { return xxx_messageInfo_UpdateGroupRequest.Size(m) @@ -429,11 +364,16 @@ func (m *UpdateGroupRequest) GetValidateOnly() bool { return false } -// The `DeleteGroup` request. You can only delete a group if it has no children. +// The `DeleteGroup` request. The default behavior is to be able to delete a +// single group without any descendants. type DeleteGroupRequest struct { // The group to delete. The format is // `"projects/{project_id_or_number}/groups/{group_id}"`. - Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"` + Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"` + // If this field is true, then the request means to delete a group with all + // its descendants. Otherwise, the request means to delete a group only when + // it has no descendants. The default value is false. + Recursive bool `protobuf:"varint,4,opt,name=recursive,proto3" json:"recursive,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -443,16 +383,17 @@ func (m *DeleteGroupRequest) Reset() { *m = DeleteGroupRequest{} } func (m *DeleteGroupRequest) String() string { return proto.CompactTextString(m) } func (*DeleteGroupRequest) ProtoMessage() {} func (*DeleteGroupRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_group_service_c051ad810375e8ee, []int{5} + return fileDescriptor_21ad21d0ed55c55a, []int{5} } + func (m *DeleteGroupRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DeleteGroupRequest.Unmarshal(m, b) } func (m *DeleteGroupRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_DeleteGroupRequest.Marshal(b, m, deterministic) } -func (dst *DeleteGroupRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_DeleteGroupRequest.Merge(dst, src) +func (m *DeleteGroupRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_DeleteGroupRequest.Merge(m, src) } func (m *DeleteGroupRequest) XXX_Size() int { return xxx_messageInfo_DeleteGroupRequest.Size(m) @@ -470,6 +411,13 @@ func (m *DeleteGroupRequest) GetName() string { return "" } +func (m *DeleteGroupRequest) GetRecursive() bool { + if m != nil { + return m.Recursive + } + return false +} + // The `ListGroupMembers` request. type ListGroupMembersRequest struct { // The group whose members are listed. The format is @@ -503,16 +451,17 @@ func (m *ListGroupMembersRequest) Reset() { *m = ListGroupMembersRequest func (m *ListGroupMembersRequest) String() string { return proto.CompactTextString(m) } func (*ListGroupMembersRequest) ProtoMessage() {} func (*ListGroupMembersRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_group_service_c051ad810375e8ee, []int{6} + return fileDescriptor_21ad21d0ed55c55a, []int{6} } + func (m *ListGroupMembersRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ListGroupMembersRequest.Unmarshal(m, b) } func (m *ListGroupMembersRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ListGroupMembersRequest.Marshal(b, m, deterministic) } -func (dst *ListGroupMembersRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_ListGroupMembersRequest.Merge(dst, src) +func (m *ListGroupMembersRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_ListGroupMembersRequest.Merge(m, src) } func (m *ListGroupMembersRequest) XXX_Size() int { return xxx_messageInfo_ListGroupMembersRequest.Size(m) @@ -577,16 +526,17 @@ func (m *ListGroupMembersResponse) Reset() { *m = ListGroupMembersRespon func (m *ListGroupMembersResponse) String() string { return proto.CompactTextString(m) } func (*ListGroupMembersResponse) ProtoMessage() {} func (*ListGroupMembersResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_group_service_c051ad810375e8ee, []int{7} + return fileDescriptor_21ad21d0ed55c55a, []int{7} } + func (m *ListGroupMembersResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ListGroupMembersResponse.Unmarshal(m, b) } func (m *ListGroupMembersResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ListGroupMembersResponse.Marshal(b, m, deterministic) } -func (dst *ListGroupMembersResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_ListGroupMembersResponse.Merge(dst, src) +func (m *ListGroupMembersResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_ListGroupMembersResponse.Merge(m, src) } func (m *ListGroupMembersResponse) XXX_Size() int { return xxx_messageInfo_ListGroupMembersResponse.Size(m) @@ -629,6 +579,71 @@ func init() { proto.RegisterType((*ListGroupMembersResponse)(nil), "google.monitoring.v3.ListGroupMembersResponse") } +func init() { + proto.RegisterFile("google/monitoring/v3/group_service.proto", fileDescriptor_21ad21d0ed55c55a) +} + +var fileDescriptor_21ad21d0ed55c55a = []byte{ + // 908 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0x4d, 0x6f, 0xdc, 0x44, + 0x18, 0xc6, 0xf9, 0xdc, 0x9d, 0x6d, 0x95, 0x66, 0x54, 0xb5, 0x8b, 0x93, 0x56, 0x8b, 0xdb, 0x84, + 0x55, 0x68, 0x6c, 0x91, 0x3d, 0x20, 0x15, 0x51, 0xa9, 0x29, 0x10, 0x90, 0xa8, 0x1a, 0xb9, 0xa5, + 0x07, 0x14, 0x69, 0x35, 0xf1, 0xbe, 0xeb, 0x0c, 0xd8, 0x33, 0x66, 0x66, 0x76, 0x43, 0x8a, 0x2a, + 0x01, 0x12, 0x87, 0x9e, 0xb9, 0x71, 0xe3, 0x58, 0xfe, 0x05, 0xd7, 0x1c, 0xe1, 0x2f, 0x20, 0xf1, + 0x33, 0x40, 0x1e, 0xcf, 0xc4, 0xce, 0x7e, 0x25, 0x1c, 0x7a, 0x5b, 0xcf, 0xfb, 0xbc, 0xf3, 0x3c, + 0xef, 0xe7, 0x2c, 0x6a, 0xc7, 0x9c, 0xc7, 0x09, 0x04, 0x29, 0x67, 0x54, 0x71, 0x41, 0x59, 0x1c, + 0x0c, 0x3b, 0x41, 0x2c, 0xf8, 0x20, 0xeb, 0x4a, 0x10, 0x43, 0x1a, 0x81, 0x9f, 0x09, 0xae, 0x38, + 0xbe, 0x5e, 0x20, 0xfd, 0x12, 0xe9, 0x0f, 0x3b, 0xee, 0xba, 0xf1, 0x27, 0x19, 0x0d, 0x08, 0x63, + 0x5c, 0x11, 0x45, 0x39, 0x93, 0x85, 0x8f, 0x7b, 0xa7, 0x62, 0x35, 0x7e, 0xd0, 0xeb, 0x0a, 0x90, + 0x7c, 0x20, 0xec, 0xc5, 0xee, 0x3b, 0x13, 0x25, 0x44, 0x3c, 0x4d, 0x39, 0x33, 0x90, 0xd6, 0x74, + 0x95, 0x06, 0xb1, 0x66, 0x10, 0xfa, 0xeb, 0x70, 0xd0, 0x0f, 0x20, 0xcd, 0xd4, 0x89, 0x31, 0xde, + 0xac, 0xc8, 0x88, 0x12, 0x0a, 0x4c, 0x15, 0x06, 0xef, 0x5f, 0x07, 0xad, 0x7e, 0x41, 0xa5, 0xda, + 0xcb, 0x6f, 0x92, 0x21, 0x7c, 0x3b, 0x00, 0xa9, 0x30, 0x46, 0x0b, 0x8c, 0xa4, 0xd0, 0x5c, 0x6e, + 0x39, 0xed, 0x7a, 0xa8, 0x7f, 0xe3, 0x7b, 0x68, 0x35, 0x3a, 0xa2, 0x49, 0x4f, 0x00, 0xeb, 0xf2, + 0x7e, 0x57, 0x53, 0x37, 0xe7, 0x72, 0xc0, 0x67, 0x6f, 0x85, 0x2b, 0xd6, 0xf4, 0xa4, 0xaf, 0x6f, + 0xc2, 0x3e, 0xc2, 0x84, 0x45, 0x20, 0x15, 0x17, 0xb2, 0x84, 0xcf, 0x1b, 0xf8, 0xb5, 0x33, 0x9b, + 0xc5, 0xef, 0xa0, 0xeb, 0x3d, 0x90, 0x11, 0xb0, 0x1e, 0x61, 0xaa, 0xe2, 0xb1, 0x60, 0x3c, 0x70, + 0xc5, 0x6a, 0x7d, 0xd6, 0x50, 0x3d, 0x23, 0x31, 0x74, 0x25, 0x7d, 0x01, 0xcd, 0xc5, 0x96, 0xd3, + 0x5e, 0x0c, 0x6b, 0xf9, 0xc1, 0x53, 0xfa, 0x02, 0xf0, 0x2d, 0x84, 0xb4, 0x51, 0xf1, 0x6f, 0x80, + 0x35, 0x97, 0x74, 0x20, 0x1a, 0xfe, 0x2c, 0x3f, 0xd8, 0xad, 0xa1, 0xa5, 0x3e, 0x4d, 0x14, 0x08, + 0x8f, 0x23, 0x5c, 0x4d, 0x80, 0xcc, 0x38, 0x93, 0x80, 0xdf, 0x47, 0x8b, 0x85, 0x00, 0xa7, 0x35, + 0xdf, 0x6e, 0xec, 0xac, 0xf9, 0x93, 0x6a, 0xef, 0x6b, 0xa7, 0xb0, 0x40, 0xe2, 0x4d, 0xb4, 0xc2, + 0xe0, 0x3b, 0xd5, 0xad, 0xd0, 0xea, 0xf4, 0x84, 0x57, 0xf3, 0xe3, 0x7d, 0x4b, 0xed, 0x6d, 0xa0, + 0x95, 0x3d, 0x28, 0xf8, 0x46, 0xf3, 0x3d, 0x5f, 0xe6, 0xdb, 0xfb, 0xc1, 0x41, 0xf8, 0x91, 0x00, + 0xa2, 0x60, 0x22, 0x74, 0xa1, 0x52, 0x9a, 0x33, 0xb1, 0x39, 0xdf, 0xe5, 0xc4, 0xde, 0x41, 0x57, + 0x87, 0x24, 0xa1, 0x3d, 0xa2, 0xa0, 0xcb, 0x59, 0x72, 0xa2, 0xa9, 0x6b, 0xe1, 0x15, 0x7b, 0xf8, + 0x84, 0x25, 0x27, 0x5e, 0x82, 0xf0, 0x97, 0x59, 0x6f, 0x54, 0xc1, 0x9b, 0x62, 0xfb, 0x14, 0xe1, + 0x8f, 0x21, 0x81, 0x29, 0xf1, 0x56, 0x52, 0x83, 0xd7, 0x51, 0x5d, 0x40, 0x34, 0x10, 0x92, 0x0e, + 0x8b, 0x44, 0xd4, 0xc2, 0xf2, 0xc0, 0xfb, 0xc3, 0x41, 0x37, 0xcf, 0x2a, 0xfa, 0x18, 0xd2, 0x43, + 0x10, 0x33, 0x1b, 0xfb, 0x5c, 0x1b, 0xcd, 0xcf, 0x6c, 0xa3, 0x85, 0x91, 0x36, 0xc2, 0x37, 0x6c, + 0x1b, 0xe9, 0xfe, 0xab, 0x87, 0xe6, 0x0b, 0x3f, 0x40, 0x35, 0xca, 0x14, 0x88, 0x21, 0x49, 0x74, + 0xef, 0x35, 0x76, 0xbc, 0xc9, 0x69, 0x7a, 0x46, 0x53, 0xf8, 0xdc, 0x20, 0xc3, 0x33, 0x1f, 0xef, + 0x57, 0x07, 0x35, 0xc7, 0x63, 0x30, 0xbd, 0xf9, 0x01, 0x5a, 0x4e, 0x8b, 0x23, 0xd3, 0x9d, 0xb7, + 0xec, 0xdd, 0x24, 0xa3, 0xfe, 0x63, 0xbb, 0x65, 0x42, 0xb3, 0x64, 0x42, 0x8b, 0xbe, 0x6c, 0x87, + 0xe6, 0x41, 0x2b, 0xae, 0x48, 0x52, 0x4d, 0x49, 0x5d, 0x9f, 0xe4, 0x39, 0xd9, 0xf9, 0x67, 0x19, + 0x5d, 0xd1, 0xc2, 0x9e, 0x16, 0xeb, 0x11, 0xff, 0xec, 0x20, 0x54, 0xce, 0x10, 0x7e, 0x77, 0x72, + 0xa8, 0x63, 0x6b, 0xc6, 0x6d, 0x5f, 0x0c, 0x2c, 0x42, 0xf6, 0xee, 0xfe, 0xf4, 0xd7, 0xdf, 0xbf, + 0xcc, 0xdd, 0xc6, 0xeb, 0xf9, 0xd6, 0xfb, 0x3e, 0x2f, 0xdb, 0x47, 0x99, 0xe0, 0x5f, 0x43, 0xa4, + 0x64, 0xb0, 0xf5, 0xb2, 0xd8, 0x83, 0x12, 0x0f, 0x51, 0xcd, 0x4e, 0x16, 0xde, 0x98, 0xd2, 0x96, + 0xe7, 0x27, 0xcf, 0x9d, 0xd5, 0xbd, 0xde, 0xa6, 0x66, 0x6d, 0xe1, 0xdb, 0x93, 0x58, 0x0d, 0x69, + 0xb0, 0xf5, 0x12, 0xff, 0xe8, 0xa0, 0x46, 0x65, 0x54, 0xf1, 0x94, 0xb8, 0xc6, 0xa7, 0x79, 0x36, + 0xfd, 0x7b, 0x9a, 0x7e, 0xc3, 0x9b, 0x19, 0xf4, 0x7d, 0x33, 0x62, 0xaf, 0x1c, 0xd4, 0xa8, 0x0c, + 0xeb, 0x34, 0x0d, 0xe3, 0xf3, 0x3c, 0x5b, 0x43, 0x47, 0x6b, 0xd8, 0x76, 0xef, 0x6a, 0x0d, 0xc5, + 0x7b, 0x33, 0x35, 0x11, 0x56, 0xcb, 0x31, 0x6a, 0x54, 0x26, 0x79, 0x9a, 0x94, 0xf1, 0x61, 0x77, + 0x6f, 0x58, 0xa4, 0x7d, 0xc4, 0xfc, 0x4f, 0xf2, 0x47, 0xcc, 0x16, 0x62, 0xeb, 0xa2, 0x42, 0xfc, + 0xe6, 0xa0, 0x6b, 0xa3, 0x63, 0x83, 0xb7, 0x2f, 0xe8, 0xb2, 0xf3, 0x2b, 0xc2, 0xf5, 0x2f, 0x0b, + 0x37, 0xad, 0xe9, 0x6b, 0x6d, 0x6d, 0xbc, 0x39, 0x5b, 0x5b, 0x60, 0x86, 0xd0, 0x7d, 0xed, 0x9c, + 0x3e, 0x7c, 0xbb, 0x72, 0x77, 0xc1, 0x46, 0x32, 0x2a, 0xfd, 0x88, 0xa7, 0x7f, 0x3e, 0x7c, 0xe5, + 0x1c, 0x29, 0x95, 0xc9, 0xfb, 0x41, 0x70, 0x7c, 0x7c, 0x3c, 0x62, 0x0d, 0xc8, 0x40, 0x1d, 0x05, + 0x51, 0xc2, 0x07, 0xbd, 0xed, 0x2c, 0x21, 0xaa, 0xcf, 0x45, 0x7a, 0xef, 0x22, 0x78, 0xc9, 0xf5, + 0x3f, 0xa0, 0xbe, 0x00, 0xd2, 0xdb, 0x7d, 0xed, 0xa0, 0x66, 0xc4, 0xd3, 0x89, 0x19, 0xd9, 0x5d, + 0xad, 0xee, 0x80, 0xfd, 0xbc, 0x60, 0xfb, 0xce, 0x57, 0x0f, 0x0c, 0x34, 0xe6, 0x09, 0x61, 0xb1, + 0xcf, 0x45, 0x1c, 0xc4, 0xc0, 0x74, 0x39, 0x83, 0x92, 0xf1, 0xfc, 0xdf, 0x98, 0x0f, 0xcb, 0xaf, + 0xdf, 0xe7, 0xdc, 0xbd, 0xe2, 0x82, 0x47, 0x79, 0x90, 0x76, 0x99, 0xe5, 0x8c, 0xcf, 0x3b, 0xa7, + 0xd6, 0x78, 0xa0, 0x8d, 0x07, 0xa5, 0xf1, 0xe0, 0x79, 0xe7, 0x70, 0x49, 0x93, 0x74, 0xfe, 0x0b, + 0x00, 0x00, 0xff, 0xff, 0x39, 0x86, 0x4a, 0x89, 0xd0, 0x09, 0x00, 0x00, +} + // Reference imports to suppress errors if they are not otherwise used. var _ context.Context var _ grpc.ClientConn @@ -735,6 +750,29 @@ type GroupServiceServer interface { ListGroupMembers(context.Context, *ListGroupMembersRequest) (*ListGroupMembersResponse, error) } +// UnimplementedGroupServiceServer can be embedded to have forward compatible implementations. +type UnimplementedGroupServiceServer struct { +} + +func (*UnimplementedGroupServiceServer) ListGroups(ctx context.Context, req *ListGroupsRequest) (*ListGroupsResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method ListGroups not implemented") +} +func (*UnimplementedGroupServiceServer) GetGroup(ctx context.Context, req *GetGroupRequest) (*Group, error) { + return nil, status.Errorf(codes.Unimplemented, "method GetGroup not implemented") +} +func (*UnimplementedGroupServiceServer) CreateGroup(ctx context.Context, req *CreateGroupRequest) (*Group, error) { + return nil, status.Errorf(codes.Unimplemented, "method CreateGroup not implemented") +} +func (*UnimplementedGroupServiceServer) UpdateGroup(ctx context.Context, req *UpdateGroupRequest) (*Group, error) { + return nil, status.Errorf(codes.Unimplemented, "method UpdateGroup not implemented") +} +func (*UnimplementedGroupServiceServer) DeleteGroup(ctx context.Context, req *DeleteGroupRequest) (*empty.Empty, error) { + return nil, status.Errorf(codes.Unimplemented, "method DeleteGroup not implemented") +} +func (*UnimplementedGroupServiceServer) ListGroupMembers(ctx context.Context, req *ListGroupMembersRequest) (*ListGroupMembersResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method ListGroupMembers not implemented") +} + func RegisterGroupServiceServer(s *grpc.Server, srv GroupServiceServer) { s.RegisterService(&_GroupService_serviceDesc, srv) } @@ -879,63 +917,3 @@ var _GroupService_serviceDesc = grpc.ServiceDesc{ Streams: []grpc.StreamDesc{}, Metadata: "google/monitoring/v3/group_service.proto", } - -func init() { - proto.RegisterFile("google/monitoring/v3/group_service.proto", fileDescriptor_group_service_c051ad810375e8ee) -} - -var fileDescriptor_group_service_c051ad810375e8ee = []byte{ - // 826 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0x4d, 0x6f, 0xd3, 0x4c, - 0x10, 0x7e, 0xdd, 0xa4, 0x69, 0xb2, 0x69, 0xd5, 0x76, 0x55, 0xf5, 0x8d, 0xdc, 0x0f, 0x05, 0xf7, - 0x83, 0xa8, 0x50, 0x5b, 0x24, 0x07, 0x24, 0x10, 0x3d, 0xb4, 0xa0, 0x82, 0x44, 0xd5, 0xca, 0x2d, - 0x3d, 0xa0, 0x4a, 0x91, 0x9b, 0x4c, 0x8c, 0xc1, 0xde, 0x35, 0xf6, 0x26, 0xd0, 0xa2, 0x4a, 0x80, - 0xc4, 0x81, 0x33, 0x37, 0x6e, 0x1c, 0xe1, 0x2f, 0x70, 0xe2, 0xca, 0x95, 0xbf, 0xc0, 0xff, 0x00, - 0x79, 0xbd, 0x9b, 0x38, 0x9f, 0xed, 0x85, 0x5b, 0xb2, 0xf3, 0x8c, 0x9f, 0x67, 0x66, 0x9f, 0x99, - 0x45, 0x25, 0x9b, 0x52, 0xdb, 0x05, 0xc3, 0xa3, 0xc4, 0x61, 0x34, 0x70, 0x88, 0x6d, 0xb4, 0x2a, - 0x86, 0x1d, 0xd0, 0xa6, 0x5f, 0x0d, 0x21, 0x68, 0x39, 0x35, 0xd0, 0xfd, 0x80, 0x32, 0x8a, 0xe7, - 0x62, 0xa4, 0xde, 0x41, 0xea, 0xad, 0x8a, 0xba, 0x28, 0xf2, 0x2d, 0xdf, 0x31, 0x2c, 0x42, 0x28, - 0xb3, 0x98, 0x43, 0x49, 0x18, 0xe7, 0xa8, 0x2b, 0x89, 0xa8, 0xc8, 0x83, 0x7a, 0x35, 0x80, 0x90, - 0x36, 0x03, 0xf9, 0x61, 0xf5, 0xda, 0x40, 0x09, 0x35, 0xea, 0x79, 0x94, 0x08, 0x48, 0x71, 0xb8, - 0x4a, 0x81, 0x58, 0x10, 0x08, 0xfe, 0xef, 0xb4, 0xd9, 0x30, 0xc0, 0xf3, 0xd9, 0x59, 0x1c, 0xd4, - 0xfe, 0x28, 0x68, 0xf6, 0xb1, 0x13, 0xb2, 0xdd, 0x28, 0x21, 0x34, 0xe1, 0x65, 0x13, 0x42, 0x86, - 0x31, 0x4a, 0x13, 0xcb, 0x83, 0xc2, 0x44, 0x51, 0x29, 0xe5, 0x4c, 0xfe, 0x1b, 0xdf, 0x44, 0xb3, - 0xb5, 0x67, 0x8e, 0x5b, 0x0f, 0x80, 0x54, 0x69, 0xa3, 0xca, 0x19, 0x0a, 0x63, 0x11, 0xe0, 0xe1, - 0x7f, 0xe6, 0xb4, 0x0c, 0xed, 0x37, 0xf8, 0x97, 0xb0, 0x8e, 0xb0, 0x45, 0x6a, 0x10, 0x32, 0x1a, - 0x84, 0x1d, 0x78, 0x4a, 0xc0, 0x67, 0xda, 0x31, 0x89, 0x2f, 0xa3, 0xb9, 0x3a, 0x84, 0x35, 0x20, - 0x75, 0x8b, 0xb0, 0x44, 0x46, 0x5a, 0x64, 0xe0, 0x44, 0x54, 0xe6, 0x2c, 0xa0, 0x9c, 0x6f, 0xd9, - 0x50, 0x0d, 0x9d, 0x73, 0x28, 0x8c, 0x17, 0x95, 0xd2, 0xb8, 0x99, 0x8d, 0x0e, 0x0e, 0x9d, 0x73, - 0xc0, 0x4b, 0x08, 0xf1, 0x20, 0xa3, 0x2f, 0x80, 0x14, 0x32, 0xbc, 0x10, 0x0e, 0x3f, 0x8a, 0x0e, - 0xb6, 0xb3, 0x28, 0xd3, 0x70, 0x5c, 0x06, 0x81, 0x46, 0x11, 0x4e, 0x36, 0x20, 0xf4, 0x29, 0x09, - 0x01, 0xdf, 0x42, 0xe3, 0xb1, 0x00, 0xa5, 0x98, 0x2a, 0xe5, 0xcb, 0x0b, 0xfa, 0xa0, 0x2b, 0xd6, - 0x79, 0x92, 0x19, 0x23, 0xf1, 0x3a, 0x9a, 0x26, 0xf0, 0x9a, 0x55, 0x13, 0xb4, 0xbc, 0x3d, 0xe6, - 0x54, 0x74, 0x7c, 0x20, 0xa9, 0xb5, 0x35, 0x34, 0xbd, 0x0b, 0x31, 0x5f, 0x6f, 0xbf, 0x53, 0x9d, - 0x7e, 0x6b, 0x6f, 0x15, 0x84, 0x77, 0x02, 0xb0, 0x18, 0x0c, 0x84, 0xa6, 0x13, 0x57, 0xd3, 0x16, - 0x1b, 0xf1, 0x5d, 0x4d, 0xec, 0x0a, 0x9a, 0x6a, 0x59, 0xae, 0x53, 0xb7, 0x18, 0x54, 0x29, 0x71, - 0xcf, 0x38, 0x75, 0xd6, 0x9c, 0x94, 0x87, 0xfb, 0xc4, 0x3d, 0xd3, 0x5c, 0x84, 0x9f, 0xf8, 0xf5, - 0x5e, 0x05, 0xff, 0x8a, 0xad, 0x84, 0xf0, 0x7d, 0x70, 0x61, 0x48, 0xbd, 0xc9, 0xd6, 0xfc, 0x50, - 0xd0, 0xff, 0xed, 0x3b, 0xdb, 0x03, 0xef, 0x14, 0x82, 0x91, 0xd6, 0xed, 0x32, 0x4a, 0x6a, 0xa4, - 0x51, 0xd2, 0x3d, 0x46, 0xc1, 0xf3, 0xd2, 0x28, 0xdc, 0x61, 0x39, 0x53, 0xfc, 0xc3, 0x5b, 0x28, - 0xeb, 0x10, 0x06, 0x41, 0xcb, 0x72, 0xb9, 0xbb, 0xf2, 0x65, 0x6d, 0x70, 0x23, 0x8e, 0x1c, 0x0f, - 0x1e, 0x09, 0xa4, 0xd9, 0xce, 0xd1, 0x3e, 0x2b, 0xa8, 0xd0, 0x5f, 0x83, 0x70, 0xdf, 0x6d, 0x34, - 0xe1, 0xc5, 0x47, 0xc2, 0x7f, 0x4b, 0xf2, 0xdb, 0x96, 0xef, 0xe8, 0x7b, 0x72, 0x5d, 0x98, 0x62, - 0x5b, 0x98, 0x12, 0x7d, 0x55, 0x0f, 0x46, 0x45, 0x33, 0xca, 0x2c, 0x37, 0xd9, 0x92, 0x1c, 0x3f, - 0x89, 0x7a, 0x52, 0xfe, 0x9e, 0x41, 0x93, 0x5c, 0xd8, 0x61, 0xbc, 0xe7, 0xf0, 0x07, 0x05, 0xa1, - 0xce, 0x94, 0xe0, 0xeb, 0x83, 0x4b, 0xed, 0x5b, 0x24, 0x6a, 0xe9, 0x72, 0x60, 0x5c, 0xb2, 0xb6, - 0xfa, 0xfe, 0xd7, 0xef, 0x4f, 0x63, 0xcb, 0x78, 0x31, 0x5a, 0x5f, 0x6f, 0xa2, 0x6b, 0xbb, 0xe7, - 0x07, 0xf4, 0x39, 0xd4, 0x58, 0x68, 0x6c, 0x5c, 0xc4, 0x0b, 0x2d, 0xc4, 0x2d, 0x94, 0x95, 0xb3, - 0x83, 0xd7, 0x86, 0x18, 0xaf, 0x7b, 0xb6, 0xd4, 0x51, 0xfe, 0xd4, 0xd6, 0x39, 0x6b, 0x11, 0x2f, - 0x0f, 0x62, 0x15, 0xa4, 0xc6, 0xc6, 0x05, 0x7e, 0xa7, 0xa0, 0x7c, 0x62, 0x18, 0xf1, 0x90, 0xba, - 0xfa, 0xe7, 0x75, 0x34, 0xfd, 0x0d, 0x4e, 0xbf, 0xa6, 0x8d, 0x2c, 0xfa, 0x8e, 0x18, 0xa2, 0x8f, - 0x0a, 0xca, 0x27, 0xc6, 0x71, 0x98, 0x86, 0xfe, 0x89, 0x1d, 0xad, 0xa1, 0xc2, 0x35, 0x6c, 0xaa, - 0xab, 0x5c, 0x43, 0xfc, 0x70, 0x0c, 0x6d, 0x84, 0xd4, 0xf2, 0x0a, 0xe5, 0x13, 0xb3, 0x3a, 0x4c, - 0x4a, 0xff, 0x38, 0xab, 0xf3, 0x12, 0x29, 0x5f, 0x23, 0xfd, 0x41, 0xf4, 0x1a, 0xc9, 0x8b, 0xd8, - 0xb8, 0xec, 0x22, 0xbe, 0x28, 0x68, 0xa6, 0x77, 0x6c, 0xf0, 0xe6, 0x25, 0x2e, 0xeb, 0x5e, 0x11, - 0xaa, 0x7e, 0x55, 0xb8, 0xb0, 0xa6, 0xce, 0xb5, 0x95, 0xf0, 0xfa, 0x68, 0x6d, 0x86, 0x18, 0xc2, - 0xed, 0xaf, 0x0a, 0x2a, 0xd4, 0xa8, 0x37, 0x90, 0x65, 0x7b, 0x36, 0x39, 0x57, 0x07, 0x51, 0x13, - 0x0e, 0x94, 0xa7, 0x5b, 0x02, 0x6a, 0x53, 0xd7, 0x22, 0xb6, 0x4e, 0x03, 0xdb, 0xb0, 0x81, 0xf0, - 0x16, 0x19, 0x71, 0xc8, 0xf2, 0x9d, 0xb0, 0xfb, 0x8d, 0xbf, 0xdb, 0xf9, 0xf7, 0x6d, 0x4c, 0xdd, - 0x8d, 0x3f, 0xb0, 0xe3, 0xd2, 0x66, 0x5d, 0x2e, 0x88, 0x88, 0xf1, 0xb8, 0xf2, 0x53, 0x06, 0x4f, - 0x78, 0xf0, 0xa4, 0x13, 0x3c, 0x39, 0xae, 0x9c, 0x66, 0x38, 0x49, 0xe5, 0x6f, 0x00, 0x00, 0x00, - 0xff, 0xff, 0x86, 0x94, 0xf2, 0xde, 0xed, 0x08, 0x00, 0x00, -} diff --git a/vendor/google.golang.org/genproto/googleapis/monitoring/v3/metric.pb.go b/vendor/google.golang.org/genproto/googleapis/monitoring/v3/metric.pb.go index d01dc19d80..3d6cd3232f 100644 --- a/vendor/google.golang.org/genproto/googleapis/monitoring/v3/metric.pb.go +++ b/vendor/google.golang.org/genproto/googleapis/monitoring/v3/metric.pb.go @@ -1,15 +1,18 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: google/monitoring/v3/metric.proto -package monitoring // import "google.golang.org/genproto/googleapis/monitoring/v3" +package monitoring -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" -import _ "google.golang.org/genproto/googleapis/api/annotations" -import _ "google.golang.org/genproto/googleapis/api/label" -import metric "google.golang.org/genproto/googleapis/api/metric" -import monitoredres "google.golang.org/genproto/googleapis/api/monitoredres" +import ( + fmt "fmt" + math "math" + + proto "github.com/golang/protobuf/proto" + _ "google.golang.org/genproto/googleapis/api/distribution" + _ "google.golang.org/genproto/googleapis/api/label" + metric "google.golang.org/genproto/googleapis/api/metric" + monitoredres "google.golang.org/genproto/googleapis/api/monitoredres" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -20,7 +23,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // A single data point in a time series. type Point struct { @@ -44,16 +47,17 @@ func (m *Point) Reset() { *m = Point{} } func (m *Point) String() string { return proto.CompactTextString(m) } func (*Point) ProtoMessage() {} func (*Point) Descriptor() ([]byte, []int) { - return fileDescriptor_metric_27948d2d9b5c61d2, []int{0} + return fileDescriptor_c76199a3d2c4c21e, []int{0} } + func (m *Point) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Point.Unmarshal(m, b) } func (m *Point) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Point.Marshal(b, m, deterministic) } -func (dst *Point) XXX_Merge(src proto.Message) { - xxx_messageInfo_Point.Merge(dst, src) +func (m *Point) XXX_Merge(src proto.Message) { + xxx_messageInfo_Point.Merge(m, src) } func (m *Point) XXX_Size() int { return xxx_messageInfo_Point.Size(m) @@ -128,16 +132,17 @@ func (m *TimeSeries) Reset() { *m = TimeSeries{} } func (m *TimeSeries) String() string { return proto.CompactTextString(m) } func (*TimeSeries) ProtoMessage() {} func (*TimeSeries) Descriptor() ([]byte, []int) { - return fileDescriptor_metric_27948d2d9b5c61d2, []int{1} + return fileDescriptor_c76199a3d2c4c21e, []int{1} } + func (m *TimeSeries) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TimeSeries.Unmarshal(m, b) } func (m *TimeSeries) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_TimeSeries.Marshal(b, m, deterministic) } -func (dst *TimeSeries) XXX_Merge(src proto.Message) { - xxx_messageInfo_TimeSeries.Merge(dst, src) +func (m *TimeSeries) XXX_Merge(src proto.Message) { + xxx_messageInfo_TimeSeries.Merge(m, src) } func (m *TimeSeries) XXX_Size() int { return xxx_messageInfo_TimeSeries.Size(m) @@ -195,38 +200,36 @@ func init() { proto.RegisterType((*TimeSeries)(nil), "google.monitoring.v3.TimeSeries") } -func init() { - proto.RegisterFile("google/monitoring/v3/metric.proto", fileDescriptor_metric_27948d2d9b5c61d2) -} +func init() { proto.RegisterFile("google/monitoring/v3/metric.proto", fileDescriptor_c76199a3d2c4c21e) } -var fileDescriptor_metric_27948d2d9b5c61d2 = []byte{ +var fileDescriptor_c76199a3d2c4c21e = []byte{ // 441 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0x51, 0xab, 0xd3, 0x30, - 0x14, 0xc7, 0xe9, 0xae, 0x9b, 0x33, 0x03, 0x1f, 0x82, 0x68, 0x99, 0x0a, 0x73, 0xa2, 0x0e, 0x1f, - 0x5a, 0x58, 0x41, 0x10, 0xe1, 0x82, 0x57, 0x45, 0x45, 0x2e, 0x8c, 0x28, 0x7b, 0x90, 0xc1, 0xc8, - 0x6d, 0x0f, 0x25, 0xd8, 0xe4, 0x84, 0x34, 0x2b, 0xdc, 0x27, 0x3f, 0x8c, 0x6f, 0x7e, 0x14, 0x3f, - 0x93, 0x0f, 0xd2, 0x24, 0xdd, 0x76, 0xb1, 0xf7, 0xbe, 0xb5, 0xf9, 0xff, 0xfe, 0xe7, 0x7f, 0x72, - 0x72, 0xc8, 0x93, 0x12, 0xb1, 0xac, 0x20, 0x95, 0xa8, 0x84, 0x45, 0x23, 0x54, 0x99, 0x36, 0x59, - 0x2a, 0xc1, 0x1a, 0x91, 0x27, 0xda, 0xa0, 0x45, 0x7a, 0xcf, 0x23, 0xc9, 0x01, 0x49, 0x9a, 0x6c, - 0xfa, 0x28, 0x18, 0xb9, 0x16, 0x29, 0x57, 0x0a, 0x2d, 0xb7, 0x02, 0x55, 0xed, 0x3d, 0xd3, 0xfb, - 0x47, 0x6a, 0xc5, 0x2f, 0xa0, 0x0a, 0xe7, 0x0f, 0x8e, 0xce, 0x8f, 0x43, 0xa6, 0x4f, 0x8f, 0x05, - 0x1f, 0x04, 0xc5, 0xd6, 0x40, 0x8d, 0x3b, 0x93, 0x43, 0x80, 0xfa, 0x9b, 0xcd, 0x51, 0x4a, 0x54, - 0x1e, 0x99, 0xff, 0x24, 0xc3, 0x15, 0x0a, 0x65, 0xe9, 0x29, 0x19, 0x0b, 0x65, 0xc1, 0x34, 0xbc, - 0x8a, 0xa3, 0x59, 0xb4, 0x98, 0x2c, 0xe7, 0x49, 0xdf, 0x45, 0x92, 0x6f, 0x42, 0xc2, 0xe7, 0x40, - 0xb2, 0xbd, 0x87, 0xbe, 0x22, 0xc3, 0x86, 0x57, 0x3b, 0x88, 0x07, 0xce, 0x3c, 0xbb, 0xc6, 0x7c, - 0xa9, 0xa1, 0x58, 0xb7, 0x1c, 0xf3, 0xf8, 0xfc, 0xef, 0x80, 0x90, 0xb6, 0xe4, 0x57, 0x30, 0x02, - 0x6a, 0xfa, 0x92, 0x8c, 0xfc, 0x3d, 0x43, 0x13, 0xb4, 0xab, 0xc3, 0xb5, 0x48, 0xce, 0x9d, 0xc2, - 0x02, 0x41, 0x5f, 0x93, 0x71, 0x77, 0xe1, 0x90, 0xfa, 0xf8, 0x0a, 0xdd, 0x8d, 0x85, 0x05, 0x88, - 0xed, 0x71, 0xfa, 0x96, 0x8c, 0x25, 0x58, 0x5e, 0x70, 0xcb, 0xe3, 0xdb, 0xce, 0xfa, 0xec, 0x46, - 0xeb, 0x79, 0x80, 0xd9, 0xde, 0x46, 0x3f, 0x91, 0x89, 0xef, 0x63, 0xfb, 0x43, 0xa8, 0x22, 0x3e, - 0x99, 0x45, 0x8b, 0xbb, 0xcb, 0x17, 0xff, 0xb7, 0xfb, 0x1e, 0xea, 0xdc, 0x08, 0x6d, 0xd1, 0x84, - 0x83, 0x2f, 0x42, 0x15, 0x8c, 0xc8, 0xfd, 0x37, 0xfd, 0x40, 0x88, 0x9b, 0xc5, 0xd6, 0x5e, 0x6a, - 0x88, 0x6f, 0xb9, 0x42, 0xcf, 0x6f, 0x2c, 0xe4, 0x26, 0xd8, 0xce, 0x92, 0xdd, 0x69, 0xba, 0x4f, - 0x9a, 0x91, 0x91, 0x6e, 0x9f, 0xb2, 0x8e, 0x87, 0xb3, 0x93, 0xc5, 0x64, 0xf9, 0xb0, 0xff, 0x09, - 0xdc, 0x73, 0xb3, 0x80, 0x9e, 0xfd, 0x8a, 0x48, 0x9c, 0xa3, 0xec, 0x45, 0xcf, 0x26, 0x3e, 0x78, - 0xd5, 0x6e, 0xca, 0x2a, 0xfa, 0x7e, 0x1a, 0xa0, 0x12, 0x2b, 0xae, 0xca, 0x04, 0x4d, 0x99, 0x96, - 0xa0, 0xdc, 0x1e, 0xa5, 0x5e, 0xe2, 0x5a, 0xd4, 0x57, 0xb7, 0xed, 0xcd, 0xe1, 0xef, 0xf7, 0x60, - 0xfa, 0xd1, 0x17, 0x78, 0x57, 0xe1, 0xae, 0xe8, 0x86, 0xdc, 0x66, 0xad, 0xb3, 0x3f, 0x9d, 0xb8, - 0x71, 0xe2, 0xe6, 0x20, 0x6e, 0xd6, 0xd9, 0xc5, 0xc8, 0x85, 0x64, 0xff, 0x02, 0x00, 0x00, 0xff, - 0xff, 0x5a, 0x88, 0xc9, 0x0b, 0x7e, 0x03, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0xdf, 0x8a, 0xd3, 0x40, + 0x14, 0xc6, 0x49, 0xd7, 0xd6, 0x3a, 0x05, 0x2f, 0x06, 0xd1, 0x50, 0x59, 0xa8, 0x15, 0xb5, 0x78, + 0x91, 0x40, 0x03, 0x82, 0x08, 0x0b, 0xae, 0x8a, 0x8a, 0x2c, 0x94, 0x51, 0x7a, 0x21, 0x85, 0x32, + 0x4d, 0x0e, 0xe1, 0x60, 0xe6, 0x0f, 0x93, 0x69, 0x60, 0xaf, 0x7c, 0x18, 0xef, 0x7c, 0x14, 0x9f, + 0xc9, 0x0b, 0xc9, 0xcc, 0xa4, 0xed, 0x62, 0xb7, 0x77, 0xc9, 0x7c, 0xbf, 0xef, 0x7c, 0x67, 0xce, + 0x1c, 0xf2, 0xa4, 0x54, 0xaa, 0xac, 0x20, 0x15, 0x4a, 0xa2, 0x55, 0x06, 0x65, 0x99, 0x36, 0x59, + 0x2a, 0xc0, 0x1a, 0xcc, 0x13, 0x6d, 0x94, 0x55, 0xf4, 0x81, 0x47, 0x92, 0x3d, 0x92, 0x34, 0xd9, + 0xf8, 0x3c, 0x18, 0xb9, 0xc6, 0xb4, 0xc0, 0xda, 0x1a, 0xdc, 0x6c, 0x2d, 0x2a, 0xe9, 0x4d, 0xe3, + 0x87, 0x07, 0x72, 0xc5, 0x37, 0x50, 0x85, 0xf3, 0x47, 0x07, 0xe7, 0x87, 0x29, 0xe3, 0xa7, 0x87, + 0x82, 0x4f, 0x82, 0x62, 0x6d, 0xa0, 0x56, 0x5b, 0x93, 0x43, 0x80, 0x8e, 0x77, 0x9b, 0x2b, 0x21, + 0xba, 0xe0, 0xe9, 0x4f, 0xd2, 0x5f, 0x28, 0x94, 0x96, 0x5e, 0x90, 0x21, 0x4a, 0x0b, 0xa6, 0xe1, + 0x55, 0x1c, 0x4d, 0xa2, 0xd9, 0x68, 0x3e, 0x4d, 0x8e, 0xdd, 0x24, 0xf9, 0x86, 0x02, 0x3e, 0x07, + 0x92, 0xed, 0x3c, 0xf4, 0x15, 0xe9, 0x37, 0xbc, 0xda, 0x42, 0xdc, 0x73, 0xe6, 0xc9, 0x2d, 0xe6, + 0x6b, 0x0d, 0xc5, 0xb2, 0xe5, 0x98, 0xc7, 0xa7, 0x7f, 0x7b, 0x84, 0xb4, 0x25, 0xbf, 0x82, 0x41, + 0xa8, 0xe9, 0x4b, 0x32, 0xf0, 0xf7, 0x0c, 0x4d, 0xd0, 0xae, 0x0e, 0xd7, 0x98, 0x5c, 0x39, 0x85, + 0x05, 0x82, 0xbe, 0x26, 0xc3, 0xee, 0xc2, 0x21, 0xf5, 0xfc, 0x06, 0xdd, 0x8d, 0x85, 0x05, 0x88, + 0xed, 0x70, 0xfa, 0x96, 0x0c, 0x05, 0x58, 0x5e, 0x70, 0xcb, 0xe3, 0xbb, 0xce, 0xfa, 0xec, 0xa4, + 0xf5, 0x2a, 0xc0, 0x6c, 0x67, 0xa3, 0x9f, 0xc8, 0xc8, 0xf7, 0xb1, 0xfe, 0x81, 0xb2, 0x88, 0xcf, + 0x26, 0xd1, 0xec, 0xfe, 0xfc, 0xc5, 0xff, 0xed, 0xbe, 0x87, 0x3a, 0x37, 0xa8, 0xad, 0x32, 0xe1, + 0xe0, 0x0b, 0xca, 0x82, 0x11, 0xb1, 0xfb, 0xa6, 0x1f, 0x08, 0x71, 0xb3, 0x58, 0xdb, 0x6b, 0x0d, + 0xf1, 0x1d, 0x57, 0xe8, 0xf9, 0xc9, 0x42, 0x6e, 0x82, 0xed, 0x2c, 0xd9, 0xbd, 0xa6, 0xfb, 0xa4, + 0x19, 0x19, 0xe8, 0xf6, 0x29, 0xeb, 0xb8, 0x3f, 0x39, 0x9b, 0x8d, 0xe6, 0x8f, 0x8f, 0x3f, 0x81, + 0x7b, 0x6e, 0x16, 0xd0, 0xcb, 0x5f, 0x11, 0x89, 0x73, 0x25, 0x8e, 0xa2, 0x97, 0x23, 0x1f, 0xbc, + 0x68, 0x37, 0x65, 0x11, 0x7d, 0xbf, 0x08, 0x50, 0xa9, 0x2a, 0x2e, 0xcb, 0x44, 0x99, 0x32, 0x2d, + 0x41, 0xba, 0x3d, 0x4a, 0xbd, 0xc4, 0x35, 0xd6, 0x37, 0xb7, 0xed, 0xcd, 0xfe, 0xef, 0x77, 0x6f, + 0xfc, 0xd1, 0x17, 0x78, 0x57, 0xa9, 0x6d, 0xd1, 0x0d, 0xb9, 0xcd, 0x5a, 0x66, 0x7f, 0x3a, 0x71, + 0xe5, 0xc4, 0xd5, 0x5e, 0x5c, 0x2d, 0xb3, 0xcd, 0xc0, 0x85, 0x64, 0xff, 0x02, 0x00, 0x00, 0xff, + 0xff, 0x06, 0x37, 0xbb, 0x92, 0x7f, 0x03, 0x00, 0x00, } diff --git a/vendor/google.golang.org/genproto/googleapis/monitoring/v3/metric_service.pb.go b/vendor/google.golang.org/genproto/googleapis/monitoring/v3/metric_service.pb.go index 38b5c770f6..8759a468dc 100644 --- a/vendor/google.golang.org/genproto/googleapis/monitoring/v3/metric_service.pb.go +++ b/vendor/google.golang.org/genproto/googleapis/monitoring/v3/metric_service.pb.go @@ -1,21 +1,23 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: google/monitoring/v3/metric_service.proto -package monitoring // import "google.golang.org/genproto/googleapis/monitoring/v3" - -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" -import _ "github.com/golang/protobuf/ptypes/duration" -import empty "github.com/golang/protobuf/ptypes/empty" -import _ "google.golang.org/genproto/googleapis/api/annotations" -import metric "google.golang.org/genproto/googleapis/api/metric" -import monitoredres "google.golang.org/genproto/googleapis/api/monitoredres" -import status "google.golang.org/genproto/googleapis/rpc/status" +package monitoring import ( - context "golang.org/x/net/context" + context "context" + fmt "fmt" + math "math" + + proto "github.com/golang/protobuf/proto" + _ "github.com/golang/protobuf/ptypes/duration" + empty "github.com/golang/protobuf/ptypes/empty" + _ "google.golang.org/genproto/googleapis/api/annotations" + metric "google.golang.org/genproto/googleapis/api/metric" + monitoredres "google.golang.org/genproto/googleapis/api/monitoredres" + status "google.golang.org/genproto/googleapis/rpc/status" grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status1 "google.golang.org/grpc/status" ) // Reference imports to suppress errors if they are not otherwise used. @@ -27,7 +29,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // Controls which fields are returned by `ListTimeSeries`. type ListTimeSeriesRequest_TimeSeriesView int32 @@ -45,6 +47,7 @@ var ListTimeSeriesRequest_TimeSeriesView_name = map[int32]string{ 0: "FULL", 1: "HEADERS", } + var ListTimeSeriesRequest_TimeSeriesView_value = map[string]int32{ "FULL": 0, "HEADERS": 1, @@ -53,8 +56,9 @@ var ListTimeSeriesRequest_TimeSeriesView_value = map[string]int32{ func (x ListTimeSeriesRequest_TimeSeriesView) String() string { return proto.EnumName(ListTimeSeriesRequest_TimeSeriesView_name, int32(x)) } + func (ListTimeSeriesRequest_TimeSeriesView) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_metric_service_6b0c3991af8d9a29, []int{8, 0} + return fileDescriptor_7b3d47b45a293957, []int{8, 0} } // The `ListMonitoredResourceDescriptors` request. @@ -87,16 +91,17 @@ func (m *ListMonitoredResourceDescriptorsRequest) Reset() { func (m *ListMonitoredResourceDescriptorsRequest) String() string { return proto.CompactTextString(m) } func (*ListMonitoredResourceDescriptorsRequest) ProtoMessage() {} func (*ListMonitoredResourceDescriptorsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_metric_service_6b0c3991af8d9a29, []int{0} + return fileDescriptor_7b3d47b45a293957, []int{0} } + func (m *ListMonitoredResourceDescriptorsRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ListMonitoredResourceDescriptorsRequest.Unmarshal(m, b) } func (m *ListMonitoredResourceDescriptorsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ListMonitoredResourceDescriptorsRequest.Marshal(b, m, deterministic) } -func (dst *ListMonitoredResourceDescriptorsRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_ListMonitoredResourceDescriptorsRequest.Merge(dst, src) +func (m *ListMonitoredResourceDescriptorsRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_ListMonitoredResourceDescriptorsRequest.Merge(m, src) } func (m *ListMonitoredResourceDescriptorsRequest) XXX_Size() int { return xxx_messageInfo_ListMonitoredResourceDescriptorsRequest.Size(m) @@ -155,16 +160,17 @@ func (m *ListMonitoredResourceDescriptorsResponse) Reset() { func (m *ListMonitoredResourceDescriptorsResponse) String() string { return proto.CompactTextString(m) } func (*ListMonitoredResourceDescriptorsResponse) ProtoMessage() {} func (*ListMonitoredResourceDescriptorsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_metric_service_6b0c3991af8d9a29, []int{1} + return fileDescriptor_7b3d47b45a293957, []int{1} } + func (m *ListMonitoredResourceDescriptorsResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ListMonitoredResourceDescriptorsResponse.Unmarshal(m, b) } func (m *ListMonitoredResourceDescriptorsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ListMonitoredResourceDescriptorsResponse.Marshal(b, m, deterministic) } -func (dst *ListMonitoredResourceDescriptorsResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_ListMonitoredResourceDescriptorsResponse.Merge(dst, src) +func (m *ListMonitoredResourceDescriptorsResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_ListMonitoredResourceDescriptorsResponse.Merge(m, src) } func (m *ListMonitoredResourceDescriptorsResponse) XXX_Size() int { return xxx_messageInfo_ListMonitoredResourceDescriptorsResponse.Size(m) @@ -205,16 +211,17 @@ func (m *GetMonitoredResourceDescriptorRequest) Reset() { *m = GetMonito func (m *GetMonitoredResourceDescriptorRequest) String() string { return proto.CompactTextString(m) } func (*GetMonitoredResourceDescriptorRequest) ProtoMessage() {} func (*GetMonitoredResourceDescriptorRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_metric_service_6b0c3991af8d9a29, []int{2} + return fileDescriptor_7b3d47b45a293957, []int{2} } + func (m *GetMonitoredResourceDescriptorRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetMonitoredResourceDescriptorRequest.Unmarshal(m, b) } func (m *GetMonitoredResourceDescriptorRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_GetMonitoredResourceDescriptorRequest.Marshal(b, m, deterministic) } -func (dst *GetMonitoredResourceDescriptorRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetMonitoredResourceDescriptorRequest.Merge(dst, src) +func (m *GetMonitoredResourceDescriptorRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetMonitoredResourceDescriptorRequest.Merge(m, src) } func (m *GetMonitoredResourceDescriptorRequest) XXX_Size() int { return xxx_messageInfo_GetMonitoredResourceDescriptorRequest.Size(m) @@ -261,16 +268,17 @@ func (m *ListMetricDescriptorsRequest) Reset() { *m = ListMetricDescript func (m *ListMetricDescriptorsRequest) String() string { return proto.CompactTextString(m) } func (*ListMetricDescriptorsRequest) ProtoMessage() {} func (*ListMetricDescriptorsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_metric_service_6b0c3991af8d9a29, []int{3} + return fileDescriptor_7b3d47b45a293957, []int{3} } + func (m *ListMetricDescriptorsRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ListMetricDescriptorsRequest.Unmarshal(m, b) } func (m *ListMetricDescriptorsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ListMetricDescriptorsRequest.Marshal(b, m, deterministic) } -func (dst *ListMetricDescriptorsRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_ListMetricDescriptorsRequest.Merge(dst, src) +func (m *ListMetricDescriptorsRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_ListMetricDescriptorsRequest.Merge(m, src) } func (m *ListMetricDescriptorsRequest) XXX_Size() int { return xxx_messageInfo_ListMetricDescriptorsRequest.Size(m) @@ -327,16 +335,17 @@ func (m *ListMetricDescriptorsResponse) Reset() { *m = ListMetricDescrip func (m *ListMetricDescriptorsResponse) String() string { return proto.CompactTextString(m) } func (*ListMetricDescriptorsResponse) ProtoMessage() {} func (*ListMetricDescriptorsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_metric_service_6b0c3991af8d9a29, []int{4} + return fileDescriptor_7b3d47b45a293957, []int{4} } + func (m *ListMetricDescriptorsResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ListMetricDescriptorsResponse.Unmarshal(m, b) } func (m *ListMetricDescriptorsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ListMetricDescriptorsResponse.Marshal(b, m, deterministic) } -func (dst *ListMetricDescriptorsResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_ListMetricDescriptorsResponse.Merge(dst, src) +func (m *ListMetricDescriptorsResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_ListMetricDescriptorsResponse.Merge(m, src) } func (m *ListMetricDescriptorsResponse) XXX_Size() int { return xxx_messageInfo_ListMetricDescriptorsResponse.Size(m) @@ -377,16 +386,17 @@ func (m *GetMetricDescriptorRequest) Reset() { *m = GetMetricDescriptorR func (m *GetMetricDescriptorRequest) String() string { return proto.CompactTextString(m) } func (*GetMetricDescriptorRequest) ProtoMessage() {} func (*GetMetricDescriptorRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_metric_service_6b0c3991af8d9a29, []int{5} + return fileDescriptor_7b3d47b45a293957, []int{5} } + func (m *GetMetricDescriptorRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetMetricDescriptorRequest.Unmarshal(m, b) } func (m *GetMetricDescriptorRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_GetMetricDescriptorRequest.Marshal(b, m, deterministic) } -func (dst *GetMetricDescriptorRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetMetricDescriptorRequest.Merge(dst, src) +func (m *GetMetricDescriptorRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetMetricDescriptorRequest.Merge(m, src) } func (m *GetMetricDescriptorRequest) XXX_Size() int { return xxx_messageInfo_GetMetricDescriptorRequest.Size(m) @@ -421,16 +431,17 @@ func (m *CreateMetricDescriptorRequest) Reset() { *m = CreateMetricDescr func (m *CreateMetricDescriptorRequest) String() string { return proto.CompactTextString(m) } func (*CreateMetricDescriptorRequest) ProtoMessage() {} func (*CreateMetricDescriptorRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_metric_service_6b0c3991af8d9a29, []int{6} + return fileDescriptor_7b3d47b45a293957, []int{6} } + func (m *CreateMetricDescriptorRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateMetricDescriptorRequest.Unmarshal(m, b) } func (m *CreateMetricDescriptorRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_CreateMetricDescriptorRequest.Marshal(b, m, deterministic) } -func (dst *CreateMetricDescriptorRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_CreateMetricDescriptorRequest.Merge(dst, src) +func (m *CreateMetricDescriptorRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_CreateMetricDescriptorRequest.Merge(m, src) } func (m *CreateMetricDescriptorRequest) XXX_Size() int { return xxx_messageInfo_CreateMetricDescriptorRequest.Size(m) @@ -471,16 +482,17 @@ func (m *DeleteMetricDescriptorRequest) Reset() { *m = DeleteMetricDescr func (m *DeleteMetricDescriptorRequest) String() string { return proto.CompactTextString(m) } func (*DeleteMetricDescriptorRequest) ProtoMessage() {} func (*DeleteMetricDescriptorRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_metric_service_6b0c3991af8d9a29, []int{7} + return fileDescriptor_7b3d47b45a293957, []int{7} } + func (m *DeleteMetricDescriptorRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DeleteMetricDescriptorRequest.Unmarshal(m, b) } func (m *DeleteMetricDescriptorRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_DeleteMetricDescriptorRequest.Marshal(b, m, deterministic) } -func (dst *DeleteMetricDescriptorRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_DeleteMetricDescriptorRequest.Merge(dst, src) +func (m *DeleteMetricDescriptorRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_DeleteMetricDescriptorRequest.Merge(m, src) } func (m *DeleteMetricDescriptorRequest) XXX_Size() int { return xxx_messageInfo_DeleteMetricDescriptorRequest.Size(m) @@ -509,7 +521,7 @@ type ListTimeSeriesRequest struct { // example: // // metric.type = "compute.googleapis.com/instance/cpu/usage_time" AND - // metric.label.instance_name = "my-instance-name" + // metric.labels.instance_name = "my-instance-name" Filter string `protobuf:"bytes,2,opt,name=filter,proto3" json:"filter,omitempty"` // The time interval for which results should be returned. Only time series // that contain data points in the specified interval are included @@ -543,16 +555,17 @@ func (m *ListTimeSeriesRequest) Reset() { *m = ListTimeSeriesRequest{} } func (m *ListTimeSeriesRequest) String() string { return proto.CompactTextString(m) } func (*ListTimeSeriesRequest) ProtoMessage() {} func (*ListTimeSeriesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_metric_service_6b0c3991af8d9a29, []int{8} + return fileDescriptor_7b3d47b45a293957, []int{8} } + func (m *ListTimeSeriesRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ListTimeSeriesRequest.Unmarshal(m, b) } func (m *ListTimeSeriesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ListTimeSeriesRequest.Marshal(b, m, deterministic) } -func (dst *ListTimeSeriesRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_ListTimeSeriesRequest.Merge(dst, src) +func (m *ListTimeSeriesRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_ListTimeSeriesRequest.Merge(m, src) } func (m *ListTimeSeriesRequest) XXX_Size() int { return xxx_messageInfo_ListTimeSeriesRequest.Size(m) @@ -639,16 +652,17 @@ func (m *ListTimeSeriesResponse) Reset() { *m = ListTimeSeriesResponse{} func (m *ListTimeSeriesResponse) String() string { return proto.CompactTextString(m) } func (*ListTimeSeriesResponse) ProtoMessage() {} func (*ListTimeSeriesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_metric_service_6b0c3991af8d9a29, []int{9} + return fileDescriptor_7b3d47b45a293957, []int{9} } + func (m *ListTimeSeriesResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ListTimeSeriesResponse.Unmarshal(m, b) } func (m *ListTimeSeriesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ListTimeSeriesResponse.Marshal(b, m, deterministic) } -func (dst *ListTimeSeriesResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_ListTimeSeriesResponse.Merge(dst, src) +func (m *ListTimeSeriesResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_ListTimeSeriesResponse.Merge(m, src) } func (m *ListTimeSeriesResponse) XXX_Size() int { return xxx_messageInfo_ListTimeSeriesResponse.Size(m) @@ -690,6 +704,8 @@ type CreateTimeSeriesRequest struct { // point must be more recent than any other point in its time series. Each // `TimeSeries` value must fully specify a unique time series by supplying // all label values for the metric and the monitored resource. + // + // The maximum number of `TimeSeries` objects per `Create` request is 200. TimeSeries []*TimeSeries `protobuf:"bytes,2,rep,name=time_series,json=timeSeries,proto3" json:"time_series,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` @@ -700,16 +716,17 @@ func (m *CreateTimeSeriesRequest) Reset() { *m = CreateTimeSeriesRequest func (m *CreateTimeSeriesRequest) String() string { return proto.CompactTextString(m) } func (*CreateTimeSeriesRequest) ProtoMessage() {} func (*CreateTimeSeriesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_metric_service_6b0c3991af8d9a29, []int{10} + return fileDescriptor_7b3d47b45a293957, []int{10} } + func (m *CreateTimeSeriesRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateTimeSeriesRequest.Unmarshal(m, b) } func (m *CreateTimeSeriesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_CreateTimeSeriesRequest.Marshal(b, m, deterministic) } -func (dst *CreateTimeSeriesRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_CreateTimeSeriesRequest.Merge(dst, src) +func (m *CreateTimeSeriesRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_CreateTimeSeriesRequest.Merge(m, src) } func (m *CreateTimeSeriesRequest) XXX_Size() int { return xxx_messageInfo_CreateTimeSeriesRequest.Size(m) @@ -752,16 +769,17 @@ func (m *CreateTimeSeriesError) Reset() { *m = CreateTimeSeriesError{} } func (m *CreateTimeSeriesError) String() string { return proto.CompactTextString(m) } func (*CreateTimeSeriesError) ProtoMessage() {} func (*CreateTimeSeriesError) Descriptor() ([]byte, []int) { - return fileDescriptor_metric_service_6b0c3991af8d9a29, []int{11} + return fileDescriptor_7b3d47b45a293957, []int{11} } + func (m *CreateTimeSeriesError) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateTimeSeriesError.Unmarshal(m, b) } func (m *CreateTimeSeriesError) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_CreateTimeSeriesError.Marshal(b, m, deterministic) } -func (dst *CreateTimeSeriesError) XXX_Merge(src proto.Message) { - xxx_messageInfo_CreateTimeSeriesError.Merge(dst, src) +func (m *CreateTimeSeriesError) XXX_Merge(src proto.Message) { + xxx_messageInfo_CreateTimeSeriesError.Merge(m, src) } func (m *CreateTimeSeriesError) XXX_Size() int { return xxx_messageInfo_CreateTimeSeriesError.Size(m) @@ -787,6 +805,7 @@ func (m *CreateTimeSeriesError) GetStatus() *status.Status { } func init() { + proto.RegisterEnum("google.monitoring.v3.ListTimeSeriesRequest_TimeSeriesView", ListTimeSeriesRequest_TimeSeriesView_name, ListTimeSeriesRequest_TimeSeriesView_value) proto.RegisterType((*ListMonitoredResourceDescriptorsRequest)(nil), "google.monitoring.v3.ListMonitoredResourceDescriptorsRequest") proto.RegisterType((*ListMonitoredResourceDescriptorsResponse)(nil), "google.monitoring.v3.ListMonitoredResourceDescriptorsResponse") proto.RegisterType((*GetMonitoredResourceDescriptorRequest)(nil), "google.monitoring.v3.GetMonitoredResourceDescriptorRequest") @@ -799,7 +818,85 @@ func init() { proto.RegisterType((*ListTimeSeriesResponse)(nil), "google.monitoring.v3.ListTimeSeriesResponse") proto.RegisterType((*CreateTimeSeriesRequest)(nil), "google.monitoring.v3.CreateTimeSeriesRequest") proto.RegisterType((*CreateTimeSeriesError)(nil), "google.monitoring.v3.CreateTimeSeriesError") - proto.RegisterEnum("google.monitoring.v3.ListTimeSeriesRequest_TimeSeriesView", ListTimeSeriesRequest_TimeSeriesView_name, ListTimeSeriesRequest_TimeSeriesView_value) +} + +func init() { + proto.RegisterFile("google/monitoring/v3/metric_service.proto", fileDescriptor_7b3d47b45a293957) +} + +var fileDescriptor_7b3d47b45a293957 = []byte{ + // 1126 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x57, 0xcf, 0x6f, 0x1b, 0x45, + 0x14, 0x66, 0x92, 0x34, 0x3f, 0xc6, 0x34, 0x4d, 0xa7, 0x6d, 0xea, 0x6e, 0x93, 0xca, 0x5d, 0x54, + 0xe2, 0xba, 0xe9, 0x6e, 0x65, 0x57, 0x1c, 0x92, 0x26, 0x52, 0x7e, 0x51, 0x2a, 0x02, 0x8a, 0x36, + 0x25, 0x87, 0x2a, 0x92, 0xb5, 0x59, 0xbf, 0x6c, 0x07, 0xbc, 0x3b, 0xcb, 0xec, 0x38, 0x6e, 0x8a, + 0xc2, 0x81, 0x43, 0xef, 0x08, 0x90, 0xe0, 0x5f, 0xe8, 0x01, 0xc4, 0x95, 0x23, 0xe2, 0xd4, 0x63, + 0xb9, 0x21, 0x71, 0xe3, 0x0f, 0x41, 0x3b, 0xbb, 0xce, 0xda, 0xeb, 0xdd, 0xb5, 0xcd, 0x85, 0x9b, + 0x77, 0xde, 0x9b, 0xf7, 0xbe, 0xf7, 0xcd, 0x7b, 0xf3, 0x8d, 0xf1, 0x5d, 0x9b, 0x31, 0xbb, 0x09, + 0xba, 0xc3, 0x5c, 0x2a, 0x18, 0xa7, 0xae, 0xad, 0x9f, 0xd4, 0x74, 0x07, 0x04, 0xa7, 0x56, 0xdd, + 0x07, 0x7e, 0x42, 0x2d, 0xd0, 0x3c, 0xce, 0x04, 0x23, 0x57, 0x43, 0x57, 0x2d, 0x76, 0xd5, 0x4e, + 0x6a, 0xca, 0x42, 0x14, 0xc0, 0xf4, 0xa8, 0x6e, 0xba, 0x2e, 0x13, 0xa6, 0xa0, 0xcc, 0xf5, 0xc3, + 0x3d, 0xca, 0xf5, 0x2e, 0x6b, 0x18, 0x34, 0x32, 0xbc, 0xd7, 0x6d, 0x08, 0x03, 0x42, 0xa3, 0xce, + 0xc1, 0x67, 0x2d, 0xde, 0xc9, 0xa8, 0x94, 0x52, 0xc1, 0x99, 0x4d, 0xe0, 0x22, 0xf2, 0xb8, 0x9d, + 0xea, 0x61, 0x31, 0xc7, 0x61, 0x6e, 0xae, 0x4b, 0x0f, 0x98, 0x5b, 0x91, 0x8b, 0xfc, 0x3a, 0x6a, + 0x1d, 0xeb, 0x8d, 0x16, 0x97, 0x65, 0x44, 0xf6, 0x9b, 0x49, 0x3b, 0x38, 0x9e, 0x38, 0x4d, 0x94, + 0xc8, 0x3d, 0x4b, 0xf7, 0x85, 0x29, 0x5a, 0x69, 0xb5, 0x5b, 0x4d, 0x0a, 0x6e, 0x04, 0x5a, 0xfd, + 0x16, 0xe1, 0xa5, 0x5d, 0xea, 0x8b, 0x4f, 0x3a, 0x75, 0x1b, 0x51, 0xd9, 0xdb, 0xe0, 0x5b, 0x9c, + 0x7a, 0x82, 0x71, 0xdf, 0x80, 0x2f, 0x5b, 0xe0, 0x0b, 0x42, 0xf0, 0x84, 0x6b, 0x3a, 0x50, 0xbc, + 0x50, 0x42, 0xe5, 0x19, 0x43, 0xfe, 0x26, 0xf3, 0x78, 0xf2, 0x98, 0x36, 0x05, 0xf0, 0xe2, 0x98, + 0x5c, 0x8d, 0xbe, 0xc8, 0x4d, 0x3c, 0xe3, 0x99, 0x36, 0xd4, 0x7d, 0xfa, 0x12, 0x8a, 0xe3, 0x25, + 0x54, 0xbe, 0x60, 0x4c, 0x07, 0x0b, 0xfb, 0xf4, 0x25, 0x90, 0x45, 0x8c, 0xa5, 0x51, 0xb0, 0x2f, + 0xc0, 0x2d, 0x4e, 0xc8, 0x8d, 0xd2, 0xfd, 0x69, 0xb0, 0xa0, 0xfe, 0x8c, 0x70, 0x79, 0x30, 0x26, + 0xdf, 0x63, 0xae, 0x0f, 0xe4, 0x19, 0xbe, 0xda, 0x39, 0xa9, 0x7a, 0x23, 0xb6, 0x17, 0x51, 0x69, + 0xbc, 0x5c, 0xa8, 0x2e, 0x69, 0x51, 0xa3, 0x98, 0x1e, 0xd5, 0x72, 0xe2, 0x19, 0x57, 0x78, 0x7f, + 0x0e, 0xf2, 0x3e, 0xbe, 0xe4, 0xc2, 0x0b, 0x51, 0xef, 0x02, 0x1b, 0x56, 0x79, 0x31, 0x58, 0xde, + 0x3b, 0x07, 0xbc, 0x8a, 0xef, 0x3c, 0x86, 0x3c, 0xb8, 0x49, 0x06, 0xc7, 0x63, 0x06, 0xd5, 0x57, + 0x08, 0x2f, 0xc8, 0x6a, 0x65, 0x17, 0xfc, 0x8f, 0xb4, 0x7f, 0x8f, 0xf0, 0x62, 0x06, 0x90, 0x88, + 0xeb, 0x8f, 0x31, 0x89, 0xa6, 0xb1, 0x9f, 0xe9, 0x85, 0x1e, 0xa6, 0x13, 0x21, 0x8c, 0xcb, 0x4e, + 0x32, 0xe8, 0xd0, 0xe4, 0x3e, 0xc0, 0x4a, 0x40, 0x6e, 0x32, 0x62, 0x0e, 0xa3, 0x5f, 0xe3, 0xc5, + 0x2d, 0x0e, 0xa6, 0x80, 0x11, 0x36, 0x91, 0x27, 0xf8, 0x72, 0x5f, 0x6d, 0x12, 0xd0, 0xa0, 0xd2, + 0xe6, 0x92, 0xa5, 0xa9, 0x35, 0xbc, 0xb8, 0x0d, 0x4d, 0x18, 0x29, 0xbf, 0xfa, 0xe3, 0x38, 0xbe, + 0x16, 0xb0, 0xff, 0x94, 0x3a, 0xb0, 0x0f, 0x9c, 0x42, 0xdf, 0xf9, 0xe3, 0x21, 0xce, 0x7f, 0x1d, + 0x4f, 0x53, 0x57, 0x00, 0x3f, 0x31, 0x9b, 0xf2, 0x80, 0x0b, 0x55, 0x55, 0x4b, 0xbb, 0x2a, 0xb5, + 0x20, 0xcd, 0x93, 0xc8, 0xd3, 0x38, 0xdf, 0x43, 0xb6, 0x70, 0xc1, 0xb4, 0x6d, 0x0e, 0xb6, 0xbc, + 0x72, 0x64, 0xcb, 0x15, 0xaa, 0xb7, 0xd3, 0x43, 0x6c, 0xc4, 0x8e, 0x46, 0xf7, 0x2e, 0x72, 0x03, + 0x4f, 0x33, 0xde, 0x00, 0x5e, 0x3f, 0x3a, 0x2d, 0x4e, 0x4a, 0x78, 0x53, 0xf2, 0x7b, 0xf3, 0x94, + 0x7c, 0x8a, 0x27, 0x4e, 0x28, 0xb4, 0x8b, 0x53, 0x25, 0x54, 0x9e, 0xad, 0xae, 0xa4, 0x07, 0x4e, + 0xa5, 0x41, 0x8b, 0x57, 0x0e, 0x28, 0xb4, 0x0d, 0x19, 0xa7, 0xb7, 0xdf, 0xa7, 0x73, 0xfb, 0x7d, + 0x26, 0xd9, 0xef, 0x4b, 0x78, 0xb6, 0x37, 0x26, 0x99, 0xc6, 0x13, 0x1f, 0x7e, 0xb6, 0xbb, 0x3b, + 0xf7, 0x0e, 0x29, 0xe0, 0xa9, 0x8f, 0x76, 0x36, 0xb6, 0x77, 0x8c, 0xfd, 0x39, 0xa4, 0xfe, 0x8e, + 0xf0, 0x7c, 0x12, 0x53, 0x34, 0x11, 0x1b, 0xb8, 0x20, 0xa8, 0x03, 0x81, 0x3a, 0x51, 0xe8, 0x8c, + 0x42, 0x29, 0x9b, 0xf2, 0x68, 0x3b, 0x16, 0xe7, 0xbf, 0x87, 0x9d, 0x03, 0xb2, 0x86, 0xe7, 0xe0, + 0x05, 0x58, 0xad, 0x80, 0xe2, 0x3a, 0x70, 0x1e, 0x8c, 0xde, 0xb8, 0xcc, 0x47, 0x3a, 0xf9, 0xb8, + 0x67, 0x69, 0xfb, 0xf2, 0xda, 0x37, 0x2e, 0x9d, 0xfb, 0xee, 0x48, 0x57, 0xd5, 0xc3, 0xd7, 0xc3, + 0xa1, 0xc8, 0x6e, 0xb0, 0xee, 0x71, 0x48, 0x14, 0x36, 0x36, 0x7a, 0x61, 0xc1, 0xc5, 0x76, 0x2d, + 0x99, 0x52, 0x82, 0xe9, 0x67, 0x0d, 0x8d, 0xcc, 0x5a, 0x05, 0x4f, 0x86, 0x02, 0x17, 0xcd, 0x68, + 0x1a, 0x07, 0x91, 0x47, 0xf5, 0xed, 0xbb, 0xf8, 0x62, 0x38, 0x8a, 0xfb, 0xe1, 0x23, 0x82, 0xfc, + 0x8d, 0x70, 0x69, 0x90, 0xc2, 0x90, 0xb5, 0xec, 0xee, 0x1c, 0x42, 0x2d, 0x95, 0xf5, 0xff, 0xba, + 0x3d, 0x6c, 0x2d, 0x75, 0xe5, 0x9b, 0x3f, 0xff, 0xf9, 0x6e, 0xec, 0x21, 0xa9, 0x06, 0x4f, 0x84, + 0xaf, 0x82, 0x43, 0x59, 0xf3, 0x38, 0xfb, 0x1c, 0x2c, 0xe1, 0xeb, 0x95, 0xb3, 0xf8, 0xa1, 0x92, + 0x06, 0xfd, 0x0f, 0x84, 0x6f, 0xe5, 0x2b, 0x12, 0x59, 0x4d, 0x87, 0x37, 0x94, 0x8e, 0x29, 0xc3, + 0xca, 0xaa, 0xfa, 0x48, 0x16, 0xf1, 0x01, 0x79, 0x98, 0x56, 0x44, 0x6e, 0x0d, 0x7a, 0xe5, 0x8c, + 0xfc, 0x8a, 0xc2, 0x3b, 0xb1, 0x4f, 0x91, 0x48, 0x35, 0x87, 0xdc, 0x0c, 0x1d, 0x55, 0x6a, 0x23, + 0xed, 0x89, 0x4e, 0x41, 0x97, 0x05, 0xdc, 0x25, 0x4b, 0x19, 0xa7, 0xd0, 0x87, 0xec, 0x27, 0x84, + 0xaf, 0xa4, 0xe8, 0x15, 0x79, 0x90, 0xcd, 0x77, 0xba, 0x4a, 0x28, 0xb9, 0xb2, 0xa3, 0x56, 0x25, + 0xb0, 0x65, 0x52, 0x49, 0x67, 0x36, 0x89, 0x4b, 0xaf, 0x54, 0xce, 0xc8, 0x2f, 0x08, 0xcf, 0xa7, + 0x2b, 0x23, 0xc9, 0x20, 0x27, 0x57, 0x47, 0x07, 0x20, 0xdc, 0x94, 0x08, 0x1f, 0xa9, 0xc3, 0x52, + 0xb7, 0xd2, 0x2f, 0xc0, 0x01, 0x9b, 0xf3, 0xe9, 0x5a, 0x9a, 0x85, 0x38, 0x57, 0x79, 0x95, 0xf9, + 0xce, 0xa6, 0xce, 0xf3, 0x59, 0xdb, 0x09, 0x9e, 0xcf, 0x1d, 0x36, 0x2b, 0xa3, 0xb0, 0xf9, 0x03, + 0xc2, 0xb3, 0xbd, 0xb2, 0x40, 0xee, 0x8d, 0x20, 0x68, 0xca, 0xf2, 0x70, 0xce, 0x51, 0x23, 0x96, + 0x25, 0x42, 0x95, 0x94, 0xd2, 0xd9, 0xec, 0xba, 0x1a, 0x5f, 0x21, 0x3c, 0x97, 0xbc, 0x77, 0xc9, + 0xfd, 0xbc, 0xf3, 0xed, 0xc7, 0x96, 0xc5, 0xd3, 0x3d, 0x89, 0xe2, 0x8e, 0x3a, 0x10, 0xc5, 0x0a, + 0xaa, 0x28, 0x7f, 0xa1, 0x37, 0x1b, 0x37, 0xba, 0xf2, 0x85, 0x21, 0x4d, 0x8f, 0xfa, 0x9a, 0xc5, + 0x9c, 0xb7, 0x1b, 0xbf, 0xa1, 0xe7, 0x42, 0x78, 0xfe, 0x8a, 0xae, 0xb7, 0xdb, 0xed, 0x84, 0x55, + 0x37, 0x5b, 0xe2, 0xb9, 0x6e, 0x35, 0x59, 0xab, 0x71, 0xdf, 0x6b, 0x9a, 0xe2, 0x98, 0x71, 0x67, + 0x79, 0x90, 0x7b, 0x9c, 0x6b, 0x04, 0x57, 0x8d, 0x83, 0xd9, 0x18, 0xc5, 0xbf, 0xcd, 0xa9, 0x80, + 0xcd, 0xd7, 0x08, 0x17, 0x2d, 0xe6, 0xa4, 0xd2, 0xba, 0x49, 0x7a, 0xe4, 0x66, 0x2f, 0xe0, 0x70, + 0x0f, 0x3d, 0x5b, 0x8f, 0x7c, 0x6d, 0xd6, 0x34, 0x5d, 0x5b, 0x63, 0xdc, 0xd6, 0x6d, 0x70, 0x25, + 0xc3, 0x7a, 0x9c, 0xb3, 0xf7, 0xcf, 0xe1, 0x6a, 0xfc, 0xf5, 0x7a, 0x4c, 0x79, 0x1c, 0x06, 0xd8, + 0x0a, 0x68, 0xe9, 0xdc, 0xbb, 0x41, 0xca, 0x83, 0xda, 0x9b, 0x8e, 0xf1, 0x50, 0x1a, 0x0f, 0x63, + 0xe3, 0xe1, 0x41, 0xed, 0x68, 0x52, 0x26, 0xa9, 0xfd, 0x1b, 0x00, 0x00, 0xff, 0xff, 0xd3, 0xd9, + 0x2f, 0x71, 0x62, 0x0f, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -944,6 +1041,35 @@ type MetricServiceServer interface { CreateTimeSeries(context.Context, *CreateTimeSeriesRequest) (*empty.Empty, error) } +// UnimplementedMetricServiceServer can be embedded to have forward compatible implementations. +type UnimplementedMetricServiceServer struct { +} + +func (*UnimplementedMetricServiceServer) ListMonitoredResourceDescriptors(ctx context.Context, req *ListMonitoredResourceDescriptorsRequest) (*ListMonitoredResourceDescriptorsResponse, error) { + return nil, status1.Errorf(codes.Unimplemented, "method ListMonitoredResourceDescriptors not implemented") +} +func (*UnimplementedMetricServiceServer) GetMonitoredResourceDescriptor(ctx context.Context, req *GetMonitoredResourceDescriptorRequest) (*monitoredres.MonitoredResourceDescriptor, error) { + return nil, status1.Errorf(codes.Unimplemented, "method GetMonitoredResourceDescriptor not implemented") +} +func (*UnimplementedMetricServiceServer) ListMetricDescriptors(ctx context.Context, req *ListMetricDescriptorsRequest) (*ListMetricDescriptorsResponse, error) { + return nil, status1.Errorf(codes.Unimplemented, "method ListMetricDescriptors not implemented") +} +func (*UnimplementedMetricServiceServer) GetMetricDescriptor(ctx context.Context, req *GetMetricDescriptorRequest) (*metric.MetricDescriptor, error) { + return nil, status1.Errorf(codes.Unimplemented, "method GetMetricDescriptor not implemented") +} +func (*UnimplementedMetricServiceServer) CreateMetricDescriptor(ctx context.Context, req *CreateMetricDescriptorRequest) (*metric.MetricDescriptor, error) { + return nil, status1.Errorf(codes.Unimplemented, "method CreateMetricDescriptor not implemented") +} +func (*UnimplementedMetricServiceServer) DeleteMetricDescriptor(ctx context.Context, req *DeleteMetricDescriptorRequest) (*empty.Empty, error) { + return nil, status1.Errorf(codes.Unimplemented, "method DeleteMetricDescriptor not implemented") +} +func (*UnimplementedMetricServiceServer) ListTimeSeries(ctx context.Context, req *ListTimeSeriesRequest) (*ListTimeSeriesResponse, error) { + return nil, status1.Errorf(codes.Unimplemented, "method ListTimeSeries not implemented") +} +func (*UnimplementedMetricServiceServer) CreateTimeSeries(ctx context.Context, req *CreateTimeSeriesRequest) (*empty.Empty, error) { + return nil, status1.Errorf(codes.Unimplemented, "method CreateTimeSeries not implemented") +} + func RegisterMetricServiceServer(s *grpc.Server, srv MetricServiceServer) { s.RegisterService(&_MetricService_serviceDesc, srv) } @@ -1132,77 +1258,3 @@ var _MetricService_serviceDesc = grpc.ServiceDesc{ Streams: []grpc.StreamDesc{}, Metadata: "google/monitoring/v3/metric_service.proto", } - -func init() { - proto.RegisterFile("google/monitoring/v3/metric_service.proto", fileDescriptor_metric_service_6b0c3991af8d9a29) -} - -var fileDescriptor_metric_service_6b0c3991af8d9a29 = []byte{ - // 1049 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x57, 0x4f, 0x6f, 0x1b, 0x45, - 0x14, 0x67, 0xe2, 0x34, 0x71, 0x9e, 0xd5, 0xd4, 0x9d, 0xb6, 0xae, 0xd9, 0x26, 0x95, 0xbb, 0xa8, - 0xc4, 0x75, 0xcb, 0x6e, 0x65, 0x57, 0x1c, 0x92, 0x26, 0x52, 0xfe, 0x51, 0x2a, 0x02, 0x8a, 0xd6, - 0x25, 0x87, 0x2a, 0x92, 0xb5, 0xb1, 0xa7, 0xab, 0x01, 0xef, 0xce, 0x32, 0x3b, 0x76, 0x9b, 0xa2, - 0x70, 0xe0, 0xd0, 0x3b, 0x02, 0x24, 0xf8, 0x0a, 0x39, 0x80, 0xf8, 0x0a, 0x88, 0x13, 0x57, 0xce, - 0xdc, 0xf8, 0x0a, 0xdc, 0xd1, 0xce, 0xee, 0xc6, 0xf6, 0x7a, 0x77, 0x6d, 0x73, 0xe9, 0xcd, 0x3b, - 0xef, 0xcd, 0x7b, 0xbf, 0xf7, 0x9b, 0x79, 0xef, 0x37, 0x86, 0x7b, 0x16, 0x63, 0x56, 0x97, 0xe8, - 0x36, 0x73, 0xa8, 0x60, 0x9c, 0x3a, 0x96, 0xde, 0x6f, 0xe8, 0x36, 0x11, 0x9c, 0xb6, 0x5b, 0x1e, - 0xe1, 0x7d, 0xda, 0x26, 0x9a, 0xcb, 0x99, 0x60, 0xf8, 0x7a, 0xe0, 0xaa, 0x0d, 0x5c, 0xb5, 0x7e, - 0x43, 0x59, 0x09, 0x03, 0x98, 0x2e, 0xd5, 0x4d, 0xc7, 0x61, 0xc2, 0x14, 0x94, 0x39, 0x5e, 0xb0, - 0x47, 0xb9, 0x39, 0x64, 0x0d, 0x82, 0x86, 0x86, 0xf7, 0x86, 0x0d, 0x41, 0x40, 0xd2, 0x69, 0x71, - 0xe2, 0xb1, 0x1e, 0x8f, 0x32, 0x2a, 0x77, 0x12, 0xc1, 0xb5, 0x99, 0x6d, 0x33, 0x27, 0xd3, 0x65, - 0x24, 0xd5, 0xed, 0xd0, 0x45, 0x7e, 0x9d, 0xf4, 0x5e, 0xe8, 0x9d, 0x1e, 0x97, 0x20, 0x43, 0xfb, - 0xad, 0xb8, 0x9d, 0xd8, 0xae, 0x38, 0x8d, 0x15, 0xc0, 0xdd, 0xb6, 0xee, 0x09, 0x53, 0xf4, 0xc2, - 0xca, 0xd4, 0xef, 0x10, 0xac, 0x1d, 0x50, 0x4f, 0x7c, 0x1a, 0x81, 0x37, 0x42, 0xec, 0x7b, 0xc4, - 0x6b, 0x73, 0xea, 0x0a, 0xc6, 0x3d, 0x83, 0x7c, 0xd5, 0x23, 0x9e, 0xc0, 0x18, 0xe6, 0x1d, 0xd3, - 0x26, 0xe5, 0x4b, 0x15, 0x54, 0x5d, 0x32, 0xe4, 0x6f, 0x5c, 0x82, 0x85, 0x17, 0xb4, 0x2b, 0x08, - 0x2f, 0xcf, 0xc9, 0xd5, 0xf0, 0x0b, 0xdf, 0x82, 0x25, 0xd7, 0xb4, 0x48, 0xcb, 0xa3, 0xaf, 0x49, - 0x39, 0x57, 0x41, 0xd5, 0x4b, 0x46, 0xde, 0x5f, 0x68, 0xd2, 0xd7, 0x04, 0xaf, 0x02, 0x48, 0xa3, - 0x60, 0x5f, 0x12, 0xa7, 0x3c, 0x2f, 0x37, 0x4a, 0xf7, 0x67, 0xfe, 0x82, 0xfa, 0x0b, 0x82, 0xea, - 0x64, 0x4c, 0x9e, 0xcb, 0x1c, 0x8f, 0xe0, 0xe7, 0x70, 0x3d, 0xa2, 0xbb, 0xd5, 0x19, 0xd8, 0xcb, - 0xa8, 0x92, 0xab, 0x16, 0xea, 0x6b, 0x5a, 0x78, 0xda, 0xa6, 0x4b, 0xb5, 0x8c, 0x78, 0xc6, 0x35, - 0x3e, 0x9e, 0x03, 0xbf, 0x0f, 0x57, 0x1c, 0xf2, 0x4a, 0xb4, 0x86, 0xc0, 0x06, 0x55, 0x5e, 0xf6, - 0x97, 0x0f, 0x2f, 0x00, 0x6f, 0xc0, 0xdd, 0x27, 0x24, 0x0b, 0x6e, 0x9c, 0xc1, 0xdc, 0x80, 0x41, - 0xf5, 0x0d, 0x82, 0x15, 0x59, 0xad, 0x3c, 0xec, 0xb7, 0x48, 0xfb, 0x0f, 0x08, 0x56, 0x53, 0x80, - 0x84, 0x5c, 0x7f, 0x02, 0x38, 0x6c, 0xa9, 0x71, 0xa6, 0x57, 0x46, 0x98, 0x8e, 0x85, 0x30, 0xae, - 0xda, 0xf1, 0xa0, 0x53, 0x93, 0xfb, 0x10, 0x14, 0x9f, 0xdc, 0x78, 0xc4, 0x0c, 0x46, 0xbf, 0x81, - 0xd5, 0x5d, 0x4e, 0x4c, 0x41, 0x66, 0xd8, 0x84, 0x9f, 0xc2, 0xd5, 0xb1, 0xda, 0x24, 0xa0, 0x49, - 0xa5, 0x15, 0xe3, 0xa5, 0xa9, 0x0d, 0x58, 0xdd, 0x23, 0x5d, 0x32, 0x53, 0x7e, 0xf5, 0xa7, 0x1c, - 0xdc, 0xf0, 0xd9, 0x7f, 0x46, 0x6d, 0xd2, 0x24, 0x9c, 0x92, 0xb1, 0xf3, 0x87, 0x29, 0xce, 0x7f, - 0x0b, 0xf2, 0xd4, 0x11, 0x84, 0xf7, 0xcd, 0xae, 0x3c, 0xe0, 0x42, 0x5d, 0xd5, 0x92, 0xe6, 0x9d, - 0xe6, 0xa7, 0x79, 0x1a, 0x7a, 0x1a, 0x17, 0x7b, 0xf0, 0x2e, 0x14, 0x4c, 0xcb, 0xe2, 0xc4, 0x92, - 0x93, 0x45, 0x5e, 0xb9, 0x42, 0xfd, 0x4e, 0x72, 0x88, 0xed, 0x81, 0xa3, 0x31, 0xbc, 0x0b, 0xbf, - 0x0b, 0x79, 0xc6, 0x3b, 0x84, 0xb7, 0x4e, 0x4e, 0xcb, 0x0b, 0x12, 0xde, 0xa2, 0xfc, 0xde, 0x39, - 0xc5, 0x9f, 0xc1, 0x7c, 0x9f, 0x92, 0x97, 0xe5, 0xc5, 0x0a, 0xaa, 0x2e, 0xd7, 0xd7, 0x93, 0x03, - 0x27, 0xd2, 0xa0, 0x0d, 0x56, 0x8e, 0x28, 0x79, 0x69, 0xc8, 0x38, 0xa3, 0xf7, 0x3d, 0x9f, 0x79, - 0xdf, 0x97, 0xe2, 0xf7, 0x7d, 0x0d, 0x96, 0x47, 0x63, 0xe2, 0x3c, 0xcc, 0x7f, 0xf4, 0xf9, 0xc1, - 0x41, 0xf1, 0x1d, 0x5c, 0x80, 0xc5, 0x8f, 0xf7, 0xb7, 0xf7, 0xf6, 0x8d, 0x66, 0x11, 0xa9, 0xbf, - 0x23, 0x28, 0xc5, 0x31, 0x85, 0x1d, 0xb1, 0x0d, 0x05, 0x41, 0x6d, 0xe2, 0x4b, 0x0c, 0x25, 0x51, - 0x2b, 0x54, 0xd2, 0x29, 0x0f, 0xb7, 0x83, 0xb8, 0xf8, 0x3d, 0x6d, 0x1f, 0xe0, 0x4d, 0x28, 0x92, - 0x57, 0xa4, 0xdd, 0xf3, 0x29, 0x6e, 0x11, 0xce, 0xfd, 0xd6, 0xcb, 0xc9, 0x7c, 0x38, 0xca, 0xc7, - 0xdd, 0xb6, 0xd6, 0x94, 0xd3, 0xdd, 0xb8, 0x72, 0xe1, 0xbb, 0x2f, 0x5d, 0x55, 0x17, 0x6e, 0x06, - 0x4d, 0x91, 0x7e, 0xc1, 0x86, 0xdb, 0x21, 0x56, 0xd8, 0xdc, 0xec, 0x85, 0xf9, 0x83, 0xed, 0x46, - 0x3c, 0xa5, 0x04, 0x33, 0xce, 0x1a, 0x9a, 0x99, 0xb5, 0x1a, 0x2c, 0x04, 0x3a, 0x16, 0xf6, 0x68, - 0x12, 0x07, 0xa1, 0x47, 0xfd, 0x5f, 0x80, 0xcb, 0x41, 0x2b, 0x36, 0x83, 0x97, 0x00, 0xfe, 0x1b, - 0x41, 0x65, 0x92, 0xc2, 0xe0, 0xcd, 0xf4, 0xdb, 0x39, 0x85, 0x5a, 0x2a, 0x5b, 0xff, 0x77, 0x7b, - 0x70, 0xb5, 0xd4, 0xf5, 0x6f, 0xff, 0xfa, 0xe7, 0xfb, 0xb9, 0x47, 0xb8, 0xee, 0xbf, 0x04, 0xbe, - 0xf6, 0x0f, 0x65, 0xd3, 0xe5, 0xec, 0x0b, 0xd2, 0x16, 0x9e, 0x5e, 0x3b, 0x1b, 0xbc, 0x36, 0x92, - 0xa0, 0xff, 0x81, 0xe0, 0x76, 0xb6, 0x22, 0xe1, 0x8d, 0x64, 0x78, 0x53, 0xe9, 0x98, 0x32, 0xad, - 0xac, 0xaa, 0x8f, 0x65, 0x11, 0x1f, 0xe2, 0x47, 0x49, 0x45, 0x64, 0xd6, 0xa0, 0xd7, 0xce, 0xf0, - 0x6f, 0x28, 0x98, 0x89, 0x63, 0x8a, 0x84, 0xeb, 0x19, 0xe4, 0xa6, 0xe8, 0xa8, 0xd2, 0x98, 0x69, - 0x4f, 0x78, 0x0a, 0xba, 0x2c, 0xe0, 0x1e, 0x5e, 0x4b, 0x39, 0x85, 0x31, 0x64, 0x3f, 0x23, 0xb8, - 0x96, 0xa0, 0x57, 0xf8, 0x61, 0x3a, 0xdf, 0xc9, 0x2a, 0xa1, 0x64, 0xca, 0x8e, 0x5a, 0x97, 0xc0, - 0x1e, 0xe0, 0x5a, 0x32, 0xb3, 0x71, 0x5c, 0x7a, 0xad, 0x76, 0x86, 0x7f, 0x45, 0x50, 0x4a, 0x56, - 0x46, 0x9c, 0x42, 0x4e, 0xa6, 0x8e, 0x4e, 0x40, 0xb8, 0x23, 0x11, 0x3e, 0x56, 0xa7, 0xa5, 0x6e, - 0x7d, 0x5c, 0x80, 0x7d, 0x36, 0x4b, 0xc9, 0x5a, 0x9a, 0x86, 0x38, 0x53, 0x79, 0x95, 0x52, 0xb4, - 0x29, 0x7a, 0x25, 0x6b, 0xfb, 0xfe, 0x2b, 0x39, 0x62, 0xb3, 0x36, 0x0b, 0x9b, 0x3f, 0x22, 0x58, - 0x1e, 0x95, 0x05, 0x7c, 0x7f, 0x06, 0x41, 0x53, 0x1e, 0x4c, 0xe7, 0x1c, 0x5e, 0xc4, 0xaa, 0x44, - 0xa8, 0xe2, 0x4a, 0x32, 0x9b, 0x43, 0xa3, 0xf1, 0x0d, 0x82, 0x62, 0x7c, 0xee, 0xe2, 0x0f, 0xb2, - 0xce, 0x77, 0x1c, 0x5b, 0x1a, 0x4f, 0xf7, 0x25, 0x8a, 0xbb, 0xea, 0x44, 0x14, 0xeb, 0xa8, 0xb6, - 0x73, 0x8e, 0xa0, 0xdc, 0x66, 0x76, 0x62, 0xe6, 0x1d, 0x3c, 0x32, 0x91, 0x0f, 0xfd, 0x34, 0x87, - 0xe8, 0xf9, 0x56, 0xe8, 0x6b, 0xb1, 0xae, 0xe9, 0x58, 0x1a, 0xe3, 0x96, 0x6e, 0x11, 0x47, 0x82, - 0xd0, 0x03, 0x93, 0xe9, 0x52, 0x6f, 0xf4, 0x6f, 0xd2, 0xc6, 0xe0, 0xeb, 0x7c, 0x4e, 0x79, 0x12, - 0x04, 0xd8, 0xed, 0xb2, 0x5e, 0x27, 0x1a, 0x4d, 0x7e, 0xca, 0xa3, 0xc6, 0x9f, 0x91, 0xf1, 0x58, - 0x1a, 0x8f, 0x07, 0xc6, 0xe3, 0xa3, 0xc6, 0xc9, 0x82, 0x4c, 0xd2, 0xf8, 0x2f, 0x00, 0x00, 0xff, - 0xff, 0x79, 0x2b, 0x3b, 0x90, 0x4a, 0x0e, 0x00, 0x00, -} diff --git a/vendor/google.golang.org/genproto/googleapis/monitoring/v3/mutation_record.pb.go b/vendor/google.golang.org/genproto/googleapis/monitoring/v3/mutation_record.pb.go index dbace78992..95c3fd93b0 100644 --- a/vendor/google.golang.org/genproto/googleapis/monitoring/v3/mutation_record.pb.go +++ b/vendor/google.golang.org/genproto/googleapis/monitoring/v3/mutation_record.pb.go @@ -1,12 +1,15 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: google/monitoring/v3/mutation_record.proto -package monitoring // import "google.golang.org/genproto/googleapis/monitoring/v3" +package monitoring -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" -import timestamp "github.com/golang/protobuf/ptypes/timestamp" +import ( + fmt "fmt" + math "math" + + proto "github.com/golang/protobuf/proto" + timestamp "github.com/golang/protobuf/ptypes/timestamp" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -17,7 +20,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // Describes a change made to a configuration. type MutationRecord struct { @@ -34,16 +37,17 @@ func (m *MutationRecord) Reset() { *m = MutationRecord{} } func (m *MutationRecord) String() string { return proto.CompactTextString(m) } func (*MutationRecord) ProtoMessage() {} func (*MutationRecord) Descriptor() ([]byte, []int) { - return fileDescriptor_mutation_record_c4e4f383b5193b81, []int{0} + return fileDescriptor_83c24e690bdb9101, []int{0} } + func (m *MutationRecord) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MutationRecord.Unmarshal(m, b) } func (m *MutationRecord) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_MutationRecord.Marshal(b, m, deterministic) } -func (dst *MutationRecord) XXX_Merge(src proto.Message) { - xxx_messageInfo_MutationRecord.Merge(dst, src) +func (m *MutationRecord) XXX_Merge(src proto.Message) { + xxx_messageInfo_MutationRecord.Merge(m, src) } func (m *MutationRecord) XXX_Size() int { return xxx_messageInfo_MutationRecord.Size(m) @@ -73,10 +77,10 @@ func init() { } func init() { - proto.RegisterFile("google/monitoring/v3/mutation_record.proto", fileDescriptor_mutation_record_c4e4f383b5193b81) + proto.RegisterFile("google/monitoring/v3/mutation_record.proto", fileDescriptor_83c24e690bdb9101) } -var fileDescriptor_mutation_record_c4e4f383b5193b81 = []byte{ +var fileDescriptor_83c24e690bdb9101 = []byte{ // 251 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0x4a, 0xcf, 0xcf, 0x4f, 0xcf, 0x49, 0xd5, 0xcf, 0xcd, 0xcf, 0xcb, 0x2c, 0xc9, 0x2f, 0xca, 0xcc, 0x4b, 0xd7, 0x2f, 0x33, diff --git a/vendor/google.golang.org/genproto/googleapis/monitoring/v3/notification.pb.go b/vendor/google.golang.org/genproto/googleapis/monitoring/v3/notification.pb.go index a3d70d8428..aab347701c 100644 --- a/vendor/google.golang.org/genproto/googleapis/monitoring/v3/notification.pb.go +++ b/vendor/google.golang.org/genproto/googleapis/monitoring/v3/notification.pb.go @@ -1,14 +1,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: google/monitoring/v3/notification.proto -package monitoring // import "google.golang.org/genproto/googleapis/monitoring/v3" +package monitoring -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" -import wrappers "github.com/golang/protobuf/ptypes/wrappers" -import _ "google.golang.org/genproto/googleapis/api/annotations" -import label "google.golang.org/genproto/googleapis/api/label" +import ( + fmt "fmt" + math "math" + + proto "github.com/golang/protobuf/proto" + wrappers "github.com/golang/protobuf/ptypes/wrappers" + label "google.golang.org/genproto/googleapis/api/label" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -19,7 +21,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // Indicates whether the channel has been verified or not. It is illegal // to specify this field in a @@ -50,6 +52,7 @@ var NotificationChannel_VerificationStatus_name = map[int32]string{ 1: "UNVERIFIED", 2: "VERIFIED", } + var NotificationChannel_VerificationStatus_value = map[string]int32{ "VERIFICATION_STATUS_UNSPECIFIED": 0, "UNVERIFIED": 1, @@ -59,8 +62,9 @@ var NotificationChannel_VerificationStatus_value = map[string]int32{ func (x NotificationChannel_VerificationStatus) String() string { return proto.EnumName(NotificationChannel_VerificationStatus_name, int32(x)) } + func (NotificationChannel_VerificationStatus) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_notification_5449d40305a71b45, []int{1, 0} + return fileDescriptor_4399f1e4bc1a75ef, []int{1, 0} } // A description of a notification channel. The descriptor includes @@ -99,16 +103,17 @@ func (m *NotificationChannelDescriptor) Reset() { *m = NotificationChann func (m *NotificationChannelDescriptor) String() string { return proto.CompactTextString(m) } func (*NotificationChannelDescriptor) ProtoMessage() {} func (*NotificationChannelDescriptor) Descriptor() ([]byte, []int) { - return fileDescriptor_notification_5449d40305a71b45, []int{0} + return fileDescriptor_4399f1e4bc1a75ef, []int{0} } + func (m *NotificationChannelDescriptor) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_NotificationChannelDescriptor.Unmarshal(m, b) } func (m *NotificationChannelDescriptor) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_NotificationChannelDescriptor.Marshal(b, m, deterministic) } -func (dst *NotificationChannelDescriptor) XXX_Merge(src proto.Message) { - xxx_messageInfo_NotificationChannelDescriptor.Merge(dst, src) +func (m *NotificationChannelDescriptor) XXX_Merge(src proto.Message) { + xxx_messageInfo_NotificationChannelDescriptor.Merge(m, src) } func (m *NotificationChannelDescriptor) XXX_Size() int { return xxx_messageInfo_NotificationChannelDescriptor.Size(m) @@ -184,7 +189,7 @@ type NotificationChannel struct { DisplayName string `protobuf:"bytes,3,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"` // An optional human-readable description of this notification channel. This // description may provide additional details, beyond the display - // name, for the channel. This may not exceeed 1024 Unicode characters. + // name, for the channel. This may not exceed 1024 Unicode characters. Description string `protobuf:"bytes,4,opt,name=description,proto3" json:"description,omitempty"` // Configuration fields that define the channel and its behavior. The // permissible and required labels are specified in the @@ -237,16 +242,17 @@ func (m *NotificationChannel) Reset() { *m = NotificationChannel{} } func (m *NotificationChannel) String() string { return proto.CompactTextString(m) } func (*NotificationChannel) ProtoMessage() {} func (*NotificationChannel) Descriptor() ([]byte, []int) { - return fileDescriptor_notification_5449d40305a71b45, []int{1} + return fileDescriptor_4399f1e4bc1a75ef, []int{1} } + func (m *NotificationChannel) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_NotificationChannel.Unmarshal(m, b) } func (m *NotificationChannel) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_NotificationChannel.Marshal(b, m, deterministic) } -func (dst *NotificationChannel) XXX_Merge(src proto.Message) { - xxx_messageInfo_NotificationChannel.Merge(dst, src) +func (m *NotificationChannel) XXX_Merge(src proto.Message) { + xxx_messageInfo_NotificationChannel.Merge(m, src) } func (m *NotificationChannel) XXX_Size() int { return xxx_messageInfo_NotificationChannel.Size(m) @@ -314,55 +320,54 @@ func (m *NotificationChannel) GetEnabled() *wrappers.BoolValue { } func init() { + proto.RegisterEnum("google.monitoring.v3.NotificationChannel_VerificationStatus", NotificationChannel_VerificationStatus_name, NotificationChannel_VerificationStatus_value) proto.RegisterType((*NotificationChannelDescriptor)(nil), "google.monitoring.v3.NotificationChannelDescriptor") proto.RegisterType((*NotificationChannel)(nil), "google.monitoring.v3.NotificationChannel") proto.RegisterMapType((map[string]string)(nil), "google.monitoring.v3.NotificationChannel.LabelsEntry") proto.RegisterMapType((map[string]string)(nil), "google.monitoring.v3.NotificationChannel.UserLabelsEntry") - proto.RegisterEnum("google.monitoring.v3.NotificationChannel_VerificationStatus", NotificationChannel_VerificationStatus_name, NotificationChannel_VerificationStatus_value) } func init() { - proto.RegisterFile("google/monitoring/v3/notification.proto", fileDescriptor_notification_5449d40305a71b45) -} - -var fileDescriptor_notification_5449d40305a71b45 = []byte{ - // 602 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0x6d, 0x6b, 0xdb, 0x3c, - 0x14, 0x7d, 0x9c, 0x34, 0x7d, 0x5a, 0xb9, 0xa4, 0x9d, 0x5a, 0x86, 0xf1, 0xde, 0xd2, 0xee, 0xc3, - 0xf2, 0xc9, 0x86, 0x64, 0x83, 0x75, 0x6f, 0xd0, 0xa4, 0xe9, 0x08, 0xac, 0x59, 0xc9, 0xdb, 0xa0, - 0x14, 0x82, 0x92, 0xa8, 0x9e, 0x98, 0x2d, 0x19, 0x49, 0xf6, 0xc8, 0xcf, 0xd8, 0x8f, 0xd8, 0x87, - 0xed, 0xa7, 0xec, 0x57, 0x0d, 0xcb, 0x8a, 0xed, 0xb5, 0x86, 0x75, 0xdf, 0x74, 0xcf, 0x3d, 0xe7, - 0xdc, 0x7b, 0x4f, 0x4c, 0xc0, 0x33, 0x8f, 0x31, 0xcf, 0xc7, 0x6e, 0xc0, 0x28, 0x91, 0x8c, 0x13, - 0xea, 0xb9, 0x71, 0xdb, 0xa5, 0x4c, 0x92, 0x6b, 0xb2, 0x40, 0x92, 0x30, 0xea, 0x84, 0x9c, 0x49, - 0x06, 0x0f, 0x52, 0xa2, 0x93, 0x13, 0x9d, 0xb8, 0x6d, 0x3f, 0xd4, 0x72, 0x14, 0x12, 0x17, 0x51, - 0xca, 0xa4, 0x92, 0x88, 0x54, 0x63, 0xdf, 0x2f, 0x74, 0x7d, 0x34, 0xc7, 0xbe, 0xc6, 0x0f, 0x4b, - 0x87, 0x2e, 0x58, 0x10, 0xac, 0xc7, 0xd9, 0x8f, 0x35, 0x45, 0x55, 0xf3, 0xe8, 0xda, 0xfd, 0xca, - 0x51, 0x18, 0x62, 0xae, 0xad, 0x8f, 0xbe, 0x55, 0xc0, 0xa3, 0x41, 0x61, 0xcb, 0xee, 0x67, 0x44, - 0x29, 0xf6, 0x4f, 0xb1, 0x58, 0x70, 0x12, 0x4a, 0xc6, 0x21, 0x04, 0x1b, 0x14, 0x05, 0xd8, 0xda, - 0x6c, 0x18, 0xcd, 0xed, 0xa1, 0x7a, 0x27, 0x98, 0x5c, 0x85, 0xd8, 0x32, 0x52, 0x2c, 0x79, 0xc3, - 0x43, 0xb0, 0xb3, 0x24, 0x22, 0xf4, 0xd1, 0x6a, 0xa6, 0xf8, 0x15, 0xd5, 0x33, 0x35, 0x36, 0x48, - 0x64, 0x0d, 0x60, 0x2e, 0xb5, 0x31, 0x61, 0xd4, 0xaa, 0x6a, 0x46, 0x0e, 0xc1, 0x36, 0xd8, 0x54, - 0x07, 0x0a, 0x6b, 0xa3, 0x51, 0x6d, 0x9a, 0xad, 0x07, 0x8e, 0x8e, 0x0b, 0x85, 0xc4, 0xf9, 0x90, - 0x74, 0xf2, 0xcd, 0x86, 0x9a, 0x0a, 0x07, 0x60, 0x57, 0x44, 0x61, 0xc8, 0xb8, 0xc4, 0xcb, 0x99, - 0x24, 0x98, 0x0b, 0xab, 0xd6, 0xa8, 0x36, 0xeb, 0xad, 0x43, 0xa7, 0x2c, 0x6c, 0x67, 0x84, 0x79, - 0x4c, 0x16, 0x78, 0x4c, 0x30, 0xef, 0x54, 0x2c, 0x63, 0x58, 0xcf, 0xd4, 0x09, 0x24, 0x8e, 0xbe, - 0xd7, 0xc0, 0x7e, 0x49, 0x26, 0xa5, 0x57, 0x97, 0xa5, 0x73, 0x33, 0x89, 0xea, 0x5f, 0x93, 0xd8, - 0xb8, 0x9d, 0xc4, 0x79, 0x96, 0x44, 0x4d, 0x25, 0xf1, 0xa2, 0xfc, 0x96, 0x92, 0x3d, 0xd3, 0x9c, - 0x44, 0x8f, 0x4a, 0xbe, 0xca, 0x32, 0xba, 0x04, 0x66, 0x24, 0x30, 0x9f, 0x69, 0xcf, 0x2d, 0xe5, - 0x79, 0x7c, 0x77, 0xcf, 0x89, 0xc0, 0xbc, 0xe8, 0x0b, 0xa2, 0x0c, 0x80, 0x01, 0xd8, 0x8f, 0x31, - 0xcf, 0x24, 0x33, 0x21, 0x91, 0x8c, 0x84, 0xb5, 0xdd, 0x30, 0x9a, 0xf5, 0xd6, 0x9b, 0xbb, 0xcf, - 0x98, 0x16, 0x4c, 0x46, 0xca, 0x63, 0x08, 0xe3, 0x5b, 0x18, 0x7c, 0x0e, 0xfe, 0xc7, 0x14, 0xcd, - 0x7d, 0xbc, 0xb4, 0xcc, 0x86, 0xd1, 0x34, 0x5b, 0xf6, 0x7a, 0xc4, 0xfa, 0x23, 0x77, 0x3a, 0x8c, - 0xf9, 0x53, 0xe4, 0x47, 0x78, 0xb8, 0xa6, 0xda, 0xc7, 0xc0, 0x2c, 0xec, 0x0f, 0xf7, 0x40, 0xf5, - 0x0b, 0x5e, 0xe9, 0x9f, 0x32, 0x79, 0xc2, 0x03, 0x50, 0x8b, 0x13, 0x89, 0xfe, 0x70, 0xd3, 0xe2, - 0x55, 0xe5, 0xa5, 0x61, 0xbf, 0x05, 0xbb, 0x37, 0xce, 0xff, 0x17, 0xf9, 0xd1, 0x27, 0x00, 0x6f, - 0x5f, 0x06, 0x9f, 0x82, 0x27, 0xd3, 0xde, 0xb0, 0x7f, 0xd6, 0xef, 0x9e, 0x8c, 0xfb, 0x1f, 0x07, - 0xb3, 0xd1, 0xf8, 0x64, 0x3c, 0x19, 0xcd, 0x26, 0x83, 0xd1, 0x45, 0xaf, 0xdb, 0x3f, 0xeb, 0xf7, - 0x4e, 0xf7, 0xfe, 0x83, 0x75, 0x00, 0x26, 0x83, 0x94, 0xd6, 0x3b, 0xdd, 0x33, 0xe0, 0x0e, 0xd8, - 0xca, 0xaa, 0x4a, 0xe7, 0x87, 0x01, 0xac, 0x05, 0x0b, 0x4a, 0x03, 0xee, 0xdc, 0x2b, 0x26, 0x7c, - 0x91, 0x04, 0x73, 0x61, 0x5c, 0xbe, 0xd3, 0x54, 0x8f, 0xf9, 0x88, 0x7a, 0x0e, 0xe3, 0x9e, 0xeb, - 0x61, 0xaa, 0x62, 0x73, 0xd3, 0x16, 0x0a, 0x89, 0xf8, 0xf3, 0xff, 0xe4, 0x75, 0x5e, 0xfd, 0xac, - 0xd8, 0xef, 0x53, 0x83, 0xae, 0xcf, 0xa2, 0xa5, 0x73, 0x9e, 0x4f, 0x9c, 0xb6, 0x7f, 0xad, 0x9b, - 0x57, 0xaa, 0x79, 0x95, 0x37, 0xaf, 0xa6, 0xed, 0xf9, 0xa6, 0x1a, 0xd2, 0xfe, 0x1d, 0x00, 0x00, - 0xff, 0xff, 0xf7, 0x1b, 0x09, 0x21, 0x28, 0x05, 0x00, 0x00, + proto.RegisterFile("google/monitoring/v3/notification.proto", fileDescriptor_4399f1e4bc1a75ef) +} + +var fileDescriptor_4399f1e4bc1a75ef = []byte{ + // 592 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x94, 0xdb, 0x6e, 0xd3, 0x40, + 0x10, 0x86, 0xb1, 0xd3, 0x94, 0x76, 0x5d, 0xa5, 0x65, 0x5b, 0x21, 0xcb, 0x08, 0x70, 0xcb, 0x05, + 0xb9, 0xb2, 0xa5, 0x18, 0x24, 0xca, 0x49, 0x6a, 0xd2, 0x14, 0x45, 0xa2, 0xa6, 0x72, 0x0e, 0x48, + 0x55, 0x24, 0x6b, 0x93, 0x6c, 0xcd, 0x0a, 0x7b, 0xd7, 0xda, 0xb5, 0x8d, 0xf2, 0x18, 0x3c, 0x04, + 0x17, 0xf0, 0x28, 0x3c, 0x15, 0xf2, 0x21, 0x76, 0x68, 0x2c, 0x51, 0xee, 0x76, 0x66, 0xfe, 0xf9, + 0x67, 0xe6, 0x8b, 0x15, 0xf0, 0xdc, 0x63, 0xcc, 0xf3, 0xb1, 0x19, 0x30, 0x4a, 0x22, 0xc6, 0x09, + 0xf5, 0xcc, 0xc4, 0x32, 0x29, 0x8b, 0xc8, 0x0d, 0x99, 0xa3, 0x88, 0x30, 0x6a, 0x84, 0x9c, 0x45, + 0x0c, 0x1e, 0xe5, 0x42, 0xa3, 0x12, 0x1a, 0x89, 0xa5, 0x3d, 0x2c, 0xda, 0x51, 0x48, 0x4c, 0x1f, + 0xcd, 0xb0, 0x9f, 0xab, 0xb5, 0xe3, 0x5a, 0xdb, 0x39, 0x0b, 0x82, 0x95, 0xa1, 0xf6, 0xa4, 0x90, + 0x64, 0xd1, 0x2c, 0xbe, 0x31, 0xbf, 0x71, 0x14, 0x86, 0x98, 0x8b, 0xbc, 0x7e, 0xf2, 0x5d, 0x06, + 0x8f, 0xed, 0xb5, 0x3d, 0x7a, 0x5f, 0x10, 0xa5, 0xd8, 0x3f, 0xc7, 0x62, 0xce, 0x49, 0x18, 0x31, + 0x0e, 0x21, 0xd8, 0xa2, 0x28, 0xc0, 0xea, 0xb6, 0x2e, 0xb5, 0x77, 0x9d, 0xec, 0x9d, 0xe6, 0xa2, + 0x65, 0x88, 0x55, 0x29, 0xcf, 0xa5, 0x6f, 0x78, 0x0c, 0xf6, 0x16, 0x44, 0x84, 0x3e, 0x5a, 0xba, + 0x99, 0x5e, 0xce, 0x6a, 0x4a, 0x91, 0xb3, 0xd3, 0x36, 0x1d, 0x28, 0x8b, 0xc2, 0x98, 0x30, 0xaa, + 0x36, 0x0a, 0x45, 0x95, 0x82, 0x16, 0xd8, 0xce, 0x0e, 0x14, 0xea, 0x96, 0xde, 0x68, 0x2b, 0x9d, + 0x47, 0x46, 0x01, 0x04, 0x85, 0xc4, 0xf8, 0x98, 0x56, 0xaa, 0xcd, 0x9c, 0x42, 0x0a, 0x6d, 0xb0, + 0x2f, 0xe2, 0x30, 0x64, 0x3c, 0xc2, 0x0b, 0x37, 0x22, 0x98, 0x0b, 0xb5, 0xa9, 0x37, 0xda, 0xad, + 0xce, 0xb1, 0x51, 0x87, 0xd3, 0x18, 0x62, 0x9e, 0x90, 0x39, 0x1e, 0x11, 0xcc, 0xbb, 0xb2, 0x2a, + 0x39, 0xad, 0xb2, 0x3b, 0x4d, 0x89, 0x93, 0x1f, 0x4d, 0x70, 0x58, 0xc3, 0xa4, 0xf6, 0xea, 0x3a, + 0x3a, 0xb7, 0x49, 0x34, 0xfe, 0x49, 0x62, 0x6b, 0x93, 0xc4, 0x65, 0x49, 0xa2, 0x99, 0x91, 0x78, + 0x59, 0x7f, 0x4b, 0xcd, 0x9e, 0x39, 0x27, 0xd1, 0xa7, 0x11, 0x5f, 0x96, 0x8c, 0xae, 0x81, 0x12, + 0x0b, 0xcc, 0xdd, 0xc2, 0x73, 0x27, 0xf3, 0x3c, 0xbd, 0xbb, 0xe7, 0x58, 0x60, 0xbe, 0xee, 0x0b, + 0xe2, 0x32, 0x01, 0x03, 0x70, 0x98, 0x60, 0x5e, 0xb6, 0xb8, 0x22, 0x42, 0x51, 0x2c, 0xd4, 0x5d, + 0x5d, 0x6a, 0xb7, 0x3a, 0x6f, 0xef, 0x3e, 0x63, 0xb2, 0x66, 0x32, 0xcc, 0x3c, 0x1c, 0x98, 0x6c, + 0xe4, 0xe0, 0x0b, 0x70, 0x1f, 0x53, 0x34, 0xf3, 0xf1, 0x42, 0x55, 0x74, 0xa9, 0xad, 0x74, 0xb4, + 0xd5, 0x88, 0xd5, 0x47, 0x6e, 0x74, 0x19, 0xf3, 0x27, 0xc8, 0x8f, 0xb1, 0xb3, 0x92, 0x6a, 0xa7, + 0x40, 0x59, 0xdb, 0x1f, 0x1e, 0x80, 0xc6, 0x57, 0xbc, 0x2c, 0x7e, 0xca, 0xf4, 0x09, 0x8f, 0x40, + 0x33, 0x49, 0x5b, 0x8a, 0x0f, 0x37, 0x0f, 0x5e, 0xcb, 0xaf, 0x24, 0xed, 0x1d, 0xd8, 0xbf, 0x75, + 0xfe, 0xff, 0xb4, 0x9f, 0x7c, 0x06, 0x70, 0xf3, 0x32, 0xf8, 0x0c, 0x3c, 0x9d, 0xf4, 0x9d, 0xc1, + 0xc5, 0xa0, 0x77, 0x36, 0x1a, 0x7c, 0xb2, 0xdd, 0xe1, 0xe8, 0x6c, 0x34, 0x1e, 0xba, 0x63, 0x7b, + 0x78, 0xd5, 0xef, 0x0d, 0x2e, 0x06, 0xfd, 0xf3, 0x83, 0x7b, 0xb0, 0x05, 0xc0, 0xd8, 0xce, 0x65, + 0xfd, 0xf3, 0x03, 0x09, 0xee, 0x81, 0x9d, 0x32, 0x92, 0xbb, 0x3f, 0x25, 0xa0, 0xce, 0x59, 0x50, + 0x0b, 0xb8, 0xfb, 0x60, 0x9d, 0xf0, 0x55, 0x0a, 0xe6, 0x4a, 0xba, 0x7e, 0x5f, 0x48, 0x3d, 0xe6, + 0x23, 0xea, 0x19, 0x8c, 0x7b, 0xa6, 0x87, 0x69, 0x86, 0xcd, 0xcc, 0x4b, 0x28, 0x24, 0xe2, 0xef, + 0xff, 0x93, 0x37, 0x55, 0xf4, 0x4b, 0xd6, 0x3e, 0xe4, 0x06, 0x3d, 0x9f, 0xc5, 0x0b, 0xe3, 0xb2, + 0x9a, 0x38, 0xb1, 0x7e, 0xaf, 0x8a, 0xd3, 0xac, 0x38, 0xad, 0x8a, 0xd3, 0x89, 0x35, 0xdb, 0xce, + 0x86, 0x58, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0xe7, 0xd2, 0x16, 0xc2, 0x0a, 0x05, 0x00, 0x00, } diff --git a/vendor/google.golang.org/genproto/googleapis/monitoring/v3/notification_service.pb.go b/vendor/google.golang.org/genproto/googleapis/monitoring/v3/notification_service.pb.go index 4dbcd8c684..447a7fd0dd 100644 --- a/vendor/google.golang.org/genproto/googleapis/monitoring/v3/notification_service.pb.go +++ b/vendor/google.golang.org/genproto/googleapis/monitoring/v3/notification_service.pb.go @@ -1,20 +1,22 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: google/monitoring/v3/notification_service.proto -package monitoring // import "google.golang.org/genproto/googleapis/monitoring/v3" - -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" -import empty "github.com/golang/protobuf/ptypes/empty" -import _ "github.com/golang/protobuf/ptypes/struct" -import timestamp "github.com/golang/protobuf/ptypes/timestamp" -import _ "google.golang.org/genproto/googleapis/api/annotations" -import field_mask "google.golang.org/genproto/protobuf/field_mask" +package monitoring import ( - context "golang.org/x/net/context" + context "context" + fmt "fmt" + math "math" + + proto "github.com/golang/protobuf/proto" + empty "github.com/golang/protobuf/ptypes/empty" + _ "github.com/golang/protobuf/ptypes/struct" + timestamp "github.com/golang/protobuf/ptypes/timestamp" + _ "google.golang.org/genproto/googleapis/api/annotations" + field_mask "google.golang.org/genproto/protobuf/field_mask" grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" ) // Reference imports to suppress errors if they are not otherwise used. @@ -26,7 +28,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // The `ListNotificationChannelDescriptors` request. type ListNotificationChannelDescriptorsRequest struct { @@ -59,16 +61,17 @@ func (m *ListNotificationChannelDescriptorsRequest) Reset() { func (m *ListNotificationChannelDescriptorsRequest) String() string { return proto.CompactTextString(m) } func (*ListNotificationChannelDescriptorsRequest) ProtoMessage() {} func (*ListNotificationChannelDescriptorsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_notification_service_e0bdcc277cafcf7d, []int{0} + return fileDescriptor_7e2bcd7194b305fe, []int{0} } + func (m *ListNotificationChannelDescriptorsRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ListNotificationChannelDescriptorsRequest.Unmarshal(m, b) } func (m *ListNotificationChannelDescriptorsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ListNotificationChannelDescriptorsRequest.Marshal(b, m, deterministic) } -func (dst *ListNotificationChannelDescriptorsRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_ListNotificationChannelDescriptorsRequest.Merge(dst, src) +func (m *ListNotificationChannelDescriptorsRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_ListNotificationChannelDescriptorsRequest.Merge(m, src) } func (m *ListNotificationChannelDescriptorsRequest) XXX_Size() int { return xxx_messageInfo_ListNotificationChannelDescriptorsRequest.Size(m) @@ -123,16 +126,17 @@ func (m *ListNotificationChannelDescriptorsResponse) String() string { } func (*ListNotificationChannelDescriptorsResponse) ProtoMessage() {} func (*ListNotificationChannelDescriptorsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_notification_service_e0bdcc277cafcf7d, []int{1} + return fileDescriptor_7e2bcd7194b305fe, []int{1} } + func (m *ListNotificationChannelDescriptorsResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ListNotificationChannelDescriptorsResponse.Unmarshal(m, b) } func (m *ListNotificationChannelDescriptorsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ListNotificationChannelDescriptorsResponse.Marshal(b, m, deterministic) } -func (dst *ListNotificationChannelDescriptorsResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_ListNotificationChannelDescriptorsResponse.Merge(dst, src) +func (m *ListNotificationChannelDescriptorsResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_ListNotificationChannelDescriptorsResponse.Merge(m, src) } func (m *ListNotificationChannelDescriptorsResponse) XXX_Size() int { return xxx_messageInfo_ListNotificationChannelDescriptorsResponse.Size(m) @@ -173,16 +177,17 @@ func (m *GetNotificationChannelDescriptorRequest) Reset() { func (m *GetNotificationChannelDescriptorRequest) String() string { return proto.CompactTextString(m) } func (*GetNotificationChannelDescriptorRequest) ProtoMessage() {} func (*GetNotificationChannelDescriptorRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_notification_service_e0bdcc277cafcf7d, []int{2} + return fileDescriptor_7e2bcd7194b305fe, []int{2} } + func (m *GetNotificationChannelDescriptorRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetNotificationChannelDescriptorRequest.Unmarshal(m, b) } func (m *GetNotificationChannelDescriptorRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_GetNotificationChannelDescriptorRequest.Marshal(b, m, deterministic) } -func (dst *GetNotificationChannelDescriptorRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetNotificationChannelDescriptorRequest.Merge(dst, src) +func (m *GetNotificationChannelDescriptorRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetNotificationChannelDescriptorRequest.Merge(m, src) } func (m *GetNotificationChannelDescriptorRequest) XXX_Size() int { return xxx_messageInfo_GetNotificationChannelDescriptorRequest.Size(m) @@ -222,16 +227,17 @@ func (m *CreateNotificationChannelRequest) Reset() { *m = CreateNotifica func (m *CreateNotificationChannelRequest) String() string { return proto.CompactTextString(m) } func (*CreateNotificationChannelRequest) ProtoMessage() {} func (*CreateNotificationChannelRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_notification_service_e0bdcc277cafcf7d, []int{3} + return fileDescriptor_7e2bcd7194b305fe, []int{3} } + func (m *CreateNotificationChannelRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateNotificationChannelRequest.Unmarshal(m, b) } func (m *CreateNotificationChannelRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_CreateNotificationChannelRequest.Marshal(b, m, deterministic) } -func (dst *CreateNotificationChannelRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_CreateNotificationChannelRequest.Merge(dst, src) +func (m *CreateNotificationChannelRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_CreateNotificationChannelRequest.Merge(m, src) } func (m *CreateNotificationChannelRequest) XXX_Size() int { return xxx_messageInfo_CreateNotificationChannelRequest.Size(m) @@ -263,7 +269,8 @@ type ListNotificationChannelsRequest struct { // in which to look for the notification channels; it does not name a // specific channel. To query a specific channel by REST resource name, use // the - // [`GetNotificationChannel`][google.monitoring.v3.NotificationChannelService.GetNotificationChannel] operation. + // [`GetNotificationChannel`][google.monitoring.v3.NotificationChannelService.GetNotificationChannel] + // operation. Name string `protobuf:"bytes,5,opt,name=name,proto3" json:"name,omitempty"` // If provided, this field specifies the criteria that must be met by // notification channels to be included in the response. @@ -295,16 +302,17 @@ func (m *ListNotificationChannelsRequest) Reset() { *m = ListNotificatio func (m *ListNotificationChannelsRequest) String() string { return proto.CompactTextString(m) } func (*ListNotificationChannelsRequest) ProtoMessage() {} func (*ListNotificationChannelsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_notification_service_e0bdcc277cafcf7d, []int{4} + return fileDescriptor_7e2bcd7194b305fe, []int{4} } + func (m *ListNotificationChannelsRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ListNotificationChannelsRequest.Unmarshal(m, b) } func (m *ListNotificationChannelsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ListNotificationChannelsRequest.Marshal(b, m, deterministic) } -func (dst *ListNotificationChannelsRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_ListNotificationChannelsRequest.Merge(dst, src) +func (m *ListNotificationChannelsRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_ListNotificationChannelsRequest.Merge(m, src) } func (m *ListNotificationChannelsRequest) XXX_Size() int { return xxx_messageInfo_ListNotificationChannelsRequest.Size(m) @@ -368,16 +376,17 @@ func (m *ListNotificationChannelsResponse) Reset() { *m = ListNotificati func (m *ListNotificationChannelsResponse) String() string { return proto.CompactTextString(m) } func (*ListNotificationChannelsResponse) ProtoMessage() {} func (*ListNotificationChannelsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_notification_service_e0bdcc277cafcf7d, []int{5} + return fileDescriptor_7e2bcd7194b305fe, []int{5} } + func (m *ListNotificationChannelsResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ListNotificationChannelsResponse.Unmarshal(m, b) } func (m *ListNotificationChannelsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ListNotificationChannelsResponse.Marshal(b, m, deterministic) } -func (dst *ListNotificationChannelsResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_ListNotificationChannelsResponse.Merge(dst, src) +func (m *ListNotificationChannelsResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_ListNotificationChannelsResponse.Merge(m, src) } func (m *ListNotificationChannelsResponse) XXX_Size() int { return xxx_messageInfo_ListNotificationChannelsResponse.Size(m) @@ -416,16 +425,17 @@ func (m *GetNotificationChannelRequest) Reset() { *m = GetNotificationCh func (m *GetNotificationChannelRequest) String() string { return proto.CompactTextString(m) } func (*GetNotificationChannelRequest) ProtoMessage() {} func (*GetNotificationChannelRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_notification_service_e0bdcc277cafcf7d, []int{6} + return fileDescriptor_7e2bcd7194b305fe, []int{6} } + func (m *GetNotificationChannelRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetNotificationChannelRequest.Unmarshal(m, b) } func (m *GetNotificationChannelRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_GetNotificationChannelRequest.Marshal(b, m, deterministic) } -func (dst *GetNotificationChannelRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetNotificationChannelRequest.Merge(dst, src) +func (m *GetNotificationChannelRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetNotificationChannelRequest.Merge(m, src) } func (m *GetNotificationChannelRequest) XXX_Size() int { return xxx_messageInfo_GetNotificationChannelRequest.Size(m) @@ -461,16 +471,17 @@ func (m *UpdateNotificationChannelRequest) Reset() { *m = UpdateNotifica func (m *UpdateNotificationChannelRequest) String() string { return proto.CompactTextString(m) } func (*UpdateNotificationChannelRequest) ProtoMessage() {} func (*UpdateNotificationChannelRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_notification_service_e0bdcc277cafcf7d, []int{7} + return fileDescriptor_7e2bcd7194b305fe, []int{7} } + func (m *UpdateNotificationChannelRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UpdateNotificationChannelRequest.Unmarshal(m, b) } func (m *UpdateNotificationChannelRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_UpdateNotificationChannelRequest.Marshal(b, m, deterministic) } -func (dst *UpdateNotificationChannelRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_UpdateNotificationChannelRequest.Merge(dst, src) +func (m *UpdateNotificationChannelRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_UpdateNotificationChannelRequest.Merge(m, src) } func (m *UpdateNotificationChannelRequest) XXX_Size() int { return xxx_messageInfo_UpdateNotificationChannelRequest.Size(m) @@ -514,16 +525,17 @@ func (m *DeleteNotificationChannelRequest) Reset() { *m = DeleteNotifica func (m *DeleteNotificationChannelRequest) String() string { return proto.CompactTextString(m) } func (*DeleteNotificationChannelRequest) ProtoMessage() {} func (*DeleteNotificationChannelRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_notification_service_e0bdcc277cafcf7d, []int{8} + return fileDescriptor_7e2bcd7194b305fe, []int{8} } + func (m *DeleteNotificationChannelRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DeleteNotificationChannelRequest.Unmarshal(m, b) } func (m *DeleteNotificationChannelRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_DeleteNotificationChannelRequest.Marshal(b, m, deterministic) } -func (dst *DeleteNotificationChannelRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_DeleteNotificationChannelRequest.Merge(dst, src) +func (m *DeleteNotificationChannelRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_DeleteNotificationChannelRequest.Merge(m, src) } func (m *DeleteNotificationChannelRequest) XXX_Size() int { return xxx_messageInfo_DeleteNotificationChannelRequest.Size(m) @@ -565,16 +577,17 @@ func (m *SendNotificationChannelVerificationCodeRequest) String() string { } func (*SendNotificationChannelVerificationCodeRequest) ProtoMessage() {} func (*SendNotificationChannelVerificationCodeRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_notification_service_e0bdcc277cafcf7d, []int{9} + return fileDescriptor_7e2bcd7194b305fe, []int{9} } + func (m *SendNotificationChannelVerificationCodeRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SendNotificationChannelVerificationCodeRequest.Unmarshal(m, b) } func (m *SendNotificationChannelVerificationCodeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_SendNotificationChannelVerificationCodeRequest.Marshal(b, m, deterministic) } -func (dst *SendNotificationChannelVerificationCodeRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_SendNotificationChannelVerificationCodeRequest.Merge(dst, src) +func (m *SendNotificationChannelVerificationCodeRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_SendNotificationChannelVerificationCodeRequest.Merge(m, src) } func (m *SendNotificationChannelVerificationCodeRequest) XXX_Size() int { return xxx_messageInfo_SendNotificationChannelVerificationCodeRequest.Size(m) @@ -621,16 +634,17 @@ func (m *GetNotificationChannelVerificationCodeRequest) String() string { } func (*GetNotificationChannelVerificationCodeRequest) ProtoMessage() {} func (*GetNotificationChannelVerificationCodeRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_notification_service_e0bdcc277cafcf7d, []int{10} + return fileDescriptor_7e2bcd7194b305fe, []int{10} } + func (m *GetNotificationChannelVerificationCodeRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetNotificationChannelVerificationCodeRequest.Unmarshal(m, b) } func (m *GetNotificationChannelVerificationCodeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_GetNotificationChannelVerificationCodeRequest.Marshal(b, m, deterministic) } -func (dst *GetNotificationChannelVerificationCodeRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetNotificationChannelVerificationCodeRequest.Merge(dst, src) +func (m *GetNotificationChannelVerificationCodeRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetNotificationChannelVerificationCodeRequest.Merge(m, src) } func (m *GetNotificationChannelVerificationCodeRequest) XXX_Size() int { return xxx_messageInfo_GetNotificationChannelVerificationCodeRequest.Size(m) @@ -679,16 +693,17 @@ func (m *GetNotificationChannelVerificationCodeResponse) String() string { } func (*GetNotificationChannelVerificationCodeResponse) ProtoMessage() {} func (*GetNotificationChannelVerificationCodeResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_notification_service_e0bdcc277cafcf7d, []int{11} + return fileDescriptor_7e2bcd7194b305fe, []int{11} } + func (m *GetNotificationChannelVerificationCodeResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetNotificationChannelVerificationCodeResponse.Unmarshal(m, b) } func (m *GetNotificationChannelVerificationCodeResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_GetNotificationChannelVerificationCodeResponse.Marshal(b, m, deterministic) } -func (dst *GetNotificationChannelVerificationCodeResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetNotificationChannelVerificationCodeResponse.Merge(dst, src) +func (m *GetNotificationChannelVerificationCodeResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetNotificationChannelVerificationCodeResponse.Merge(m, src) } func (m *GetNotificationChannelVerificationCodeResponse) XXX_Size() int { return xxx_messageInfo_GetNotificationChannelVerificationCodeResponse.Size(m) @@ -734,16 +749,17 @@ func (m *VerifyNotificationChannelRequest) Reset() { *m = VerifyNotifica func (m *VerifyNotificationChannelRequest) String() string { return proto.CompactTextString(m) } func (*VerifyNotificationChannelRequest) ProtoMessage() {} func (*VerifyNotificationChannelRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_notification_service_e0bdcc277cafcf7d, []int{12} + return fileDescriptor_7e2bcd7194b305fe, []int{12} } + func (m *VerifyNotificationChannelRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_VerifyNotificationChannelRequest.Unmarshal(m, b) } func (m *VerifyNotificationChannelRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_VerifyNotificationChannelRequest.Marshal(b, m, deterministic) } -func (dst *VerifyNotificationChannelRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_VerifyNotificationChannelRequest.Merge(dst, src) +func (m *VerifyNotificationChannelRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_VerifyNotificationChannelRequest.Merge(m, src) } func (m *VerifyNotificationChannelRequest) XXX_Size() int { return xxx_messageInfo_VerifyNotificationChannelRequest.Size(m) @@ -784,6 +800,82 @@ func init() { proto.RegisterType((*VerifyNotificationChannelRequest)(nil), "google.monitoring.v3.VerifyNotificationChannelRequest") } +func init() { + proto.RegisterFile("google/monitoring/v3/notification_service.proto", fileDescriptor_7e2bcd7194b305fe) +} + +var fileDescriptor_7e2bcd7194b305fe = []byte{ + // 1087 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0x41, 0x6f, 0x1b, 0x45, + 0x14, 0xd6, 0xd8, 0x49, 0x9a, 0xbe, 0x08, 0x21, 0xa6, 0x21, 0xac, 0xdd, 0x56, 0x5d, 0xed, 0xa1, + 0x49, 0xad, 0x74, 0x57, 0xb2, 0x4b, 0x84, 0x5c, 0x52, 0x9a, 0xc4, 0x6d, 0x11, 0xa4, 0x28, 0x72, + 0x4a, 0x24, 0x50, 0x84, 0xb5, 0xd9, 0x1d, 0x3b, 0x4b, 0xec, 0x99, 0x65, 0x67, 0x9c, 0x34, 0xad, + 0x2a, 0x15, 0x6e, 0x9c, 0xe1, 0x0f, 0x20, 0x71, 0xa1, 0x07, 0xc4, 0x19, 0xa9, 0x9c, 0x51, 0x8f, + 0x20, 0xb8, 0x72, 0x01, 0xf1, 0x37, 0xd0, 0xce, 0x8e, 0xb3, 0x8e, 0xb3, 0x6b, 0xef, 0xb6, 0xdc, + 0x76, 0xe6, 0xbd, 0x79, 0xef, 0x7b, 0xdf, 0x7c, 0xfb, 0xde, 0xda, 0x60, 0x75, 0x18, 0xeb, 0x74, + 0x89, 0xd5, 0x63, 0xd4, 0x13, 0x2c, 0xf0, 0x68, 0xc7, 0x3a, 0xac, 0x59, 0x94, 0x09, 0xaf, 0xed, + 0x39, 0xb6, 0xf0, 0x18, 0x6d, 0x71, 0x12, 0x1c, 0x7a, 0x0e, 0x31, 0xfd, 0x80, 0x09, 0x86, 0xe7, + 0xa3, 0x03, 0x66, 0x7c, 0xc0, 0x3c, 0xac, 0x95, 0x2f, 0xa9, 0x30, 0xb6, 0xef, 0x59, 0x36, 0xa5, + 0x4c, 0xc8, 0xa3, 0x3c, 0x3a, 0x53, 0x5e, 0x9c, 0x98, 0x44, 0x39, 0x5e, 0x54, 0x8e, 0x72, 0xb5, + 0xd7, 0x6f, 0x5b, 0xa4, 0xe7, 0x8b, 0x63, 0x65, 0xd4, 0x47, 0x8d, 0x6d, 0x8f, 0x74, 0xdd, 0x56, + 0xcf, 0xe6, 0x07, 0xca, 0xe3, 0xd2, 0xa8, 0x07, 0x17, 0x41, 0xdf, 0x11, 0xca, 0x7a, 0x65, 0xd4, + 0x2a, 0xbc, 0x1e, 0xe1, 0xc2, 0xee, 0xf9, 0xca, 0xe1, 0xad, 0xa1, 0x22, 0x9c, 0xae, 0x47, 0xa8, + 0x3a, 0x69, 0x3c, 0x86, 0x6b, 0x9b, 0x1e, 0x17, 0x1f, 0x0d, 0x01, 0xde, 0xd8, 0xb7, 0x29, 0x25, + 0xdd, 0x06, 0xe1, 0x4e, 0xe0, 0xf9, 0x82, 0x05, 0xbc, 0x49, 0xbe, 0xe8, 0x13, 0x2e, 0x30, 0x86, + 0x29, 0x6a, 0xf7, 0x88, 0x36, 0xa5, 0xa3, 0xa5, 0xf3, 0x4d, 0xf9, 0x8c, 0x2f, 0xc2, 0x79, 0xdf, + 0xee, 0x90, 0x16, 0xf7, 0x1e, 0x11, 0xad, 0xa0, 0xa3, 0xa5, 0xe9, 0xe6, 0x6c, 0xb8, 0xb1, 0xed, + 0x3d, 0x22, 0xf8, 0x32, 0x80, 0x34, 0x0a, 0x76, 0x40, 0xa8, 0x56, 0x94, 0xc7, 0xa4, 0xfb, 0x83, + 0x70, 0xc3, 0xf8, 0x19, 0x41, 0x25, 0x4b, 0x76, 0xee, 0x33, 0xca, 0x09, 0x76, 0xe1, 0x82, 0x13, + 0x59, 0x5b, 0x6e, 0x6c, 0xd6, 0x90, 0x5e, 0x5c, 0x9a, 0xab, 0xd6, 0xcc, 0xa4, 0xdb, 0x33, 0xc7, + 0x86, 0x6e, 0x62, 0xe7, 0x4c, 0x36, 0x7c, 0x15, 0x5e, 0xa7, 0xe4, 0xa1, 0x68, 0x0d, 0x01, 0x2f, + 0x48, 0xe0, 0xaf, 0x85, 0xdb, 0x5b, 0x27, 0xe0, 0x57, 0x61, 0xf1, 0x1e, 0x19, 0x0f, 0x7d, 0x94, + 0xb7, 0x62, 0xcc, 0x9b, 0xf1, 0x2d, 0x02, 0x7d, 0x23, 0x20, 0xb6, 0x20, 0x09, 0x21, 0xc6, 0x1c, + 0xc4, 0xbb, 0x30, 0x7f, 0x4a, 0xc3, 0xaa, 0x04, 0x09, 0x72, 0xae, 0x7a, 0x2d, 0x33, 0x0d, 0xcd, + 0x0b, 0xf4, 0xec, 0xa6, 0xf1, 0x3d, 0x82, 0x2b, 0x29, 0x57, 0x72, 0x46, 0x06, 0xd3, 0x43, 0xa8, + 0x16, 0x60, 0xa6, 0xed, 0x75, 0x05, 0x09, 0xb4, 0x19, 0xb9, 0xab, 0x56, 0xb8, 0x04, 0xb3, 0x2c, + 0x70, 0x49, 0xd0, 0xda, 0x3b, 0xd6, 0xce, 0x49, 0xcb, 0x39, 0xb9, 0x5e, 0x3f, 0x3e, 0xad, 0x9c, + 0xe2, 0x58, 0xe5, 0x4c, 0x8d, 0x2a, 0xe7, 0x19, 0x02, 0x3d, 0x1d, 0xa6, 0xd2, 0xcb, 0x67, 0xf0, + 0x66, 0x12, 0x53, 0x5c, 0x2b, 0x4a, 0xc5, 0xe4, 0xa0, 0x6a, 0x3e, 0x81, 0xaa, 0xec, 0x4a, 0xa9, + 0xc1, 0xe5, 0x64, 0xa5, 0x8c, 0xd3, 0xc7, 0x73, 0x04, 0xfa, 0xc7, 0xbe, 0x3b, 0x5e, 0x1f, 0x37, + 0x61, 0xae, 0x2f, 0x7d, 0x64, 0xab, 0x50, 0x12, 0x28, 0x0f, 0xea, 0x1a, 0x74, 0x03, 0xf3, 0x6e, + 0xd8, 0x4d, 0xee, 0xdb, 0xfc, 0xa0, 0x09, 0x91, 0x7b, 0xf8, 0x9c, 0x2a, 0xa4, 0xe2, 0xff, 0x22, + 0xa4, 0x4d, 0xd0, 0x1b, 0xa4, 0x4b, 0x72, 0xcb, 0x7b, 0x1e, 0xa6, 0xdb, 0x2c, 0x70, 0x22, 0x75, + 0xcd, 0x36, 0xa3, 0x85, 0xd1, 0x00, 0x73, 0x9b, 0x50, 0x37, 0x21, 0xd6, 0x0e, 0x09, 0xe2, 0x2d, + 0xe6, 0x92, 0xd1, 0xd8, 0x68, 0x88, 0xd3, 0xa7, 0x08, 0xae, 0x27, 0xdf, 0x44, 0x8e, 0x28, 0x21, + 0xe9, 0xe4, 0xa1, 0xef, 0x05, 0xa4, 0x15, 0x76, 0xd9, 0x54, 0xd2, 0x1f, 0x0c, 0x5a, 0x70, 0x13, + 0x22, 0xf7, 0x70, 0xc3, 0xf8, 0x12, 0x81, 0x99, 0x15, 0x82, 0x92, 0x31, 0x86, 0x29, 0x87, 0xb9, + 0x27, 0x18, 0xc2, 0xe7, 0x57, 0xc3, 0xf0, 0x01, 0xe8, 0x32, 0xd9, 0x71, 0x86, 0xab, 0x19, 0x2e, + 0x7c, 0x00, 0xa4, 0x10, 0x03, 0xa9, 0xfe, 0xfb, 0x06, 0x94, 0x13, 0xc2, 0x6c, 0x47, 0x83, 0x15, + 0xff, 0x83, 0xc0, 0x98, 0xdc, 0xe1, 0xf1, 0x7b, 0xc9, 0x62, 0xcb, 0x3c, 0x99, 0xca, 0xb7, 0x5f, + 0x3e, 0x40, 0xc4, 0xb2, 0xf1, 0xee, 0x57, 0xbf, 0xff, 0xfd, 0x4d, 0x61, 0x05, 0xdf, 0x08, 0xe7, + 0xf7, 0xe3, 0xb0, 0xde, 0x55, 0x3f, 0x60, 0x9f, 0x13, 0x47, 0x70, 0xab, 0xf2, 0xc4, 0xa2, 0xe3, + 0x0b, 0xf8, 0x13, 0x81, 0x3e, 0x69, 0x1a, 0xe0, 0xd5, 0x64, 0x90, 0x19, 0xa7, 0x48, 0xf9, 0x65, + 0x26, 0x9c, 0x71, 0x4b, 0x96, 0xf5, 0x0e, 0x5e, 0x49, 0x2a, 0x6b, 0x42, 0x55, 0x56, 0xe5, 0x09, + 0x7e, 0x8e, 0x40, 0x4b, 0x6b, 0xb4, 0xf8, 0xed, 0x5c, 0xac, 0x9f, 0x5c, 0xd6, 0x4a, 0xde, 0x63, + 0xea, 0x8a, 0xaa, 0xb2, 0x96, 0x65, 0x5c, 0xc9, 0x7c, 0x45, 0x1c, 0xff, 0x88, 0x60, 0x21, 0x99, + 0x60, 0x5c, 0xcb, 0x73, 0x1d, 0x03, 0xec, 0xd9, 0xdb, 0xa2, 0x71, 0x43, 0xc2, 0x35, 0xf1, 0x72, + 0x56, 0xea, 0x25, 0xe1, 0xbf, 0x22, 0x28, 0xa5, 0x7e, 0x17, 0xe0, 0x14, 0xea, 0x26, 0x7d, 0x48, + 0xe4, 0x81, 0xfd, 0xbe, 0x84, 0xbd, 0x6e, 0xe4, 0x60, 0xb9, 0x9e, 0x38, 0x48, 0xf0, 0x5f, 0x08, + 0x4a, 0xa9, 0x23, 0x2c, 0xad, 0x94, 0x49, 0x33, 0x2f, 0x4f, 0x29, 0x2d, 0x59, 0xca, 0x27, 0xd5, + 0xb5, 0xa8, 0x94, 0x04, 0x8c, 0x66, 0xc6, 0x6b, 0x49, 0xa9, 0xf0, 0x3b, 0x04, 0xa5, 0xd4, 0x29, + 0x97, 0x56, 0xe1, 0xa4, 0xb1, 0x58, 0x5e, 0x38, 0xd3, 0xc7, 0xef, 0x84, 0xbf, 0x15, 0x06, 0x82, + 0xaa, 0xe4, 0x13, 0xd4, 0x1f, 0x08, 0x16, 0x33, 0xce, 0x4e, 0xdc, 0x48, 0x46, 0x9c, 0x6f, 0xf4, + 0xa6, 0xe2, 0xdf, 0x94, 0xf8, 0xef, 0x1a, 0x6b, 0x79, 0xf0, 0xd7, 0x39, 0xa1, 0xee, 0x68, 0xa6, + 0x3a, 0xaa, 0xe0, 0xa7, 0x05, 0xb8, 0x9a, 0x6d, 0x92, 0xe2, 0x8d, 0x3c, 0x6f, 0x7a, 0x5a, 0x55, + 0x8d, 0x57, 0x0b, 0xa2, 0x7a, 0xd8, 0x87, 0x92, 0x83, 0x3b, 0xc6, 0xed, 0x5c, 0x1c, 0x74, 0x88, + 0x48, 0xa2, 0xe0, 0x17, 0x04, 0xa5, 0xd4, 0x49, 0x9e, 0x26, 0xbf, 0x49, 0xa3, 0x3f, 0xcf, 0x0b, + 0xa6, 0xa6, 0x8b, 0x51, 0xcb, 0x55, 0xcd, 0xa1, 0x44, 0x50, 0x47, 0x95, 0xf2, 0x0f, 0xe8, 0xc5, + 0x5a, 0x69, 0x28, 0x4d, 0x94, 0xd8, 0xf6, 0x3d, 0x6e, 0x3a, 0xac, 0xf7, 0xdb, 0xda, 0xd7, 0x68, + 0x5f, 0x08, 0x9f, 0xd7, 0x2d, 0xeb, 0xe8, 0xe8, 0x68, 0xc4, 0x6a, 0xd9, 0x7d, 0xb1, 0x6f, 0x39, + 0x5d, 0xd6, 0x77, 0xaf, 0xfb, 0x5d, 0x5b, 0xb4, 0x59, 0xd0, 0x5b, 0x9e, 0xe4, 0x1e, 0xe7, 0xca, + 0xe1, 0x6a, 0x06, 0xc4, 0x76, 0xd7, 0x7f, 0x42, 0xa0, 0x39, 0xac, 0x97, 0x48, 0xce, 0xba, 0x36, + 0xcc, 0x8e, 0xfa, 0xf8, 0xd9, 0x0a, 0xd5, 0xbf, 0x85, 0x3e, 0xbd, 0xa5, 0x4e, 0x74, 0x58, 0xd7, + 0xa6, 0x1d, 0x93, 0x05, 0x1d, 0xab, 0x43, 0xa8, 0x7c, 0x37, 0xac, 0x38, 0xf1, 0xe9, 0x7f, 0x10, + 0x6e, 0xc6, 0xab, 0x67, 0x85, 0xf2, 0xbd, 0x28, 0xc0, 0x46, 0x58, 0xab, 0x79, 0x3f, 0x4e, 0xbc, + 0x53, 0x7b, 0x31, 0x30, 0xee, 0x4a, 0xe3, 0x6e, 0x6c, 0xdc, 0xdd, 0xa9, 0xed, 0xcd, 0xc8, 0x24, + 0xb5, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0xfe, 0xe6, 0xcc, 0x63, 0x0a, 0x11, 0x00, 0x00, +} + // Reference imports to suppress errors if they are not otherwise used. var _ context.Context var _ grpc.ClientConn @@ -1002,6 +1094,41 @@ type NotificationChannelServiceServer interface { VerifyNotificationChannel(context.Context, *VerifyNotificationChannelRequest) (*NotificationChannel, error) } +// UnimplementedNotificationChannelServiceServer can be embedded to have forward compatible implementations. +type UnimplementedNotificationChannelServiceServer struct { +} + +func (*UnimplementedNotificationChannelServiceServer) ListNotificationChannelDescriptors(ctx context.Context, req *ListNotificationChannelDescriptorsRequest) (*ListNotificationChannelDescriptorsResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method ListNotificationChannelDescriptors not implemented") +} +func (*UnimplementedNotificationChannelServiceServer) GetNotificationChannelDescriptor(ctx context.Context, req *GetNotificationChannelDescriptorRequest) (*NotificationChannelDescriptor, error) { + return nil, status.Errorf(codes.Unimplemented, "method GetNotificationChannelDescriptor not implemented") +} +func (*UnimplementedNotificationChannelServiceServer) ListNotificationChannels(ctx context.Context, req *ListNotificationChannelsRequest) (*ListNotificationChannelsResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method ListNotificationChannels not implemented") +} +func (*UnimplementedNotificationChannelServiceServer) GetNotificationChannel(ctx context.Context, req *GetNotificationChannelRequest) (*NotificationChannel, error) { + return nil, status.Errorf(codes.Unimplemented, "method GetNotificationChannel not implemented") +} +func (*UnimplementedNotificationChannelServiceServer) CreateNotificationChannel(ctx context.Context, req *CreateNotificationChannelRequest) (*NotificationChannel, error) { + return nil, status.Errorf(codes.Unimplemented, "method CreateNotificationChannel not implemented") +} +func (*UnimplementedNotificationChannelServiceServer) UpdateNotificationChannel(ctx context.Context, req *UpdateNotificationChannelRequest) (*NotificationChannel, error) { + return nil, status.Errorf(codes.Unimplemented, "method UpdateNotificationChannel not implemented") +} +func (*UnimplementedNotificationChannelServiceServer) DeleteNotificationChannel(ctx context.Context, req *DeleteNotificationChannelRequest) (*empty.Empty, error) { + return nil, status.Errorf(codes.Unimplemented, "method DeleteNotificationChannel not implemented") +} +func (*UnimplementedNotificationChannelServiceServer) SendNotificationChannelVerificationCode(ctx context.Context, req *SendNotificationChannelVerificationCodeRequest) (*empty.Empty, error) { + return nil, status.Errorf(codes.Unimplemented, "method SendNotificationChannelVerificationCode not implemented") +} +func (*UnimplementedNotificationChannelServiceServer) GetNotificationChannelVerificationCode(ctx context.Context, req *GetNotificationChannelVerificationCodeRequest) (*GetNotificationChannelVerificationCodeResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method GetNotificationChannelVerificationCode not implemented") +} +func (*UnimplementedNotificationChannelServiceServer) VerifyNotificationChannel(ctx context.Context, req *VerifyNotificationChannelRequest) (*NotificationChannel, error) { + return nil, status.Errorf(codes.Unimplemented, "method VerifyNotificationChannel not implemented") +} + func RegisterNotificationChannelServiceServer(s *grpc.Server, srv NotificationChannelServiceServer) { s.RegisterService(&_NotificationChannelService_serviceDesc, srv) } @@ -1234,75 +1361,3 @@ var _NotificationChannelService_serviceDesc = grpc.ServiceDesc{ Streams: []grpc.StreamDesc{}, Metadata: "google/monitoring/v3/notification_service.proto", } - -func init() { - proto.RegisterFile("google/monitoring/v3/notification_service.proto", fileDescriptor_notification_service_e0bdcc277cafcf7d) -} - -var fileDescriptor_notification_service_e0bdcc277cafcf7d = []byte{ - // 1020 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0x41, 0x6f, 0xdc, 0x44, - 0x14, 0xd6, 0xec, 0x26, 0x69, 0xfa, 0x22, 0x04, 0x9a, 0x86, 0xc8, 0xd9, 0xb6, 0xaa, 0xe5, 0x43, - 0x93, 0xae, 0x8a, 0x2d, 0xad, 0x4b, 0x84, 0x52, 0x52, 0xda, 0x64, 0xdb, 0x22, 0x48, 0x51, 0xb4, - 0x29, 0x91, 0x40, 0x11, 0x2b, 0xc7, 0x9e, 0x35, 0x26, 0xbb, 0x33, 0xc6, 0x33, 0x1b, 0x35, 0xad, - 0x2a, 0x15, 0xfe, 0x02, 0xfc, 0x01, 0x24, 0x4e, 0x3d, 0x20, 0xce, 0xa0, 0x72, 0x46, 0x5c, 0x11, - 0x5c, 0xb9, 0xc0, 0xff, 0x40, 0x1e, 0xcf, 0x66, 0x37, 0x9b, 0xf1, 0xae, 0xdd, 0xf6, 0xe6, 0x99, - 0x37, 0xf3, 0xde, 0xf7, 0xbe, 0xf7, 0xf9, 0x3d, 0x1b, 0x9c, 0x90, 0xb1, 0xb0, 0x4b, 0x9c, 0x1e, - 0xa3, 0x91, 0x60, 0x49, 0x44, 0x43, 0xe7, 0xc8, 0x75, 0x28, 0x13, 0x51, 0x27, 0xf2, 0x3d, 0x11, - 0x31, 0xda, 0xe6, 0x24, 0x39, 0x8a, 0x7c, 0x62, 0xc7, 0x09, 0x13, 0x0c, 0x2f, 0x66, 0x17, 0xec, - 0xe1, 0x05, 0xfb, 0xc8, 0xad, 0x5d, 0x52, 0x6e, 0xbc, 0x38, 0x72, 0x3c, 0x4a, 0x99, 0x90, 0x57, - 0x79, 0x76, 0xa7, 0xb6, 0x32, 0x35, 0x88, 0x3a, 0x78, 0x51, 0x1d, 0x94, 0xab, 0x83, 0x7e, 0xc7, - 0x21, 0xbd, 0x58, 0x1c, 0x2b, 0xa3, 0x39, 0x6e, 0xec, 0x44, 0xa4, 0x1b, 0xb4, 0x7b, 0x1e, 0x3f, - 0x54, 0x27, 0x2e, 0x8d, 0x9f, 0xe0, 0x22, 0xe9, 0xfb, 0x42, 0x59, 0xaf, 0x8c, 0x5b, 0x45, 0xd4, - 0x23, 0x5c, 0x78, 0xbd, 0x38, 0x3b, 0x60, 0x3d, 0x81, 0x6b, 0xdb, 0x11, 0x17, 0x9f, 0x8c, 0xe0, - 0xda, 0xfa, 0xd2, 0xa3, 0x94, 0x74, 0x9b, 0x84, 0xfb, 0x49, 0x14, 0x0b, 0x96, 0xf0, 0x16, 0xf9, - 0xba, 0x4f, 0xb8, 0xc0, 0x18, 0x66, 0xa8, 0xd7, 0x23, 0xc6, 0x8c, 0x89, 0x56, 0xcf, 0xb7, 0xe4, - 0x33, 0xbe, 0x08, 0xe7, 0x63, 0x2f, 0x24, 0x6d, 0x1e, 0x3d, 0x26, 0x46, 0xc5, 0x44, 0xab, 0xb3, - 0xad, 0xf9, 0x74, 0x63, 0x37, 0x7a, 0x4c, 0xf0, 0x65, 0x00, 0x69, 0x14, 0xec, 0x90, 0x50, 0xa3, - 0x2a, 0xaf, 0xc9, 0xe3, 0x0f, 0xd3, 0x0d, 0xeb, 0x17, 0x04, 0xf5, 0x22, 0xd1, 0x79, 0xcc, 0x28, - 0x27, 0x38, 0x80, 0x0b, 0x7e, 0x66, 0x6d, 0x07, 0x43, 0xb3, 0x81, 0xcc, 0xea, 0xea, 0x42, 0xc3, - 0xb5, 0x75, 0x45, 0xb2, 0x27, 0xba, 0x6e, 0x61, 0xff, 0x4c, 0x34, 0x7c, 0x15, 0xde, 0xa4, 0xe4, - 0x91, 0x68, 0x8f, 0x00, 0xaf, 0x48, 0xe0, 0x6f, 0xa4, 0xdb, 0x3b, 0x27, 0xe0, 0x37, 0x60, 0xe5, - 0x3e, 0x99, 0x0c, 0x7d, 0x9c, 0xb7, 0xea, 0x90, 0x37, 0xeb, 0x7b, 0x04, 0xe6, 0x56, 0x42, 0x3c, - 0x41, 0x34, 0x2e, 0x26, 0x5c, 0xc4, 0xfb, 0xb0, 0x78, 0x4a, 0xaa, 0x2a, 0x05, 0x09, 0x72, 0xa1, - 0x71, 0xad, 0x30, 0x0d, 0xad, 0x0b, 0xf4, 0xec, 0xa6, 0xf5, 0x23, 0x82, 0x2b, 0x39, 0x25, 0x39, - 0x23, 0x83, 0xd9, 0x11, 0x54, 0x4b, 0x30, 0xd7, 0x89, 0xba, 0x82, 0x24, 0xc6, 0x9c, 0xdc, 0x55, - 0x2b, 0xbc, 0x0c, 0xf3, 0x2c, 0x09, 0x48, 0xd2, 0x3e, 0x38, 0x36, 0xce, 0x49, 0xcb, 0x39, 0xb9, - 0xde, 0x3c, 0x3e, 0xad, 0x9c, 0xea, 0x44, 0xe5, 0xcc, 0x8c, 0x2b, 0xe7, 0x39, 0x02, 0x33, 0x1f, - 0xa6, 0xd2, 0xcb, 0x17, 0xf0, 0xb6, 0x8e, 0x29, 0x6e, 0x54, 0xa5, 0x62, 0x4a, 0x50, 0xb5, 0xa8, - 0xa1, 0xaa, 0xb8, 0x52, 0x5c, 0xb8, 0xac, 0x57, 0xca, 0x24, 0x7d, 0xbc, 0x40, 0x60, 0x7e, 0x1a, - 0x07, 0x93, 0xf5, 0x71, 0x13, 0x16, 0xfa, 0xf2, 0x8c, 0xec, 0x08, 0x4a, 0x02, 0xb5, 0x41, 0x5e, - 0x83, 0x97, 0xde, 0xbe, 0x97, 0x36, 0x8d, 0x07, 0x1e, 0x3f, 0x6c, 0x41, 0x76, 0x3c, 0x7d, 0xce, - 0x15, 0x52, 0xf5, 0xb5, 0x08, 0x69, 0x1b, 0xcc, 0x26, 0xe9, 0x92, 0xd2, 0xf2, 0x5e, 0x84, 0xd9, - 0x0e, 0x4b, 0xfc, 0x4c, 0x5d, 0xf3, 0xad, 0x6c, 0x61, 0x35, 0xc1, 0xde, 0x25, 0x34, 0xd0, 0xf8, - 0xda, 0x23, 0xc9, 0x70, 0x8b, 0x05, 0x64, 0xdc, 0x37, 0x1a, 0xe1, 0xf4, 0x19, 0x82, 0x77, 0xf4, - 0x95, 0x28, 0xe1, 0x25, 0x25, 0x9d, 0x3c, 0x8a, 0xa3, 0x84, 0xb4, 0xd3, 0x66, 0x9a, 0x4b, 0xfa, - 0xc3, 0x41, 0xa7, 0x6d, 0x41, 0x76, 0x3c, 0xdd, 0xb0, 0xbe, 0x41, 0x60, 0x17, 0x85, 0xa0, 0x64, - 0x8c, 0x61, 0xc6, 0x67, 0xc1, 0x09, 0x86, 0xf4, 0xf9, 0xd5, 0x30, 0x7c, 0x04, 0xa6, 0x0c, 0x76, - 0x5c, 0xa0, 0x34, 0xa3, 0x89, 0x0f, 0x80, 0x54, 0x86, 0x40, 0x1a, 0xbf, 0xbe, 0x05, 0x35, 0x8d, - 0x9b, 0xdd, 0x6c, 0x7e, 0xe2, 0xff, 0x10, 0x58, 0xd3, 0x3b, 0x3c, 0xfe, 0x40, 0x2f, 0xb6, 0xc2, - 0x93, 0xa9, 0x76, 0xfb, 0xe5, 0x1d, 0x64, 0x2c, 0x5b, 0xef, 0x7f, 0xfb, 0xe7, 0xbf, 0xdf, 0x55, - 0xd6, 0xf0, 0x8d, 0x74, 0x4c, 0x3f, 0x49, 0xf3, 0xdd, 0x88, 0x13, 0xf6, 0x15, 0xf1, 0x05, 0x77, - 0xea, 0x4f, 0x1d, 0x3a, 0x39, 0x81, 0xbf, 0x11, 0x98, 0xd3, 0xa6, 0x01, 0xde, 0xd0, 0x83, 0x2c, - 0x38, 0x45, 0x6a, 0x2f, 0x33, 0xe1, 0xac, 0x5b, 0x32, 0xad, 0xf7, 0xf0, 0x9a, 0x2e, 0xad, 0x29, - 0x59, 0x39, 0xf5, 0xa7, 0xf8, 0x05, 0x02, 0x23, 0xaf, 0xd1, 0xe2, 0x77, 0x4b, 0xb1, 0x7e, 0x52, - 0xac, 0xb5, 0xb2, 0xd7, 0x54, 0x89, 0x1a, 0x32, 0x97, 0xeb, 0xb8, 0x5e, 0xb8, 0x44, 0x1c, 0xff, - 0x84, 0x60, 0x49, 0x4f, 0x30, 0x76, 0xcb, 0x94, 0x63, 0x80, 0xbd, 0x78, 0x5b, 0xb4, 0x6e, 0x48, - 0xb8, 0x36, 0xbe, 0x5e, 0x94, 0x7a, 0x49, 0xf8, 0xef, 0x08, 0x96, 0x73, 0xbf, 0x0b, 0x70, 0x0e, - 0x75, 0xd3, 0x3e, 0x24, 0xca, 0xc0, 0xfe, 0x50, 0xc2, 0xde, 0xb4, 0x4a, 0xb0, 0xbc, 0xae, 0x1d, - 0x24, 0xf8, 0x1f, 0x04, 0xcb, 0xb9, 0x23, 0x2c, 0x2f, 0x95, 0x69, 0x33, 0xaf, 0x4c, 0x2a, 0x6d, - 0x99, 0xca, 0x67, 0x8d, 0x3b, 0x59, 0x2a, 0x1a, 0x8c, 0x76, 0xc1, 0xb2, 0xe4, 0x64, 0xf8, 0x03, - 0x82, 0xe5, 0xdc, 0x29, 0x97, 0x97, 0xe1, 0xb4, 0xb1, 0x58, 0x5b, 0x3a, 0xd3, 0xc7, 0xef, 0xa6, - 0xbf, 0x04, 0x03, 0x41, 0xd5, 0xcb, 0x09, 0xea, 0x2f, 0x04, 0x2b, 0x05, 0x67, 0x27, 0x6e, 0xea, - 0x11, 0x97, 0x1b, 0xbd, 0xb9, 0xf8, 0xb7, 0x25, 0xfe, 0x7b, 0xd6, 0x9d, 0x32, 0xf8, 0xd7, 0x39, - 0xa1, 0xc1, 0x78, 0xa4, 0x75, 0x54, 0xc7, 0xcf, 0x2a, 0x70, 0xb5, 0xd8, 0x24, 0xc5, 0x5b, 0x65, - 0xde, 0xf4, 0xbc, 0xac, 0x9a, 0xaf, 0xe6, 0x44, 0xf5, 0xb0, 0x8f, 0x25, 0x07, 0x77, 0xad, 0xdb, - 0xa5, 0x38, 0x08, 0x89, 0xd0, 0x51, 0xf0, 0x1b, 0x82, 0xe5, 0xdc, 0x49, 0x9e, 0x27, 0xbf, 0x69, - 0xa3, 0xbf, 0xcc, 0x0b, 0xa6, 0xa6, 0x8b, 0xe5, 0x96, 0xca, 0xe6, 0x48, 0x22, 0x58, 0x47, 0xf5, - 0xcd, 0x9f, 0x11, 0x18, 0x3e, 0xeb, 0x69, 0x03, 0x6e, 0x1a, 0xa3, 0x11, 0xd5, 0x07, 0xc5, 0x4e, - 0xaa, 0xa8, 0x1d, 0xf4, 0xf9, 0x2d, 0x75, 0x23, 0x64, 0x5d, 0x8f, 0x86, 0x36, 0x4b, 0x42, 0x27, - 0x24, 0x54, 0xea, 0x4d, 0xfd, 0xdd, 0x7b, 0x71, 0xc4, 0x4f, 0xff, 0x7c, 0xdf, 0x1c, 0xae, 0x9e, - 0x57, 0x6a, 0xf7, 0x33, 0x07, 0x5b, 0x5d, 0xd6, 0x0f, 0xec, 0x07, 0xc3, 0xc0, 0x7b, 0xee, 0x1f, - 0x03, 0xe3, 0xbe, 0x34, 0xee, 0x0f, 0x8d, 0xfb, 0x7b, 0xee, 0xc1, 0x9c, 0x0c, 0xe2, 0xfe, 0x1f, - 0x00, 0x00, 0xff, 0xff, 0x57, 0x01, 0xd1, 0x1c, 0x45, 0x10, 0x00, 0x00, -} diff --git a/vendor/google.golang.org/genproto/googleapis/monitoring/v3/span_context.pb.go b/vendor/google.golang.org/genproto/googleapis/monitoring/v3/span_context.pb.go index 9778aa43e1..8ba8246b2e 100644 --- a/vendor/google.golang.org/genproto/googleapis/monitoring/v3/span_context.pb.go +++ b/vendor/google.golang.org/genproto/googleapis/monitoring/v3/span_context.pb.go @@ -1,11 +1,14 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: google/monitoring/v3/span_context.proto -package monitoring // import "google.golang.org/genproto/googleapis/monitoring/v3" +package monitoring -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + math "math" + + proto "github.com/golang/protobuf/proto" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -16,7 +19,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // The context of a span, attached to google.api.Distribution.Exemplars // in google.api.Distribution values during aggregation. @@ -43,16 +46,17 @@ func (m *SpanContext) Reset() { *m = SpanContext{} } func (m *SpanContext) String() string { return proto.CompactTextString(m) } func (*SpanContext) ProtoMessage() {} func (*SpanContext) Descriptor() ([]byte, []int) { - return fileDescriptor_span_context_0c1dbe9c6f1a1a54, []int{0} + return fileDescriptor_933032e252f1c5e4, []int{0} } + func (m *SpanContext) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SpanContext.Unmarshal(m, b) } func (m *SpanContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_SpanContext.Marshal(b, m, deterministic) } -func (dst *SpanContext) XXX_Merge(src proto.Message) { - xxx_messageInfo_SpanContext.Merge(dst, src) +func (m *SpanContext) XXX_Merge(src proto.Message) { + xxx_messageInfo_SpanContext.Merge(m, src) } func (m *SpanContext) XXX_Size() int { return xxx_messageInfo_SpanContext.Size(m) @@ -75,10 +79,10 @@ func init() { } func init() { - proto.RegisterFile("google/monitoring/v3/span_context.proto", fileDescriptor_span_context_0c1dbe9c6f1a1a54) + proto.RegisterFile("google/monitoring/v3/span_context.proto", fileDescriptor_933032e252f1c5e4) } -var fileDescriptor_span_context_0c1dbe9c6f1a1a54 = []byte{ +var fileDescriptor_933032e252f1c5e4 = []byte{ // 197 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x4f, 0xcf, 0xcf, 0x4f, 0xcf, 0x49, 0xd5, 0xcf, 0xcd, 0xcf, 0xcb, 0x2c, 0xc9, 0x2f, 0xca, 0xcc, 0x4b, 0xd7, 0x2f, 0x33, diff --git a/vendor/google.golang.org/genproto/googleapis/monitoring/v3/uptime.pb.go b/vendor/google.golang.org/genproto/googleapis/monitoring/v3/uptime.pb.go index 9326d663fb..840f7203bc 100644 --- a/vendor/google.golang.org/genproto/googleapis/monitoring/v3/uptime.pb.go +++ b/vendor/google.golang.org/genproto/googleapis/monitoring/v3/uptime.pb.go @@ -1,13 +1,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: google/monitoring/v3/uptime.proto -package monitoring // import "google.golang.org/genproto/googleapis/monitoring/v3" +package monitoring -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" -import duration "github.com/golang/protobuf/ptypes/duration" -import monitoredres "google.golang.org/genproto/googleapis/api/monitoredres" +import ( + fmt "fmt" + math "math" + + proto "github.com/golang/protobuf/proto" + duration "github.com/golang/protobuf/ptypes/duration" + monitoredres "google.golang.org/genproto/googleapis/api/monitoredres" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -18,13 +21,13 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package -// The regions from which an uptime check can be run. +// The regions from which an Uptime check can be run. type UptimeCheckRegion int32 const ( - // Default value if no region is specified. Will result in uptime checks + // Default value if no region is specified. Will result in Uptime checks // running from all regions. UptimeCheckRegion_REGION_UNSPECIFIED UptimeCheckRegion = 0 // Allows checks to run from locations within the United States of America. @@ -46,6 +49,7 @@ var UptimeCheckRegion_name = map[int32]string{ 3: "SOUTH_AMERICA", 4: "ASIA_PACIFIC", } + var UptimeCheckRegion_value = map[string]int32{ "REGION_UNSPECIFIED": 0, "USA": 1, @@ -57,8 +61,9 @@ var UptimeCheckRegion_value = map[string]int32{ func (x UptimeCheckRegion) String() string { return proto.EnumName(UptimeCheckRegion_name, int32(x)) } + func (UptimeCheckRegion) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_uptime_9dda9bdcd2304945, []int{0} + return fileDescriptor_7ca0e36dfc8221d8, []int{0} } // The supported resource types that can be used as values of @@ -83,6 +88,7 @@ var GroupResourceType_name = map[int32]string{ 1: "INSTANCE", 2: "AWS_ELB_LOAD_BALANCER", } + var GroupResourceType_value = map[string]int32{ "RESOURCE_TYPE_UNSPECIFIED": 0, "INSTANCE": 1, @@ -92,20 +98,113 @@ var GroupResourceType_value = map[string]int32{ func (x GroupResourceType) String() string { return proto.EnumName(GroupResourceType_name, int32(x)) } + func (GroupResourceType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_uptime_9dda9bdcd2304945, []int{1} + return fileDescriptor_7ca0e36dfc8221d8, []int{1} } -// An internal checker allows uptime checks to run on private/internal GCP +// Operational states for an internal checker. +type InternalChecker_State int32 + +const ( + // An internal checker should never be in the unspecified state. + InternalChecker_UNSPECIFIED InternalChecker_State = 0 + // The checker is being created, provisioned, and configured. A checker in + // this state can be returned by `ListInternalCheckers` or + // `GetInternalChecker`, as well as by examining the [long running + // Operation](https://cloud.google.com/apis/design/design_patterns#long_running_operations) + // that created it. + InternalChecker_CREATING InternalChecker_State = 1 + // The checker is running and available for use. A checker in this state + // can be returned by `ListInternalCheckers` or `GetInternalChecker` as + // well as by examining the [long running + // Operation](https://cloud.google.com/apis/design/design_patterns#long_running_operations) + // that created it. + // If a checker is being torn down, it is neither visible nor usable, so + // there is no "deleting" or "down" state. + InternalChecker_RUNNING InternalChecker_State = 2 +) + +var InternalChecker_State_name = map[int32]string{ + 0: "UNSPECIFIED", + 1: "CREATING", + 2: "RUNNING", +} + +var InternalChecker_State_value = map[string]int32{ + "UNSPECIFIED": 0, + "CREATING": 1, + "RUNNING": 2, +} + +func (x InternalChecker_State) String() string { + return proto.EnumName(InternalChecker_State_name, int32(x)) +} + +func (InternalChecker_State) EnumDescriptor() ([]byte, []int) { + return fileDescriptor_7ca0e36dfc8221d8, []int{0, 0} +} + +// Options to perform content matching. +type UptimeCheckConfig_ContentMatcher_ContentMatcherOption int32 + +const ( + // No content matcher type specified (maintained for backward + // compatibility, but deprecated for future use). + // Treated as `CONTAINS_STRING`. + UptimeCheckConfig_ContentMatcher_CONTENT_MATCHER_OPTION_UNSPECIFIED UptimeCheckConfig_ContentMatcher_ContentMatcherOption = 0 + // Selects substring matching (there is a match if the output contains + // the `content` string). This is the default value for checks without + // a `matcher` option, or where the value of `matcher` is + // `CONTENT_MATCHER_OPTION_UNSPECIFIED`. + UptimeCheckConfig_ContentMatcher_CONTAINS_STRING UptimeCheckConfig_ContentMatcher_ContentMatcherOption = 1 + // Selects negation of substring matching (there is a match if the output + // does NOT contain the `content` string). + UptimeCheckConfig_ContentMatcher_NOT_CONTAINS_STRING UptimeCheckConfig_ContentMatcher_ContentMatcherOption = 2 + // Selects regular expression matching (there is a match of the output + // matches the regular expression specified in the `content` string). + UptimeCheckConfig_ContentMatcher_MATCHES_REGEX UptimeCheckConfig_ContentMatcher_ContentMatcherOption = 3 + // Selects negation of regular expression matching (there is a match if + // the output does NOT match the regular expression specified in the + // `content` string). + UptimeCheckConfig_ContentMatcher_NOT_MATCHES_REGEX UptimeCheckConfig_ContentMatcher_ContentMatcherOption = 4 +) + +var UptimeCheckConfig_ContentMatcher_ContentMatcherOption_name = map[int32]string{ + 0: "CONTENT_MATCHER_OPTION_UNSPECIFIED", + 1: "CONTAINS_STRING", + 2: "NOT_CONTAINS_STRING", + 3: "MATCHES_REGEX", + 4: "NOT_MATCHES_REGEX", +} + +var UptimeCheckConfig_ContentMatcher_ContentMatcherOption_value = map[string]int32{ + "CONTENT_MATCHER_OPTION_UNSPECIFIED": 0, + "CONTAINS_STRING": 1, + "NOT_CONTAINS_STRING": 2, + "MATCHES_REGEX": 3, + "NOT_MATCHES_REGEX": 4, +} + +func (x UptimeCheckConfig_ContentMatcher_ContentMatcherOption) String() string { + return proto.EnumName(UptimeCheckConfig_ContentMatcher_ContentMatcherOption_name, int32(x)) +} + +func (UptimeCheckConfig_ContentMatcher_ContentMatcherOption) EnumDescriptor() ([]byte, []int) { + return fileDescriptor_7ca0e36dfc8221d8, []int{1, 3, 0} +} + +// An internal checker allows Uptime checks to run on private/internal GCP // resources. +// +// Deprecated: Do not use. type InternalChecker struct { // A unique resource name for this InternalChecker. The format is: // - // // `projects/[PROJECT_ID]/internalCheckers/[INTERNAL_CHECKER_ID]`. // - // PROJECT_ID is the stackdriver workspace project for the - // uptime check config associated with the internal checker. + // `[PROJECT_ID]` is the Stackdriver Workspace project for the + // Uptime check config associated with the internal checker. Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` // The checker's human-readable name. The display name // should be unique within a Stackdriver Workspace in order to make it easier @@ -114,31 +213,34 @@ type InternalChecker struct { // The [GCP VPC network](https://cloud.google.com/vpc/docs/vpc) where the // internal resource lives (ex: "default"). Network string `protobuf:"bytes,3,opt,name=network,proto3" json:"network,omitempty"` - // The GCP zone the uptime check should egress from. Only respected for - // internal uptime checks, where internal_network is specified. + // The GCP zone the Uptime check should egress from. Only respected for + // internal Uptime checks, where internal_network is specified. GcpZone string `protobuf:"bytes,4,opt,name=gcp_zone,json=gcpZone,proto3" json:"gcp_zone,omitempty"` - // The GCP project_id where the internal checker lives. Not necessary - // the same as the workspace project. - PeerProjectId string `protobuf:"bytes,6,opt,name=peer_project_id,json=peerProjectId,proto3" json:"peer_project_id,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + // The GCP project ID where the internal checker lives. Not necessary + // the same as the Workspace project. + PeerProjectId string `protobuf:"bytes,6,opt,name=peer_project_id,json=peerProjectId,proto3" json:"peer_project_id,omitempty"` + // The current operational state of the internal checker. + State InternalChecker_State `protobuf:"varint,7,opt,name=state,proto3,enum=google.monitoring.v3.InternalChecker_State" json:"state,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *InternalChecker) Reset() { *m = InternalChecker{} } func (m *InternalChecker) String() string { return proto.CompactTextString(m) } func (*InternalChecker) ProtoMessage() {} func (*InternalChecker) Descriptor() ([]byte, []int) { - return fileDescriptor_uptime_9dda9bdcd2304945, []int{0} + return fileDescriptor_7ca0e36dfc8221d8, []int{0} } + func (m *InternalChecker) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_InternalChecker.Unmarshal(m, b) } func (m *InternalChecker) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_InternalChecker.Marshal(b, m, deterministic) } -func (dst *InternalChecker) XXX_Merge(src proto.Message) { - xxx_messageInfo_InternalChecker.Merge(dst, src) +func (m *InternalChecker) XXX_Merge(src proto.Message) { + xxx_messageInfo_InternalChecker.Merge(m, src) } func (m *InternalChecker) XXX_Size() int { return xxx_messageInfo_InternalChecker.Size(m) @@ -184,19 +286,25 @@ func (m *InternalChecker) GetPeerProjectId() string { return "" } +func (m *InternalChecker) GetState() InternalChecker_State { + if m != nil { + return m.State + } + return InternalChecker_UNSPECIFIED +} + // This message configures which resources and services to monitor for // availability. type UptimeCheckConfig struct { - // A unique resource name for this UptimeCheckConfig. The format is: - // + // A unique resource name for this Uptime check configuration. The format is: // // `projects/[PROJECT_ID]/uptimeCheckConfigs/[UPTIME_CHECK_ID]`. // - // This field should be omitted when creating the uptime check configuration; + // This field should be omitted when creating the Uptime check configuration; // on create, the resource name is assigned by the server and included in the // response. Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - // A human-friendly name for the uptime check configuration. The display name + // A human-friendly name for the Uptime check configuration. The display name // should be unique within a Stackdriver Workspace in order to make it easier // to identify; however, uniqueness is not enforced. Required. DisplayName string `protobuf:"bytes,2,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"` @@ -206,42 +314,37 @@ type UptimeCheckConfig struct { // *UptimeCheckConfig_MonitoredResource // *UptimeCheckConfig_ResourceGroup_ Resource isUptimeCheckConfig_Resource `protobuf_oneof:"resource"` - // The type of uptime check request. + // The type of Uptime check request. // // Types that are valid to be assigned to CheckRequestType: // *UptimeCheckConfig_HttpCheck_ // *UptimeCheckConfig_TcpCheck_ CheckRequestType isUptimeCheckConfig_CheckRequestType `protobuf_oneof:"check_request_type"` - // How often, in seconds, the uptime check is performed. + // How often, in seconds, the Uptime check is performed. // Currently, the only supported values are `60s` (1 minute), `300s` // (5 minutes), `600s` (10 minutes), and `900s` (15 minutes). Optional, - // defaults to `300s`. + // defaults to `60s`. Period *duration.Duration `protobuf:"bytes,7,opt,name=period,proto3" json:"period,omitempty"` // The maximum amount of time to wait for the request to complete (must be // between 1 and 60 seconds). Required. Timeout *duration.Duration `protobuf:"bytes,8,opt,name=timeout,proto3" json:"timeout,omitempty"` - // The expected content on the page the check is run against. - // Currently, only the first entry in the list is supported, and other entries - // will be ignored. The server will look for an exact match of the string in - // the page response's content. This field is optional and should only be - // specified if a content match is required. + // The content that is expected to appear in the data returned by the target + // server against which the check is run. Currently, only the first entry + // in the `content_matchers` list is supported, and additional entries will + // be ignored. This field is optional and should only be specified if a + // content match is required as part of the/ Uptime check. ContentMatchers []*UptimeCheckConfig_ContentMatcher `protobuf:"bytes,9,rep,name=content_matchers,json=contentMatchers,proto3" json:"content_matchers,omitempty"` // The list of regions from which the check will be run. // Some regions contain one location, and others contain more than one. - // If this field is specified, enough regions to include a minimum of - // 3 locations must be provided, or an error message is returned. - // Not specifying this field will result in uptime checks running from all - // regions. + // If this field is specified, enough regions must be provided to include a + // minimum of 3 locations. Not specifying this field will result in Uptime + // checks running from all available regions. SelectedRegions []UptimeCheckRegion `protobuf:"varint,10,rep,packed,name=selected_regions,json=selectedRegions,proto3,enum=google.monitoring.v3.UptimeCheckRegion" json:"selected_regions,omitempty"` - // If this is true, then checks are made only from the 'internal_checkers'. - // If it is false, then checks are made only from the 'selected_regions'. - // It is an error to provide 'selected_regions' when is_internal is true, - // or to provide 'internal_checkers' when is_internal is false. - IsInternal bool `protobuf:"varint,15,opt,name=is_internal,json=isInternal,proto3" json:"is_internal,omitempty"` // The internal checkers that this check will egress from. If `is_internal` is - // true and this list is empty, the check will egress from all the - // InternalCheckers configured for the project that owns this CheckConfig. - InternalCheckers []*InternalChecker `protobuf:"bytes,14,rep,name=internal_checkers,json=internalCheckers,proto3" json:"internal_checkers,omitempty"` + // `true` and this list is empty, the check will egress from all the + // InternalCheckers configured for the project that owns this + // `UptimeCheckConfig`. + InternalCheckers []*InternalChecker `protobuf:"bytes,14,rep,name=internal_checkers,json=internalCheckers,proto3" json:"internal_checkers,omitempty"` // Deprecated: Do not use. XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -251,16 +354,17 @@ func (m *UptimeCheckConfig) Reset() { *m = UptimeCheckConfig{} } func (m *UptimeCheckConfig) String() string { return proto.CompactTextString(m) } func (*UptimeCheckConfig) ProtoMessage() {} func (*UptimeCheckConfig) Descriptor() ([]byte, []int) { - return fileDescriptor_uptime_9dda9bdcd2304945, []int{1} + return fileDescriptor_7ca0e36dfc8221d8, []int{1} } + func (m *UptimeCheckConfig) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UptimeCheckConfig.Unmarshal(m, b) } func (m *UptimeCheckConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_UptimeCheckConfig.Marshal(b, m, deterministic) } -func (dst *UptimeCheckConfig) XXX_Merge(src proto.Message) { - xxx_messageInfo_UptimeCheckConfig.Merge(dst, src) +func (m *UptimeCheckConfig) XXX_Merge(src proto.Message) { + xxx_messageInfo_UptimeCheckConfig.Merge(m, src) } func (m *UptimeCheckConfig) XXX_Size() int { return xxx_messageInfo_UptimeCheckConfig.Size(m) @@ -387,13 +491,7 @@ func (m *UptimeCheckConfig) GetSelectedRegions() []UptimeCheckRegion { return nil } -func (m *UptimeCheckConfig) GetIsInternal() bool { - if m != nil { - return m.IsInternal - } - return false -} - +// Deprecated: Do not use. func (m *UptimeCheckConfig) GetInternalCheckers() []*InternalChecker { if m != nil { return m.InternalCheckers @@ -401,9 +499,9 @@ func (m *UptimeCheckConfig) GetInternalCheckers() []*InternalChecker { return nil } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*UptimeCheckConfig) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _UptimeCheckConfig_OneofMarshaler, _UptimeCheckConfig_OneofUnmarshaler, _UptimeCheckConfig_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*UptimeCheckConfig) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*UptimeCheckConfig_MonitoredResource)(nil), (*UptimeCheckConfig_ResourceGroup_)(nil), (*UptimeCheckConfig_HttpCheck_)(nil), @@ -411,125 +509,11 @@ func (*UptimeCheckConfig) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buf } } -func _UptimeCheckConfig_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*UptimeCheckConfig) - // resource - switch x := m.Resource.(type) { - case *UptimeCheckConfig_MonitoredResource: - b.EncodeVarint(3<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.MonitoredResource); err != nil { - return err - } - case *UptimeCheckConfig_ResourceGroup_: - b.EncodeVarint(4<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.ResourceGroup); err != nil { - return err - } - case nil: - default: - return fmt.Errorf("UptimeCheckConfig.Resource has unexpected type %T", x) - } - // check_request_type - switch x := m.CheckRequestType.(type) { - case *UptimeCheckConfig_HttpCheck_: - b.EncodeVarint(5<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.HttpCheck); err != nil { - return err - } - case *UptimeCheckConfig_TcpCheck_: - b.EncodeVarint(6<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.TcpCheck); err != nil { - return err - } - case nil: - default: - return fmt.Errorf("UptimeCheckConfig.CheckRequestType has unexpected type %T", x) - } - return nil -} - -func _UptimeCheckConfig_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*UptimeCheckConfig) - switch tag { - case 3: // resource.monitored_resource - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(monitoredres.MonitoredResource) - err := b.DecodeMessage(msg) - m.Resource = &UptimeCheckConfig_MonitoredResource{msg} - return true, err - case 4: // resource.resource_group - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(UptimeCheckConfig_ResourceGroup) - err := b.DecodeMessage(msg) - m.Resource = &UptimeCheckConfig_ResourceGroup_{msg} - return true, err - case 5: // check_request_type.http_check - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(UptimeCheckConfig_HttpCheck) - err := b.DecodeMessage(msg) - m.CheckRequestType = &UptimeCheckConfig_HttpCheck_{msg} - return true, err - case 6: // check_request_type.tcp_check - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(UptimeCheckConfig_TcpCheck) - err := b.DecodeMessage(msg) - m.CheckRequestType = &UptimeCheckConfig_TcpCheck_{msg} - return true, err - default: - return false, nil - } -} - -func _UptimeCheckConfig_OneofSizer(msg proto.Message) (n int) { - m := msg.(*UptimeCheckConfig) - // resource - switch x := m.Resource.(type) { - case *UptimeCheckConfig_MonitoredResource: - s := proto.Size(x.MonitoredResource) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *UptimeCheckConfig_ResourceGroup_: - s := proto.Size(x.ResourceGroup) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - // check_request_type - switch x := m.CheckRequestType.(type) { - case *UptimeCheckConfig_HttpCheck_: - s := proto.Size(x.HttpCheck) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *UptimeCheckConfig_TcpCheck_: - s := proto.Size(x.TcpCheck) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - // The resource submessage for group checks. It can be used instead of a // monitored resource, when multiple resources are being monitored. type UptimeCheckConfig_ResourceGroup struct { - // The group of resources being monitored. Should be only the - // group_id, not projects//groups/. + // The group of resources being monitored. Should be only the `[GROUP_ID]`, + // and not the full-path `projects/[PROJECT_ID]/groups/[GROUP_ID]`. GroupId string `protobuf:"bytes,1,opt,name=group_id,json=groupId,proto3" json:"group_id,omitempty"` // The resource type of the group members. ResourceType GroupResourceType `protobuf:"varint,2,opt,name=resource_type,json=resourceType,proto3,enum=google.monitoring.v3.GroupResourceType" json:"resource_type,omitempty"` @@ -542,16 +526,17 @@ func (m *UptimeCheckConfig_ResourceGroup) Reset() { *m = UptimeCheckConf func (m *UptimeCheckConfig_ResourceGroup) String() string { return proto.CompactTextString(m) } func (*UptimeCheckConfig_ResourceGroup) ProtoMessage() {} func (*UptimeCheckConfig_ResourceGroup) Descriptor() ([]byte, []int) { - return fileDescriptor_uptime_9dda9bdcd2304945, []int{1, 0} + return fileDescriptor_7ca0e36dfc8221d8, []int{1, 0} } + func (m *UptimeCheckConfig_ResourceGroup) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UptimeCheckConfig_ResourceGroup.Unmarshal(m, b) } func (m *UptimeCheckConfig_ResourceGroup) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_UptimeCheckConfig_ResourceGroup.Marshal(b, m, deterministic) } -func (dst *UptimeCheckConfig_ResourceGroup) XXX_Merge(src proto.Message) { - xxx_messageInfo_UptimeCheckConfig_ResourceGroup.Merge(dst, src) +func (m *UptimeCheckConfig_ResourceGroup) XXX_Merge(src proto.Message) { + xxx_messageInfo_UptimeCheckConfig_ResourceGroup.Merge(m, src) } func (m *UptimeCheckConfig_ResourceGroup) XXX_Size() int { return xxx_messageInfo_UptimeCheckConfig_ResourceGroup.Size(m) @@ -576,17 +561,20 @@ func (m *UptimeCheckConfig_ResourceGroup) GetResourceType() GroupResourceType { return GroupResourceType_RESOURCE_TYPE_UNSPECIFIED } -// Information involved in an HTTP/HTTPS uptime check request. +// Information involved in an HTTP/HTTPS Uptime check request. type UptimeCheckConfig_HttpCheck struct { - // If true, use HTTPS instead of HTTP to run the check. + // If `true`, use HTTPS instead of HTTP to run the check. UseSsl bool `protobuf:"varint,1,opt,name=use_ssl,json=useSsl,proto3" json:"use_ssl,omitempty"` - // The path to the page to run the check against. Will be combined with the - // host (specified within the MonitoredResource) and port to construct the - // full URL. Optional (defaults to "/"). + // Optional (defaults to "/"). The path to the page against which to run + // the check. Will be combined with the `host` (specified within the + // `monitored_resource`) and `port` to construct the full URL. If the + // provided path does not begin with "/", a "/" will be prepended + // automatically. Path string `protobuf:"bytes,2,opt,name=path,proto3" json:"path,omitempty"` - // The port to the page to run the check against. Will be combined with host - // (specified within the MonitoredResource) and path to construct the full - // URL. Optional (defaults to 80 without SSL, or 443 with SSL). + // Optional (defaults to 80 when `use_ssl` is `false`, and 443 when + // `use_ssl` is `true`). The TCP port on the HTTP server against which to + // run the check. Will be combined with host (specified within the + // `monitored_resource`) and `path` to construct the full URL. Port int32 `protobuf:"varint,3,opt,name=port,proto3" json:"port,omitempty"` // The authentication information. Optional when creating an HTTP check; // defaults to empty. @@ -595,10 +583,10 @@ type UptimeCheckConfig_HttpCheck struct { // Encryption should be specified for any headers related to authentication // that you do not wish to be seen when retrieving the configuration. The // server will be responsible for encrypting the headers. - // On Get/List calls, if mask_headers is set to True then the headers - // will be obscured with ******. + // On Get/List calls, if `mask_headers` is set to `true` then the headers + // will be obscured with `******.` MaskHeaders bool `protobuf:"varint,5,opt,name=mask_headers,json=maskHeaders,proto3" json:"mask_headers,omitempty"` - // The list of headers to send as part of the uptime check request. + // The list of headers to send as part of the Uptime check request. // If two headers have the same key and different values, they should // be entered as a single header, with the value being a comma-separated // list of all the desired values as described at @@ -606,26 +594,32 @@ type UptimeCheckConfig_HttpCheck struct { // Entering two separate headers with the same key in a Create call will // cause the first to be overwritten by the second. // The maximum number of headers allowed is 100. - Headers map[string]string `protobuf:"bytes,6,rep,name=headers,proto3" json:"headers,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:"-"` + Headers map[string]string `protobuf:"bytes,6,rep,name=headers,proto3" json:"headers,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + // Boolean specifying whether to include SSL certificate validation as a + // part of the Uptime check. Only applies to checks where + // `monitored_resource` is set to `uptime_url`. If `use_ssl` is `false`, + // setting `validate_ssl` to `true` has no effect. + ValidateSsl bool `protobuf:"varint,7,opt,name=validate_ssl,json=validateSsl,proto3" json:"validate_ssl,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *UptimeCheckConfig_HttpCheck) Reset() { *m = UptimeCheckConfig_HttpCheck{} } func (m *UptimeCheckConfig_HttpCheck) String() string { return proto.CompactTextString(m) } func (*UptimeCheckConfig_HttpCheck) ProtoMessage() {} func (*UptimeCheckConfig_HttpCheck) Descriptor() ([]byte, []int) { - return fileDescriptor_uptime_9dda9bdcd2304945, []int{1, 1} + return fileDescriptor_7ca0e36dfc8221d8, []int{1, 1} } + func (m *UptimeCheckConfig_HttpCheck) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UptimeCheckConfig_HttpCheck.Unmarshal(m, b) } func (m *UptimeCheckConfig_HttpCheck) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_UptimeCheckConfig_HttpCheck.Marshal(b, m, deterministic) } -func (dst *UptimeCheckConfig_HttpCheck) XXX_Merge(src proto.Message) { - xxx_messageInfo_UptimeCheckConfig_HttpCheck.Merge(dst, src) +func (m *UptimeCheckConfig_HttpCheck) XXX_Merge(src proto.Message) { + xxx_messageInfo_UptimeCheckConfig_HttpCheck.Merge(m, src) } func (m *UptimeCheckConfig_HttpCheck) XXX_Size() int { return xxx_messageInfo_UptimeCheckConfig_HttpCheck.Size(m) @@ -678,13 +672,21 @@ func (m *UptimeCheckConfig_HttpCheck) GetHeaders() map[string]string { return nil } -// A type of authentication to perform against the specified resource or URL -// that uses username and password. -// Currently, only Basic authentication is supported in Uptime Monitoring. +func (m *UptimeCheckConfig_HttpCheck) GetValidateSsl() bool { + if m != nil { + return m.ValidateSsl + } + return false +} + +// The authentication parameters to provide to the specified resource or +// URL that requires a username and password. Currently, only +// [Basic HTTP authentication](https://tools.ietf.org/html/rfc7617) is +// supported in Uptime checks. type UptimeCheckConfig_HttpCheck_BasicAuthentication struct { - // The username to authenticate. + // The username to use when authenticating with the HTTP server. Username string `protobuf:"bytes,1,opt,name=username,proto3" json:"username,omitempty"` - // The password to authenticate. + // The password to use when authenticating with the HTTP server. Password string `protobuf:"bytes,2,opt,name=password,proto3" json:"password,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` @@ -699,16 +701,17 @@ func (m *UptimeCheckConfig_HttpCheck_BasicAuthentication) String() string { } func (*UptimeCheckConfig_HttpCheck_BasicAuthentication) ProtoMessage() {} func (*UptimeCheckConfig_HttpCheck_BasicAuthentication) Descriptor() ([]byte, []int) { - return fileDescriptor_uptime_9dda9bdcd2304945, []int{1, 1, 0} + return fileDescriptor_7ca0e36dfc8221d8, []int{1, 1, 0} } + func (m *UptimeCheckConfig_HttpCheck_BasicAuthentication) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UptimeCheckConfig_HttpCheck_BasicAuthentication.Unmarshal(m, b) } func (m *UptimeCheckConfig_HttpCheck_BasicAuthentication) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_UptimeCheckConfig_HttpCheck_BasicAuthentication.Marshal(b, m, deterministic) } -func (dst *UptimeCheckConfig_HttpCheck_BasicAuthentication) XXX_Merge(src proto.Message) { - xxx_messageInfo_UptimeCheckConfig_HttpCheck_BasicAuthentication.Merge(dst, src) +func (m *UptimeCheckConfig_HttpCheck_BasicAuthentication) XXX_Merge(src proto.Message) { + xxx_messageInfo_UptimeCheckConfig_HttpCheck_BasicAuthentication.Merge(m, src) } func (m *UptimeCheckConfig_HttpCheck_BasicAuthentication) XXX_Size() int { return xxx_messageInfo_UptimeCheckConfig_HttpCheck_BasicAuthentication.Size(m) @@ -733,11 +736,11 @@ func (m *UptimeCheckConfig_HttpCheck_BasicAuthentication) GetPassword() string { return "" } -// Information required for a TCP uptime check request. +// Information required for a TCP Uptime check request. type UptimeCheckConfig_TcpCheck struct { - // The port to the page to run the check against. Will be combined with host - // (specified within the MonitoredResource) to construct the full URL. - // Required. + // The TCP port on the server against which to run the check. Will be + // combined with host (specified within the `monitored_resource`) to + // construct the full URL. Required. Port int32 `protobuf:"varint,1,opt,name=port,proto3" json:"port,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` @@ -748,16 +751,17 @@ func (m *UptimeCheckConfig_TcpCheck) Reset() { *m = UptimeCheckConfig_Tc func (m *UptimeCheckConfig_TcpCheck) String() string { return proto.CompactTextString(m) } func (*UptimeCheckConfig_TcpCheck) ProtoMessage() {} func (*UptimeCheckConfig_TcpCheck) Descriptor() ([]byte, []int) { - return fileDescriptor_uptime_9dda9bdcd2304945, []int{1, 2} + return fileDescriptor_7ca0e36dfc8221d8, []int{1, 2} } + func (m *UptimeCheckConfig_TcpCheck) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UptimeCheckConfig_TcpCheck.Unmarshal(m, b) } func (m *UptimeCheckConfig_TcpCheck) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_UptimeCheckConfig_TcpCheck.Marshal(b, m, deterministic) } -func (dst *UptimeCheckConfig_TcpCheck) XXX_Merge(src proto.Message) { - xxx_messageInfo_UptimeCheckConfig_TcpCheck.Merge(dst, src) +func (m *UptimeCheckConfig_TcpCheck) XXX_Merge(src proto.Message) { + xxx_messageInfo_UptimeCheckConfig_TcpCheck.Merge(m, src) } func (m *UptimeCheckConfig_TcpCheck) XXX_Size() int { return xxx_messageInfo_UptimeCheckConfig_TcpCheck.Size(m) @@ -779,26 +783,30 @@ func (m *UptimeCheckConfig_TcpCheck) GetPort() int32 { // expressions, together with their negations. type UptimeCheckConfig_ContentMatcher struct { // String or regex content to match (max 1024 bytes) - Content string `protobuf:"bytes,1,opt,name=content,proto3" json:"content,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Content string `protobuf:"bytes,1,opt,name=content,proto3" json:"content,omitempty"` + // The type of content matcher that will be applied to the server output, + // compared to the `content` string when the check is run. + Matcher UptimeCheckConfig_ContentMatcher_ContentMatcherOption `protobuf:"varint,2,opt,name=matcher,proto3,enum=google.monitoring.v3.UptimeCheckConfig_ContentMatcher_ContentMatcherOption" json:"matcher,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *UptimeCheckConfig_ContentMatcher) Reset() { *m = UptimeCheckConfig_ContentMatcher{} } func (m *UptimeCheckConfig_ContentMatcher) String() string { return proto.CompactTextString(m) } func (*UptimeCheckConfig_ContentMatcher) ProtoMessage() {} func (*UptimeCheckConfig_ContentMatcher) Descriptor() ([]byte, []int) { - return fileDescriptor_uptime_9dda9bdcd2304945, []int{1, 3} + return fileDescriptor_7ca0e36dfc8221d8, []int{1, 3} } + func (m *UptimeCheckConfig_ContentMatcher) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UptimeCheckConfig_ContentMatcher.Unmarshal(m, b) } func (m *UptimeCheckConfig_ContentMatcher) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_UptimeCheckConfig_ContentMatcher.Marshal(b, m, deterministic) } -func (dst *UptimeCheckConfig_ContentMatcher) XXX_Merge(src proto.Message) { - xxx_messageInfo_UptimeCheckConfig_ContentMatcher.Merge(dst, src) +func (m *UptimeCheckConfig_ContentMatcher) XXX_Merge(src proto.Message) { + xxx_messageInfo_UptimeCheckConfig_ContentMatcher.Merge(m, src) } func (m *UptimeCheckConfig_ContentMatcher) XXX_Size() int { return xxx_messageInfo_UptimeCheckConfig_ContentMatcher.Size(m) @@ -816,6 +824,13 @@ func (m *UptimeCheckConfig_ContentMatcher) GetContent() string { return "" } +func (m *UptimeCheckConfig_ContentMatcher) GetMatcher() UptimeCheckConfig_ContentMatcher_ContentMatcherOption { + if m != nil { + return m.Matcher + } + return UptimeCheckConfig_ContentMatcher_CONTENT_MATCHER_OPTION_UNSPECIFIED +} + // Contains the region, location, and list of IP // addresses where checkers in the location run from. type UptimeCheckIp struct { @@ -825,10 +840,10 @@ type UptimeCheckIp struct { // a particular city/town/metro (and its containing state/province or country) // within the broader umbrella region category. Location string `protobuf:"bytes,2,opt,name=location,proto3" json:"location,omitempty"` - // The IP address from which the uptime check originates. This is a full - // IP address (not an IP address range). Most IP addresses, as of this - // publication, are in IPv4 format; however, one should not rely on the - // IP addresses being in IPv4 format indefinitely and should support + // The IP address from which the Uptime check originates. This is a fully + // specified IP address (not an IP address range). Most IP addresses, as of + // this publication, are in IPv4 format; however, one should not rely on the + // IP addresses being in IPv4 format indefinitely, and should support // interpreting this field in either IPv4 or IPv6 format. IpAddress string `protobuf:"bytes,3,opt,name=ip_address,json=ipAddress,proto3" json:"ip_address,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -840,16 +855,17 @@ func (m *UptimeCheckIp) Reset() { *m = UptimeCheckIp{} } func (m *UptimeCheckIp) String() string { return proto.CompactTextString(m) } func (*UptimeCheckIp) ProtoMessage() {} func (*UptimeCheckIp) Descriptor() ([]byte, []int) { - return fileDescriptor_uptime_9dda9bdcd2304945, []int{2} + return fileDescriptor_7ca0e36dfc8221d8, []int{2} } + func (m *UptimeCheckIp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UptimeCheckIp.Unmarshal(m, b) } func (m *UptimeCheckIp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_UptimeCheckIp.Marshal(b, m, deterministic) } -func (dst *UptimeCheckIp) XXX_Merge(src proto.Message) { - xxx_messageInfo_UptimeCheckIp.Merge(dst, src) +func (m *UptimeCheckIp) XXX_Merge(src proto.Message) { + xxx_messageInfo_UptimeCheckIp.Merge(m, src) } func (m *UptimeCheckIp) XXX_Size() int { return xxx_messageInfo_UptimeCheckIp.Size(m) @@ -882,6 +898,10 @@ func (m *UptimeCheckIp) GetIpAddress() string { } func init() { + proto.RegisterEnum("google.monitoring.v3.UptimeCheckRegion", UptimeCheckRegion_name, UptimeCheckRegion_value) + proto.RegisterEnum("google.monitoring.v3.GroupResourceType", GroupResourceType_name, GroupResourceType_value) + proto.RegisterEnum("google.monitoring.v3.InternalChecker_State", InternalChecker_State_name, InternalChecker_State_value) + proto.RegisterEnum("google.monitoring.v3.UptimeCheckConfig_ContentMatcher_ContentMatcherOption", UptimeCheckConfig_ContentMatcher_ContentMatcherOption_name, UptimeCheckConfig_ContentMatcher_ContentMatcherOption_value) proto.RegisterType((*InternalChecker)(nil), "google.monitoring.v3.InternalChecker") proto.RegisterType((*UptimeCheckConfig)(nil), "google.monitoring.v3.UptimeCheckConfig") proto.RegisterType((*UptimeCheckConfig_ResourceGroup)(nil), "google.monitoring.v3.UptimeCheckConfig.ResourceGroup") @@ -891,79 +911,84 @@ func init() { proto.RegisterType((*UptimeCheckConfig_TcpCheck)(nil), "google.monitoring.v3.UptimeCheckConfig.TcpCheck") proto.RegisterType((*UptimeCheckConfig_ContentMatcher)(nil), "google.monitoring.v3.UptimeCheckConfig.ContentMatcher") proto.RegisterType((*UptimeCheckIp)(nil), "google.monitoring.v3.UptimeCheckIp") - proto.RegisterEnum("google.monitoring.v3.UptimeCheckRegion", UptimeCheckRegion_name, UptimeCheckRegion_value) - proto.RegisterEnum("google.monitoring.v3.GroupResourceType", GroupResourceType_name, GroupResourceType_value) } -func init() { - proto.RegisterFile("google/monitoring/v3/uptime.proto", fileDescriptor_uptime_9dda9bdcd2304945) -} - -var fileDescriptor_uptime_9dda9bdcd2304945 = []byte{ - // 1036 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xed, 0x6e, 0xe3, 0x44, - 0x17, 0xae, 0x9b, 0x36, 0x1f, 0x27, 0xfd, 0x70, 0xe7, 0xed, 0x0b, 0x6e, 0xa4, 0x2e, 0xdd, 0x22, - 0xa0, 0xea, 0x8f, 0x84, 0x6d, 0x04, 0x42, 0x8b, 0xb4, 0xc8, 0x49, 0x4d, 0x13, 0xa9, 0x4d, 0xa2, - 0x49, 0xb3, 0xc0, 0x52, 0x31, 0x72, 0xed, 0xa9, 0x63, 0x9a, 0x78, 0x8c, 0x67, 0xdc, 0xa5, 0xdc, - 0x02, 0x97, 0x81, 0xf8, 0xc3, 0x15, 0x70, 0x0d, 0x5c, 0x00, 0xd7, 0x83, 0x66, 0xec, 0x49, 0x9b, - 0xb6, 0x68, 0x5b, 0xfe, 0xcd, 0x73, 0x3e, 0x9e, 0x39, 0x73, 0xe6, 0x3c, 0x63, 0xc3, 0xf3, 0x80, - 0xb1, 0x60, 0x42, 0x1b, 0x53, 0x16, 0x85, 0x82, 0x25, 0x61, 0x14, 0x34, 0xae, 0x9a, 0x8d, 0x34, - 0x16, 0xe1, 0x94, 0xd6, 0xe3, 0x84, 0x09, 0x86, 0x36, 0xb3, 0x90, 0xfa, 0x4d, 0x48, 0xfd, 0xaa, - 0x59, 0xfb, 0x30, 0x4f, 0x74, 0xe3, 0x50, 0x27, 0x53, 0x9f, 0x24, 0x94, 0xb3, 0x34, 0xf1, 0xf2, - 0xd4, 0xda, 0xb3, 0x3c, 0x48, 0xa1, 0xf3, 0xf4, 0xa2, 0xe1, 0xa7, 0x89, 0x2b, 0x42, 0x16, 0x65, - 0xfe, 0xdd, 0xdf, 0x0d, 0x58, 0xef, 0x46, 0x82, 0x26, 0x91, 0x3b, 0x69, 0x8f, 0xa9, 0x77, 0x49, - 0x13, 0x84, 0x60, 0x29, 0x72, 0xa7, 0xd4, 0x32, 0x76, 0x8c, 0xbd, 0x0a, 0x56, 0x6b, 0xf4, 0x1c, - 0x56, 0xfc, 0x90, 0xc7, 0x13, 0xf7, 0x9a, 0x28, 0xdf, 0xa2, 0xf2, 0x55, 0x73, 0x5b, 0x4f, 0x86, - 0x58, 0x50, 0x8a, 0xa8, 0x78, 0xcb, 0x92, 0x4b, 0xab, 0xa0, 0xbc, 0x1a, 0xa2, 0x2d, 0x28, 0x07, - 0x5e, 0x4c, 0x7e, 0x61, 0x11, 0xb5, 0x96, 0x32, 0x57, 0xe0, 0xc5, 0x6f, 0x58, 0x44, 0xd1, 0xc7, - 0xb0, 0x1e, 0x53, 0x9a, 0x90, 0x38, 0x61, 0x3f, 0x52, 0x4f, 0x90, 0xd0, 0xb7, 0x8a, 0x2a, 0x62, - 0x55, 0x9a, 0x07, 0x99, 0xb5, 0xeb, 0xef, 0xfe, 0x5d, 0x85, 0x8d, 0x91, 0xea, 0x89, 0xaa, 0xb2, - 0xcd, 0xa2, 0x8b, 0x30, 0xf8, 0xaf, 0x95, 0xf6, 0x00, 0xdd, 0x6f, 0x98, 0x2a, 0xba, 0x7a, 0xb0, - 0x5d, 0xcf, 0x9b, 0xed, 0xc6, 0x61, 0xfd, 0x44, 0x47, 0xe1, 0x3c, 0xa8, 0xb3, 0x80, 0x37, 0xa6, - 0x77, 0x8d, 0xe8, 0x07, 0x58, 0xd3, 0x2c, 0x24, 0x48, 0x58, 0x1a, 0xab, 0x53, 0x56, 0x0f, 0x3e, - 0xab, 0x3f, 0x74, 0x71, 0xf5, 0x7b, 0xe7, 0xa8, 0x6b, 0xa6, 0x23, 0x99, 0xdc, 0x59, 0xc0, 0xab, - 0xc9, 0x6d, 0x03, 0xc2, 0x00, 0x63, 0x21, 0x62, 0xe2, 0xc9, 0x14, 0x6b, 0x59, 0x71, 0xbf, 0x78, - 0x2c, 0x77, 0x47, 0x88, 0x58, 0xe1, 0x8e, 0x81, 0x2b, 0x63, 0x0d, 0x50, 0x1f, 0x2a, 0xc2, 0xd3, - 0x94, 0x45, 0x45, 0xf9, 0xe9, 0x63, 0x29, 0x4f, 0xbd, 0x19, 0x63, 0x59, 0xe4, 0x6b, 0xf4, 0x02, - 0x8a, 0x31, 0x4d, 0x42, 0xe6, 0x5b, 0x25, 0xc5, 0xb6, 0xa5, 0xd9, 0xf4, 0xe8, 0xd5, 0x0f, 0xf3, - 0xd1, 0xc3, 0x79, 0x20, 0x6a, 0x42, 0x49, 0x52, 0xb3, 0x54, 0x58, 0xe5, 0x77, 0xe5, 0xe8, 0x48, - 0xe4, 0x82, 0xe9, 0xb1, 0x48, 0xd0, 0x48, 0x90, 0xa9, 0x2b, 0xbc, 0x31, 0x4d, 0xb8, 0x55, 0xd9, - 0x29, 0xec, 0x55, 0x0f, 0x3e, 0x7f, 0x6c, 0xfd, 0xed, 0x2c, 0xff, 0x24, 0x4b, 0xc7, 0xeb, 0xde, - 0x1c, 0xe6, 0x08, 0x83, 0xc9, 0xe9, 0x84, 0x7a, 0x42, 0x8d, 0x47, 0x10, 0xb2, 0x88, 0x5b, 0xb0, - 0x53, 0xd8, 0x5b, 0x3b, 0xf8, 0xe4, 0x9d, 0x5b, 0x60, 0x15, 0x8f, 0xd7, 0x35, 0x41, 0x86, 0x39, - 0xfa, 0x00, 0xaa, 0x21, 0x27, 0x61, 0x2e, 0x35, 0x6b, 0x7d, 0xc7, 0xd8, 0x2b, 0x63, 0x08, 0xb9, - 0x16, 0x1f, 0xc2, 0xb0, 0xa1, 0xbd, 0xd9, 0xad, 0xc8, 0x83, 0xad, 0xa9, 0x83, 0x7d, 0xf4, 0xf0, - 0xae, 0x77, 0x74, 0x8b, 0xcd, 0x70, 0xde, 0xc0, 0x6b, 0x3f, 0xc3, 0xea, 0xdc, 0x68, 0x29, 0x25, - 0xca, 0x85, 0xd4, 0x99, 0x91, 0x2b, 0x51, 0xe2, 0xae, 0x8f, 0x8e, 0x61, 0x36, 0x75, 0x44, 0x5c, - 0xc7, 0x99, 0x70, 0xfe, 0xf5, 0xc4, 0x8a, 0x4e, 0x73, 0x9f, 0x5e, 0xc7, 0x14, 0xaf, 0x24, 0xb7, - 0x50, 0xed, 0xcf, 0x02, 0x54, 0x66, 0x93, 0x87, 0xde, 0x87, 0x52, 0xca, 0x29, 0xe1, 0x7c, 0xa2, - 0x76, 0x2d, 0xe3, 0x62, 0xca, 0xe9, 0x90, 0x4f, 0xa4, 0x80, 0x63, 0x57, 0x8c, 0x73, 0x91, 0xaa, - 0xb5, 0xb2, 0xb1, 0x44, 0x28, 0x3d, 0x2e, 0x63, 0xb5, 0x46, 0xe7, 0x50, 0x71, 0x53, 0x31, 0x26, - 0x61, 0x74, 0xc1, 0x72, 0x71, 0x39, 0x4f, 0x16, 0x40, 0xbd, 0xe5, 0xf2, 0xd0, 0xb3, 0x53, 0x31, - 0xa6, 0x91, 0x08, 0xbd, 0x6c, 0xae, 0xca, 0x92, 0xb7, 0x1b, 0x5d, 0x30, 0xf9, 0x70, 0x4c, 0x5d, - 0x7e, 0x49, 0xc6, 0xd4, 0xf5, 0x65, 0xef, 0x97, 0x55, 0xa5, 0x55, 0x69, 0xeb, 0x64, 0x26, 0xf4, - 0x2d, 0x94, 0xb4, 0xb7, 0xa8, 0x6e, 0xe6, 0xd5, 0xd3, 0x8b, 0xc8, 0xb9, 0x9c, 0x48, 0x24, 0xd7, - 0x58, 0xd3, 0xd5, 0x4e, 0xe0, 0x7f, 0x0f, 0x54, 0x87, 0x6a, 0x50, 0x4e, 0xb9, 0xbc, 0xd3, 0xd9, - 0x23, 0x37, 0xc3, 0xd2, 0x17, 0xbb, 0x9c, 0xbf, 0x65, 0x89, 0x9f, 0xf7, 0x6f, 0x86, 0x6b, 0x2f, - 0x61, 0xe5, 0xf6, 0x3e, 0xc8, 0x84, 0xc2, 0x25, 0xbd, 0xce, 0x29, 0xe4, 0x12, 0x6d, 0xc2, 0xf2, - 0x95, 0x3b, 0x49, 0xf5, 0xfb, 0x98, 0x81, 0x97, 0x8b, 0x5f, 0x18, 0xb5, 0x67, 0x50, 0xd6, 0x02, - 0x9f, 0xdd, 0x85, 0x71, 0x73, 0x17, 0xb5, 0x7d, 0x58, 0x9b, 0x17, 0x90, 0x7c, 0xf9, 0x73, 0x09, - 0xe9, 0xa1, 0xca, 0x61, 0x0b, 0xa0, 0xac, 0xc7, 0xa2, 0xb5, 0x09, 0x48, 0xcd, 0x35, 0x49, 0xe8, - 0x4f, 0x29, 0xe5, 0x42, 0x4d, 0xd9, 0xee, 0xaf, 0x06, 0xac, 0xde, 0x6a, 0x57, 0x37, 0x46, 0x5f, - 0x41, 0x31, 0x13, 0x9d, 0x22, 0x7b, 0x82, 0xe6, 0xf2, 0x34, 0xd9, 0x98, 0x09, 0xcb, 0x1a, 0xa8, - 0x1b, 0xa3, 0x31, 0xda, 0x06, 0x08, 0x63, 0xe2, 0xfa, 0x7e, 0x42, 0x39, 0xcf, 0xbf, 0x53, 0x95, - 0x30, 0xb6, 0x33, 0xc3, 0x3e, 0x9d, 0xfb, 0xca, 0x64, 0xbc, 0xe8, 0x3d, 0x40, 0xd8, 0x39, 0xea, - 0xf6, 0x7b, 0x64, 0xd4, 0x1b, 0x0e, 0x9c, 0x76, 0xf7, 0xeb, 0xae, 0x73, 0x68, 0x2e, 0xa0, 0x12, - 0x14, 0x46, 0x43, 0xdb, 0x34, 0x10, 0x40, 0xd1, 0x19, 0xe1, 0xfe, 0xc0, 0x31, 0x17, 0xd1, 0x06, - 0xac, 0x0e, 0xfb, 0xa3, 0xd3, 0x0e, 0xb1, 0x4f, 0x1c, 0xdc, 0x6d, 0xdb, 0x66, 0x01, 0x99, 0xb0, - 0x62, 0x0f, 0xbb, 0x36, 0x19, 0xd8, 0x32, 0xb5, 0x6d, 0x2e, 0xed, 0x7f, 0x0f, 0x1b, 0xf7, 0x04, - 0x84, 0xb6, 0x61, 0x0b, 0x3b, 0xc3, 0xfe, 0x08, 0xb7, 0x1d, 0x72, 0xfa, 0xdd, 0xc0, 0xb9, 0xb3, - 0xdb, 0x0a, 0x94, 0xbb, 0xbd, 0xe1, 0xa9, 0xdd, 0x6b, 0x3b, 0xa6, 0x81, 0xb6, 0xe0, 0xff, 0xf6, - 0x37, 0x43, 0xe2, 0x1c, 0xb7, 0xc8, 0x71, 0xdf, 0x3e, 0x24, 0x2d, 0xfb, 0x58, 0x7a, 0xb0, 0xb9, - 0xd8, 0xfa, 0xcd, 0x00, 0xcb, 0x63, 0xd3, 0x07, 0xbb, 0xd6, 0xaa, 0x66, 0xc7, 0x1b, 0xc8, 0xf7, - 0x75, 0x60, 0xbc, 0x79, 0x95, 0x07, 0x05, 0x6c, 0xe2, 0x46, 0x41, 0x9d, 0x25, 0x41, 0x23, 0xa0, - 0x91, 0x7a, 0x7d, 0x1b, 0x99, 0xcb, 0x8d, 0x43, 0x3e, 0xff, 0x6f, 0xf2, 0xe5, 0x0d, 0xfa, 0x63, - 0xb1, 0x76, 0x94, 0x11, 0xb4, 0x27, 0x2c, 0xf5, 0xf5, 0xf7, 0x52, 0xee, 0xf5, 0xba, 0xf9, 0x97, - 0x76, 0x9e, 0x29, 0xe7, 0xd9, 0x8d, 0xf3, 0xec, 0x75, 0xf3, 0xbc, 0xa8, 0x36, 0x69, 0xfe, 0x13, - 0x00, 0x00, 0xff, 0xff, 0x0a, 0x0a, 0xbb, 0x6b, 0xff, 0x08, 0x00, 0x00, +func init() { proto.RegisterFile("google/monitoring/v3/uptime.proto", fileDescriptor_7ca0e36dfc8221d8) } + +var fileDescriptor_7ca0e36dfc8221d8 = []byte{ + // 1183 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xdd, 0x6e, 0xdb, 0x36, + 0x14, 0xae, 0xec, 0xc4, 0x3f, 0xc7, 0xf9, 0x51, 0xd8, 0x74, 0x55, 0x0c, 0xb4, 0x48, 0x33, 0xac, + 0x0b, 0x3a, 0xc0, 0x59, 0x63, 0x6c, 0x18, 0x3a, 0xa0, 0x83, 0xec, 0x6a, 0xb1, 0xb0, 0x44, 0x36, + 0x28, 0xbb, 0xeb, 0xba, 0x62, 0x84, 0x2a, 0x31, 0xb6, 0x16, 0x5b, 0xd4, 0x24, 0x2a, 0x5d, 0xf6, + 0x0a, 0xbb, 0xdf, 0xfd, 0xb0, 0xbb, 0x3e, 0xca, 0x5e, 0x61, 0xd8, 0xbb, 0x0c, 0x24, 0x25, 0x27, + 0x4e, 0x32, 0x34, 0xed, 0x1d, 0xbf, 0xf3, 0xf3, 0x91, 0x3c, 0x3c, 0x1f, 0x49, 0x78, 0x30, 0x66, + 0x6c, 0x3c, 0xa5, 0x7b, 0x33, 0x16, 0x85, 0x9c, 0x25, 0x61, 0x34, 0xde, 0x3b, 0x6d, 0xef, 0x65, + 0x31, 0x0f, 0x67, 0xb4, 0x15, 0x27, 0x8c, 0x33, 0xb4, 0xa9, 0x42, 0x5a, 0xe7, 0x21, 0xad, 0xd3, + 0x76, 0xf3, 0xe3, 0x3c, 0xd1, 0x8b, 0xc3, 0x22, 0x99, 0x06, 0x24, 0xa1, 0x29, 0xcb, 0x12, 0x3f, + 0x4f, 0x6d, 0xde, 0xcf, 0x83, 0x24, 0x7a, 0x9d, 0x1d, 0xef, 0x05, 0x59, 0xe2, 0xf1, 0x90, 0x45, + 0xca, 0xbf, 0xf3, 0x67, 0x09, 0xd6, 0xed, 0x88, 0xd3, 0x24, 0xf2, 0xa6, 0xdd, 0x09, 0xf5, 0x4f, + 0x68, 0x82, 0x10, 0x2c, 0x45, 0xde, 0x8c, 0x1a, 0xda, 0xb6, 0xb6, 0x5b, 0xc7, 0x72, 0x8c, 0x1e, + 0xc0, 0x4a, 0x10, 0xa6, 0xf1, 0xd4, 0x3b, 0x23, 0xd2, 0x57, 0x92, 0xbe, 0x46, 0x6e, 0x73, 0x44, + 0x88, 0x01, 0xd5, 0x88, 0xf2, 0x37, 0x2c, 0x39, 0x31, 0xca, 0xd2, 0x5b, 0x40, 0xb4, 0x05, 0xb5, + 0xb1, 0x1f, 0x93, 0xdf, 0x58, 0x44, 0x8d, 0x25, 0xe5, 0x1a, 0xfb, 0xf1, 0x4b, 0x16, 0x51, 0xf4, + 0x10, 0xd6, 0x63, 0x4a, 0x13, 0x12, 0x27, 0xec, 0x67, 0xea, 0x73, 0x12, 0x06, 0x46, 0x45, 0x46, + 0xac, 0x0a, 0xf3, 0x40, 0x59, 0xed, 0x00, 0x99, 0xb0, 0x9c, 0x72, 0x8f, 0x53, 0xa3, 0xba, 0xad, + 0xed, 0xae, 0xed, 0x7f, 0xd6, 0xba, 0xae, 0x24, 0xad, 0x4b, 0x3b, 0x69, 0xb9, 0x22, 0x05, 0xab, + 0xcc, 0x9d, 0x36, 0x2c, 0x4b, 0x8c, 0xd6, 0xa1, 0x31, 0x72, 0xdc, 0x81, 0xd5, 0xb5, 0xbf, 0xb5, + 0xad, 0x67, 0xfa, 0x2d, 0xb4, 0x02, 0xb5, 0x2e, 0xb6, 0xcc, 0xa1, 0xed, 0x1c, 0xe8, 0x1a, 0x6a, + 0x40, 0x15, 0x8f, 0x1c, 0x47, 0x80, 0xd2, 0x93, 0x92, 0xa1, 0xed, 0xfc, 0xbb, 0x0a, 0x1b, 0x23, + 0x79, 0x1e, 0x92, 0xb7, 0xcb, 0xa2, 0xe3, 0x70, 0xfc, 0xa1, 0x55, 0x72, 0x00, 0x5d, 0x3d, 0x2c, + 0x59, 0xb0, 0xc6, 0xfe, 0xbd, 0x62, 0x57, 0x5e, 0x1c, 0xb6, 0x8e, 0x8a, 0x28, 0x9c, 0x07, 0xf5, + 0x6e, 0xe1, 0x8d, 0xd9, 0x65, 0x23, 0xfa, 0x09, 0xd6, 0x0a, 0x16, 0x32, 0x4e, 0x58, 0x16, 0xcb, + 0x0a, 0x37, 0xf6, 0xbf, 0xb8, 0xbe, 0x42, 0x57, 0xf6, 0xd1, 0x2a, 0x98, 0x0e, 0x44, 0x72, 0xef, + 0x16, 0x5e, 0x4d, 0x2e, 0x1a, 0x10, 0x06, 0x98, 0x70, 0x1e, 0x13, 0x5f, 0xa4, 0x18, 0xcb, 0x92, + 0xfb, 0xf1, 0x4d, 0xb9, 0x7b, 0x9c, 0xc7, 0x12, 0xf7, 0x34, 0x5c, 0x9f, 0x14, 0x00, 0xf5, 0xa1, + 0xce, 0xfd, 0x82, 0xb2, 0x22, 0x29, 0x3f, 0xbf, 0x29, 0xe5, 0xd0, 0x9f, 0x33, 0xd6, 0x78, 0x3e, + 0x46, 0x8f, 0xa1, 0x12, 0xd3, 0x24, 0x64, 0x81, 0x6c, 0x8f, 0xc6, 0xfe, 0x56, 0xc1, 0x56, 0xb4, + 0x7d, 0xeb, 0x59, 0xde, 0xf6, 0x38, 0x0f, 0x44, 0x6d, 0xa8, 0x0a, 0x6a, 0x96, 0x71, 0xa3, 0xf6, + 0xae, 0x9c, 0x22, 0x12, 0x79, 0xa0, 0xfb, 0x2c, 0xe2, 0x34, 0xe2, 0x64, 0xe6, 0x71, 0x7f, 0x42, + 0x93, 0xd4, 0xa8, 0x6f, 0x97, 0x77, 0x1b, 0xfb, 0x5f, 0xde, 0x74, 0xfd, 0x5d, 0x95, 0x7f, 0xa4, + 0xd2, 0xf1, 0xba, 0xbf, 0x80, 0x53, 0x84, 0x41, 0x4f, 0xe9, 0x94, 0xfa, 0x5c, 0xb6, 0xc7, 0x38, + 0x64, 0x51, 0x6a, 0xc0, 0x76, 0x79, 0x77, 0x6d, 0xff, 0xd3, 0x77, 0x4e, 0x81, 0x65, 0x3c, 0x5e, + 0x2f, 0x08, 0x14, 0x4e, 0xd1, 0x73, 0xd8, 0x08, 0x73, 0x65, 0xa8, 0xa2, 0x8b, 0x75, 0xaf, 0xc9, + 0x75, 0x7f, 0x72, 0x23, 0x21, 0x75, 0x4a, 0x86, 0x86, 0xf5, 0x70, 0xd1, 0x98, 0x36, 0x7f, 0x85, + 0xd5, 0x85, 0xee, 0x91, 0x42, 0x17, 0x03, 0x21, 0x63, 0x2d, 0x17, 0xba, 0xc0, 0x76, 0x80, 0x0e, + 0x61, 0xde, 0x58, 0x84, 0x9f, 0xc5, 0x4a, 0x1b, 0xff, 0xbb, 0x29, 0x49, 0x57, 0x70, 0x0f, 0xcf, + 0x62, 0x8a, 0x57, 0x92, 0x0b, 0xa8, 0xf9, 0x4f, 0x19, 0xea, 0xf3, 0xe6, 0x42, 0x77, 0xa1, 0x9a, + 0xa5, 0x94, 0xa4, 0xe9, 0x54, 0xce, 0x5a, 0xc3, 0x95, 0x2c, 0xa5, 0x6e, 0x3a, 0x15, 0x1a, 0x8d, + 0x3d, 0x3e, 0xc9, 0x75, 0x28, 0xc7, 0xd2, 0xc6, 0x12, 0x2e, 0x25, 0xb7, 0x8c, 0xe5, 0x18, 0xbd, + 0x86, 0xba, 0x97, 0xf1, 0x09, 0x09, 0xa3, 0x63, 0x96, 0xeb, 0xc7, 0x7a, 0xef, 0x1e, 0x6f, 0x75, + 0xbc, 0x34, 0xf4, 0xcd, 0x8c, 0x4f, 0x68, 0xc4, 0x43, 0x5f, 0xb5, 0x4e, 0x4d, 0xf0, 0xda, 0xd1, + 0x31, 0x13, 0x77, 0xc3, 0xcc, 0x4b, 0x4f, 0xc8, 0x84, 0x7a, 0x81, 0xa8, 0xff, 0xb2, 0x5c, 0x69, + 0x43, 0xd8, 0x7a, 0xca, 0x84, 0x5e, 0x40, 0xb5, 0xf0, 0x56, 0xe4, 0xe9, 0x3c, 0x7d, 0xff, 0x45, + 0xe4, 0x5c, 0x56, 0xc4, 0x93, 0x33, 0x5c, 0xd0, 0x89, 0xc9, 0x4f, 0xbd, 0x69, 0x18, 0x78, 0x5c, + 0x95, 0xa9, 0xaa, 0x26, 0x2f, 0x6c, 0x6e, 0x3a, 0x6d, 0x1e, 0xc1, 0xed, 0x6b, 0x36, 0x80, 0x9a, + 0x50, 0xcb, 0x52, 0x71, 0xec, 0xf3, 0xab, 0x6e, 0x8e, 0x85, 0x2f, 0xf6, 0xd2, 0xf4, 0x0d, 0x4b, + 0x82, 0xbc, 0xc4, 0x73, 0xdc, 0x7c, 0x02, 0x2b, 0x17, 0x97, 0x82, 0x74, 0x28, 0x9f, 0xd0, 0xb3, + 0x9c, 0x42, 0x0c, 0xd1, 0x26, 0x2c, 0x9f, 0x7a, 0xd3, 0xac, 0xb8, 0x25, 0x15, 0x78, 0x52, 0xfa, + 0x4a, 0x6b, 0xde, 0x87, 0x5a, 0x21, 0xf3, 0xf9, 0x71, 0x69, 0xe7, 0xc7, 0xd5, 0x7c, 0x5b, 0x82, + 0xb5, 0x45, 0x1d, 0x89, 0xc7, 0x27, 0x57, 0x52, 0xd1, 0x78, 0x39, 0x44, 0x14, 0xaa, 0xb9, 0x56, + 0xf3, 0x96, 0xfb, 0xee, 0xc3, 0xa4, 0x7a, 0x09, 0xf6, 0x63, 0x75, 0x35, 0xe4, 0xdc, 0x3b, 0x7f, + 0x68, 0xb0, 0x79, 0x5d, 0x04, 0x7a, 0x08, 0x3b, 0xdd, 0xbe, 0x33, 0xb4, 0x9c, 0x21, 0x39, 0x32, + 0x87, 0xdd, 0x9e, 0x85, 0x49, 0x7f, 0x30, 0xb4, 0xfb, 0x0e, 0x59, 0x7c, 0x84, 0x6e, 0xc3, 0xba, + 0x88, 0x33, 0x6d, 0xc7, 0x25, 0xee, 0x10, 0xab, 0xb7, 0xe8, 0x2e, 0xdc, 0x76, 0xfa, 0x43, 0x72, + 0xd9, 0x51, 0x42, 0x1b, 0xb0, 0xaa, 0xd8, 0x5c, 0x82, 0xad, 0x03, 0xeb, 0x85, 0x5e, 0x46, 0x77, + 0x60, 0x43, 0xc4, 0x2e, 0x9a, 0x97, 0x3a, 0x00, 0xb5, 0x42, 0x3a, 0x9d, 0x4d, 0x40, 0x52, 0xff, + 0x24, 0xa1, 0xbf, 0x64, 0x34, 0xe5, 0x52, 0x89, 0x3b, 0xbf, 0x6b, 0xb0, 0x7a, 0x61, 0xf7, 0x76, + 0x8c, 0xbe, 0x81, 0x8a, 0xba, 0x7b, 0x64, 0x31, 0xdf, 0xe3, 0xea, 0xc9, 0xd3, 0x44, 0x67, 0x4c, + 0x99, 0xea, 0xa0, 0xa2, 0x33, 0x0a, 0x8c, 0xee, 0x01, 0x84, 0x31, 0xf1, 0x82, 0x20, 0xa1, 0x69, + 0x9a, 0x7f, 0x15, 0xea, 0x61, 0x6c, 0x2a, 0xc3, 0x23, 0xba, 0xf0, 0xd8, 0x2a, 0x5e, 0xf4, 0x11, + 0x20, 0x6c, 0x1d, 0x5c, 0x2d, 0x5a, 0x15, 0xca, 0x23, 0xd7, 0xd4, 0x35, 0x04, 0x50, 0xb1, 0x46, + 0xb8, 0x3f, 0xb0, 0x54, 0x6d, 0xdc, 0xfe, 0x68, 0xd8, 0x23, 0xe6, 0x91, 0x85, 0xed, 0xae, 0xa9, + 0x97, 0x91, 0x0e, 0x2b, 0xa6, 0x6b, 0x9b, 0x64, 0x60, 0x8a, 0xd4, 0xae, 0xbe, 0xf4, 0xe8, 0x47, + 0xd8, 0xb8, 0x72, 0xc9, 0xa0, 0x7b, 0xb0, 0x85, 0x2d, 0xb7, 0x3f, 0xc2, 0x5d, 0x8b, 0x0c, 0x7f, + 0x18, 0x58, 0xe4, 0xca, 0x3f, 0xc1, 0x76, 0xdc, 0xa1, 0xe9, 0x74, 0x2d, 0x5d, 0x43, 0x5b, 0x70, + 0xc7, 0xfc, 0xde, 0x25, 0xd6, 0x61, 0x87, 0x1c, 0xf6, 0xcd, 0x67, 0xa4, 0x63, 0x1e, 0x0a, 0x0f, + 0xd6, 0x4b, 0x9d, 0xbf, 0x34, 0x30, 0x7c, 0x36, 0xbb, 0xb6, 0x6a, 0x9d, 0x86, 0xda, 0xde, 0x40, + 0x3c, 0x33, 0x03, 0xed, 0xe5, 0xd3, 0x3c, 0x68, 0xcc, 0xa6, 0x5e, 0x34, 0x6e, 0xb1, 0x64, 0xbc, + 0x37, 0xa6, 0x91, 0x7c, 0x84, 0xf6, 0x94, 0xcb, 0x8b, 0xc3, 0x74, 0xf1, 0x7b, 0xf8, 0xf5, 0x39, + 0x7a, 0x5b, 0x6a, 0x1e, 0x28, 0x82, 0xee, 0x94, 0x65, 0x41, 0xf1, 0x6d, 0x10, 0x73, 0x3d, 0x6f, + 0xff, 0x5d, 0x38, 0x5f, 0x49, 0xe7, 0xab, 0x73, 0xe7, 0xab, 0xe7, 0xed, 0xd7, 0x15, 0x39, 0x49, + 0xfb, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x44, 0x42, 0x24, 0x08, 0x82, 0x0a, 0x00, 0x00, } diff --git a/vendor/google.golang.org/genproto/googleapis/monitoring/v3/uptime_service.pb.go b/vendor/google.golang.org/genproto/googleapis/monitoring/v3/uptime_service.pb.go index 5192f4a18f..eae78fcf76 100644 --- a/vendor/google.golang.org/genproto/googleapis/monitoring/v3/uptime_service.pb.go +++ b/vendor/google.golang.org/genproto/googleapis/monitoring/v3/uptime_service.pb.go @@ -1,18 +1,21 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: google/monitoring/v3/uptime_service.proto -package monitoring // import "google.golang.org/genproto/googleapis/monitoring/v3" - -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" -import empty "github.com/golang/protobuf/ptypes/empty" -import _ "google.golang.org/genproto/googleapis/api/annotations" -import field_mask "google.golang.org/genproto/protobuf/field_mask" +package monitoring import ( - context "golang.org/x/net/context" + context "context" + fmt "fmt" + math "math" + + proto "github.com/golang/protobuf/proto" + _ "github.com/golang/protobuf/ptypes/duration" + empty "github.com/golang/protobuf/ptypes/empty" + _ "google.golang.org/genproto/googleapis/api/annotations" + field_mask "google.golang.org/genproto/protobuf/field_mask" grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" ) // Reference imports to suppress errors if they are not otherwise used. @@ -24,11 +27,11 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // The protocol for the `ListUptimeCheckConfigs` request. type ListUptimeCheckConfigsRequest struct { - // The project whose uptime check configurations are listed. The format + // The project whose Uptime check configurations are listed. The format // is `projects/[PROJECT_ID]`. Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"` // The maximum number of results to return in a single response. The server @@ -49,16 +52,17 @@ func (m *ListUptimeCheckConfigsRequest) Reset() { *m = ListUptimeCheckCo func (m *ListUptimeCheckConfigsRequest) String() string { return proto.CompactTextString(m) } func (*ListUptimeCheckConfigsRequest) ProtoMessage() {} func (*ListUptimeCheckConfigsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_uptime_service_c74f83143a8cb5a4, []int{0} + return fileDescriptor_6222dd2aa0db8eee, []int{0} } + func (m *ListUptimeCheckConfigsRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ListUptimeCheckConfigsRequest.Unmarshal(m, b) } func (m *ListUptimeCheckConfigsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ListUptimeCheckConfigsRequest.Marshal(b, m, deterministic) } -func (dst *ListUptimeCheckConfigsRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_ListUptimeCheckConfigsRequest.Merge(dst, src) +func (m *ListUptimeCheckConfigsRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_ListUptimeCheckConfigsRequest.Merge(m, src) } func (m *ListUptimeCheckConfigsRequest) XXX_Size() int { return xxx_messageInfo_ListUptimeCheckConfigsRequest.Size(m) @@ -92,7 +96,7 @@ func (m *ListUptimeCheckConfigsRequest) GetPageToken() string { // The protocol for the `ListUptimeCheckConfigs` response. type ListUptimeCheckConfigsResponse struct { - // The returned uptime check configurations. + // The returned Uptime check configurations. UptimeCheckConfigs []*UptimeCheckConfig `protobuf:"bytes,1,rep,name=uptime_check_configs,json=uptimeCheckConfigs,proto3" json:"uptime_check_configs,omitempty"` // This field represents the pagination token to retrieve the next page of // results. If the value is empty, it means no further results for the @@ -100,7 +104,7 @@ type ListUptimeCheckConfigsResponse struct { // next_page_token is passed to the subsequent List method call (in the // request message's page_token field). NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"` - // The total number of uptime check configurations for the project, + // The total number of Uptime check configurations for the project, // irrespective of any pagination. TotalSize int32 `protobuf:"varint,3,opt,name=total_size,json=totalSize,proto3" json:"total_size,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -112,16 +116,17 @@ func (m *ListUptimeCheckConfigsResponse) Reset() { *m = ListUptimeCheckC func (m *ListUptimeCheckConfigsResponse) String() string { return proto.CompactTextString(m) } func (*ListUptimeCheckConfigsResponse) ProtoMessage() {} func (*ListUptimeCheckConfigsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_uptime_service_c74f83143a8cb5a4, []int{1} + return fileDescriptor_6222dd2aa0db8eee, []int{1} } + func (m *ListUptimeCheckConfigsResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ListUptimeCheckConfigsResponse.Unmarshal(m, b) } func (m *ListUptimeCheckConfigsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ListUptimeCheckConfigsResponse.Marshal(b, m, deterministic) } -func (dst *ListUptimeCheckConfigsResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_ListUptimeCheckConfigsResponse.Merge(dst, src) +func (m *ListUptimeCheckConfigsResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_ListUptimeCheckConfigsResponse.Merge(m, src) } func (m *ListUptimeCheckConfigsResponse) XXX_Size() int { return xxx_messageInfo_ListUptimeCheckConfigsResponse.Size(m) @@ -155,7 +160,7 @@ func (m *ListUptimeCheckConfigsResponse) GetTotalSize() int32 { // The protocol for the `GetUptimeCheckConfig` request. type GetUptimeCheckConfigRequest struct { - // The uptime check configuration to retrieve. The format + // The Uptime check configuration to retrieve. The format // is `projects/[PROJECT_ID]/uptimeCheckConfigs/[UPTIME_CHECK_ID]`. Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -167,16 +172,17 @@ func (m *GetUptimeCheckConfigRequest) Reset() { *m = GetUptimeCheckConfi func (m *GetUptimeCheckConfigRequest) String() string { return proto.CompactTextString(m) } func (*GetUptimeCheckConfigRequest) ProtoMessage() {} func (*GetUptimeCheckConfigRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_uptime_service_c74f83143a8cb5a4, []int{2} + return fileDescriptor_6222dd2aa0db8eee, []int{2} } + func (m *GetUptimeCheckConfigRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUptimeCheckConfigRequest.Unmarshal(m, b) } func (m *GetUptimeCheckConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_GetUptimeCheckConfigRequest.Marshal(b, m, deterministic) } -func (dst *GetUptimeCheckConfigRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetUptimeCheckConfigRequest.Merge(dst, src) +func (m *GetUptimeCheckConfigRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetUptimeCheckConfigRequest.Merge(m, src) } func (m *GetUptimeCheckConfigRequest) XXX_Size() int { return xxx_messageInfo_GetUptimeCheckConfigRequest.Size(m) @@ -196,10 +202,10 @@ func (m *GetUptimeCheckConfigRequest) GetName() string { // The protocol for the `CreateUptimeCheckConfig` request. type CreateUptimeCheckConfigRequest struct { - // The project in which to create the uptime check. The format + // The project in which to create the Uptime check. The format // is `projects/[PROJECT_ID]`. Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"` - // The new uptime check configuration. + // The new Uptime check configuration. UptimeCheckConfig *UptimeCheckConfig `protobuf:"bytes,2,opt,name=uptime_check_config,json=uptimeCheckConfig,proto3" json:"uptime_check_config,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` @@ -210,16 +216,17 @@ func (m *CreateUptimeCheckConfigRequest) Reset() { *m = CreateUptimeChec func (m *CreateUptimeCheckConfigRequest) String() string { return proto.CompactTextString(m) } func (*CreateUptimeCheckConfigRequest) ProtoMessage() {} func (*CreateUptimeCheckConfigRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_uptime_service_c74f83143a8cb5a4, []int{3} + return fileDescriptor_6222dd2aa0db8eee, []int{3} } + func (m *CreateUptimeCheckConfigRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateUptimeCheckConfigRequest.Unmarshal(m, b) } func (m *CreateUptimeCheckConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_CreateUptimeCheckConfigRequest.Marshal(b, m, deterministic) } -func (dst *CreateUptimeCheckConfigRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_CreateUptimeCheckConfigRequest.Merge(dst, src) +func (m *CreateUptimeCheckConfigRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_CreateUptimeCheckConfigRequest.Merge(m, src) } func (m *CreateUptimeCheckConfigRequest) XXX_Size() int { return xxx_messageInfo_CreateUptimeCheckConfigRequest.Size(m) @@ -246,16 +253,16 @@ func (m *CreateUptimeCheckConfigRequest) GetUptimeCheckConfig() *UptimeCheckConf // The protocol for the `UpdateUptimeCheckConfig` request. type UpdateUptimeCheckConfigRequest struct { - // Optional. If present, only the listed fields in the current uptime check + // Optional. If present, only the listed fields in the current Uptime check // configuration are updated with values from the new configuration. If this // field is empty, then the current configuration is completely replaced with // the new configuration. UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"` - // Required. If an `"updateMask"` has been specified, this field gives - // the values for the set of fields mentioned in the `"updateMask"`. If an - // `"updateMask"` has not been given, this uptime check configuration replaces - // the current configuration. If a field is mentioned in `"updateMask"` but - // the corresonding field is omitted in this partial uptime check + // Required. If an `updateMask` has been specified, this field gives + // the values for the set of fields mentioned in the `updateMask`. If an + // `updateMask` has not been given, this Uptime check configuration replaces + // the current configuration. If a field is mentioned in `updateMask` but + // the corresonding field is omitted in this partial Uptime check // configuration, it has the effect of deleting/clearing the field from the // configuration on the server. // @@ -272,16 +279,17 @@ func (m *UpdateUptimeCheckConfigRequest) Reset() { *m = UpdateUptimeChec func (m *UpdateUptimeCheckConfigRequest) String() string { return proto.CompactTextString(m) } func (*UpdateUptimeCheckConfigRequest) ProtoMessage() {} func (*UpdateUptimeCheckConfigRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_uptime_service_c74f83143a8cb5a4, []int{4} + return fileDescriptor_6222dd2aa0db8eee, []int{4} } + func (m *UpdateUptimeCheckConfigRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UpdateUptimeCheckConfigRequest.Unmarshal(m, b) } func (m *UpdateUptimeCheckConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_UpdateUptimeCheckConfigRequest.Marshal(b, m, deterministic) } -func (dst *UpdateUptimeCheckConfigRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_UpdateUptimeCheckConfigRequest.Merge(dst, src) +func (m *UpdateUptimeCheckConfigRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_UpdateUptimeCheckConfigRequest.Merge(m, src) } func (m *UpdateUptimeCheckConfigRequest) XXX_Size() int { return xxx_messageInfo_UpdateUptimeCheckConfigRequest.Size(m) @@ -308,7 +316,7 @@ func (m *UpdateUptimeCheckConfigRequest) GetUptimeCheckConfig() *UptimeCheckConf // The protocol for the `DeleteUptimeCheckConfig` request. type DeleteUptimeCheckConfigRequest struct { - // The uptime check configuration to delete. The format + // The Uptime check configuration to delete. The format // is `projects/[PROJECT_ID]/uptimeCheckConfigs/[UPTIME_CHECK_ID]`. Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -320,16 +328,17 @@ func (m *DeleteUptimeCheckConfigRequest) Reset() { *m = DeleteUptimeChec func (m *DeleteUptimeCheckConfigRequest) String() string { return proto.CompactTextString(m) } func (*DeleteUptimeCheckConfigRequest) ProtoMessage() {} func (*DeleteUptimeCheckConfigRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_uptime_service_c74f83143a8cb5a4, []int{5} + return fileDescriptor_6222dd2aa0db8eee, []int{5} } + func (m *DeleteUptimeCheckConfigRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DeleteUptimeCheckConfigRequest.Unmarshal(m, b) } func (m *DeleteUptimeCheckConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_DeleteUptimeCheckConfigRequest.Marshal(b, m, deterministic) } -func (dst *DeleteUptimeCheckConfigRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_DeleteUptimeCheckConfigRequest.Merge(dst, src) +func (m *DeleteUptimeCheckConfigRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_DeleteUptimeCheckConfigRequest.Merge(m, src) } func (m *DeleteUptimeCheckConfigRequest) XXX_Size() int { return xxx_messageInfo_DeleteUptimeCheckConfigRequest.Size(m) @@ -369,16 +378,17 @@ func (m *ListUptimeCheckIpsRequest) Reset() { *m = ListUptimeCheckIpsReq func (m *ListUptimeCheckIpsRequest) String() string { return proto.CompactTextString(m) } func (*ListUptimeCheckIpsRequest) ProtoMessage() {} func (*ListUptimeCheckIpsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_uptime_service_c74f83143a8cb5a4, []int{6} + return fileDescriptor_6222dd2aa0db8eee, []int{6} } + func (m *ListUptimeCheckIpsRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ListUptimeCheckIpsRequest.Unmarshal(m, b) } func (m *ListUptimeCheckIpsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ListUptimeCheckIpsRequest.Marshal(b, m, deterministic) } -func (dst *ListUptimeCheckIpsRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_ListUptimeCheckIpsRequest.Merge(dst, src) +func (m *ListUptimeCheckIpsRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_ListUptimeCheckIpsRequest.Merge(m, src) } func (m *ListUptimeCheckIpsRequest) XXX_Size() int { return xxx_messageInfo_ListUptimeCheckIpsRequest.Size(m) @@ -424,16 +434,17 @@ func (m *ListUptimeCheckIpsResponse) Reset() { *m = ListUptimeCheckIpsRe func (m *ListUptimeCheckIpsResponse) String() string { return proto.CompactTextString(m) } func (*ListUptimeCheckIpsResponse) ProtoMessage() {} func (*ListUptimeCheckIpsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_uptime_service_c74f83143a8cb5a4, []int{7} + return fileDescriptor_6222dd2aa0db8eee, []int{7} } + func (m *ListUptimeCheckIpsResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ListUptimeCheckIpsResponse.Unmarshal(m, b) } func (m *ListUptimeCheckIpsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ListUptimeCheckIpsResponse.Marshal(b, m, deterministic) } -func (dst *ListUptimeCheckIpsResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_ListUptimeCheckIpsResponse.Merge(dst, src) +func (m *ListUptimeCheckIpsResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_ListUptimeCheckIpsResponse.Merge(m, src) } func (m *ListUptimeCheckIpsResponse) XXX_Size() int { return xxx_messageInfo_ListUptimeCheckIpsResponse.Size(m) @@ -469,6 +480,66 @@ func init() { proto.RegisterType((*ListUptimeCheckIpsResponse)(nil), "google.monitoring.v3.ListUptimeCheckIpsResponse") } +func init() { + proto.RegisterFile("google/monitoring/v3/uptime_service.proto", fileDescriptor_6222dd2aa0db8eee) +} + +var fileDescriptor_6222dd2aa0db8eee = []byte{ + // 825 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0xcd, 0x6e, 0xd3, 0x4a, + 0x14, 0xd6, 0x24, 0xbd, 0xd5, 0xcd, 0x54, 0xf7, 0x6f, 0x6e, 0xd4, 0xa4, 0xee, 0x6d, 0x94, 0x9b, + 0x2b, 0x5d, 0x4a, 0x54, 0x6c, 0x9a, 0x74, 0xd5, 0x8a, 0x4a, 0x6d, 0x80, 0xaa, 0x12, 0x95, 0xaa, + 0x94, 0xb6, 0x02, 0x2a, 0x45, 0xae, 0x33, 0x71, 0x4d, 0x6c, 0xcf, 0x60, 0x8f, 0x5b, 0x28, 0xea, + 0x86, 0x1d, 0x4b, 0xd4, 0x25, 0x7b, 0x24, 0xfa, 0x00, 0xb0, 0x86, 0x65, 0x97, 0x20, 0xde, 0x80, + 0x37, 0xe0, 0x05, 0x90, 0xc7, 0x63, 0x9c, 0x1f, 0xdb, 0x4d, 0xc4, 0x2e, 0xf6, 0x39, 0x73, 0xce, + 0x77, 0xbe, 0xf9, 0xce, 0x17, 0xc3, 0xeb, 0x3a, 0x21, 0xba, 0x89, 0x15, 0x8b, 0xd8, 0x06, 0x23, + 0x8e, 0x61, 0xeb, 0xca, 0x71, 0x5d, 0xf1, 0x28, 0x33, 0x2c, 0xdc, 0x72, 0xb1, 0x73, 0x6c, 0x68, + 0x58, 0xa6, 0x0e, 0x61, 0x04, 0xe5, 0x83, 0x54, 0x39, 0x4a, 0x95, 0x8f, 0xeb, 0xd2, 0x3f, 0xa2, + 0x80, 0x4a, 0x0d, 0x45, 0xb5, 0x6d, 0xc2, 0x54, 0x66, 0x10, 0xdb, 0x0d, 0xce, 0x48, 0xff, 0xa6, + 0x94, 0x17, 0x29, 0x25, 0x91, 0xc2, 0x9f, 0x0e, 0xbd, 0x8e, 0xd2, 0xf6, 0x1c, 0x5e, 0x43, 0xc4, + 0x67, 0x07, 0xe3, 0xd8, 0xa2, 0xec, 0x99, 0x08, 0x96, 0x07, 0x83, 0x1d, 0x03, 0x9b, 0xed, 0x96, + 0xa5, 0xba, 0x5d, 0x91, 0x51, 0xe8, 0xc1, 0xa7, 0x99, 0x06, 0xb6, 0x59, 0x10, 0xa8, 0xb8, 0x70, + 0xee, 0x9e, 0xe1, 0xb2, 0x5d, 0x8e, 0xa5, 0x71, 0x84, 0xb5, 0x6e, 0x83, 0xd8, 0x1d, 0x43, 0x77, + 0x9b, 0xf8, 0x89, 0x87, 0x5d, 0x86, 0xa6, 0xe1, 0x24, 0x55, 0x1d, 0x6c, 0xb3, 0x22, 0x28, 0x83, + 0xf9, 0x5c, 0x53, 0x3c, 0xa1, 0x59, 0x98, 0xa3, 0xaa, 0x8e, 0x5b, 0xae, 0x71, 0x8a, 0x8b, 0xd9, + 0x32, 0x98, 0xff, 0xa5, 0xf9, 0xab, 0xff, 0x62, 0xc7, 0x38, 0xc5, 0x68, 0x0e, 0x42, 0x1e, 0x64, + 0xa4, 0x8b, 0xed, 0xe2, 0x04, 0x3f, 0xc8, 0xd3, 0xef, 0xfb, 0x2f, 0x2a, 0x1f, 0x01, 0x2c, 0x25, + 0x75, 0x75, 0x29, 0xb1, 0x5d, 0x8c, 0x1e, 0xc0, 0xbc, 0xa0, 0x5f, 0xf3, 0xc3, 0x2d, 0x2d, 0x88, + 0x17, 0x41, 0x39, 0x3b, 0x3f, 0x55, 0xbb, 0x26, 0xc7, 0xdd, 0x82, 0x3c, 0x54, 0xaf, 0x89, 0xbc, + 0xa1, 0x16, 0xe8, 0x7f, 0xf8, 0x87, 0x8d, 0x9f, 0xb2, 0x56, 0x0f, 0xc2, 0x0c, 0x47, 0xf8, 0x9b, + 0xff, 0x7a, 0x3b, 0x44, 0xe9, 0x0f, 0xc1, 0x08, 0x53, 0xcd, 0xde, 0x11, 0x73, 0xfc, 0x8d, 0x3f, + 0x63, 0x65, 0x11, 0xce, 0x6e, 0xe0, 0xe1, 0x11, 0x42, 0xde, 0x10, 0x9c, 0xb0, 0x55, 0x0b, 0x0b, + 0xd6, 0xf8, 0xef, 0xca, 0x2b, 0x00, 0x4b, 0x0d, 0x07, 0xab, 0x0c, 0x27, 0x1e, 0x4b, 0xa2, 0x7b, + 0x1f, 0xfe, 0x1d, 0xc3, 0x07, 0x07, 0x3e, 0x06, 0x1d, 0x7f, 0x0d, 0xd1, 0x51, 0x79, 0x07, 0x60, + 0x69, 0x97, 0xb6, 0xd3, 0x30, 0xad, 0xc0, 0x29, 0x8f, 0x67, 0x70, 0x45, 0x89, 0x9e, 0x52, 0xd8, + 0x33, 0x14, 0x9d, 0x7c, 0xd7, 0x17, 0xdd, 0x96, 0xea, 0x76, 0x9b, 0x30, 0x48, 0xf7, 0x7f, 0x27, + 0x01, 0xcf, 0xfe, 0x34, 0xf0, 0x25, 0x58, 0xba, 0x8d, 0x4d, 0x9c, 0x82, 0x3b, 0xee, 0x0a, 0xf6, + 0xe1, 0xcc, 0x80, 0xf2, 0x36, 0xe9, 0x0f, 0xad, 0xf7, 0x69, 0x3a, 0x93, 0xaa, 0xe9, 0xec, 0xa0, + 0xa6, 0xcf, 0x01, 0x94, 0xe2, 0x2a, 0x0b, 0x3d, 0x6f, 0xc1, 0x3f, 0xfb, 0x68, 0x30, 0x68, 0xa8, + 0xe5, 0xff, 0xae, 0xe4, 0x60, 0x93, 0x36, 0x7f, 0xf7, 0xfa, 0xca, 0x8e, 0xaa, 0xe1, 0xda, 0xb7, + 0x1c, 0x44, 0x3d, 0x95, 0x76, 0x02, 0x2b, 0x43, 0xef, 0x01, 0x9c, 0x8e, 0x5f, 0x40, 0x54, 0x8f, + 0x87, 0x93, 0x6a, 0x12, 0xd2, 0xd2, 0x78, 0x87, 0x02, 0x4e, 0x2a, 0xb5, 0x17, 0x9f, 0xbf, 0x9e, + 0x67, 0x16, 0x50, 0xd5, 0x77, 0xc3, 0xe7, 0x81, 0xd0, 0x6f, 0x51, 0x87, 0x3c, 0xc6, 0x1a, 0x73, + 0x95, 0xea, 0x99, 0x12, 0xb3, 0xbc, 0x6f, 0x00, 0xcc, 0xc7, 0xad, 0x1d, 0x5a, 0x8c, 0x87, 0x90, + 0xb2, 0xa2, 0xd2, 0xa8, 0xea, 0x1b, 0x00, 0xea, 0xeb, 0xa8, 0x07, 0x66, 0x0c, 0x4a, 0xa5, 0x7a, + 0x86, 0x3e, 0x00, 0x58, 0x48, 0xd8, 0x75, 0x94, 0x40, 0x57, 0xba, 0x35, 0x8c, 0x0e, 0x77, 0x83, + 0xc3, 0x5d, 0xab, 0x8c, 0xc1, 0xeb, 0x72, 0xdc, 0x92, 0xa2, 0x2f, 0x00, 0x16, 0x12, 0xbc, 0x21, + 0x69, 0x86, 0x74, 0x2b, 0x19, 0x7d, 0x86, 0x47, 0x7c, 0x86, 0xdd, 0xda, 0x2a, 0x9f, 0x21, 0x06, + 0x9c, 0x3c, 0xd2, 0x35, 0xc4, 0xcf, 0xf5, 0x1a, 0xc0, 0x42, 0x82, 0x77, 0x24, 0xcd, 0x95, 0x6e, + 0x35, 0xd2, 0xf4, 0x90, 0x1b, 0xde, 0xf1, 0xff, 0x9f, 0x43, 0xe5, 0x54, 0xc7, 0x51, 0xce, 0x39, + 0x80, 0x68, 0xd8, 0x49, 0x90, 0x32, 0xd2, 0x8e, 0x45, 0x6e, 0x26, 0xdd, 0x1c, 0xfd, 0x80, 0x58, + 0x48, 0x89, 0xa3, 0xcd, 0x23, 0x14, 0x7d, 0x9e, 0x84, 0x39, 0xd2, 0x5b, 0x70, 0xb9, 0x36, 0xd3, + 0x53, 0x29, 0xa8, 0xad, 0x52, 0xc3, 0x95, 0x35, 0x62, 0x7d, 0x5a, 0x7b, 0x09, 0x8e, 0x18, 0xa3, + 0xee, 0xb2, 0xa2, 0x9c, 0x9c, 0x9c, 0x0c, 0x44, 0x15, 0xd5, 0x63, 0x47, 0x8a, 0x66, 0x12, 0xaf, + 0x7d, 0x83, 0x9a, 0x2a, 0xeb, 0x10, 0xc7, 0x5a, 0xb8, 0x2a, 0x3d, 0xea, 0x35, 0x46, 0xaa, 0xec, + 0x60, 0xb5, 0xbd, 0x7e, 0x01, 0x60, 0x51, 0x23, 0x56, 0xec, 0xfc, 0xeb, 0xc2, 0x0f, 0x85, 0x15, + 0x6e, 0xfb, 0xf7, 0xb5, 0x0d, 0x1e, 0xae, 0x8a, 0x5c, 0x9d, 0x98, 0xaa, 0xad, 0xcb, 0xc4, 0xd1, + 0x15, 0x1d, 0xdb, 0xfc, 0x36, 0x95, 0xa8, 0x65, 0xff, 0x17, 0xdc, 0x4a, 0xf4, 0x74, 0x91, 0x91, + 0x36, 0x82, 0x02, 0x0d, 0x7f, 0x4a, 0x79, 0x2b, 0x6a, 0xb9, 0x57, 0xbf, 0x0c, 0x83, 0x07, 0x3c, + 0x78, 0x10, 0x05, 0x0f, 0xf6, 0xea, 0x87, 0x93, 0xbc, 0x49, 0xfd, 0x7b, 0x00, 0x00, 0x00, 0xff, + 0xff, 0x44, 0xf4, 0x57, 0x5e, 0x84, 0x0a, 0x00, 0x00, +} + // Reference imports to suppress errors if they are not otherwise used. var _ context.Context var _ grpc.ClientConn @@ -481,23 +552,23 @@ const _ = grpc.SupportPackageIsVersion4 // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type UptimeCheckServiceClient interface { - // Lists the existing valid uptime check configurations for the project, - // leaving out any invalid configurations. + // Lists the existing valid Uptime check configurations for the project + // (leaving out any invalid configurations). ListUptimeCheckConfigs(ctx context.Context, in *ListUptimeCheckConfigsRequest, opts ...grpc.CallOption) (*ListUptimeCheckConfigsResponse, error) - // Gets a single uptime check configuration. + // Gets a single Uptime check configuration. GetUptimeCheckConfig(ctx context.Context, in *GetUptimeCheckConfigRequest, opts ...grpc.CallOption) (*UptimeCheckConfig, error) - // Creates a new uptime check configuration. + // Creates a new Uptime check configuration. CreateUptimeCheckConfig(ctx context.Context, in *CreateUptimeCheckConfigRequest, opts ...grpc.CallOption) (*UptimeCheckConfig, error) - // Updates an uptime check configuration. You can either replace the entire + // Updates an Uptime check configuration. You can either replace the entire // configuration with a new one or replace only certain fields in the current - // configuration by specifying the fields to be updated via `"updateMask"`. + // configuration by specifying the fields to be updated via `updateMask`. // Returns the updated configuration. UpdateUptimeCheckConfig(ctx context.Context, in *UpdateUptimeCheckConfigRequest, opts ...grpc.CallOption) (*UptimeCheckConfig, error) - // Deletes an uptime check configuration. Note that this method will fail - // if the uptime check configuration is referenced by an alert policy or + // Deletes an Uptime check configuration. Note that this method will fail + // if the Uptime check configuration is referenced by an alert policy or // other dependent configs that would be rendered invalid by the deletion. DeleteUptimeCheckConfig(ctx context.Context, in *DeleteUptimeCheckConfigRequest, opts ...grpc.CallOption) (*empty.Empty, error) - // Returns the list of IPs that checkers run from + // Returns the list of IP addresses that checkers run from ListUptimeCheckIps(ctx context.Context, in *ListUptimeCheckIpsRequest, opts ...grpc.CallOption) (*ListUptimeCheckIpsResponse, error) } @@ -565,26 +636,49 @@ func (c *uptimeCheckServiceClient) ListUptimeCheckIps(ctx context.Context, in *L // UptimeCheckServiceServer is the server API for UptimeCheckService service. type UptimeCheckServiceServer interface { - // Lists the existing valid uptime check configurations for the project, - // leaving out any invalid configurations. + // Lists the existing valid Uptime check configurations for the project + // (leaving out any invalid configurations). ListUptimeCheckConfigs(context.Context, *ListUptimeCheckConfigsRequest) (*ListUptimeCheckConfigsResponse, error) - // Gets a single uptime check configuration. + // Gets a single Uptime check configuration. GetUptimeCheckConfig(context.Context, *GetUptimeCheckConfigRequest) (*UptimeCheckConfig, error) - // Creates a new uptime check configuration. + // Creates a new Uptime check configuration. CreateUptimeCheckConfig(context.Context, *CreateUptimeCheckConfigRequest) (*UptimeCheckConfig, error) - // Updates an uptime check configuration. You can either replace the entire + // Updates an Uptime check configuration. You can either replace the entire // configuration with a new one or replace only certain fields in the current - // configuration by specifying the fields to be updated via `"updateMask"`. + // configuration by specifying the fields to be updated via `updateMask`. // Returns the updated configuration. UpdateUptimeCheckConfig(context.Context, *UpdateUptimeCheckConfigRequest) (*UptimeCheckConfig, error) - // Deletes an uptime check configuration. Note that this method will fail - // if the uptime check configuration is referenced by an alert policy or + // Deletes an Uptime check configuration. Note that this method will fail + // if the Uptime check configuration is referenced by an alert policy or // other dependent configs that would be rendered invalid by the deletion. DeleteUptimeCheckConfig(context.Context, *DeleteUptimeCheckConfigRequest) (*empty.Empty, error) - // Returns the list of IPs that checkers run from + // Returns the list of IP addresses that checkers run from ListUptimeCheckIps(context.Context, *ListUptimeCheckIpsRequest) (*ListUptimeCheckIpsResponse, error) } +// UnimplementedUptimeCheckServiceServer can be embedded to have forward compatible implementations. +type UnimplementedUptimeCheckServiceServer struct { +} + +func (*UnimplementedUptimeCheckServiceServer) ListUptimeCheckConfigs(ctx context.Context, req *ListUptimeCheckConfigsRequest) (*ListUptimeCheckConfigsResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method ListUptimeCheckConfigs not implemented") +} +func (*UnimplementedUptimeCheckServiceServer) GetUptimeCheckConfig(ctx context.Context, req *GetUptimeCheckConfigRequest) (*UptimeCheckConfig, error) { + return nil, status.Errorf(codes.Unimplemented, "method GetUptimeCheckConfig not implemented") +} +func (*UnimplementedUptimeCheckServiceServer) CreateUptimeCheckConfig(ctx context.Context, req *CreateUptimeCheckConfigRequest) (*UptimeCheckConfig, error) { + return nil, status.Errorf(codes.Unimplemented, "method CreateUptimeCheckConfig not implemented") +} +func (*UnimplementedUptimeCheckServiceServer) UpdateUptimeCheckConfig(ctx context.Context, req *UpdateUptimeCheckConfigRequest) (*UptimeCheckConfig, error) { + return nil, status.Errorf(codes.Unimplemented, "method UpdateUptimeCheckConfig not implemented") +} +func (*UnimplementedUptimeCheckServiceServer) DeleteUptimeCheckConfig(ctx context.Context, req *DeleteUptimeCheckConfigRequest) (*empty.Empty, error) { + return nil, status.Errorf(codes.Unimplemented, "method DeleteUptimeCheckConfig not implemented") +} +func (*UnimplementedUptimeCheckServiceServer) ListUptimeCheckIps(ctx context.Context, req *ListUptimeCheckIpsRequest) (*ListUptimeCheckIpsResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method ListUptimeCheckIps not implemented") +} + func RegisterUptimeCheckServiceServer(s *grpc.Server, srv UptimeCheckServiceServer) { s.RegisterService(&_UptimeCheckService_serviceDesc, srv) } @@ -729,58 +823,3 @@ var _UptimeCheckService_serviceDesc = grpc.ServiceDesc{ Streams: []grpc.StreamDesc{}, Metadata: "google/monitoring/v3/uptime_service.proto", } - -func init() { - proto.RegisterFile("google/monitoring/v3/uptime_service.proto", fileDescriptor_uptime_service_c74f83143a8cb5a4) -} - -var fileDescriptor_uptime_service_c74f83143a8cb5a4 = []byte{ - // 747 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0xcd, 0x6e, 0xd3, 0x4a, - 0x14, 0xd6, 0x24, 0xbd, 0x55, 0x7b, 0xaa, 0x7b, 0x2f, 0x0c, 0x51, 0x1b, 0x5c, 0x1a, 0x05, 0x23, - 0x41, 0x89, 0x90, 0x4d, 0x93, 0xae, 0xa8, 0xa8, 0x44, 0x03, 0x54, 0x95, 0xa8, 0x54, 0xa5, 0xb4, - 0x15, 0x50, 0x29, 0x72, 0xd3, 0xa9, 0x31, 0x49, 0x3c, 0xc6, 0x33, 0xae, 0xa0, 0xa8, 0x1b, 0xde, - 0x00, 0x75, 0xc9, 0x9e, 0x45, 0x1f, 0x00, 0xd6, 0xb0, 0x41, 0x62, 0x8b, 0x78, 0x03, 0x1e, 0x04, - 0x79, 0x3c, 0x26, 0x7f, 0x63, 0xe3, 0x88, 0x5d, 0x3c, 0xe7, 0xcc, 0x39, 0xdf, 0xf9, 0xfc, 0x9d, - 0x2f, 0x86, 0x9b, 0x36, 0xa5, 0x76, 0x87, 0x98, 0x5d, 0xea, 0x3a, 0x9c, 0xfa, 0x8e, 0x6b, 0x9b, - 0xc7, 0x35, 0x33, 0xf0, 0xb8, 0xd3, 0x25, 0x4d, 0x46, 0xfc, 0x63, 0xa7, 0x45, 0x0c, 0xcf, 0xa7, - 0x9c, 0xe2, 0x42, 0x94, 0x6a, 0xf4, 0x52, 0x8d, 0xe3, 0x9a, 0x76, 0x45, 0x16, 0xb0, 0x3c, 0xc7, - 0xb4, 0x5c, 0x97, 0x72, 0x8b, 0x3b, 0xd4, 0x65, 0xd1, 0x1d, 0xed, 0x6a, 0x4a, 0x79, 0x99, 0x32, - 0x2f, 0x53, 0xc4, 0xd3, 0x41, 0x70, 0x64, 0x92, 0xae, 0xc7, 0x5f, 0xcb, 0x60, 0x79, 0x38, 0x78, - 0xe4, 0x90, 0xce, 0x61, 0xb3, 0x6b, 0xb1, 0x76, 0x94, 0xa1, 0x33, 0x58, 0x78, 0xe4, 0x30, 0xbe, - 0x23, 0x4a, 0xd6, 0x9f, 0x93, 0x56, 0xbb, 0x4e, 0xdd, 0x23, 0xc7, 0x66, 0x0d, 0xf2, 0x32, 0x20, - 0x8c, 0xe3, 0x59, 0x98, 0xf4, 0x2c, 0x9f, 0xb8, 0xbc, 0x88, 0xca, 0x68, 0x71, 0xba, 0x21, 0x9f, - 0xf0, 0x3c, 0x4c, 0x7b, 0x96, 0x4d, 0x9a, 0xcc, 0x39, 0x21, 0xc5, 0x7c, 0x19, 0x2d, 0xfe, 0xd3, - 0x98, 0x0a, 0x0f, 0xb6, 0x9d, 0x13, 0x82, 0x17, 0x00, 0x44, 0x90, 0xd3, 0x36, 0x71, 0x8b, 0x13, - 0xe2, 0xa2, 0x48, 0x7f, 0x1c, 0x1e, 0xe8, 0x5f, 0x10, 0x94, 0x92, 0xba, 0x32, 0x8f, 0xba, 0x8c, - 0xe0, 0x27, 0x50, 0x90, 0x2c, 0xb6, 0xc2, 0x70, 0xb3, 0x15, 0xc5, 0x8b, 0xa8, 0x9c, 0x5f, 0x9c, - 0xa9, 0xde, 0x30, 0x54, 0x64, 0x1a, 0x23, 0xf5, 0x1a, 0x38, 0x18, 0x69, 0x81, 0xaf, 0xc3, 0xff, - 0x2e, 0x79, 0xc5, 0x9b, 0x7d, 0x08, 0x73, 0x02, 0xe1, 0xbf, 0xe1, 0xf1, 0x56, 0x8c, 0x32, 0x1c, - 0x82, 0x53, 0x6e, 0x75, 0xfa, 0x47, 0x9c, 0x16, 0x27, 0xe1, 0x8c, 0xfa, 0x12, 0xcc, 0xaf, 0x93, - 0xd1, 0x11, 0x62, 0xde, 0x30, 0x4c, 0xb8, 0x56, 0x97, 0x48, 0xd6, 0xc4, 0x6f, 0xfd, 0x1d, 0x82, - 0x52, 0xdd, 0x27, 0x16, 0x27, 0x89, 0xd7, 0x92, 0xe8, 0xde, 0x83, 0x4b, 0x0a, 0x3e, 0x04, 0xf0, - 0x31, 0xe8, 0xb8, 0x38, 0x42, 0x87, 0xfe, 0x11, 0x41, 0x69, 0xc7, 0x3b, 0x4c, 0xc3, 0xb4, 0x02, - 0x33, 0x81, 0xc8, 0x10, 0xc2, 0x91, 0x3d, 0xb5, 0xb8, 0x67, 0xac, 0x2d, 0xe3, 0x61, 0xa8, 0xad, - 0x4d, 0x8b, 0xb5, 0x1b, 0x10, 0xa5, 0x87, 0xbf, 0x93, 0x80, 0xe7, 0xff, 0x1a, 0xf8, 0x32, 0x94, - 0xee, 0x93, 0x0e, 0x49, 0xc1, 0xad, 0x7a, 0x05, 0x7b, 0x70, 0x79, 0x48, 0x79, 0x1b, 0xde, 0x6f, - 0xad, 0x0f, 0x68, 0x3a, 0x97, 0xaa, 0xe9, 0xfc, 0xb0, 0xa6, 0xcf, 0x10, 0x68, 0xaa, 0xca, 0x52, - 0xcf, 0x9b, 0x70, 0x61, 0x80, 0x06, 0xc7, 0x8b, 0xb5, 0x7c, 0xed, 0x8f, 0x1c, 0x6c, 0x78, 0x8d, - 0xff, 0x82, 0x81, 0xb2, 0x59, 0x35, 0x5c, 0xfd, 0x3a, 0x05, 0xb8, 0xaf, 0xd2, 0x76, 0xe4, 0x48, - 0xf8, 0x13, 0x82, 0x59, 0xf5, 0x02, 0xe2, 0x9a, 0x1a, 0x4e, 0xaa, 0x49, 0x68, 0xcb, 0xe3, 0x5d, - 0x8a, 0x38, 0xd1, 0xab, 0x6f, 0xbf, 0xff, 0x3c, 0xcb, 0xdd, 0xc2, 0x95, 0xd0, 0xd4, 0xde, 0x44, - 0x42, 0xbf, 0xeb, 0xf9, 0xf4, 0x05, 0x69, 0x71, 0x66, 0x56, 0x4e, 0x4d, 0xc5, 0xf2, 0x7e, 0x40, - 0x50, 0x50, 0xad, 0x1d, 0x5e, 0x52, 0x43, 0x48, 0x59, 0x51, 0x2d, 0xab, 0xfa, 0x86, 0x80, 0x86, - 0x3a, 0xea, 0x83, 0xa9, 0x40, 0x69, 0x56, 0x4e, 0xf1, 0x67, 0x04, 0x73, 0x09, 0xbb, 0x8e, 0x13, - 0xe8, 0x4a, 0xb7, 0x86, 0xec, 0x70, 0xd7, 0x05, 0xdc, 0x7b, 0xfa, 0x18, 0xbc, 0xde, 0x51, 0x2d, - 0x29, 0xfe, 0x81, 0x60, 0x2e, 0xc1, 0x1b, 0x92, 0x66, 0x48, 0xb7, 0x92, 0xec, 0x33, 0x3c, 0x13, - 0x33, 0xec, 0x54, 0x57, 0xc5, 0x0c, 0x0a, 0x70, 0x46, 0xa6, 0xd7, 0xa0, 0x9e, 0xeb, 0x3d, 0x82, - 0xb9, 0x04, 0xef, 0x48, 0x9a, 0x2b, 0xdd, 0x6a, 0xb4, 0xd9, 0x11, 0x37, 0x7c, 0x10, 0xfe, 0x0d, - 0xc7, 0xca, 0xa9, 0x8c, 0xa3, 0x9c, 0x33, 0x04, 0x78, 0xd4, 0x49, 0xb0, 0x99, 0x69, 0xc7, 0x7a, - 0x6e, 0xa6, 0xdd, 0xce, 0x7e, 0x41, 0x2e, 0xa4, 0x26, 0xd0, 0x16, 0x30, 0xee, 0x7d, 0x65, 0xc4, - 0x39, 0x6b, 0xe7, 0x08, 0x8a, 0x2d, 0xda, 0x55, 0xd6, 0x5c, 0x93, 0x1e, 0x23, 0xed, 0x65, 0x2b, - 0xe4, 0x60, 0x0b, 0x3d, 0x5d, 0x95, 0xb9, 0x36, 0xed, 0x58, 0xae, 0x6d, 0x50, 0xdf, 0x36, 0x6d, - 0xe2, 0x0a, 0x86, 0xcc, 0x28, 0x64, 0x79, 0x0e, 0x1b, 0xfc, 0xb8, 0x59, 0xe9, 0x3d, 0x9d, 0xe7, - 0xb4, 0xf5, 0xa8, 0x40, 0xbd, 0x43, 0x83, 0x43, 0x63, 0xb3, 0xd7, 0x72, 0xb7, 0xf6, 0x2d, 0x0e, - 0xee, 0x8b, 0xe0, 0x7e, 0x2f, 0xb8, 0xbf, 0x5b, 0x3b, 0x98, 0x14, 0x4d, 0x6a, 0xbf, 0x02, 0x00, - 0x00, 0xff, 0xff, 0x27, 0xb8, 0x65, 0x92, 0x9f, 0x09, 0x00, 0x00, -} diff --git a/vendor/google.golang.org/genproto/googleapis/rpc/status/status.pb.go b/vendor/google.golang.org/genproto/googleapis/rpc/status/status.pb.go index 7bfe37a3db..0b9907f89b 100644 --- a/vendor/google.golang.org/genproto/googleapis/rpc/status/status.pb.go +++ b/vendor/google.golang.org/genproto/googleapis/rpc/status/status.pb.go @@ -1,12 +1,15 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: google/rpc/status.proto -package status // import "google.golang.org/genproto/googleapis/rpc/status" +package status -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" -import any "github.com/golang/protobuf/ptypes/any" +import ( + fmt "fmt" + math "math" + + proto "github.com/golang/protobuf/proto" + any "github.com/golang/protobuf/ptypes/any" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -17,26 +20,27 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package -// The `Status` type defines a logical error model that is suitable for different -// programming environments, including REST APIs and RPC APIs. It is used by -// [gRPC](https://github.com/grpc). The error model is designed to be: +// The `Status` type defines a logical error model that is suitable for +// different programming environments, including REST APIs and RPC APIs. It is +// used by [gRPC](https://github.com/grpc). The error model is designed to be: // // - Simple to use and understand for most users // - Flexible enough to meet unexpected needs // // # Overview // -// The `Status` message contains three pieces of data: error code, error message, -// and error details. The error code should be an enum value of -// [google.rpc.Code][google.rpc.Code], but it may accept additional error codes if needed. The -// error message should be a developer-facing English message that helps -// developers *understand* and *resolve* the error. If a localized user-facing -// error message is needed, put the localized message in the error details or -// localize it in the client. The optional error details may contain arbitrary -// information about the error. There is a predefined set of error detail types -// in the package `google.rpc` that can be used for common error conditions. +// The `Status` message contains three pieces of data: error code, error +// message, and error details. The error code should be an enum value of +// [google.rpc.Code][google.rpc.Code], but it may accept additional error codes +// if needed. The error message should be a developer-facing English message +// that helps developers *understand* and *resolve* the error. If a localized +// user-facing error message is needed, put the localized message in the error +// details or localize it in the client. The optional error details may contain +// arbitrary information about the error. There is a predefined set of error +// detail types in the package `google.rpc` that can be used for common error +// conditions. // // # Language mapping // @@ -72,11 +76,13 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package // - Logging. If some API errors are stored in logs, the message `Status` could // be used directly after any stripping needed for security/privacy reasons. type Status struct { - // The status code, which should be an enum value of [google.rpc.Code][google.rpc.Code]. + // The status code, which should be an enum value of + // [google.rpc.Code][google.rpc.Code]. Code int32 `protobuf:"varint,1,opt,name=code,proto3" json:"code,omitempty"` // A developer-facing error message, which should be in English. Any // user-facing error message should be localized and sent in the - // [google.rpc.Status.details][google.rpc.Status.details] field, or localized by the client. + // [google.rpc.Status.details][google.rpc.Status.details] field, or localized + // by the client. Message string `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"` // A list of messages that carry the error details. There is a common set of // message types for APIs to use. @@ -90,16 +96,17 @@ func (m *Status) Reset() { *m = Status{} } func (m *Status) String() string { return proto.CompactTextString(m) } func (*Status) ProtoMessage() {} func (*Status) Descriptor() ([]byte, []int) { - return fileDescriptor_status_c6e4de62dcdf2edf, []int{0} + return fileDescriptor_24d244abaf643bfe, []int{0} } + func (m *Status) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Status.Unmarshal(m, b) } func (m *Status) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Status.Marshal(b, m, deterministic) } -func (dst *Status) XXX_Merge(src proto.Message) { - xxx_messageInfo_Status.Merge(dst, src) +func (m *Status) XXX_Merge(src proto.Message) { + xxx_messageInfo_Status.Merge(m, src) } func (m *Status) XXX_Size() int { return xxx_messageInfo_Status.Size(m) @@ -135,9 +142,9 @@ func init() { proto.RegisterType((*Status)(nil), "google.rpc.Status") } -func init() { proto.RegisterFile("google/rpc/status.proto", fileDescriptor_status_c6e4de62dcdf2edf) } +func init() { proto.RegisterFile("google/rpc/status.proto", fileDescriptor_24d244abaf643bfe) } -var fileDescriptor_status_c6e4de62dcdf2edf = []byte{ +var fileDescriptor_24d244abaf643bfe = []byte{ // 209 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x4f, 0xcf, 0xcf, 0x4f, 0xcf, 0x49, 0xd5, 0x2f, 0x2a, 0x48, 0xd6, 0x2f, 0x2e, 0x49, 0x2c, 0x29, 0x2d, 0xd6, 0x2b, 0x28, diff --git a/vendor/google.golang.org/genproto/protobuf/field_mask/field_mask.pb.go b/vendor/google.golang.org/genproto/protobuf/field_mask/field_mask.pb.go index 86886693fb..a0889f0c7a 100644 --- a/vendor/google.golang.org/genproto/protobuf/field_mask/field_mask.pb.go +++ b/vendor/google.golang.org/genproto/protobuf/field_mask/field_mask.pb.go @@ -1,11 +1,14 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: google/protobuf/field_mask.proto -package field_mask // import "google.golang.org/genproto/protobuf/field_mask" +package field_mask -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + math "math" + + proto "github.com/golang/protobuf/proto" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -16,7 +19,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // `FieldMask` represents a set of symbolic field paths, for example: // @@ -229,16 +232,17 @@ func (m *FieldMask) Reset() { *m = FieldMask{} } func (m *FieldMask) String() string { return proto.CompactTextString(m) } func (*FieldMask) ProtoMessage() {} func (*FieldMask) Descriptor() ([]byte, []int) { - return fileDescriptor_field_mask_02a8b0c0831edcce, []int{0} + return fileDescriptor_5158202634f0da48, []int{0} } + func (m *FieldMask) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FieldMask.Unmarshal(m, b) } func (m *FieldMask) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_FieldMask.Marshal(b, m, deterministic) } -func (dst *FieldMask) XXX_Merge(src proto.Message) { - xxx_messageInfo_FieldMask.Merge(dst, src) +func (m *FieldMask) XXX_Merge(src proto.Message) { + xxx_messageInfo_FieldMask.Merge(m, src) } func (m *FieldMask) XXX_Size() int { return xxx_messageInfo_FieldMask.Size(m) @@ -260,11 +264,9 @@ func init() { proto.RegisterType((*FieldMask)(nil), "google.protobuf.FieldMask") } -func init() { - proto.RegisterFile("google/protobuf/field_mask.proto", fileDescriptor_field_mask_02a8b0c0831edcce) -} +func init() { proto.RegisterFile("google/protobuf/field_mask.proto", fileDescriptor_5158202634f0da48) } -var fileDescriptor_field_mask_02a8b0c0831edcce = []byte{ +var fileDescriptor_5158202634f0da48 = []byte{ // 175 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x48, 0xcf, 0xcf, 0x4f, 0xcf, 0x49, 0xd5, 0x2f, 0x28, 0xca, 0x2f, 0xc9, 0x4f, 0x2a, 0x4d, 0xd3, 0x4f, 0xcb, 0x4c, 0xcd, diff --git a/vendor/google.golang.org/grpc/CONTRIBUTING.md b/vendor/google.golang.org/grpc/CONTRIBUTING.md index 0863eb26b6..ca34e8aa0d 100644 --- a/vendor/google.golang.org/grpc/CONTRIBUTING.md +++ b/vendor/google.golang.org/grpc/CONTRIBUTING.md @@ -31,6 +31,7 @@ How to get your contributions merged smoothly and quickly. - `make vet` to catch vet errors - `make test` to run the tests - `make testrace` to run tests in race mode + - optional `make testappengine` to run tests with appengine - Exceptions to the rules can be made if there's a compelling reason for doing so. diff --git a/vendor/google.golang.org/grpc/Makefile b/vendor/google.golang.org/grpc/Makefile index 41a754f977..db982aabde 100644 --- a/vendor/google.golang.org/grpc/Makefile +++ b/vendor/google.golang.org/grpc/Makefile @@ -1,4 +1,4 @@ -all: vet test testrace testappengine +all: vet test testrace build: deps go build google.golang.org/grpc/... diff --git a/vendor/google.golang.org/grpc/README.md b/vendor/google.golang.org/grpc/README.md index e3fb3c75ae..f5eec6717f 100644 --- a/vendor/google.golang.org/grpc/README.md +++ b/vendor/google.golang.org/grpc/README.md @@ -20,7 +20,7 @@ gRPC-Go requires Go 1.9 or later. Constraints ----------- -The grpc package should only depend on standard Go packages and a small number of exceptions. If your contribution introduces new dependencies which are NOT in the [list](http://godoc.org/google.golang.org/grpc?imports), you need a discussion with gRPC-Go authors and consultants. +The grpc package should only depend on standard Go packages and a small number of exceptions. If your contribution introduces new dependencies which are NOT in the [list](https://godoc.org/google.golang.org/grpc?imports), you need a discussion with gRPC-Go authors and consultants. Documentation ------------- diff --git a/vendor/google.golang.org/grpc/backoff.go b/vendor/google.golang.org/grpc/backoff.go index fa31565fd2..97c6e2568f 100644 --- a/vendor/google.golang.org/grpc/backoff.go +++ b/vendor/google.golang.org/grpc/backoff.go @@ -17,7 +17,7 @@ */ // See internal/backoff package for the backoff implementation. This file is -// kept for the exported types and API backward compatility. +// kept for the exported types and API backward compatibility. package grpc diff --git a/vendor/google.golang.org/grpc/balancer/balancer.go b/vendor/google.golang.org/grpc/balancer/balancer.go index 1bf46aafe6..fafede238c 100644 --- a/vendor/google.golang.org/grpc/balancer/balancer.go +++ b/vendor/google.golang.org/grpc/balancer/balancer.go @@ -28,6 +28,7 @@ import ( "google.golang.org/grpc/connectivity" "google.golang.org/grpc/credentials" + "google.golang.org/grpc/internal" "google.golang.org/grpc/metadata" "google.golang.org/grpc/resolver" ) @@ -47,8 +48,20 @@ func Register(b Builder) { m[strings.ToLower(b.Name())] = b } +// unregisterForTesting deletes the balancer with the given name from the +// balancer map. +// +// This function is not thread-safe. +func unregisterForTesting(name string) { + delete(m, name) +} + +func init() { + internal.BalancerUnregister = unregisterForTesting +} + // Get returns the resolver builder registered with the given name. -// Note that the compare is done in a case-insenstive fashion. +// Note that the compare is done in a case-insensitive fashion. // If no builder is register with the name, nil will be returned. func Get(name string) Builder { if b, ok := m[strings.ToLower(name)]; ok { @@ -114,7 +127,7 @@ type ClientConn interface { // The SubConn will be shutdown. RemoveSubConn(SubConn) - // UpdateBalancerState is called by balancer to nofity gRPC that some internal + // UpdateBalancerState is called by balancer to notify gRPC that some internal // state in balancer has changed. // // gRPC will update the connectivity state of the ClientConn, and will call pick @@ -158,9 +171,6 @@ type PickOptions struct { // FullMethodName is the method name that NewClientStream() is called // with. The canonical format is /service/Method. FullMethodName string - // Header contains the metadata from the RPC's client header. The metadata - // should not be modified; make a copy first if needed. - Header metadata.MD } // DoneInfo contains additional information for done. @@ -173,6 +183,11 @@ type DoneInfo struct { BytesSent bool // BytesReceived indicates if any byte has been received from the server. BytesReceived bool + // ServerLoad is the load received from server. It's usually sent as part of + // trailing metadata. + // + // The only supported type now is *orca_v1.LoadReport. + ServerLoad interface{} } var ( @@ -202,8 +217,10 @@ type Picker interface { // // If a SubConn is returned: // - If it is READY, gRPC will send the RPC on it; - // - If it is not ready, or becomes not ready after it's returned, gRPC will block - // until UpdateBalancerState() is called and will call pick on the new picker. + // - If it is not ready, or becomes not ready after it's returned, gRPC will + // block until UpdateBalancerState() is called and will call pick on the + // new picker. The done function returned from Pick(), if not nil, will be + // called with nil error, no bytes sent and no bytes received. // // If the returned error is not nil: // - If the error is ErrNoSubConnAvailable, gRPC will block until UpdateBalancerState() @@ -214,9 +231,10 @@ type Picker interface { // - Else (error is other non-nil error): // - The RPC will fail with unavailable error. // - // The returned done() function will be called once the rpc has finished, with the - // final status of that RPC. - // done may be nil if balancer doesn't care about the RPC status. + // The returned done() function will be called once the rpc has finished, + // with the final status of that RPC. If the SubConn returned is not a + // valid SubConn type, done may not be called. done may be nil if balancer + // doesn't care about the RPC status. Pick(ctx context.Context, opts PickOptions) (conn SubConn, done func(DoneInfo), err error) } @@ -235,18 +253,46 @@ type Balancer interface { // that back to gRPC. // Balancer should also generate and update Pickers when its internal state has // been changed by the new state. + // + // Deprecated: if V2Balancer is implemented by the Balancer, + // UpdateSubConnState will be called instead. HandleSubConnStateChange(sc SubConn, state connectivity.State) // HandleResolvedAddrs is called by gRPC to send updated resolved addresses to // balancers. // Balancer can create new SubConn or remove SubConn with the addresses. // An empty address slice and a non-nil error will be passed if the resolver returns // non-nil error to gRPC. + // + // Deprecated: if V2Balancer is implemented by the Balancer, + // UpdateResolverState will be called instead. HandleResolvedAddrs([]resolver.Address, error) // Close closes the balancer. The balancer is not required to call // ClientConn.RemoveSubConn for its existing SubConns. Close() } +// SubConnState describes the state of a SubConn. +type SubConnState struct { + ConnectivityState connectivity.State + // TODO: add last connection error +} + +// V2Balancer is defined for documentation purposes. If a Balancer also +// implements V2Balancer, its UpdateResolverState method will be called instead +// of HandleResolvedAddrs and its UpdateSubConnState will be called instead of +// HandleSubConnStateChange. +type V2Balancer interface { + // UpdateResolverState is called by gRPC when the state of the resolver + // changes. + UpdateResolverState(resolver.State) + // UpdateSubConnState is called by gRPC when the state of a SubConn + // changes. + UpdateSubConnState(SubConn, SubConnState) + // Close closes the balancer. The balancer is not required to call + // ClientConn.RemoveSubConn for its existing SubConns. + Close() +} + // ConnectivityStateEvaluator takes the connectivity states of multiple SubConns // and returns one aggregated connectivity state. // diff --git a/vendor/google.golang.org/grpc/balancer/base/balancer.go b/vendor/google.golang.org/grpc/balancer/base/balancer.go index 5f55b274f4..c5a51bd1d9 100644 --- a/vendor/google.golang.org/grpc/balancer/base/balancer.go +++ b/vendor/google.golang.org/grpc/balancer/base/balancer.go @@ -40,7 +40,7 @@ func (bb *baseBuilder) Build(cc balancer.ClientConn, opt balancer.BuildOptions) subConns: make(map[resolver.Address]balancer.SubConn), scStates: make(map[balancer.SubConn]connectivity.State), - csEvltr: &connectivityStateEvaluator{}, + csEvltr: &balancer.ConnectivityStateEvaluator{}, // Initialize picker to a picker that always return // ErrNoSubConnAvailable, because when state of a SubConn changes, we // may call UpdateBalancerState with this picker. @@ -57,7 +57,7 @@ type baseBalancer struct { cc balancer.ClientConn pickerBuilder PickerBuilder - csEvltr *connectivityStateEvaluator + csEvltr *balancer.ConnectivityStateEvaluator state connectivity.State subConns map[resolver.Address]balancer.SubConn @@ -67,14 +67,16 @@ type baseBalancer struct { } func (b *baseBalancer) HandleResolvedAddrs(addrs []resolver.Address, err error) { - if err != nil { - grpclog.Infof("base.baseBalancer: HandleResolvedAddrs called with error %v", err) - return - } - grpclog.Infoln("base.baseBalancer: got new resolved addresses: ", addrs) + panic("not implemented") +} + +func (b *baseBalancer) UpdateResolverState(s resolver.State) { + // TODO: handle s.Err (log if not nil) once implemented. + // TODO: handle s.ServiceConfig? + grpclog.Infoln("base.baseBalancer: got new resolver state: ", s) // addrsSet is the set converted from addrs, it's used for quick lookup of an address. addrsSet := make(map[resolver.Address]struct{}) - for _, a := range addrs { + for _, a := range s.Addresses { addrsSet[a] = struct{}{} if _, ok := b.subConns[a]; !ok { // a is a new address (not existing in b.subConns). @@ -120,6 +122,11 @@ func (b *baseBalancer) regeneratePicker() { } func (b *baseBalancer) HandleSubConnStateChange(sc balancer.SubConn, s connectivity.State) { + panic("not implemented") +} + +func (b *baseBalancer) UpdateSubConnState(sc balancer.SubConn, state balancer.SubConnState) { + s := state.ConnectivityState grpclog.Infof("base.baseBalancer: handle SubConn state change: %p, %v", sc, s) oldS, ok := b.scStates[sc] if !ok { @@ -137,7 +144,7 @@ func (b *baseBalancer) HandleSubConnStateChange(sc balancer.SubConn, s connectiv } oldAggrState := b.state - b.state = b.csEvltr.recordTransition(oldS, s) + b.state = b.csEvltr.RecordTransition(oldS, s) // Regenerate picker when one of the following happens: // - this sc became ready from not-ready @@ -169,44 +176,3 @@ type errPicker struct { func (p *errPicker) Pick(ctx context.Context, opts balancer.PickOptions) (balancer.SubConn, func(balancer.DoneInfo), error) { return nil, nil, p.err } - -// connectivityStateEvaluator gets updated by addrConns when their -// states transition, based on which it evaluates the state of -// ClientConn. -type connectivityStateEvaluator struct { - numReady uint64 // Number of addrConns in ready state. - numConnecting uint64 // Number of addrConns in connecting state. - numTransientFailure uint64 // Number of addrConns in transientFailure. -} - -// recordTransition records state change happening in every subConn and based on -// that it evaluates what aggregated state should be. -// It can only transition between Ready, Connecting and TransientFailure. Other states, -// Idle and Shutdown are transitioned into by ClientConn; in the beginning of the connection -// before any subConn is created ClientConn is in idle state. In the end when ClientConn -// closes it is in Shutdown state. -// -// recordTransition should only be called synchronously from the same goroutine. -func (cse *connectivityStateEvaluator) recordTransition(oldState, newState connectivity.State) connectivity.State { - // Update counters. - for idx, state := range []connectivity.State{oldState, newState} { - updateVal := 2*uint64(idx) - 1 // -1 for oldState and +1 for new. - switch state { - case connectivity.Ready: - cse.numReady += updateVal - case connectivity.Connecting: - cse.numConnecting += updateVal - case connectivity.TransientFailure: - cse.numTransientFailure += updateVal - } - } - - // Evaluate. - if cse.numReady > 0 { - return connectivity.Ready - } - if cse.numConnecting > 0 { - return connectivity.Connecting - } - return connectivity.TransientFailure -} diff --git a/vendor/google.golang.org/grpc/balancer/roundrobin/roundrobin.go b/vendor/google.golang.org/grpc/balancer/roundrobin/roundrobin.go index 57aea9fb4d..29f7a4ddd6 100644 --- a/vendor/google.golang.org/grpc/balancer/roundrobin/roundrobin.go +++ b/vendor/google.golang.org/grpc/balancer/roundrobin/roundrobin.go @@ -28,6 +28,7 @@ import ( "google.golang.org/grpc/balancer" "google.golang.org/grpc/balancer/base" "google.golang.org/grpc/grpclog" + "google.golang.org/grpc/internal/grpcrand" "google.golang.org/grpc/resolver" ) @@ -47,12 +48,19 @@ type rrPickerBuilder struct{} func (*rrPickerBuilder) Build(readySCs map[resolver.Address]balancer.SubConn) balancer.Picker { grpclog.Infof("roundrobinPicker: newPicker called with readySCs: %v", readySCs) + if len(readySCs) == 0 { + return base.NewErrPicker(balancer.ErrNoSubConnAvailable) + } var scs []balancer.SubConn for _, sc := range readySCs { scs = append(scs, sc) } return &rrPicker{ subConns: scs, + // Start at a random index, as the same RR balancer rebuilds a new + // picker when SubConn states change, and we don't want to apply excess + // load to the first server in the list. + next: grpcrand.Intn(len(scs)), } } @@ -67,10 +75,6 @@ type rrPicker struct { } func (p *rrPicker) Pick(ctx context.Context, opts balancer.PickOptions) (balancer.SubConn, func(balancer.DoneInfo), error) { - if len(p.subConns) <= 0 { - return nil, nil, balancer.ErrNoSubConnAvailable - } - p.mu.Lock() sc := p.subConns[p.next] p.next = (p.next + 1) % len(p.subConns) diff --git a/vendor/google.golang.org/grpc/balancer_conn_wrappers.go b/vendor/google.golang.org/grpc/balancer_conn_wrappers.go index 77b6847756..bc965f0aca 100644 --- a/vendor/google.golang.org/grpc/balancer_conn_wrappers.go +++ b/vendor/google.golang.org/grpc/balancer_conn_wrappers.go @@ -82,20 +82,13 @@ func (b *scStateUpdateBuffer) get() <-chan *scStateUpdate { return b.c } -// resolverUpdate contains the new resolved addresses or error if there's -// any. -type resolverUpdate struct { - addrs []resolver.Address - err error -} - // ccBalancerWrapper is a wrapper on top of cc for balancers. // It implements balancer.ClientConn interface. type ccBalancerWrapper struct { cc *ClientConn balancer balancer.Balancer stateChangeQueue *scStateUpdateBuffer - resolverUpdateCh chan *resolverUpdate + resolverUpdateCh chan *resolver.State done chan struct{} mu sync.Mutex @@ -106,7 +99,7 @@ func newCCBalancerWrapper(cc *ClientConn, b balancer.Builder, bopts balancer.Bui ccb := &ccBalancerWrapper{ cc: cc, stateChangeQueue: newSCStateUpdateBuffer(), - resolverUpdateCh: make(chan *resolverUpdate, 1), + resolverUpdateCh: make(chan *resolver.State, 1), done: make(chan struct{}), subConns: make(map[*acBalancerWrapper]struct{}), } @@ -128,15 +121,23 @@ func (ccb *ccBalancerWrapper) watcher() { return default: } - ccb.balancer.HandleSubConnStateChange(t.sc, t.state) - case t := <-ccb.resolverUpdateCh: + if ub, ok := ccb.balancer.(balancer.V2Balancer); ok { + ub.UpdateSubConnState(t.sc, balancer.SubConnState{ConnectivityState: t.state}) + } else { + ccb.balancer.HandleSubConnStateChange(t.sc, t.state) + } + case s := <-ccb.resolverUpdateCh: select { case <-ccb.done: ccb.balancer.Close() return default: } - ccb.balancer.HandleResolvedAddrs(t.addrs, t.err) + if ub, ok := ccb.balancer.(balancer.V2Balancer); ok { + ub.UpdateResolverState(*s) + } else { + ccb.balancer.HandleResolvedAddrs(s.Addresses, nil) + } case <-ccb.done: } @@ -177,15 +178,23 @@ func (ccb *ccBalancerWrapper) handleSubConnStateChange(sc balancer.SubConn, s co }) } -func (ccb *ccBalancerWrapper) handleResolvedAddrs(addrs []resolver.Address, err error) { +func (ccb *ccBalancerWrapper) updateResolverState(s resolver.State) { + if ccb.cc.curBalancerName != grpclbName { + // Filter any grpclb addresses since we don't have the grpclb balancer. + for i := 0; i < len(s.Addresses); { + if s.Addresses[i].Type == resolver.GRPCLB { + copy(s.Addresses[i:], s.Addresses[i+1:]) + s.Addresses = s.Addresses[:len(s.Addresses)-1] + continue + } + i++ + } + } select { case <-ccb.resolverUpdateCh: default: } - ccb.resolverUpdateCh <- &resolverUpdate{ - addrs: addrs, - err: err, - } + ccb.resolverUpdateCh <- &s } func (ccb *ccBalancerWrapper) NewSubConn(addrs []resolver.Address, opts balancer.NewSubConnOptions) (balancer.SubConn, error) { diff --git a/vendor/google.golang.org/grpc/balancer_v1_wrapper.go b/vendor/google.golang.org/grpc/balancer_v1_wrapper.go index ca07c154b2..29bda6353d 100644 --- a/vendor/google.golang.org/grpc/balancer_v1_wrapper.go +++ b/vendor/google.golang.org/grpc/balancer_v1_wrapper.go @@ -24,11 +24,9 @@ import ( "sync" "google.golang.org/grpc/balancer" - "google.golang.org/grpc/codes" "google.golang.org/grpc/connectivity" "google.golang.org/grpc/grpclog" "google.golang.org/grpc/resolver" - "google.golang.org/grpc/status" ) type balancerWrapperBuilder struct { @@ -283,9 +281,8 @@ func (bw *balancerWrapper) Close() { } // The picker is the balancerWrapper itself. -// Pick should never return ErrNoSubConnAvailable. // It either blocks or returns error, consistent with v1 balancer Get(). -func (bw *balancerWrapper) Pick(ctx context.Context, opts balancer.PickOptions) (balancer.SubConn, func(balancer.DoneInfo), error) { +func (bw *balancerWrapper) Pick(ctx context.Context, opts balancer.PickOptions) (sc balancer.SubConn, done func(balancer.DoneInfo), err error) { failfast := true // Default failfast is true. if ss, ok := rpcInfoFromContext(ctx); ok { failfast = ss.failfast @@ -294,35 +291,51 @@ func (bw *balancerWrapper) Pick(ctx context.Context, opts balancer.PickOptions) if err != nil { return nil, nil, err } - var done func(balancer.DoneInfo) if p != nil { - done = func(i balancer.DoneInfo) { p() } + done = func(balancer.DoneInfo) { p() } + defer func() { + if err != nil { + p() + } + }() } - var sc balancer.SubConn + bw.mu.Lock() defer bw.mu.Unlock() if bw.pickfirst { // Get the first sc in conns. - for _, sc = range bw.conns { - break - } - } else { - var ok bool - sc, ok = bw.conns[resolver.Address{ - Addr: a.Addr, - Type: resolver.Backend, - ServerName: "", - Metadata: a.Metadata, - }] - if !ok && failfast { - return nil, nil, status.Errorf(codes.Unavailable, "there is no connection available") - } - if s, ok := bw.connSt[sc]; failfast && (!ok || s.s != connectivity.Ready) { - // If the returned sc is not ready and RPC is failfast, - // return error, and this RPC will fail. - return nil, nil, status.Errorf(codes.Unavailable, "there is no connection available") + for _, sc := range bw.conns { + return sc, done, nil } + return nil, nil, balancer.ErrNoSubConnAvailable + } + sc, ok1 := bw.conns[resolver.Address{ + Addr: a.Addr, + Type: resolver.Backend, + ServerName: "", + Metadata: a.Metadata, + }] + s, ok2 := bw.connSt[sc] + if !ok1 || !ok2 { + // This can only happen due to a race where Get() returned an address + // that was subsequently removed by Notify. In this case we should + // retry always. + return nil, nil, balancer.ErrNoSubConnAvailable + } + switch s.s { + case connectivity.Ready, connectivity.Idle: + return sc, done, nil + case connectivity.Shutdown, connectivity.TransientFailure: + // If the returned sc has been shut down or is in transient failure, + // return error, and this RPC will fail or wait for another picker (if + // non-failfast). + return nil, nil, balancer.ErrTransientFailure + default: + // For other states (connecting or unknown), the v1 balancer would + // traditionally wait until ready and then issue the RPC. Returning + // ErrNoSubConnAvailable will be a slight improvement in that it will + // allow the balancer to choose another address in case others are + // connected. + return nil, nil, balancer.ErrNoSubConnAvailable } - - return sc, done, nil } diff --git a/vendor/google.golang.org/grpc/call.go b/vendor/google.golang.org/grpc/call.go index 100f05dc74..9e20e4d385 100644 --- a/vendor/google.golang.org/grpc/call.go +++ b/vendor/google.golang.org/grpc/call.go @@ -40,7 +40,7 @@ func (cc *ClientConn) Invoke(ctx context.Context, method string, args, reply int func combine(o1 []CallOption, o2 []CallOption) []CallOption { // we don't use append because o1 could have extra capacity whose // elements would be overwritten, which could cause inadvertent - // sharing (and race connditions) between concurrent calls + // sharing (and race conditions) between concurrent calls if len(o1) == 0 { return o2 } else if len(o2) == 0 { diff --git a/vendor/google.golang.org/grpc/clientconn.go b/vendor/google.golang.org/grpc/clientconn.go index 84b6dbe3ea..bd2d2b3177 100644 --- a/vendor/google.golang.org/grpc/clientconn.go +++ b/vendor/google.golang.org/grpc/clientconn.go @@ -36,14 +36,12 @@ import ( "google.golang.org/grpc/connectivity" "google.golang.org/grpc/credentials" "google.golang.org/grpc/grpclog" - "google.golang.org/grpc/internal" "google.golang.org/grpc/internal/backoff" "google.golang.org/grpc/internal/channelz" "google.golang.org/grpc/internal/envconfig" "google.golang.org/grpc/internal/grpcsync" "google.golang.org/grpc/internal/transport" "google.golang.org/grpc/keepalive" - "google.golang.org/grpc/metadata" "google.golang.org/grpc/resolver" _ "google.golang.org/grpc/resolver/dns" // To register dns resolver. _ "google.golang.org/grpc/resolver/passthrough" // To register passthrough resolver. @@ -70,11 +68,9 @@ var ( errConnClosing = errors.New("grpc: the connection is closing") // errBalancerClosed indicates that the balancer is closed. errBalancerClosed = errors.New("grpc: balancer is closed") - // We use an accessor so that minConnectTimeout can be - // atomically read and updated while testing. - getMinConnectTimeout = func() time.Duration { - return minConnectTimeout - } + // invalidDefaultServiceConfigErrPrefix is used to prefix the json parsing error for the default + // service config. + invalidDefaultServiceConfigErrPrefix = "grpc: the provided default service config is invalid" ) // The following errors are returned from Dial and DialContext @@ -87,7 +83,7 @@ var ( // with other individual Transport Credentials. errTransportCredsAndBundle = errors.New("grpc: credentials.Bundle may not be used with individual TransportCredentials") // errTransportCredentialsMissing indicates that users want to transmit security - // information (e.g., oauth2 token) which requires secure connection on an insecure + // information (e.g., OAuth2 token) which requires secure connection on an insecure // connection. errTransportCredentialsMissing = errors.New("grpc: the credentials require transport level security (use grpc.WithTransportCredentials() to set)") // errCredentialsConflict indicates that grpc.WithTransportCredentials() @@ -141,6 +137,12 @@ func DialContext(ctx context.Context, target string, opts ...DialOption) (conn * opt.apply(&cc.dopts) } + defer func() { + if err != nil { + cc.Close() + } + }() + if channelz.IsOn() { if cc.dopts.channelzParentID != 0 { cc.channelzID = channelz.RegisterChannel(&channelzChannel{cc}, cc.dopts.channelzParentID, target) @@ -180,6 +182,13 @@ func DialContext(ctx context.Context, target string, opts ...DialOption) (conn * } } + if cc.dopts.defaultServiceConfigRawJSON != nil { + sc, err := parseServiceConfig(*cc.dopts.defaultServiceConfigRawJSON) + if err != nil { + return nil, fmt.Errorf("%s: %v", invalidDefaultServiceConfigErrPrefix, err) + } + cc.dopts.defaultServiceConfig = sc + } cc.mkp = cc.dopts.copts.KeepaliveParams if cc.dopts.copts.Dialer == nil { @@ -202,17 +211,12 @@ func DialContext(ctx context.Context, target string, opts ...DialOption) (conn * ctx, cancel = context.WithTimeout(ctx, cc.dopts.timeout) defer cancel() } - defer func() { select { case <-ctx.Done(): conn, err = nil, ctx.Err() default: } - - if err != nil { - cc.Close() - } }() scSet := false @@ -221,7 +225,7 @@ func DialContext(ctx context.Context, target string, opts ...DialOption) (conn * select { case sc, ok := <-cc.dopts.scChan: if ok { - cc.sc = sc + cc.sc = &sc scSet = true } default: @@ -238,9 +242,9 @@ func DialContext(ctx context.Context, target string, opts ...DialOption) (conn * grpclog.Infof("parsed scheme: %q", cc.parsedTarget.Scheme) cc.dopts.resolverBuilder = resolver.Get(cc.parsedTarget.Scheme) if cc.dopts.resolverBuilder == nil { - // If resolver builder is still nil, the parse target's scheme is + // If resolver builder is still nil, the parsed target's scheme is // not registered. Fallback to default resolver and set Endpoint to - // the original unparsed target. + // the original target. grpclog.Infof("scheme %q not registered, fallback to default scheme", cc.parsedTarget.Scheme) cc.parsedTarget = resolver.Target{ Scheme: resolver.GetDefaultScheme(), @@ -267,7 +271,7 @@ func DialContext(ctx context.Context, target string, opts ...DialOption) (conn * select { case sc, ok := <-cc.dopts.scChan: if ok { - cc.sc = sc + cc.sc = &sc } case <-ctx.Done(): return nil, ctx.Err() @@ -389,14 +393,11 @@ type ClientConn struct { mu sync.RWMutex resolverWrapper *ccResolverWrapper - sc ServiceConfig - scRaw string + sc *ServiceConfig conns map[*addrConn]struct{} // Keepalive parameter can be updated if a GoAway is received. mkp keepalive.ClientParameters curBalancerName string - preBalancerName string // previous balancer name. - curAddresses []resolver.Address balancerWrapper *ccBalancerWrapper retryThrottler atomic.Value @@ -437,9 +438,8 @@ func (cc *ClientConn) scWatcher() { } cc.mu.Lock() // TODO: load balance policy runtime change is ignored. - // We may revist this decision in the future. - cc.sc = sc - cc.scRaw = "" + // We may revisit this decision in the future. + cc.sc = &sc cc.mu.Unlock() case <-cc.ctx.Done(): return @@ -466,50 +466,72 @@ func (cc *ClientConn) waitForResolvedAddrs(ctx context.Context) error { } } -func (cc *ClientConn) handleResolvedAddrs(addrs []resolver.Address, err error) { +// gRPC should resort to default service config when: +// * resolver service config is disabled +// * or, resolver does not return a service config or returns an invalid one. +func (cc *ClientConn) fallbackToDefaultServiceConfig(sc string) bool { + if cc.dopts.disableServiceConfig { + return true + } + // The logic below is temporary, will be removed once we change the resolver.State ServiceConfig field type. + // Right now, we assume that empty service config string means resolver does not return a config. + if sc == "" { + return true + } + // TODO: the logic below is temporary. Once we finish the logic to validate service config + // in resolver, we will replace the logic below. + _, err := parseServiceConfig(sc) + return err != nil +} + +func (cc *ClientConn) updateResolverState(s resolver.State) error { cc.mu.Lock() defer cc.mu.Unlock() + // Check if the ClientConn is already closed. Some fields (e.g. + // balancerWrapper) are set to nil when closing the ClientConn, and could + // cause nil pointer panic if we don't have this check. if cc.conns == nil { - // cc was closed. - return + return nil } - if reflect.DeepEqual(cc.curAddresses, addrs) { - return + if cc.fallbackToDefaultServiceConfig(s.ServiceConfig) { + if cc.dopts.defaultServiceConfig != nil && cc.sc == nil { + cc.applyServiceConfig(cc.dopts.defaultServiceConfig) + } + } else { + // TODO: the parsing logic below will be moved inside resolver. + sc, err := parseServiceConfig(s.ServiceConfig) + if err != nil { + return err + } + if cc.sc == nil || cc.sc.rawJSONString != s.ServiceConfig { + cc.applyServiceConfig(sc) + } } - cc.curAddresses = addrs - cc.firstResolveEvent.Fire() + // update the service config that will be sent to balancer. + if cc.sc != nil { + s.ServiceConfig = cc.sc.rawJSONString + } if cc.dopts.balancerBuilder == nil { // Only look at balancer types and switch balancer if balancer dial // option is not set. var isGRPCLB bool - for _, a := range addrs { + for _, a := range s.Addresses { if a.Type == resolver.GRPCLB { isGRPCLB = true break } } var newBalancerName string + // TODO: use new loadBalancerConfig field with appropriate priority. if isGRPCLB { newBalancerName = grpclbName + } else if cc.sc != nil && cc.sc.LB != nil { + newBalancerName = *cc.sc.LB } else { - // Address list doesn't contain grpclb address. Try to pick a - // non-grpclb balancer. - newBalancerName = cc.curBalancerName - // If current balancer is grpclb, switch to the previous one. - if newBalancerName == grpclbName { - newBalancerName = cc.preBalancerName - } - // The following could be true in two cases: - // - the first time handling resolved addresses - // (curBalancerName="") - // - the first time handling non-grpclb addresses - // (curBalancerName="grpclb", preBalancerName="") - if newBalancerName == "" { - newBalancerName = PickFirstBalancerName - } + newBalancerName = PickFirstBalancerName } cc.switchBalancer(newBalancerName) } else if cc.balancerWrapper == nil { @@ -518,7 +540,9 @@ func (cc *ClientConn) handleResolvedAddrs(addrs []resolver.Address, err error) { cc.balancerWrapper = newCCBalancerWrapper(cc, cc.dopts.balancerBuilder, cc.balancerBuildOpts) } - cc.balancerWrapper.handleResolvedAddrs(addrs, nil) + cc.balancerWrapper.updateResolverState(s) + cc.firstResolveEvent.Fire() + return nil } // switchBalancer starts the switching from current balancer to the balancer @@ -530,10 +554,6 @@ func (cc *ClientConn) handleResolvedAddrs(addrs []resolver.Address, err error) { // // Caller must hold cc.mu. func (cc *ClientConn) switchBalancer(name string) { - if cc.conns == nil { - return - } - if strings.ToLower(cc.curBalancerName) == strings.ToLower(name) { return } @@ -543,15 +563,11 @@ func (cc *ClientConn) switchBalancer(name string) { grpclog.Infoln("ignoring balancer switching: Balancer DialOption used instead") return } - // TODO(bar switching) change this to two steps: drain and close. - // Keep track of sc in wrapper. if cc.balancerWrapper != nil { cc.balancerWrapper.close() } builder := balancer.Get(name) - // TODO(yuxuanli): If user send a service config that does not contain a valid balancer name, should - // we reuse previous one? if channelz.IsOn() { if builder == nil { channelz.AddTraceEvent(cc.channelzID, &channelz.TraceEventDesc{ @@ -570,7 +586,6 @@ func (cc *ClientConn) switchBalancer(name string) { builder = newPickfirstBuilder() } - cc.preBalancerName = cc.curBalancerName cc.curBalancerName = builder.Name() cc.balancerWrapper = newCCBalancerWrapper(cc, builder, cc.balancerBuildOpts) } @@ -592,13 +607,12 @@ func (cc *ClientConn) handleSubConnStateChange(sc balancer.SubConn, s connectivi // Caller needs to make sure len(addrs) > 0. func (cc *ClientConn) newAddrConn(addrs []resolver.Address, opts balancer.NewSubConnOptions) (*addrConn, error) { ac := &addrConn{ - cc: cc, - addrs: addrs, - scopts: opts, - dopts: cc.dopts, - czData: new(channelzData), - successfulHandshake: true, // make the first nextAddr() call _not_ move addrIdx up by 1 - resetBackoff: make(chan struct{}), + cc: cc, + addrs: addrs, + scopts: opts, + dopts: cc.dopts, + czData: new(channelzData), + resetBackoff: make(chan struct{}), } ac.ctx, ac.cancel = context.WithCancel(cc.ctx) // Track ac in cc. This needs to be done before any getTransport(...) is called. @@ -680,11 +694,10 @@ func (ac *addrConn) connect() error { return nil } ac.updateConnectivityState(connectivity.Connecting) - ac.cc.handleSubConnStateChange(ac.acbw, ac.state) ac.mu.Unlock() // Start a goroutine connecting to the server asynchronously. - go ac.resetTransport(false) + go ac.resetTransport() return nil } @@ -703,6 +716,12 @@ func (ac *addrConn) tryUpdateAddrs(addrs []resolver.Address) bool { return true } + // Unless we're busy reconnecting already, let's reconnect from the top of + // the list. + if ac.state != connectivity.Ready { + return false + } + var curAddrFound bool for _, a := range addrs { if reflect.DeepEqual(ac.curAddr, a) { @@ -713,7 +732,6 @@ func (ac *addrConn) tryUpdateAddrs(addrs []resolver.Address) bool { grpclog.Infof("addrConn: tryUpdateAddrs curAddrFound: %v", curAddrFound) if curAddrFound { ac.addrs = addrs - ac.addrIdx = 0 // Start reconnecting from beginning in the new list. } return curAddrFound @@ -730,6 +748,9 @@ func (cc *ClientConn) GetMethodConfig(method string) MethodConfig { // TODO: Avoid the locking here. cc.mu.RLock() defer cc.mu.RUnlock() + if cc.sc == nil { + return MethodConfig{} + } m, ok := cc.sc.Methods[method] if !ok { i := strings.LastIndex(method, "/") @@ -741,14 +762,15 @@ func (cc *ClientConn) GetMethodConfig(method string) MethodConfig { func (cc *ClientConn) healthCheckConfig() *healthCheckConfig { cc.mu.RLock() defer cc.mu.RUnlock() + if cc.sc == nil { + return nil + } return cc.sc.healthCheckConfig } func (cc *ClientConn) getTransport(ctx context.Context, failfast bool, method string) (transport.ClientTransport, func(balancer.DoneInfo), error) { - hdr, _ := metadata.FromOutgoingContext(ctx) t, done, err := cc.blockingpicker.pick(ctx, failfast, balancer.PickOptions{ FullMethodName: method, - Header: hdr, }) if err != nil { return nil, nil, toRPCErr(err) @@ -756,65 +778,25 @@ func (cc *ClientConn) getTransport(ctx context.Context, failfast bool, method st return t, done, nil } -// handleServiceConfig parses the service config string in JSON format to Go native -// struct ServiceConfig, and store both the struct and the JSON string in ClientConn. -func (cc *ClientConn) handleServiceConfig(js string) error { - if cc.dopts.disableServiceConfig { - return nil +func (cc *ClientConn) applyServiceConfig(sc *ServiceConfig) error { + if sc == nil { + // should never reach here. + return fmt.Errorf("got nil pointer for service config") } - if cc.scRaw == js { - return nil - } - if channelz.IsOn() { - channelz.AddTraceEvent(cc.channelzID, &channelz.TraceEventDesc{ - // The special formatting of \"%s\" instead of %q is to provide nice printing of service config - // for human consumption. - Desc: fmt.Sprintf("Channel has a new service config \"%s\"", js), - Severity: channelz.CtINFO, - }) - } - sc, err := parseServiceConfig(js) - if err != nil { - return err - } - cc.mu.Lock() - // Check if the ClientConn is already closed. Some fields (e.g. - // balancerWrapper) are set to nil when closing the ClientConn, and could - // cause nil pointer panic if we don't have this check. - if cc.conns == nil { - cc.mu.Unlock() - return nil - } - cc.scRaw = js cc.sc = sc - if sc.retryThrottling != nil { + if cc.sc.retryThrottling != nil { newThrottler := &retryThrottler{ - tokens: sc.retryThrottling.MaxTokens, - max: sc.retryThrottling.MaxTokens, - thresh: sc.retryThrottling.MaxTokens / 2, - ratio: sc.retryThrottling.TokenRatio, + tokens: cc.sc.retryThrottling.MaxTokens, + max: cc.sc.retryThrottling.MaxTokens, + thresh: cc.sc.retryThrottling.MaxTokens / 2, + ratio: cc.sc.retryThrottling.TokenRatio, } cc.retryThrottler.Store(newThrottler) } else { cc.retryThrottler.Store((*retryThrottler)(nil)) } - if sc.LB != nil && *sc.LB != grpclbName { // "grpclb" is not a valid balancer option in service config. - if cc.curBalancerName == grpclbName { - // If current balancer is grpclb, there's at least one grpclb - // balancer address in the resolved list. Don't switch the balancer, - // but change the previous balancer name, so if a new resolved - // address list doesn't contain grpclb address, balancer will be - // switched to *sc.LB. - cc.preBalancerName = *sc.LB - } else { - cc.switchBalancer(*sc.LB) - cc.balancerWrapper.handleResolvedAddrs(cc.curAddresses, nil) - } - } - - cc.mu.Unlock() return nil } @@ -890,7 +872,7 @@ func (cc *ClientConn) Close() error { } channelz.AddTraceEvent(cc.channelzID, ted) // TraceEvent needs to be called before RemoveEntry, as TraceEvent may add trace reference to - // the entity beng deleted, and thus prevent it from being deleted right away. + // the entity being deleted, and thus prevent it from being deleted right away. channelz.RemoveEntry(cc.channelzID) } return nil @@ -913,42 +895,34 @@ type addrConn struct { transport transport.ClientTransport // The current transport. mu sync.Mutex - addrIdx int // The index in addrs list to start reconnecting from. curAddr resolver.Address // The current address. addrs []resolver.Address // All addresses that the resolver resolved to. // Use updateConnectivityState for updating addrConn's connectivity state. state connectivity.State - tearDownErr error // The reason this addrConn is torn down. - - backoffIdx int - // backoffDeadline is the time until which resetTransport needs to - // wait before increasing backoffIdx count. - backoffDeadline time.Time - // connectDeadline is the time by which all connection - // negotiations must complete. - connectDeadline time.Time - + backoffIdx int // Needs to be stateful for resetConnectBackoff. resetBackoff chan struct{} - channelzID int64 // channelz unique identification number + channelzID int64 // channelz unique identification number. czData *channelzData - - successfulHandshake bool - - healthCheckEnabled bool } // Note: this requires a lock on ac.mu. func (ac *addrConn) updateConnectivityState(s connectivity.State) { + if ac.state == s { + return + } + + updateMsg := fmt.Sprintf("Subchannel Connectivity change to %v", s) ac.state = s if channelz.IsOn() { channelz.AddTraceEvent(ac.channelzID, &channelz.TraceEventDesc{ - Desc: fmt.Sprintf("Subchannel Connectivity change to %v", s), + Desc: updateMsg, Severity: channelz.CtINFO, }) } + ac.cc.handleSubConnStateChange(ac.acbw, s) } // adjustParams updates parameters used to create transports upon @@ -965,24 +939,10 @@ func (ac *addrConn) adjustParams(r transport.GoAwayReason) { } } -// resetTransport makes sure that a healthy ac.transport exists. -// -// The transport will close itself when it encounters an error, or on GOAWAY, or on deadline waiting for handshake, or -// when the clientconn is closed. Each iteration creating a new transport will try a different address that the balancer -// assigned to the addrConn, until it has tried all addresses. Once it has tried all addresses, it will re-resolve to -// get a new address list. If an error is received, the list is re-resolved and the next reset attempt will try from the -// beginning. This method has backoff built in. The backoff amount starts at 0 and increases each time resolution occurs -// (addresses are exhausted). The backoff amount is reset to 0 each time a handshake is received. -// -// If the DialOption WithWaitForHandshake was set, resetTransport returns successfully only after handshake is received. -func (ac *addrConn) resetTransport(resolveNow bool) { - for { - // If this is the first in a line of resets, we want to resolve immediately. The only other time we - // want to reset is if we have tried all the addresses handed to us. - if resolveNow { - ac.mu.Lock() +func (ac *addrConn) resetTransport() { + for i := 0; ; i++ { + if i > 0 { ac.cc.resolveNow(resolver.ResolveNowOption{}) - ac.mu.Unlock() } ac.mu.Lock() @@ -991,63 +951,128 @@ func (ac *addrConn) resetTransport(resolveNow bool) { return } - // The transport that was used before is no longer viable. - ac.transport = nil - // If the connection is READY, a failure must have occurred. - // Otherwise, we'll consider this is a transient failure when: - // We've exhausted all addresses - // We're in CONNECTING - // And it's not the very first addr to try TODO(deklerk) find a better way to do this than checking ac.successfulHandshake - if ac.state == connectivity.Ready || (ac.addrIdx == len(ac.addrs)-1 && ac.state == connectivity.Connecting && !ac.successfulHandshake) { - ac.updateConnectivityState(connectivity.TransientFailure) - ac.cc.handleSubConnStateChange(ac.acbw, ac.state) + addrs := ac.addrs + backoffFor := ac.dopts.bs.Backoff(ac.backoffIdx) + // This will be the duration that dial gets to finish. + dialDuration := minConnectTimeout + if ac.dopts.minConnectTimeout != nil { + dialDuration = ac.dopts.minConnectTimeout() } - ac.transport = nil + + if dialDuration < backoffFor { + // Give dial more time as we keep failing to connect. + dialDuration = backoffFor + } + // We can potentially spend all the time trying the first address, and + // if the server accepts the connection and then hangs, the following + // addresses will never be tried. + // + // The spec doesn't mention what should be done for multiple addresses. + // https://github.com/grpc/grpc/blob/master/doc/connection-backoff.md#proposed-backoff-algorithm + connectDeadline := time.Now().Add(dialDuration) ac.mu.Unlock() - if err := ac.nextAddr(); err != nil { - return + newTr, addr, reconnect, err := ac.tryAllAddrs(addrs, connectDeadline) + if err != nil { + // After exhausting all addresses, the addrConn enters + // TRANSIENT_FAILURE. + ac.mu.Lock() + if ac.state == connectivity.Shutdown { + ac.mu.Unlock() + return + } + ac.updateConnectivityState(connectivity.TransientFailure) + + // Backoff. + b := ac.resetBackoff + ac.mu.Unlock() + + timer := time.NewTimer(backoffFor) + select { + case <-timer.C: + ac.mu.Lock() + ac.backoffIdx++ + ac.mu.Unlock() + case <-b: + timer.Stop() + case <-ac.ctx.Done(): + timer.Stop() + return + } + continue } ac.mu.Lock() if ac.state == connectivity.Shutdown { + newTr.Close() ac.mu.Unlock() return } + ac.curAddr = addr + ac.transport = newTr + ac.backoffIdx = 0 - backoffIdx := ac.backoffIdx - backoffFor := ac.dopts.bs.Backoff(backoffIdx) - - // This will be the duration that dial gets to finish. - dialDuration := getMinConnectTimeout() - if backoffFor > dialDuration { - // Give dial more time as we keep failing to connect. - dialDuration = backoffFor + healthCheckConfig := ac.cc.healthCheckConfig() + // LB channel health checking is only enabled when all the four requirements below are met: + // 1. it is not disabled by the user with the WithDisableHealthCheck DialOption, + // 2. the internal.HealthCheckFunc is set by importing the grpc/healthcheck package, + // 3. a service config with non-empty healthCheckConfig field is provided, + // 4. the current load balancer allows it. + hctx, hcancel := context.WithCancel(ac.ctx) + healthcheckManagingState := false + if !ac.cc.dopts.disableHealthCheck && healthCheckConfig != nil && ac.scopts.HealthCheckEnabled { + if ac.cc.dopts.healthCheckFunc == nil { + // TODO: add a link to the health check doc in the error message. + grpclog.Error("the client side LB channel health check function has not been set.") + } else { + // TODO(deklerk) refactor to just return transport + go ac.startHealthCheck(hctx, newTr, addr, healthCheckConfig.ServiceName) + healthcheckManagingState = true + } + } + if !healthcheckManagingState { + ac.updateConnectivityState(connectivity.Ready) } - start := time.Now() - connectDeadline := start.Add(dialDuration) - ac.backoffDeadline = start.Add(backoffFor) - ac.connectDeadline = connectDeadline - ac.mu.Unlock() - ac.cc.mu.RLock() - ac.dopts.copts.KeepaliveParams = ac.cc.mkp - ac.cc.mu.RUnlock() - + // Block until the created transport is down. And when this happens, + // we restart from the top of the addr list. + <-reconnect.Done() + hcancel() + + // Need to reconnect after a READY, the addrConn enters + // TRANSIENT_FAILURE. + // + // This will set addrConn to TRANSIENT_FAILURE for a very short period + // of time, and turns CONNECTING. It seems reasonable to skip this, but + // READY-CONNECTING is not a valid transition. ac.mu.Lock() - if ac.state == connectivity.Shutdown { ac.mu.Unlock() return } + ac.updateConnectivityState(connectivity.TransientFailure) + ac.mu.Unlock() + } +} - if ac.state != connectivity.Connecting { - ac.updateConnectivityState(connectivity.Connecting) - ac.cc.handleSubConnStateChange(ac.acbw, ac.state) +// tryAllAddrs tries to creates a connection to the addresses, and stop when at the +// first successful one. It returns the transport, the address and a Event in +// the successful case. The Event fires when the returned transport disconnects. +func (ac *addrConn) tryAllAddrs(addrs []resolver.Address, connectDeadline time.Time) (transport.ClientTransport, resolver.Address, *grpcsync.Event, error) { + for _, addr := range addrs { + ac.mu.Lock() + if ac.state == connectivity.Shutdown { + ac.mu.Unlock() + return nil, resolver.Address{}, nil, errConnClosing } + ac.updateConnectivityState(connectivity.Connecting) + ac.transport = nil + + ac.cc.mu.RLock() + ac.dopts.copts.KeepaliveParams = ac.cc.mkp + ac.cc.mu.RUnlock() - addr := ac.addrs[ac.addrIdx] copts := ac.dopts.copts if ac.scopts.CredsBundle != nil { copts.CredsBundle = ac.scopts.CredsBundle @@ -1061,77 +1086,45 @@ func (ac *addrConn) resetTransport(resolveNow bool) { }) } - if err := ac.createTransport(backoffIdx, addr, copts, connectDeadline); err != nil { - continue + newTr, reconnect, err := ac.createTransport(addr, copts, connectDeadline) + if err == nil { + return newTr, addr, reconnect, nil } - - return + ac.cc.blockingpicker.updateConnectionError(err) } + + // Couldn't connect to any address. + return nil, resolver.Address{}, nil, fmt.Errorf("couldn't connect to any address") } -// createTransport creates a connection to one of the backends in addrs. -func (ac *addrConn) createTransport(backoffNum int, addr resolver.Address, copts transport.ConnectOptions, connectDeadline time.Time) error { - oneReset := sync.Once{} - skipReset := make(chan struct{}) - allowedToReset := make(chan struct{}) +// createTransport creates a connection to addr. It returns the transport and a +// Event in the successful case. The Event fires when the returned transport +// disconnects. +func (ac *addrConn) createTransport(addr resolver.Address, copts transport.ConnectOptions, connectDeadline time.Time) (transport.ClientTransport, *grpcsync.Event, error) { prefaceReceived := make(chan struct{}) onCloseCalled := make(chan struct{}) + reconnect := grpcsync.NewEvent() - var prefaceMu sync.Mutex - var serverPrefaceReceived bool - var clientPrefaceWrote bool - - hcCtx, hcCancel := context.WithCancel(ac.ctx) + target := transport.TargetInfo{ + Addr: addr.Addr, + Metadata: addr.Metadata, + Authority: ac.cc.authority, + } onGoAway := func(r transport.GoAwayReason) { - hcCancel() ac.mu.Lock() ac.adjustParams(r) ac.mu.Unlock() - select { - case <-skipReset: // The outer resetTransport loop will handle reconnection. - return - case <-allowedToReset: // We're in the clear to reset. - go oneReset.Do(func() { ac.resetTransport(false) }) - } + reconnect.Fire() } - prefaceTimer := time.NewTimer(connectDeadline.Sub(time.Now())) - onClose := func() { - hcCancel() close(onCloseCalled) - prefaceTimer.Stop() - - select { - case <-skipReset: // The outer resetTransport loop will handle reconnection. - return - case <-allowedToReset: // We're in the clear to reset. - oneReset.Do(func() { ac.resetTransport(false) }) - } - } - - target := transport.TargetInfo{ - Addr: addr.Addr, - Metadata: addr.Metadata, - Authority: ac.cc.authority, + reconnect.Fire() } onPrefaceReceipt := func() { close(prefaceReceived) - prefaceTimer.Stop() - - // TODO(deklerk): optimization; does anyone else actually use this lock? maybe we can just remove it for this scope - ac.mu.Lock() - - prefaceMu.Lock() - serverPrefaceReceived = true - if clientPrefaceWrote { - ac.successfulHandshake = true - } - prefaceMu.Unlock() - - ac.mu.Unlock() } connectCtx, cancel := context.WithDeadline(ac.ctx, connectDeadline) @@ -1141,115 +1134,28 @@ func (ac *addrConn) createTransport(backoffNum int, addr resolver.Address, copts } newTr, err := transport.NewClientTransport(connectCtx, ac.cc.ctx, target, copts, onPrefaceReceipt, onGoAway, onClose) - - if err == nil { - prefaceMu.Lock() - clientPrefaceWrote = true - if serverPrefaceReceived || ac.dopts.reqHandshake == envconfig.RequireHandshakeOff { - ac.successfulHandshake = true - } - prefaceMu.Unlock() - - if ac.dopts.reqHandshake == envconfig.RequireHandshakeOn { - select { - case <-prefaceTimer.C: - // We didn't get the preface in time. - newTr.Close() - err = errors.New("timed out waiting for server handshake") - case <-prefaceReceived: - // We got the preface - huzzah! things are good. - case <-onCloseCalled: - // The transport has already closed - noop. - close(allowedToReset) - return nil - } - } else if ac.dopts.reqHandshake == envconfig.RequireHandshakeHybrid { - go func() { - select { - case <-prefaceTimer.C: - // We didn't get the preface in time. - newTr.Close() - case <-prefaceReceived: - // We got the preface just in the nick of time - huzzah! - case <-onCloseCalled: - // The transport has already closed - noop. - } - }() - } - } - if err != nil { // newTr is either nil, or closed. - ac.cc.blockingpicker.updateConnectionError(err) - ac.mu.Lock() - if ac.state == connectivity.Shutdown { - // ac.tearDown(...) has been invoked. - ac.mu.Unlock() - - // We don't want to reset during this close because we prefer to kick out of this function and let the loop - // in resetTransport take care of reconnecting. - close(skipReset) - - return errConnClosing - } - ac.mu.Unlock() grpclog.Warningf("grpc: addrConn.createTransport failed to connect to %v. Err :%v. Reconnecting...", addr, err) - - // We don't want to reset during this close because we prefer to kick out of this function and let the loop - // in resetTransport take care of reconnecting. - close(skipReset) - - return err + return nil, nil, err } - // Now there is a viable transport to be use, so set ac.transport to reflect the new viable transport. - ac.mu.Lock() - if ac.state == connectivity.Shutdown { - ac.mu.Unlock() - close(skipReset) - newTr.Close() - return nil - } - ac.transport = newTr - ac.mu.Unlock() - - healthCheckConfig := ac.cc.healthCheckConfig() - // LB channel health checking is only enabled when all the four requirements below are met: - // 1. it is not disabled by the user with the WithDisableHealthCheck DialOption, - // 2. the internal.HealthCheckFunc is set by importing the grpc/healthcheck package, - // 3. a service config with non-empty healthCheckConfig field is provided, - // 4. the current load balancer allows it. - if !ac.cc.dopts.disableHealthCheck && healthCheckConfig != nil && ac.scopts.HealthCheckEnabled { - if internal.HealthCheckFunc != nil { - go ac.startHealthCheck(hcCtx, newTr, addr, healthCheckConfig.ServiceName) - close(allowedToReset) - return nil + if ac.dopts.reqHandshake == envconfig.RequireHandshakeOn { + select { + case <-time.After(connectDeadline.Sub(time.Now())): + // We didn't get the preface in time. + newTr.Close() + grpclog.Warningf("grpc: addrConn.createTransport failed to connect to %v: didn't receive server preface in time. Reconnecting...", addr) + return nil, nil, errors.New("timed out waiting for server handshake") + case <-prefaceReceived: + // We got the preface - huzzah! things are good. + case <-onCloseCalled: + // The transport has already closed - noop. + return nil, nil, errors.New("connection closed") + // TODO(deklerk) this should bail on ac.ctx.Done(). Add a test and fix. } - // TODO: add a link to the health check doc in the error message. - grpclog.Error("the client side LB channel health check function has not been set.") - } - - // No LB channel health check case - ac.mu.Lock() - - if ac.state == connectivity.Shutdown { - ac.mu.Unlock() - - // unblock onGoAway/onClose callback. - close(skipReset) - return errConnClosing } - - ac.updateConnectivityState(connectivity.Ready) - ac.cc.handleSubConnStateChange(ac.acbw, ac.state) - ac.curAddr = addr - - ac.mu.Unlock() - - // Ok, _now_ we will finally let the transport reset if it encounters a closable error. Without this, the reader - // goroutine failing races with all the code in this method that sets the connection to "ready". - close(allowedToReset) - return nil + return newTr, reconnect, nil } func (ac *addrConn) startHealthCheck(ctx context.Context, newTr transport.ClientTransport, addr resolver.Address, serviceName string) { @@ -1269,19 +1175,12 @@ func (ac *addrConn) startHealthCheck(ctx context.Context, newTr transport.Client firstReady = false ac.curAddr = addr } - if ac.state != connectivity.Ready { - ac.updateConnectivityState(connectivity.Ready) - ac.cc.handleSubConnStateChange(ac.acbw, ac.state) - } + ac.updateConnectivityState(connectivity.Ready) } else { - if ac.state != connectivity.TransientFailure { - ac.updateConnectivityState(connectivity.TransientFailure) - ac.cc.handleSubConnStateChange(ac.acbw, ac.state) - } + ac.updateConnectivityState(connectivity.TransientFailure) } } - - err := internal.HealthCheckFunc(ctx, newStream, reportHealth, serviceName) + err := ac.cc.dopts.healthCheckFunc(ctx, newStream, reportHealth, serviceName) if err != nil { if status.Code(err) == codes.Unimplemented { if channelz.IsOn() { @@ -1297,55 +1196,6 @@ func (ac *addrConn) startHealthCheck(ctx context.Context, newTr transport.Client } } -// nextAddr increments the addrIdx if there are more addresses to try. If -// there are no more addrs to try it will re-resolve, set addrIdx to 0, and -// increment the backoffIdx. -// -// nextAddr must be called without ac.mu being held. -func (ac *addrConn) nextAddr() error { - ac.mu.Lock() - - // If a handshake has been observed, we want the next usage to start at - // index 0 immediately. - if ac.successfulHandshake { - ac.successfulHandshake = false - ac.backoffDeadline = time.Time{} - ac.connectDeadline = time.Time{} - ac.addrIdx = 0 - ac.backoffIdx = 0 - ac.mu.Unlock() - return nil - } - - if ac.addrIdx < len(ac.addrs)-1 { - ac.addrIdx++ - ac.mu.Unlock() - return nil - } - - ac.addrIdx = 0 - ac.backoffIdx++ - - if ac.state == connectivity.Shutdown { - ac.mu.Unlock() - return errConnClosing - } - ac.cc.resolveNow(resolver.ResolveNowOption{}) - backoffDeadline := ac.backoffDeadline - b := ac.resetBackoff - ac.mu.Unlock() - timer := time.NewTimer(backoffDeadline.Sub(time.Now())) - select { - case <-timer.C: - case <-b: - timer.Stop() - case <-ac.ctx.Done(): - timer.Stop() - return ac.ctx.Err() - } - return nil -} - func (ac *addrConn) resetConnectBackoff() { ac.mu.Lock() close(ac.resetBackoff) @@ -1393,8 +1243,6 @@ func (ac *addrConn) tearDown(err error) { // between setting the state and logic that waits on context cancelation / etc. ac.updateConnectivityState(connectivity.Shutdown) ac.cancel() - ac.tearDownErr = err - ac.cc.handleSubConnStateChange(ac.acbw, ac.state) ac.curAddr = resolver.Address{} if err == errConnDrain && curTr != nil { // GracefulClose(...) may be executed multiple times when diff --git a/vendor/google.golang.org/grpc/connectivity/connectivity.go b/vendor/google.golang.org/grpc/connectivity/connectivity.go index b1d7dbc547..34ec36fbf6 100644 --- a/vendor/google.golang.org/grpc/connectivity/connectivity.go +++ b/vendor/google.golang.org/grpc/connectivity/connectivity.go @@ -52,7 +52,7 @@ func (s State) String() string { const ( // Idle indicates the ClientConn is idle. Idle State = iota - // Connecting indicates the ClienConn is connecting. + // Connecting indicates the ClientConn is connecting. Connecting // Ready indicates the ClientConn is ready for work. Ready diff --git a/vendor/google.golang.org/grpc/credentials/credentials.go b/vendor/google.golang.org/grpc/credentials/credentials.go index a851560456..88aff94596 100644 --- a/vendor/google.golang.org/grpc/credentials/credentials.go +++ b/vendor/google.golang.org/grpc/credentials/credentials.go @@ -36,9 +36,6 @@ import ( "google.golang.org/grpc/credentials/internal" ) -// alpnProtoStr are the specified application level protocols for gRPC. -var alpnProtoStr = []string{"h2"} - // PerRPCCredentials defines the common interface for the credentials which need to // attach security information to every RPC (e.g., oauth2). type PerRPCCredentials interface { @@ -208,10 +205,23 @@ func (c *tlsCreds) OverrideServerName(serverNameOverride string) error { return nil } +const alpnProtoStrH2 = "h2" + +func appendH2ToNextProtos(ps []string) []string { + for _, p := range ps { + if p == alpnProtoStrH2 { + return ps + } + } + ret := make([]string, 0, len(ps)+1) + ret = append(ret, ps...) + return append(ret, alpnProtoStrH2) +} + // NewTLS uses c to construct a TransportCredentials based on TLS. func NewTLS(c *tls.Config) TransportCredentials { tc := &tlsCreds{cloneTLSConfig(c)} - tc.config.NextProtos = alpnProtoStr + tc.config.NextProtos = appendH2ToNextProtos(tc.config.NextProtos) return tc } diff --git a/vendor/google.golang.org/grpc/credentials/tls13.go b/vendor/google.golang.org/grpc/credentials/tls13.go new file mode 100644 index 0000000000..ccbf35b331 --- /dev/null +++ b/vendor/google.golang.org/grpc/credentials/tls13.go @@ -0,0 +1,30 @@ +// +build go1.12 + +/* + * + * Copyright 2019 gRPC authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package credentials + +import "crypto/tls" + +// This init function adds cipher suite constants only defined in Go 1.12. +func init() { + cipherSuiteLookup[tls.TLS_AES_128_GCM_SHA256] = "TLS_AES_128_GCM_SHA256" + cipherSuiteLookup[tls.TLS_AES_256_GCM_SHA384] = "TLS_AES_256_GCM_SHA384" + cipherSuiteLookup[tls.TLS_CHACHA20_POLY1305_SHA256] = "TLS_CHACHA20_POLY1305_SHA256" +} diff --git a/vendor/google.golang.org/grpc/dialoptions.go b/vendor/google.golang.org/grpc/dialoptions.go index fe00a254d0..e114fecbb7 100644 --- a/vendor/google.golang.org/grpc/dialoptions.go +++ b/vendor/google.golang.org/grpc/dialoptions.go @@ -26,6 +26,7 @@ import ( "google.golang.org/grpc/balancer" "google.golang.org/grpc/credentials" + "google.golang.org/grpc/grpclog" "google.golang.org/grpc/internal" "google.golang.org/grpc/internal/backoff" "google.golang.org/grpc/internal/envconfig" @@ -54,12 +55,16 @@ type dialOptions struct { // balancer, and also by WithBalancerName dial option. balancerBuilder balancer.Builder // This is to support grpclb. - resolverBuilder resolver.Builder - reqHandshake envconfig.RequireHandshakeSetting - channelzParentID int64 - disableServiceConfig bool - disableRetry bool - disableHealthCheck bool + resolverBuilder resolver.Builder + reqHandshake envconfig.RequireHandshakeSetting + channelzParentID int64 + disableServiceConfig bool + disableRetry bool + disableHealthCheck bool + healthCheckFunc internal.HealthChecker + minConnectTimeout func() time.Duration + defaultServiceConfig *ServiceConfig // defaultServiceConfig is parsed from defaultServiceConfigRawJSON. + defaultServiceConfigRawJSON *string } // DialOption configures how we set up the connection. @@ -94,10 +99,8 @@ func newFuncDialOption(f func(*dialOptions)) *funcDialOption { // WithWaitForHandshake blocks until the initial settings frame is received from // the server before assigning RPCs to the connection. // -// Deprecated: this will become the default behavior in the 1.17 release, and -// will be removed after the 1.18 release. To override the default behavior in -// the 1.17 release, either use this dial option or set the environment -// variable GRPC_GO_READY_BEFORE_HANDSHAKE=on. +// Deprecated: this is the default behavior, and this option will be removed +// after the 1.18 release. func WithWaitForHandshake() DialOption { return newFuncDialOption(func(o *dialOptions) { o.reqHandshake = envconfig.RequireHandshakeOn @@ -165,7 +168,7 @@ func WithDefaultCallOptions(cos ...CallOption) DialOption { // WithCodec returns a DialOption which sets a codec for message marshaling and // unmarshaling. // -// Deprecated: use WithDefaultCallOptions(CallCustomCodec(c)) instead. +// Deprecated: use WithDefaultCallOptions(ForceCodec(_)) instead. func WithCodec(c Codec) DialOption { return WithDefaultCallOptions(CallCustomCodec(c)) } @@ -329,26 +332,32 @@ func WithTimeout(d time.Duration) DialOption { }) } -func withContextDialer(f func(context.Context, string) (net.Conn, error)) DialOption { +// WithContextDialer returns a DialOption that sets a dialer to create +// connections. If FailOnNonTempDialError() is set to true, and an error is +// returned by f, gRPC checks the error's Temporary() method to decide if it +// should try to reconnect to the network address. +func WithContextDialer(f func(context.Context, string) (net.Conn, error)) DialOption { return newFuncDialOption(func(o *dialOptions) { o.copts.Dialer = f }) } func init() { - internal.WithContextDialer = withContextDialer internal.WithResolverBuilder = withResolverBuilder + internal.WithHealthCheckFunc = withHealthCheckFunc } // WithDialer returns a DialOption that specifies a function to use for dialing // network addresses. If FailOnNonTempDialError() is set to true, and an error // is returned by f, gRPC checks the error's Temporary() method to decide if it // should try to reconnect to the network address. +// +// Deprecated: use WithContextDialer instead func WithDialer(f func(string, time.Duration) (net.Conn, error)) DialOption { - return withContextDialer( + return WithContextDialer( func(ctx context.Context, addr string) (net.Conn, error) { if deadline, ok := ctx.Deadline(); ok { - return f(addr, deadline.Sub(time.Now())) + return f(addr, time.Until(deadline)) } return f(addr, 0) }) @@ -388,6 +397,10 @@ func WithUserAgent(s string) DialOption { // WithKeepaliveParams returns a DialOption that specifies keepalive parameters // for the client transport. func WithKeepaliveParams(kp keepalive.ClientParameters) DialOption { + if kp.Time < internal.KeepaliveMinPingTime { + grpclog.Warningf("Adjusting keepalive ping interval to minimum period of %v", internal.KeepaliveMinPingTime) + kp.Time = internal.KeepaliveMinPingTime + } return newFuncDialOption(func(o *dialOptions) { o.copts.KeepaliveParams = kp }) @@ -430,12 +443,27 @@ func WithChannelzParentID(id int64) DialOption { // WithDisableServiceConfig returns a DialOption that causes grpc to ignore any // service config provided by the resolver and provides a hint to the resolver // to not fetch service configs. +// +// Note that, this dial option only disables service config from resolver. If +// default service config is provided, grpc will use the default service config. func WithDisableServiceConfig() DialOption { return newFuncDialOption(func(o *dialOptions) { o.disableServiceConfig = true }) } +// WithDefaultServiceConfig returns a DialOption that configures the default +// service config, which will be used in cases where: +// 1. WithDisableServiceConfig is called. +// 2. Resolver does not return service config or if the resolver gets and invalid config. +// +// This API is EXPERIMENTAL. +func WithDefaultServiceConfig(s string) DialOption { + return newFuncDialOption(func(o *dialOptions) { + o.defaultServiceConfigRawJSON = &s + }) +} + // WithDisableRetry returns a DialOption that disables retries, even if the // service config enables them. This does not impact transparent retries, which // will happen automatically if no data is written to the wire or if the RPC is @@ -460,7 +488,8 @@ func WithMaxHeaderListSize(s uint32) DialOption { }) } -// WithDisableHealthCheck disables the LB channel health checking for all SubConns of this ClientConn. +// WithDisableHealthCheck disables the LB channel health checking for all +// SubConns of this ClientConn. // // This API is EXPERIMENTAL. func WithDisableHealthCheck() DialOption { @@ -468,13 +497,36 @@ func WithDisableHealthCheck() DialOption { o.disableHealthCheck = true }) } + +// withHealthCheckFunc replaces the default health check function with the +// provided one. It makes tests easier to change the health check function. +// +// For testing purpose only. +func withHealthCheckFunc(f internal.HealthChecker) DialOption { + return newFuncDialOption(func(o *dialOptions) { + o.healthCheckFunc = f + }) +} + func defaultDialOptions() dialOptions { return dialOptions{ - disableRetry: !envconfig.Retry, - reqHandshake: envconfig.RequireHandshake, + disableRetry: !envconfig.Retry, + reqHandshake: envconfig.RequireHandshake, + healthCheckFunc: internal.HealthCheckFunc, copts: transport.ConnectOptions{ WriteBufferSize: defaultWriteBufSize, ReadBufferSize: defaultReadBufSize, }, } } + +// withGetMinConnectDeadline specifies the function that clientconn uses to +// get minConnectDeadline. This can be used to make connection attempts happen +// faster/slower. +// +// For testing purpose only. +func withMinConnectDeadline(f func() time.Duration) DialOption { + return newFuncDialOption(func(o *dialOptions) { + o.minConnectTimeout = f + }) +} diff --git a/vendor/google.golang.org/grpc/encoding/encoding.go b/vendor/google.golang.org/grpc/encoding/encoding.go index ade8b7cec7..30a75da99d 100644 --- a/vendor/google.golang.org/grpc/encoding/encoding.go +++ b/vendor/google.golang.org/grpc/encoding/encoding.go @@ -102,10 +102,10 @@ func RegisterCodec(codec Codec) { if codec == nil { panic("cannot register a nil Codec") } - contentSubtype := strings.ToLower(codec.Name()) - if contentSubtype == "" { - panic("cannot register Codec with empty string result for String()") + if codec.Name() == "" { + panic("cannot register Codec with empty string result for Name()") } + contentSubtype := strings.ToLower(codec.Name()) registeredCodecs[contentSubtype] = codec } diff --git a/vendor/google.golang.org/grpc/go.mod b/vendor/google.golang.org/grpc/go.mod index f296dcf4e6..9f3ef3a539 100644 --- a/vendor/google.golang.org/grpc/go.mod +++ b/vendor/google.golang.org/grpc/go.mod @@ -2,19 +2,18 @@ module google.golang.org/grpc require ( cloud.google.com/go v0.26.0 // indirect + github.com/BurntSushi/toml v0.3.1 // indirect github.com/client9/misspell v0.3.4 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b github.com/golang/mock v1.1.1 github.com/golang/protobuf v1.2.0 - github.com/kisielk/gotool v1.0.0 // indirect - golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3 - golang.org/x/net v0.0.0-20180826012351-8a410e7b638d + golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3 + golang.org/x/net v0.0.0-20190311183353-d8887717615a golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f // indirect - golang.org/x/sys v0.0.0-20180830151530-49385e6e1522 - golang.org/x/text v0.3.0 // indirect - golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52 + golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a + golang.org/x/tools v0.0.0-20190311212946-11955173bddd google.golang.org/appengine v1.1.0 // indirect google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8 - honnef.co/go/tools v0.0.0-20180728063816-88497007e858 + honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099 ) diff --git a/vendor/google.golang.org/grpc/go.sum b/vendor/google.golang.org/grpc/go.sum index bfb6bb7c0e..b8638ce769 100644 --- a/vendor/google.golang.org/grpc/go.sum +++ b/vendor/google.golang.org/grpc/go.sum @@ -1,5 +1,7 @@ cloud.google.com/go v0.26.0 h1:e0WKqKTd5BnrG8aKH3J3h+QvEIQtSUcf2n5UZ5ZgLtQ= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/client9/misspell v0.3.4 h1:ta993UF76GwbvJcIo3Y68y/M3WxlpEHPWIGDkJYwzJI= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= @@ -8,25 +10,24 @@ github.com/golang/mock v1.1.1 h1:G5FRp8JnTd7RQH5kemVNlMeyXQAztQ3mOWV95KxsXH8= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/kisielk/gotool v1.0.0 h1:AV2c/EiW3KqPNT9ZKl07ehoAGi4C5/01Cfbblndcapg= -github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3 h1:x/bBzNauLQAlE3fLku/xy92Y8QwKX5HZymrMz2IiKFc= -golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/net v0.0.0-20180826012351-8a410e7b638d h1:g9qWBGx4puODJTMVyoPrpoxPFgVGd+z1DZwjfRu4d0I= -golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3 h1:XQyxROzUlZH+WIQwySDgnISgOivlhjIEwaQaJEJrrN0= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/net v0.0.0-20190311183353-d8887717615a h1:oWX7TPOiFAMXLq8o0ikBYfCJVlRHBcsciT5bXOrH628= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be h1:vEDujvNQGv4jgYKudGeI/+DAX4Jffq6hpD55MmoEvKs= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f h1:wMNYb4v58l5UBM7MYRLPG6ZhfOqbKu7X5eyFl8ZhKvA= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522 h1:Ve1ORMCxvRmSXBwJK+t3Oy+V2vRW2OetUQBq4rJIkZE= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52 h1:JG/0uqcGdTNgq7FdU+61l5Pdmb8putNZlXb65bJBROs= -golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd h1:/e+gpKk9r3dJobndpTytxS2gOy6m5uvpg+ISQoEcusQ= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= google.golang.org/appengine v1.1.0 h1:igQkv0AAhEIvTEpD5LIpAfav2eeVO9HBTjvKHVJPRSs= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8 h1:Nw54tB0rB7hY/N0NQvRW8DG4Yk3Q6T9cu9RcFQDu1tc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -honnef.co/go/tools v0.0.0-20180728063816-88497007e858 h1:wN+eVZ7U+gqdqkec6C6VXR1OFf9a5Ul9ETzeYsYv20g= -honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099 h1:XJP7lxbSxWLOMNdBE4B/STaqVy6L73o0knwj2vIlxnw= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/vendor/google.golang.org/grpc/grpclog/grpclog.go b/vendor/google.golang.org/grpc/grpclog/grpclog.go index 1fabb11e1b..51bb9457cd 100644 --- a/vendor/google.golang.org/grpc/grpclog/grpclog.go +++ b/vendor/google.golang.org/grpc/grpclog/grpclog.go @@ -18,7 +18,7 @@ // Package grpclog defines logging for grpc. // -// All logs in transport package only go to verbose level 2. +// All logs in transport and grpclb packages only go to verbose level 2. // All logs in other packages in grpc are logged in spite of the verbosity level. // // In the default logger, diff --git a/vendor/google.golang.org/grpc/internal/balancerload/load.go b/vendor/google.golang.org/grpc/internal/balancerload/load.go new file mode 100644 index 0000000000..3a905d9665 --- /dev/null +++ b/vendor/google.golang.org/grpc/internal/balancerload/load.go @@ -0,0 +1,46 @@ +/* + * Copyright 2019 gRPC authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +// Package balancerload defines APIs to parse server loads in trailers. The +// parsed loads are sent to balancers in DoneInfo. +package balancerload + +import ( + "google.golang.org/grpc/metadata" +) + +// Parser converts loads from metadata into a concrete type. +type Parser interface { + // Parse parses loads from metadata. + Parse(md metadata.MD) interface{} +} + +var parser Parser + +// SetParser sets the load parser. +// +// Not mutex-protected, should be called before any gRPC functions. +func SetParser(lr Parser) { + parser = lr +} + +// Parse calls parser.Read(). +func Parse(md metadata.MD) interface{} { + if parser == nil { + return nil + } + return parser.Parse(md) +} diff --git a/vendor/google.golang.org/grpc/internal/binarylog/env_config.go b/vendor/google.golang.org/grpc/internal/binarylog/env_config.go index eb188eae5a..4cc2525df7 100644 --- a/vendor/google.golang.org/grpc/internal/binarylog/env_config.go +++ b/vendor/google.golang.org/grpc/internal/binarylog/env_config.go @@ -180,7 +180,7 @@ func parseHeaderMessageLengthConfig(c string) (hdrLenStr, msgLenStr uint64, err if s := match[1]; s != "" { msgLenStr, err = strconv.ParseUint(s, 10, 64) if err != nil { - return 0, 0, fmt.Errorf("Failed to convert %q to uint", s) + return 0, 0, fmt.Errorf("failed to convert %q to uint", s) } return 0, msgLenStr, nil } @@ -195,13 +195,13 @@ func parseHeaderMessageLengthConfig(c string) (hdrLenStr, msgLenStr uint64, err if s := match[1]; s != "" { hdrLenStr, err = strconv.ParseUint(s, 10, 64) if err != nil { - return 0, 0, fmt.Errorf("Failed to convert %q to uint", s) + return 0, 0, fmt.Errorf("failed to convert %q to uint", s) } } if s := match[2]; s != "" { msgLenStr, err = strconv.ParseUint(s, 10, 64) if err != nil { - return 0, 0, fmt.Errorf("Failed to convert %q to uint", s) + return 0, 0, fmt.Errorf("failed to convert %q to uint", s) } } return hdrLenStr, msgLenStr, nil diff --git a/vendor/google.golang.org/grpc/internal/binarylog/method_logger.go b/vendor/google.golang.org/grpc/internal/binarylog/method_logger.go index b06cdd4d43..160f6e8616 100644 --- a/vendor/google.golang.org/grpc/internal/binarylog/method_logger.go +++ b/vendor/google.golang.org/grpc/internal/binarylog/method_logger.go @@ -377,10 +377,7 @@ func metadataKeyOmit(key string) bool { case "grpc-trace-bin": // grpc-trace-bin is special because it's visiable to users. return false } - if strings.HasPrefix(key, "grpc-") { - return true - } - return false + return strings.HasPrefix(key, "grpc-") } func mdToMetadataProto(md metadata.MD) *pb.Metadata { diff --git a/vendor/google.golang.org/grpc/internal/channelz/funcs.go b/vendor/google.golang.org/grpc/internal/channelz/funcs.go index 3021a31a52..041520d351 100644 --- a/vendor/google.golang.org/grpc/internal/channelz/funcs.go +++ b/vendor/google.golang.org/grpc/internal/channelz/funcs.go @@ -40,7 +40,7 @@ var ( db dbWrapper idGen idGenerator // EntryPerPage defines the number of channelz entries to be shown on a web page. - EntryPerPage = 50 + EntryPerPage = int64(50) curState int32 maxTraceEntry = defaultMaxTraceEntry ) @@ -113,20 +113,20 @@ func NewChannelzStorage() { // boolean indicating whether there's more top channels to be queried for. // // The arg id specifies that only top channel with id at or above it will be included -// in the result. The returned slice is up to a length of EntryPerPage, and is -// sorted in ascending id order. -func GetTopChannels(id int64) ([]*ChannelMetric, bool) { - return db.get().GetTopChannels(id) +// in the result. The returned slice is up to a length of the arg maxResults or +// EntryPerPage if maxResults is zero, and is sorted in ascending id order. +func GetTopChannels(id int64, maxResults int64) ([]*ChannelMetric, bool) { + return db.get().GetTopChannels(id, maxResults) } // GetServers returns a slice of server's ServerMetric, along with a // boolean indicating whether there's more servers to be queried for. // // The arg id specifies that only server with id at or above it will be included -// in the result. The returned slice is up to a length of EntryPerPage, and is -// sorted in ascending id order. -func GetServers(id int64) ([]*ServerMetric, bool) { - return db.get().GetServers(id) +// in the result. The returned slice is up to a length of the arg maxResults or +// EntryPerPage if maxResults is zero, and is sorted in ascending id order. +func GetServers(id int64, maxResults int64) ([]*ServerMetric, bool) { + return db.get().GetServers(id, maxResults) } // GetServerSockets returns a slice of server's (identified by id) normal socket's @@ -134,10 +134,10 @@ func GetServers(id int64) ([]*ServerMetric, bool) { // be queried for. // // The arg startID specifies that only sockets with id at or above it will be -// included in the result. The returned slice is up to a length of EntryPerPage, -// and is sorted in ascending id order. -func GetServerSockets(id int64, startID int64) ([]*SocketMetric, bool) { - return db.get().GetServerSockets(id, startID) +// included in the result. The returned slice is up to a length of the arg maxResults +// or EntryPerPage if maxResults is zero, and is sorted in ascending id order. +func GetServerSockets(id int64, startID int64, maxResults int64) ([]*SocketMetric, bool) { + return db.get().GetServerSockets(id, startID, maxResults) } // GetChannel returns the ChannelMetric for the channel (identified by id). @@ -155,6 +155,11 @@ func GetSocket(id int64) *SocketMetric { return db.get().GetSocket(id) } +// GetServer returns the ServerMetric for the server (identified by id). +func GetServer(id int64) *ServerMetric { + return db.get().GetServer(id) +} + // RegisterChannel registers the given channel c in channelz database with ref // as its reference name, and add it to the child list of its parent (identified // by pid). pid = 0 means no parent. It returns the unique channelz tracking id @@ -447,29 +452,32 @@ func copyMap(m map[int64]string) map[int64]string { return n } -func min(a, b int) int { +func min(a, b int64) int64 { if a < b { return a } return b } -func (c *channelMap) GetTopChannels(id int64) ([]*ChannelMetric, bool) { +func (c *channelMap) GetTopChannels(id int64, maxResults int64) ([]*ChannelMetric, bool) { + if maxResults <= 0 { + maxResults = EntryPerPage + } c.mu.RLock() - l := len(c.topLevelChannels) + l := int64(len(c.topLevelChannels)) ids := make([]int64, 0, l) - cns := make([]*channel, 0, min(l, EntryPerPage)) + cns := make([]*channel, 0, min(l, maxResults)) for k := range c.topLevelChannels { ids = append(ids, k) } sort.Sort(int64Slice(ids)) idx := sort.Search(len(ids), func(i int) bool { return ids[i] >= id }) - count := 0 + count := int64(0) var end bool var t []*ChannelMetric for i, v := range ids[idx:] { - if count == EntryPerPage { + if count == maxResults { break } if cn, ok := c.channels[v]; ok { @@ -499,21 +507,24 @@ func (c *channelMap) GetTopChannels(id int64) ([]*ChannelMetric, bool) { return t, end } -func (c *channelMap) GetServers(id int64) ([]*ServerMetric, bool) { +func (c *channelMap) GetServers(id, maxResults int64) ([]*ServerMetric, bool) { + if maxResults <= 0 { + maxResults = EntryPerPage + } c.mu.RLock() - l := len(c.servers) + l := int64(len(c.servers)) ids := make([]int64, 0, l) - ss := make([]*server, 0, min(l, EntryPerPage)) + ss := make([]*server, 0, min(l, maxResults)) for k := range c.servers { ids = append(ids, k) } sort.Sort(int64Slice(ids)) idx := sort.Search(len(ids), func(i int) bool { return ids[i] >= id }) - count := 0 + count := int64(0) var end bool var s []*ServerMetric for i, v := range ids[idx:] { - if count == EntryPerPage { + if count == maxResults { break } if svr, ok := c.servers[v]; ok { @@ -541,7 +552,10 @@ func (c *channelMap) GetServers(id int64) ([]*ServerMetric, bool) { return s, end } -func (c *channelMap) GetServerSockets(id int64, startID int64) ([]*SocketMetric, bool) { +func (c *channelMap) GetServerSockets(id int64, startID int64, maxResults int64) ([]*SocketMetric, bool) { + if maxResults <= 0 { + maxResults = EntryPerPage + } var svr *server var ok bool c.mu.RLock() @@ -551,18 +565,18 @@ func (c *channelMap) GetServerSockets(id int64, startID int64) ([]*SocketMetric, return nil, true } svrskts := svr.sockets - l := len(svrskts) + l := int64(len(svrskts)) ids := make([]int64, 0, l) - sks := make([]*normalSocket, 0, min(l, EntryPerPage)) + sks := make([]*normalSocket, 0, min(l, maxResults)) for k := range svrskts { ids = append(ids, k) } sort.Sort(int64Slice(ids)) idx := sort.Search(len(ids), func(i int) bool { return ids[i] >= startID }) - count := 0 + count := int64(0) var end bool for i, v := range ids[idx:] { - if count == EntryPerPage { + if count == maxResults { break } if ns, ok := c.normalSockets[v]; ok { @@ -655,6 +669,23 @@ func (c *channelMap) GetSocket(id int64) *SocketMetric { return nil } +func (c *channelMap) GetServer(id int64) *ServerMetric { + sm := &ServerMetric{} + var svr *server + var ok bool + c.mu.RLock() + if svr, ok = c.servers[id]; !ok { + c.mu.RUnlock() + return nil + } + sm.ListenSockets = copyMap(svr.listenSockets) + c.mu.RUnlock() + sm.ID = svr.id + sm.RefName = svr.refName + sm.ServerData = svr.s.ChannelzMetric() + return sm +} + type idGenerator struct { id int64 } diff --git a/vendor/google.golang.org/grpc/internal/envconfig/envconfig.go b/vendor/google.golang.org/grpc/internal/envconfig/envconfig.go index a3e02b6619..11be7cd08c 100644 --- a/vendor/google.golang.org/grpc/internal/envconfig/envconfig.go +++ b/vendor/google.golang.org/grpc/internal/envconfig/envconfig.go @@ -34,13 +34,9 @@ const ( type RequireHandshakeSetting int const ( - // RequireHandshakeHybrid (default, deprecated) indicates to wait for - // handshake before considering a connection ready, but wait before - // considering successful. - RequireHandshakeHybrid RequireHandshakeSetting = iota - // RequireHandshakeOn (default after the 1.17 release) indicates to wait - // for handshake before considering a connection ready/successful. - RequireHandshakeOn + // RequireHandshakeOn indicates to wait for handshake before considering a + // connection ready/successful. + RequireHandshakeOn RequireHandshakeSetting = iota // RequireHandshakeOff indicates to not wait for handshake before // considering a connection ready/successful. RequireHandshakeOff @@ -53,17 +49,16 @@ var ( // environment variable. // // Will be removed after the 1.18 release. - RequireHandshake RequireHandshakeSetting + RequireHandshake = RequireHandshakeOn ) func init() { switch strings.ToLower(os.Getenv(requireHandshakeStr)) { case "on": + fallthrough + default: RequireHandshake = RequireHandshakeOn case "off": RequireHandshake = RequireHandshakeOff - case "hybrid": - // Will be removed after the 1.17 release. - RequireHandshake = RequireHandshakeHybrid } } diff --git a/vendor/google.golang.org/grpc/internal/internal.go b/vendor/google.golang.org/grpc/internal/internal.go index f8932b1d86..c1d2c690ca 100644 --- a/vendor/google.golang.org/grpc/internal/internal.go +++ b/vendor/google.golang.org/grpc/internal/internal.go @@ -20,17 +20,28 @@ // symbols to avoid circular dependencies. package internal -import "context" +import ( + "context" + "time" +) var ( - // WithContextDialer is exported by clientconn.go - WithContextDialer interface{} // func(context.Context, string) (net.Conn, error) grpc.DialOption - // WithResolverBuilder is exported by clientconn.go + // WithResolverBuilder is exported by dialoptions.go WithResolverBuilder interface{} // func (resolver.Builder) grpc.DialOption + // WithHealthCheckFunc is not exported by dialoptions.go + WithHealthCheckFunc interface{} // func (HealthChecker) DialOption // HealthCheckFunc is used to provide client-side LB channel health checking - HealthCheckFunc func(ctx context.Context, newStream func() (interface{}, error), reportHealth func(bool), serviceName string) error + HealthCheckFunc HealthChecker + // BalancerUnregister is exported by package balancer to unregister a balancer. + BalancerUnregister func(name string) + // KeepaliveMinPingTime is the minimum ping interval. This must be 10s by + // default, but tests may wish to set it lower for convenience. + KeepaliveMinPingTime = 10 * time.Second ) +// HealthChecker defines the signature of the client-side LB channel health checking function. +type HealthChecker func(ctx context.Context, newStream func() (interface{}, error), reportHealth func(bool), serviceName string) error + const ( // CredsBundleModeFallback switches GoogleDefaultCreds to fallback mode. CredsBundleModeFallback = "fallback" diff --git a/vendor/google.golang.org/grpc/internal/syscall/syscall_nonlinux.go b/vendor/google.golang.org/grpc/internal/syscall/syscall_nonlinux.go index 61678feb00..d3fd9dab33 100644 --- a/vendor/google.golang.org/grpc/internal/syscall/syscall_nonlinux.go +++ b/vendor/google.golang.org/grpc/internal/syscall/syscall_nonlinux.go @@ -22,18 +22,24 @@ package syscall import ( "net" + "sync" "time" "google.golang.org/grpc/grpclog" ) -func init() { - grpclog.Info("CPU time info is unavailable on non-linux or appengine environment.") +var once sync.Once + +func log() { + once.Do(func() { + grpclog.Info("CPU time info is unavailable on non-linux or appengine environment.") + }) } // GetCPUTime returns the how much CPU time has passed since the start of this process. // It always returns 0 under non-linux or appengine environment. func GetCPUTime() int64 { + log() return 0 } @@ -42,22 +48,26 @@ type Rusage struct{} // GetRusage is a no-op function under non-linux or appengine environment. func GetRusage() (rusage *Rusage) { + log() return nil } // CPUTimeDiff returns the differences of user CPU time and system CPU time used // between two Rusage structs. It a no-op function for non-linux or appengine environment. func CPUTimeDiff(first *Rusage, latest *Rusage) (float64, float64) { + log() return 0, 0 } // SetTCPUserTimeout is a no-op function under non-linux or appengine environments func SetTCPUserTimeout(conn net.Conn, timeout time.Duration) error { + log() return nil } // GetTCPUserTimeout is a no-op function under non-linux or appengine environments // a negative return value indicates the operation is not supported func GetTCPUserTimeout(conn net.Conn) (int, error) { + log() return -1, nil } diff --git a/vendor/google.golang.org/grpc/internal/transport/handler_server.go b/vendor/google.golang.org/grpc/internal/transport/handler_server.go index 73b41ea7e0..f2de84d43a 100644 --- a/vendor/google.golang.org/grpc/internal/transport/handler_server.go +++ b/vendor/google.golang.org/grpc/internal/transport/handler_server.go @@ -63,9 +63,6 @@ func NewServerHandlerTransport(w http.ResponseWriter, r *http.Request, stats sta if _, ok := w.(http.Flusher); !ok { return nil, errors.New("gRPC requires a ResponseWriter supporting http.Flusher") } - if _, ok := w.(http.CloseNotifier); !ok { - return nil, errors.New("gRPC requires a ResponseWriter supporting http.CloseNotifier") - } st := &serverHandlerTransport{ rw: w, @@ -176,17 +173,11 @@ func (a strAddr) String() string { return string(a) } // do runs fn in the ServeHTTP goroutine. func (ht *serverHandlerTransport) do(fn func()) error { - // Avoid a panic writing to closed channel. Imperfect but maybe good enough. select { case <-ht.closedCh: return ErrConnClosing - default: - select { - case ht.writes <- fn: - return nil - case <-ht.closedCh: - return ErrConnClosing - } + case ht.writes <- fn: + return nil } } @@ -237,7 +228,6 @@ func (ht *serverHandlerTransport) WriteStatus(s *Stream, st *status.Status) erro if ht.stats != nil { ht.stats.HandleRPC(s.Context(), &stats.OutTrailer{}) } - close(ht.writes) } ht.Close() return err @@ -315,19 +305,13 @@ func (ht *serverHandlerTransport) HandleStreams(startStream func(*Stream), trace ctx, cancel = context.WithCancel(ctx) } - // requestOver is closed when either the request's context is done - // or the status has been written via WriteStatus. + // requestOver is closed when the status has been written via WriteStatus. requestOver := make(chan struct{}) - - // clientGone receives a single value if peer is gone, either - // because the underlying connection is dead or because the - // peer sends an http2 RST_STREAM. - clientGone := ht.rw.(http.CloseNotifier).CloseNotify() go func() { select { case <-requestOver: case <-ht.closedCh: - case <-clientGone: + case <-ht.req.Context().Done(): } cancel() ht.Close() @@ -407,10 +391,7 @@ func (ht *serverHandlerTransport) HandleStreams(startStream func(*Stream), trace func (ht *serverHandlerTransport) runStream() { for { select { - case fn, ok := <-ht.writes: - if !ok { - return - } + case fn := <-ht.writes: fn() case <-ht.closedCh: return diff --git a/vendor/google.golang.org/grpc/internal/transport/http2_client.go b/vendor/google.golang.org/grpc/internal/transport/http2_client.go index 39208b146e..9dee6db61d 100644 --- a/vendor/google.golang.org/grpc/internal/transport/http2_client.go +++ b/vendor/google.golang.org/grpc/internal/transport/http2_client.go @@ -91,10 +91,10 @@ type http2Client struct { maxSendHeaderListSize *uint32 bdpEst *bdpEstimator - // onSuccess is a callback that client transport calls upon + // onPrefaceReceipt is a callback that client transport calls upon // receiving server preface to signal that a succefull HTTP2 // connection was established. - onSuccess func() + onPrefaceReceipt func() maxConcurrentStreams uint32 streamQuota int64 @@ -145,7 +145,7 @@ func isTemporary(err error) bool { // newHTTP2Client constructs a connected ClientTransport to addr based on HTTP2 // and starts to receive messages on it. Non-nil error returns if construction // fails. -func newHTTP2Client(connectCtx, ctx context.Context, addr TargetInfo, opts ConnectOptions, onSuccess func(), onGoAway func(GoAwayReason), onClose func()) (_ *http2Client, err error) { +func newHTTP2Client(connectCtx, ctx context.Context, addr TargetInfo, opts ConnectOptions, onPrefaceReceipt func(), onGoAway func(GoAwayReason), onClose func()) (_ *http2Client, err error) { scheme := "http" ctx, cancel := context.WithCancel(ctx) defer func() { @@ -240,7 +240,7 @@ func newHTTP2Client(connectCtx, ctx context.Context, addr TargetInfo, opts Conne kp: kp, statsHandler: opts.StatsHandler, initialWindowSize: initialWindowSize, - onSuccess: onSuccess, + onPrefaceReceipt: onPrefaceReceipt, nextID: 1, maxConcurrentStreams: defaultMaxStreamsClient, streamQuota: defaultMaxStreamsClient, @@ -322,7 +322,9 @@ func newHTTP2Client(connectCtx, ctx context.Context, addr TargetInfo, opts Conne } } - t.framer.writer.Flush() + if err := t.framer.writer.Flush(); err != nil { + return nil, err + } go func() { t.loopy = newLoopyWriter(clientSide, t.framer, t.controlBuf, t.bdpEst) err := t.loopy.run() @@ -362,6 +364,9 @@ func (t *http2Client) newStream(ctx context.Context, callHdr *CallHdr) *Stream { ctx: s.ctx, ctxDone: s.ctx.Done(), recv: s.buf, + closeStream: func(err error) { + t.CloseStream(s, err) + }, }, windowHandler: func(n int) { t.updateWindow(s, uint32(n)) @@ -414,7 +419,7 @@ func (t *http2Client) createHeaderFields(ctx context.Context, callHdr *CallHdr) if dl, ok := ctx.Deadline(); ok { // Send out timeout regardless its value. The server can detect timeout context by itself. // TODO(mmukhi): Perhaps this field should be updated when actually writing out to the wire. - timeout := dl.Sub(time.Now()) + timeout := time.Until(dl) headerFields = append(headerFields, hpack.HeaderField{Name: "grpc-timeout", Value: encodeTimeout(timeout)}) } for k, v := range authData { @@ -780,7 +785,7 @@ func (t *http2Client) Close() error { } t.statsHandler.HandleConn(t.ctx, connEnd) } - go t.onClose() + t.onClose() return err } @@ -1135,15 +1140,27 @@ func (t *http2Client) operateHeaders(frame *http2.MetaHeadersFrame) { if !ok { return } + endStream := frame.StreamEnded() atomic.StoreUint32(&s.bytesReceived, 1) - var state decodeState + initialHeader := atomic.SwapUint32(&s.headerDone, 1) == 0 + + if !initialHeader && !endStream { + // As specified by RFC 7540, a HEADERS frame (and associated CONTINUATION frames) can only appear + // at the start or end of a stream. Therefore, second HEADERS frame must have EOS bit set. + st := status.New(codes.Internal, "a HEADERS frame cannot appear in the middle of a stream") + t.closeStream(s, st.Err(), true, http2.ErrCodeProtocol, st, nil, false) + return + } + + state := &decodeState{} + // Initialize isGRPC value to be !initialHeader, since if a gRPC ResponseHeader has been received + // which indicates peer speaking gRPC, we are in gRPC mode. + state.data.isGRPC = !initialHeader if err := state.decodeHeader(frame); err != nil { - t.closeStream(s, err, true, http2.ErrCodeProtocol, status.New(codes.Internal, err.Error()), nil, false) - // Something wrong. Stops reading even when there is remaining. + t.closeStream(s, err, true, http2.ErrCodeProtocol, status.Convert(err), nil, endStream) return } - endStream := frame.StreamEnded() var isHeader bool defer func() { if t.statsHandler != nil { @@ -1162,29 +1179,30 @@ func (t *http2Client) operateHeaders(frame *http2.MetaHeadersFrame) { } } }() + // If headers haven't been received yet. - if atomic.SwapUint32(&s.headerDone, 1) == 0 { + if initialHeader { if !endStream { - // Headers frame is not actually a trailers-only frame. + // Headers frame is ResponseHeader. isHeader = true // These values can be set without any synchronization because // stream goroutine will read it only after seeing a closed // headerChan which we'll close after setting this. - s.recvCompress = state.encoding - if len(state.mdata) > 0 { - s.header = state.mdata + s.recvCompress = state.data.encoding + if len(state.data.mdata) > 0 { + s.header = state.data.mdata } - } else { - s.noHeaders = true + close(s.headerChan) + return } + // Headers frame is Trailers-only. + s.noHeaders = true close(s.headerChan) } - if !endStream { - return - } + // if client received END_STREAM from server while stream was still active, send RST_STREAM rst := s.getState() == streamActive - t.closeStream(s, io.EOF, rst, http2.ErrCodeNo, state.status(), state.mdata, true) + t.closeStream(s, io.EOF, rst, http2.ErrCodeNo, state.status(), state.data.mdata, true) } // reader runs as a separate goroutine in charge of reading data from network @@ -1210,7 +1228,7 @@ func (t *http2Client) reader() { t.Close() // this kicks off resetTransport, so must be last before return return } - t.onSuccess() + t.onPrefaceReceipt() t.handleSettings(sf, true) // loop to keep reading incoming messages on this transport. @@ -1351,6 +1369,8 @@ func (t *http2Client) ChannelzMetric() *channelz.SocketInternalMetric { return &s } +func (t *http2Client) RemoteAddr() net.Addr { return t.remoteAddr } + func (t *http2Client) IncrMsgSent() { atomic.AddInt64(&t.czData.msgSent, 1) atomic.StoreInt64(&t.czData.lastMsgSentTime, time.Now().UnixNano()) diff --git a/vendor/google.golang.org/grpc/internal/transport/http2_server.go b/vendor/google.golang.org/grpc/internal/transport/http2_server.go index df2740398b..435092e5c8 100644 --- a/vendor/google.golang.org/grpc/internal/transport/http2_server.go +++ b/vendor/google.golang.org/grpc/internal/transport/http2_server.go @@ -286,7 +286,9 @@ func newHTTP2Server(conn net.Conn, config *ServerConfig) (_ ServerTransport, err // operateHeader takes action on the decoded headers. func (t *http2Server) operateHeaders(frame *http2.MetaHeadersFrame, handle func(*Stream), traceCtx func(context.Context, string) context.Context) (fatal bool) { streamID := frame.Header().StreamID - state := decodeState{serverSide: true} + state := &decodeState{ + serverSide: true, + } if err := state.decodeHeader(frame); err != nil { if se, ok := status.FromError(err); ok { t.controlBuf.put(&cleanupStream{ @@ -305,16 +307,16 @@ func (t *http2Server) operateHeaders(frame *http2.MetaHeadersFrame, handle func( st: t, buf: buf, fc: &inFlow{limit: uint32(t.initialWindowSize)}, - recvCompress: state.encoding, - method: state.method, - contentSubtype: state.contentSubtype, + recvCompress: state.data.encoding, + method: state.data.method, + contentSubtype: state.data.contentSubtype, } if frame.StreamEnded() { // s is just created by the caller. No lock needed. s.state = streamReadDone } - if state.timeoutSet { - s.ctx, s.cancel = context.WithTimeout(t.ctx, state.timeout) + if state.data.timeoutSet { + s.ctx, s.cancel = context.WithTimeout(t.ctx, state.data.timeout) } else { s.ctx, s.cancel = context.WithCancel(t.ctx) } @@ -327,19 +329,19 @@ func (t *http2Server) operateHeaders(frame *http2.MetaHeadersFrame, handle func( } s.ctx = peer.NewContext(s.ctx, pr) // Attach the received metadata to the context. - if len(state.mdata) > 0 { - s.ctx = metadata.NewIncomingContext(s.ctx, state.mdata) + if len(state.data.mdata) > 0 { + s.ctx = metadata.NewIncomingContext(s.ctx, state.data.mdata) } - if state.statsTags != nil { - s.ctx = stats.SetIncomingTags(s.ctx, state.statsTags) + if state.data.statsTags != nil { + s.ctx = stats.SetIncomingTags(s.ctx, state.data.statsTags) } - if state.statsTrace != nil { - s.ctx = stats.SetIncomingTrace(s.ctx, state.statsTrace) + if state.data.statsTrace != nil { + s.ctx = stats.SetIncomingTrace(s.ctx, state.data.statsTrace) } if t.inTapHandle != nil { var err error info := &tap.Info{ - FullMethodName: state.method, + FullMethodName: state.data.method, } s.ctx, err = t.inTapHandle(s.ctx, info) if err != nil { @@ -435,7 +437,7 @@ func (t *http2Server) HandleStreams(handle func(*Stream), traceCtx func(context. s := t.activeStreams[se.StreamID] t.mu.Unlock() if s != nil { - t.closeStream(s, true, se.Code, nil, false) + t.closeStream(s, true, se.Code, false) } else { t.controlBuf.put(&cleanupStream{ streamID: se.StreamID, @@ -577,7 +579,7 @@ func (t *http2Server) handleData(f *http2.DataFrame) { } if size > 0 { if err := s.fc.onData(size); err != nil { - t.closeStream(s, true, http2.ErrCodeFlowControl, nil, false) + t.closeStream(s, true, http2.ErrCodeFlowControl, false) return } if f.Header().Flags.Has(http2.FlagDataPadded) { @@ -602,11 +604,18 @@ func (t *http2Server) handleData(f *http2.DataFrame) { } func (t *http2Server) handleRSTStream(f *http2.RSTStreamFrame) { - s, ok := t.getStream(f) - if !ok { + // If the stream is not deleted from the transport's active streams map, then do a regular close stream. + if s, ok := t.getStream(f); ok { + t.closeStream(s, false, 0, false) return } - t.closeStream(s, false, 0, nil, false) + // If the stream is already deleted from the active streams map, then put a cleanupStream item into controlbuf to delete the stream from loopy writer's established streams map. + t.controlBuf.put(&cleanupStream{ + streamID: f.Header().StreamID, + rst: false, + rstCode: 0, + onWrite: func() {}, + }) } func (t *http2Server) handleSettings(f *http2.SettingsFrame) { @@ -770,7 +779,7 @@ func (t *http2Server) writeHeaderLocked(s *Stream) error { if err != nil { return err } - t.closeStream(s, true, http2.ErrCodeInternal, nil, false) + t.closeStream(s, true, http2.ErrCodeInternal, false) return ErrHeaderListSizeLimitViolation } if t.stats != nil { @@ -834,10 +843,12 @@ func (t *http2Server) WriteStatus(s *Stream, st *status.Status) error { if err != nil { return err } - t.closeStream(s, true, http2.ErrCodeInternal, nil, false) + t.closeStream(s, true, http2.ErrCodeInternal, false) return ErrHeaderListSizeLimitViolation } - t.closeStream(s, false, 0, trailingHeader, true) + // Send a RST_STREAM after the trailers if the client has not already half-closed. + rst := s.getState() == streamActive + t.finishStream(s, rst, http2.ErrCodeNo, trailingHeader, true) if t.stats != nil { t.stats.HandleRPC(s.Context(), &stats.OutTrailer{}) } @@ -849,6 +860,9 @@ func (t *http2Server) WriteStatus(s *Stream, st *status.Status) error { func (t *http2Server) Write(s *Stream, hdr []byte, data []byte, opts *Options) error { if !s.isHeaderSent() { // Headers haven't been written yet. if err := t.WriteHeader(s, nil); err != nil { + if _, ok := err.(ConnectionError); ok { + return err + } // TODO(mmukhi, dfawley): Make sure this is the right code to return. return status.Errorf(codes.Internal, "transport: %v", err) } @@ -1004,45 +1018,65 @@ func (t *http2Server) Close() error { return err } -// closeStream clears the footprint of a stream when the stream is not needed -// any more. -func (t *http2Server) closeStream(s *Stream, rst bool, rstCode http2.ErrCode, hdr *headerFrame, eosReceived bool) { - if s.swapState(streamDone) == streamDone { +// deleteStream deletes the stream s from transport's active streams. +func (t *http2Server) deleteStream(s *Stream, eosReceived bool) (oldState streamState) { + oldState = s.swapState(streamDone) + if oldState == streamDone { // If the stream was already done, return. - return + return oldState } + // In case stream sending and receiving are invoked in separate // goroutines (e.g., bi-directional streaming), cancel needs to be // called to interrupt the potential blocking on other goroutines. s.cancel() - cleanup := &cleanupStream{ + + t.mu.Lock() + if _, ok := t.activeStreams[s.id]; ok { + delete(t.activeStreams, s.id) + if len(t.activeStreams) == 0 { + t.idle = time.Now() + } + } + t.mu.Unlock() + + if channelz.IsOn() { + if eosReceived { + atomic.AddInt64(&t.czData.streamsSucceeded, 1) + } else { + atomic.AddInt64(&t.czData.streamsFailed, 1) + } + } + + return oldState +} + +// finishStream closes the stream and puts the trailing headerFrame into controlbuf. +func (t *http2Server) finishStream(s *Stream, rst bool, rstCode http2.ErrCode, hdr *headerFrame, eosReceived bool) { + oldState := t.deleteStream(s, eosReceived) + // If the stream is already closed, then don't put trailing header to controlbuf. + if oldState == streamDone { + return + } + + hdr.cleanup = &cleanupStream{ streamID: s.id, rst: rst, rstCode: rstCode, - onWrite: func() { - t.mu.Lock() - if t.activeStreams != nil { - delete(t.activeStreams, s.id) - if len(t.activeStreams) == 0 { - t.idle = time.Now() - } - } - t.mu.Unlock() - if channelz.IsOn() { - if eosReceived { - atomic.AddInt64(&t.czData.streamsSucceeded, 1) - } else { - atomic.AddInt64(&t.czData.streamsFailed, 1) - } - } - }, - } - if hdr != nil { - hdr.cleanup = cleanup - t.controlBuf.put(hdr) - } else { - t.controlBuf.put(cleanup) + onWrite: func() {}, } + t.controlBuf.put(hdr) +} + +// closeStream clears the footprint of a stream when the stream is not needed any more. +func (t *http2Server) closeStream(s *Stream, rst bool, rstCode http2.ErrCode, eosReceived bool) { + t.deleteStream(s, eosReceived) + t.controlBuf.put(&cleanupStream{ + streamID: s.id, + rst: rst, + rstCode: rstCode, + onWrite: func() {}, + }) } func (t *http2Server) RemoteAddr() net.Addr { @@ -1155,7 +1189,7 @@ func (t *http2Server) IncrMsgRecv() { } func (t *http2Server) getOutFlowWindow() int64 { - resp := make(chan uint32) + resp := make(chan uint32, 1) timer := time.NewTimer(time.Second) defer timer.Stop() t.controlBuf.put(&outFlowControlSizeRequest{resp}) diff --git a/vendor/google.golang.org/grpc/internal/transport/http_util.go b/vendor/google.golang.org/grpc/internal/transport/http_util.go index 77a2cfaaef..9d212867ce 100644 --- a/vendor/google.golang.org/grpc/internal/transport/http_util.go +++ b/vendor/google.golang.org/grpc/internal/transport/http_util.go @@ -78,7 +78,8 @@ var ( codes.ResourceExhausted: http2.ErrCodeEnhanceYourCalm, codes.PermissionDenied: http2.ErrCodeInadequateSecurity, } - httpStatusConvTab = map[int]codes.Code{ + // HTTPStatusConvTab is the HTTP status code to gRPC error code conversion table. + HTTPStatusConvTab = map[int]codes.Code{ // 400 Bad Request - INTERNAL. http.StatusBadRequest: codes.Internal, // 401 Unauthorized - UNAUTHENTICATED. @@ -98,9 +99,7 @@ var ( } ) -// Records the states during HPACK decoding. Must be reset once the -// decoding of the entire headers are finished. -type decodeState struct { +type parsedHeaderData struct { encoding string // statusGen caches the stream status received from the trailer the server // sent. Client side only. Do not access directly. After all trailers are @@ -120,8 +119,30 @@ type decodeState struct { statsTags []byte statsTrace []byte contentSubtype string + + // isGRPC field indicates whether the peer is speaking gRPC (otherwise HTTP). + // + // We are in gRPC mode (peer speaking gRPC) if: + // * We are client side and have already received a HEADER frame that indicates gRPC peer. + // * The header contains valid a content-type, i.e. a string starts with "application/grpc" + // And we should handle error specific to gRPC. + // + // Otherwise (i.e. a content-type string starts without "application/grpc", or does not exist), we + // are in HTTP fallback mode, and should handle error specific to HTTP. + isGRPC bool + grpcErr error + httpErr error + contentTypeErr string +} + +// decodeState configures decoding criteria and records the decoded data. +type decodeState struct { // whether decoding on server side or not serverSide bool + + // Records the states during HPACK decoding. It will be filled with info parsed from HTTP HEADERS + // frame once decodeHeader function has been invoked and returned. + data parsedHeaderData } // isReservedHeader checks whether hdr belongs to HTTP2 headers @@ -202,11 +223,11 @@ func contentType(contentSubtype string) string { } func (d *decodeState) status() *status.Status { - if d.statusGen == nil { + if d.data.statusGen == nil { // No status-details were provided; generate status using code/msg. - d.statusGen = status.New(codes.Code(int32(*(d.rawStatusCode))), d.rawStatusMsg) + d.data.statusGen = status.New(codes.Code(int32(*(d.data.rawStatusCode))), d.data.rawStatusMsg) } - return d.statusGen + return d.data.statusGen } const binHdrSuffix = "-bin" @@ -244,113 +265,146 @@ func (d *decodeState) decodeHeader(frame *http2.MetaHeadersFrame) error { if frame.Truncated { return status.Error(codes.Internal, "peer header list size exceeded limit") } + for _, hf := range frame.Fields { - if err := d.processHeaderField(hf); err != nil { - return err - } + d.processHeaderField(hf) } - if d.serverSide { + if d.data.isGRPC { + if d.data.grpcErr != nil { + return d.data.grpcErr + } + if d.serverSide { + return nil + } + if d.data.rawStatusCode == nil && d.data.statusGen == nil { + // gRPC status doesn't exist. + // Set rawStatusCode to be unknown and return nil error. + // So that, if the stream has ended this Unknown status + // will be propagated to the user. + // Otherwise, it will be ignored. In which case, status from + // a later trailer, that has StreamEnded flag set, is propagated. + code := int(codes.Unknown) + d.data.rawStatusCode = &code + } return nil } - // If grpc status exists, no need to check further. - if d.rawStatusCode != nil || d.statusGen != nil { - return nil + // HTTP fallback mode + if d.data.httpErr != nil { + return d.data.httpErr } - // If grpc status doesn't exist and http status doesn't exist, - // then it's a malformed header. - if d.httpStatus == nil { - return status.Error(codes.Internal, "malformed header: doesn't contain status(gRPC or HTTP)") - } + var ( + code = codes.Internal // when header does not include HTTP status, return INTERNAL + ok bool + ) - if *(d.httpStatus) != http.StatusOK { - code, ok := httpStatusConvTab[*(d.httpStatus)] + if d.data.httpStatus != nil { + code, ok = HTTPStatusConvTab[*(d.data.httpStatus)] if !ok { code = codes.Unknown } - return status.Error(code, http.StatusText(*(d.httpStatus))) - } - - // gRPC status doesn't exist and http status is OK. - // Set rawStatusCode to be unknown and return nil error. - // So that, if the stream has ended this Unknown status - // will be propagated to the user. - // Otherwise, it will be ignored. In which case, status from - // a later trailer, that has StreamEnded flag set, is propagated. - code := int(codes.Unknown) - d.rawStatusCode = &code - return nil + } + + return status.Error(code, d.constructHTTPErrMsg()) +} + +// constructErrMsg constructs error message to be returned in HTTP fallback mode. +// Format: HTTP status code and its corresponding message + content-type error message. +func (d *decodeState) constructHTTPErrMsg() string { + var errMsgs []string + + if d.data.httpStatus == nil { + errMsgs = append(errMsgs, "malformed header: missing HTTP status") + } else { + errMsgs = append(errMsgs, fmt.Sprintf("%s: HTTP status code %d", http.StatusText(*(d.data.httpStatus)), *d.data.httpStatus)) + } + + if d.data.contentTypeErr == "" { + errMsgs = append(errMsgs, "transport: missing content-type field") + } else { + errMsgs = append(errMsgs, d.data.contentTypeErr) + } + + return strings.Join(errMsgs, "; ") } func (d *decodeState) addMetadata(k, v string) { - if d.mdata == nil { - d.mdata = make(map[string][]string) + if d.data.mdata == nil { + d.data.mdata = make(map[string][]string) } - d.mdata[k] = append(d.mdata[k], v) + d.data.mdata[k] = append(d.data.mdata[k], v) } -func (d *decodeState) processHeaderField(f hpack.HeaderField) error { +func (d *decodeState) processHeaderField(f hpack.HeaderField) { switch f.Name { case "content-type": contentSubtype, validContentType := contentSubtype(f.Value) if !validContentType { - return status.Errorf(codes.Internal, "transport: received the unexpected content-type %q", f.Value) + d.data.contentTypeErr = fmt.Sprintf("transport: received the unexpected content-type %q", f.Value) + return } - d.contentSubtype = contentSubtype + d.data.contentSubtype = contentSubtype // TODO: do we want to propagate the whole content-type in the metadata, // or come up with a way to just propagate the content-subtype if it was set? // ie {"content-type": "application/grpc+proto"} or {"content-subtype": "proto"} // in the metadata? d.addMetadata(f.Name, f.Value) + d.data.isGRPC = true case "grpc-encoding": - d.encoding = f.Value + d.data.encoding = f.Value case "grpc-status": code, err := strconv.Atoi(f.Value) if err != nil { - return status.Errorf(codes.Internal, "transport: malformed grpc-status: %v", err) + d.data.grpcErr = status.Errorf(codes.Internal, "transport: malformed grpc-status: %v", err) + return } - d.rawStatusCode = &code + d.data.rawStatusCode = &code case "grpc-message": - d.rawStatusMsg = decodeGrpcMessage(f.Value) + d.data.rawStatusMsg = decodeGrpcMessage(f.Value) case "grpc-status-details-bin": v, err := decodeBinHeader(f.Value) if err != nil { - return status.Errorf(codes.Internal, "transport: malformed grpc-status-details-bin: %v", err) + d.data.grpcErr = status.Errorf(codes.Internal, "transport: malformed grpc-status-details-bin: %v", err) + return } s := &spb.Status{} if err := proto.Unmarshal(v, s); err != nil { - return status.Errorf(codes.Internal, "transport: malformed grpc-status-details-bin: %v", err) + d.data.grpcErr = status.Errorf(codes.Internal, "transport: malformed grpc-status-details-bin: %v", err) + return } - d.statusGen = status.FromProto(s) + d.data.statusGen = status.FromProto(s) case "grpc-timeout": - d.timeoutSet = true + d.data.timeoutSet = true var err error - if d.timeout, err = decodeTimeout(f.Value); err != nil { - return status.Errorf(codes.Internal, "transport: malformed time-out: %v", err) + if d.data.timeout, err = decodeTimeout(f.Value); err != nil { + d.data.grpcErr = status.Errorf(codes.Internal, "transport: malformed time-out: %v", err) } case ":path": - d.method = f.Value + d.data.method = f.Value case ":status": code, err := strconv.Atoi(f.Value) if err != nil { - return status.Errorf(codes.Internal, "transport: malformed http-status: %v", err) + d.data.httpErr = status.Errorf(codes.Internal, "transport: malformed http-status: %v", err) + return } - d.httpStatus = &code + d.data.httpStatus = &code case "grpc-tags-bin": v, err := decodeBinHeader(f.Value) if err != nil { - return status.Errorf(codes.Internal, "transport: malformed grpc-tags-bin: %v", err) + d.data.grpcErr = status.Errorf(codes.Internal, "transport: malformed grpc-tags-bin: %v", err) + return } - d.statsTags = v + d.data.statsTags = v d.addMetadata(f.Name, string(v)) case "grpc-trace-bin": v, err := decodeBinHeader(f.Value) if err != nil { - return status.Errorf(codes.Internal, "transport: malformed grpc-trace-bin: %v", err) + d.data.grpcErr = status.Errorf(codes.Internal, "transport: malformed grpc-trace-bin: %v", err) + return } - d.statsTrace = v + d.data.statsTrace = v d.addMetadata(f.Name, string(v)) default: if isReservedHeader(f.Name) && !isWhitelistedHeader(f.Name) { @@ -359,11 +413,10 @@ func (d *decodeState) processHeaderField(f hpack.HeaderField) error { v, err := decodeMetadataHeader(f.Name, f.Value) if err != nil { errorf("Failed to decode metadata header (%q, %q): %v", f.Name, f.Value, err) - return nil + return } d.addMetadata(f.Name, v) } - return nil } type timeoutUnit uint8 diff --git a/vendor/google.golang.org/grpc/internal/transport/transport.go b/vendor/google.golang.org/grpc/internal/transport/transport.go index 4d7e89067c..7f82cbb080 100644 --- a/vendor/google.golang.org/grpc/internal/transport/transport.go +++ b/vendor/google.golang.org/grpc/internal/transport/transport.go @@ -110,15 +110,15 @@ func (b *recvBuffer) get() <-chan recvMsg { return b.c } -// // recvBufferReader implements io.Reader interface to read the data from // recvBuffer. type recvBufferReader struct { - ctx context.Context - ctxDone <-chan struct{} // cache of ctx.Done() (for performance). - recv *recvBuffer - last []byte // Stores the remaining data in the previous calls. - err error + closeStream func(error) // Closes the client transport stream with the given error and nil trailer metadata. + ctx context.Context + ctxDone <-chan struct{} // cache of ctx.Done() (for performance). + recv *recvBuffer + last []byte // Stores the remaining data in the previous calls. + err error } // Read reads the next len(p) bytes from last. If last is drained, it tries to @@ -128,31 +128,53 @@ func (r *recvBufferReader) Read(p []byte) (n int, err error) { if r.err != nil { return 0, r.err } - n, r.err = r.read(p) - return n, r.err -} - -func (r *recvBufferReader) read(p []byte) (n int, err error) { if r.last != nil && len(r.last) > 0 { // Read remaining data left in last call. copied := copy(p, r.last) r.last = r.last[copied:] return copied, nil } + if r.closeStream != nil { + n, r.err = r.readClient(p) + } else { + n, r.err = r.read(p) + } + return n, r.err +} + +func (r *recvBufferReader) read(p []byte) (n int, err error) { select { case <-r.ctxDone: return 0, ContextErr(r.ctx.Err()) case m := <-r.recv.get(): - r.recv.load() - if m.err != nil { - return 0, m.err - } - copied := copy(p, m.data) - r.last = m.data[copied:] - return copied, nil + return r.readAdditional(m, p) } } +func (r *recvBufferReader) readClient(p []byte) (n int, err error) { + // If the context is canceled, then closes the stream with nil metadata. + // closeStream writes its error parameter to r.recv as a recvMsg. + // r.readAdditional acts on that message and returns the necessary error. + select { + case <-r.ctxDone: + r.closeStream(ContextErr(r.ctx.Err())) + m := <-r.recv.get() + return r.readAdditional(m, p) + case m := <-r.recv.get(): + return r.readAdditional(m, p) + } +} + +func (r *recvBufferReader) readAdditional(m recvMsg, p []byte) (n int, err error) { + r.recv.load() + if m.err != nil { + return 0, m.err + } + copied := copy(p, m.data) + r.last = m.data[copied:] + return copied, nil +} + type streamState uint32 const ( @@ -305,8 +327,7 @@ func (s *Stream) TrailersOnly() (bool, error) { if err != nil { return false, err } - // if !headerDone, some other connection error occurred. - return s.noHeaders && atomic.LoadUint32(&s.headerDone) == 1, nil + return s.noHeaders, nil } // Trailer returns the cached trailer metedata. Note that if it is not called @@ -511,8 +532,8 @@ type TargetInfo struct { // NewClientTransport establishes the transport with the required ConnectOptions // and returns it to the caller. -func NewClientTransport(connectCtx, ctx context.Context, target TargetInfo, opts ConnectOptions, onSuccess func(), onGoAway func(GoAwayReason), onClose func()) (ClientTransport, error) { - return newHTTP2Client(connectCtx, ctx, target, opts, onSuccess, onGoAway, onClose) +func NewClientTransport(connectCtx, ctx context.Context, target TargetInfo, opts ConnectOptions, onPrefaceReceipt func(), onGoAway func(GoAwayReason), onClose func()) (ClientTransport, error) { + return newHTTP2Client(connectCtx, ctx, target, opts, onPrefaceReceipt, onGoAway, onClose) } // Options provides additional hints and information for message @@ -589,6 +610,9 @@ type ClientTransport interface { // GetGoAwayReason returns the reason why GoAway frame was received. GetGoAwayReason() GoAwayReason + // RemoteAddr returns the remote network address. + RemoteAddr() net.Addr + // IncrMsgSent increments the number of message sent through this transport. IncrMsgSent() diff --git a/vendor/google.golang.org/grpc/keepalive/keepalive.go b/vendor/google.golang.org/grpc/keepalive/keepalive.go index 78eea1fc93..34d31b5e7d 100644 --- a/vendor/google.golang.org/grpc/keepalive/keepalive.go +++ b/vendor/google.golang.org/grpc/keepalive/keepalive.go @@ -33,6 +33,7 @@ import ( type ClientParameters struct { // After a duration of this time if the client doesn't see any activity it // pings the server to see if the transport is still alive. + // If set below 10s, a minimum value of 10s will be used instead. Time time.Duration // The current default value is infinity. // After having pinged for keepalive check, the client waits for a duration // of Timeout and if no activity is seen even after that the connection is @@ -57,11 +58,12 @@ type ServerParameters struct { // random jitter of +/-10% will be added to MaxConnectionAge to spread out // connection storms. MaxConnectionAge time.Duration // The current default value is infinity. - // MaxConnectinoAgeGrace is an additive period after MaxConnectionAge after + // MaxConnectionAgeGrace is an additive period after MaxConnectionAge after // which the connection will be forcibly closed. MaxConnectionAgeGrace time.Duration // The current default value is infinity. // After a duration of this time if the server doesn't see any activity it // pings the client to see if the transport is still alive. + // If set below 1s, a minimum value of 1s will be used instead. Time time.Duration // The current default value is 2 hours. // After having pinged for keepalive check, the server waits for a duration // of Timeout and if no activity is seen even after that the connection is diff --git a/vendor/google.golang.org/grpc/naming/dns_resolver.go b/vendor/google.golang.org/grpc/naming/dns_resolver.go index fd8cd3b5a4..c9f79dc533 100644 --- a/vendor/google.golang.org/grpc/naming/dns_resolver.go +++ b/vendor/google.golang.org/grpc/naming/dns_resolver.go @@ -76,8 +76,8 @@ func formatIP(addr string) (addrIP string, ok bool) { // parseTarget takes the user input target string, returns formatted host and port info. // If target doesn't specify a port, set the port to be the defaultPort. -// If target is in IPv6 format and host-name is enclosed in sqarue brackets, brackets -// are strippd when setting the host. +// If target is in IPv6 format and host-name is enclosed in square brackets, brackets +// are stripped when setting the host. // examples: // target: "www.google.com" returns host: "www.google.com", port: "443" // target: "ipv4-host:80" returns host: "ipv4-host", port: "80" @@ -221,7 +221,7 @@ func (w *dnsWatcher) lookupSRV() map[string]*Update { for _, s := range srvs { lbAddrs, err := lookupHost(w.ctx, s.Target) if err != nil { - grpclog.Warningf("grpc: failed load banlacer address dns lookup due to %v.\n", err) + grpclog.Warningf("grpc: failed load balancer address dns lookup due to %v.\n", err) continue } for _, a := range lbAddrs { diff --git a/vendor/google.golang.org/grpc/naming/naming.go b/vendor/google.golang.org/grpc/naming/naming.go index 8cc39e9375..c99fdbef43 100644 --- a/vendor/google.golang.org/grpc/naming/naming.go +++ b/vendor/google.golang.org/grpc/naming/naming.go @@ -17,7 +17,7 @@ */ // Package naming defines the naming API and related data structures for gRPC. -// The interface is EXPERIMENTAL and may be suject to change. +// The interface is EXPERIMENTAL and may be subject to change. // // Deprecated: please use package resolver. package naming diff --git a/vendor/google.golang.org/grpc/picker_wrapper.go b/vendor/google.golang.org/grpc/picker_wrapper.go index 14f915d676..f9625496c4 100644 --- a/vendor/google.golang.org/grpc/picker_wrapper.go +++ b/vendor/google.golang.org/grpc/picker_wrapper.go @@ -101,10 +101,7 @@ func doneChannelzWrapper(acw *acBalancerWrapper, done func(balancer.DoneInfo)) f // - the subConn returned by the current picker is not READY // When one of these situations happens, pick blocks until the picker gets updated. func (bp *pickerWrapper) pick(ctx context.Context, failfast bool, opts balancer.PickOptions) (transport.ClientTransport, func(balancer.DoneInfo), error) { - var ( - p balancer.Picker - ch chan struct{} - ) + var ch chan struct{} for { bp.mu.Lock() @@ -130,7 +127,7 @@ func (bp *pickerWrapper) pick(ctx context.Context, failfast bool, opts balancer. } ch = bp.blockingCh - p = bp.picker + p := bp.picker bp.mu.Unlock() subConn, done, err := p.Pick(ctx, opts) @@ -144,15 +141,22 @@ func (bp *pickerWrapper) pick(ctx context.Context, failfast bool, opts balancer. continue } return nil, nil, status.Errorf(codes.Unavailable, "%v, latest connection error: %v", err, bp.connectionError()) + case context.DeadlineExceeded: + return nil, nil, status.Error(codes.DeadlineExceeded, err.Error()) + case context.Canceled: + return nil, nil, status.Error(codes.Canceled, err.Error()) default: + if _, ok := status.FromError(err); ok { + return nil, nil, err + } // err is some other error. - return nil, nil, toRPCErr(err) + return nil, nil, status.Error(codes.Unknown, err.Error()) } } acw, ok := subConn.(*acBalancerWrapper) if !ok { - grpclog.Infof("subconn returned from pick is not *acBalancerWrapper") + grpclog.Error("subconn returned from pick is not *acBalancerWrapper") continue } if t, ok := acw.getAddrConn().getReadyTransport(); ok { @@ -161,6 +165,11 @@ func (bp *pickerWrapper) pick(ctx context.Context, failfast bool, opts balancer. } return t, done, nil } + if done != nil { + // Calling done with nil error, no bytes sent and no bytes received. + // DoneInfo with default value works. + done(balancer.DoneInfo{}) + } grpclog.Infof("blockingPicker: the picked transport is not ready, loop back to repick") // If ok == false, ac.state is not READY. // A valid picker always returns READY subConn. This means the state of ac diff --git a/vendor/google.golang.org/grpc/resolver/dns/dns_resolver.go b/vendor/google.golang.org/grpc/resolver/dns/dns_resolver.go index f33189fede..5835599077 100644 --- a/vendor/google.golang.org/grpc/resolver/dns/dns_resolver.go +++ b/vendor/google.golang.org/grpc/resolver/dns/dns_resolver.go @@ -47,6 +47,8 @@ const ( defaultFreq = time.Minute * 30 defaultDNSSvrPort = "53" golang = "GO" + // txtPrefix is the prefix string to be prepended to the host name for txt record lookup. + txtPrefix = "_grpc_config." // In DNS, service config is encoded in a TXT record via the mechanism // described in RFC-1464 using the attribute name grpc_config. txtAttribute = "grpc_config=" @@ -282,7 +284,7 @@ func (d *dnsResolver) lookupSRV() []resolver.Address { } func (d *dnsResolver) lookupTXT() string { - ss, err := d.resolver.LookupTXT(d.ctx, d.host) + ss, err := d.resolver.LookupTXT(d.ctx, txtPrefix+d.host) if err != nil { grpclog.Infof("grpc: failed dns TXT record lookup due to %v.\n", err) return "" @@ -346,8 +348,8 @@ func formatIP(addr string) (addrIP string, ok bool) { // parseTarget takes the user input target string and default port, returns formatted host and port info. // If target doesn't specify a port, set the port to be the defaultPort. -// If target is in IPv6 format and host-name is enclosed in sqarue brackets, brackets -// are strippd when setting the host. +// If target is in IPv6 format and host-name is enclosed in square brackets, brackets +// are stripped when setting the host. // examples: // target: "www.google.com" defaultPort: "443" returns host: "www.google.com", port: "443" // target: "ipv4-host:80" defaultPort: "443" returns host: "ipv4-host", port: "80" diff --git a/vendor/google.golang.org/grpc/resolver/passthrough/passthrough.go b/vendor/google.golang.org/grpc/resolver/passthrough/passthrough.go index b76010d74d..893d5d12cb 100644 --- a/vendor/google.golang.org/grpc/resolver/passthrough/passthrough.go +++ b/vendor/google.golang.org/grpc/resolver/passthrough/passthrough.go @@ -45,7 +45,7 @@ type passthroughResolver struct { } func (r *passthroughResolver) start() { - r.cc.NewAddress([]resolver.Address{{Addr: r.target.Endpoint}}) + r.cc.UpdateState(resolver.State{Addresses: []resolver.Address{{Addr: r.target.Endpoint}}}) } func (*passthroughResolver) ResolveNow(o resolver.ResolveNowOption) {} diff --git a/vendor/google.golang.org/grpc/resolver/resolver.go b/vendor/google.golang.org/grpc/resolver/resolver.go index 145cf477ed..52ec603daa 100644 --- a/vendor/google.golang.org/grpc/resolver/resolver.go +++ b/vendor/google.golang.org/grpc/resolver/resolver.go @@ -98,6 +98,15 @@ type BuildOption struct { DisableServiceConfig bool } +// State contains the current Resolver state relevant to the ClientConn. +type State struct { + Addresses []Address // Resolved addresses for the target + ServiceConfig string // JSON representation of the service config + + // TODO: add Err error + // TODO: add ParsedServiceConfig interface{} +} + // ClientConn contains the callbacks for resolver to notify any updates // to the gRPC ClientConn. // @@ -106,12 +115,18 @@ type BuildOption struct { // testing, the new implementation should embed this interface. This allows // gRPC to add new methods to this interface. type ClientConn interface { + // UpdateState updates the state of the ClientConn appropriately. + UpdateState(State) // NewAddress is called by resolver to notify ClientConn a new list // of resolved addresses. // The address list should be the complete list of resolved addresses. + // + // Deprecated: Use UpdateState instead. NewAddress(addresses []Address) // NewServiceConfig is called by resolver to notify ClientConn a new // service config. The service config should be provided as a json string. + // + // Deprecated: Use UpdateState instead. NewServiceConfig(serviceConfig string) } diff --git a/vendor/google.golang.org/grpc/resolver_conn_wrapper.go b/vendor/google.golang.org/grpc/resolver_conn_wrapper.go index 9d7602539f..e9cef3a92b 100644 --- a/vendor/google.golang.org/grpc/resolver_conn_wrapper.go +++ b/vendor/google.golang.org/grpc/resolver_conn_wrapper.go @@ -21,6 +21,7 @@ package grpc import ( "fmt" "strings" + "sync/atomic" "google.golang.org/grpc/grpclog" "google.golang.org/grpc/internal/channelz" @@ -30,16 +31,16 @@ import ( // ccResolverWrapper is a wrapper on top of cc for resolvers. // It implements resolver.ClientConnection interface. type ccResolverWrapper struct { - cc *ClientConn - resolver resolver.Resolver - addrCh chan []resolver.Address - scCh chan string - done chan struct{} - lastAddressesCount int + cc *ClientConn + resolver resolver.Resolver + addrCh chan []resolver.Address + scCh chan string + done uint32 // accessed atomically; set to 1 when closed. + curState resolver.State } // split2 returns the values from strings.SplitN(s, sep, 2). -// If sep is not found, it returns ("", s, false) instead. +// If sep is not found, it returns ("", "", false) instead. func split2(s, sep string) (string, string, bool) { spl := strings.SplitN(s, sep, 2) if len(spl) < 2 { @@ -82,7 +83,6 @@ func newCCResolverWrapper(cc *ClientConn) (*ccResolverWrapper, error) { cc: cc, addrCh: make(chan []resolver.Address, 1), scCh: make(chan string, 1), - done: make(chan struct{}), } var err error @@ -99,57 +99,67 @@ func (ccr *ccResolverWrapper) resolveNow(o resolver.ResolveNowOption) { func (ccr *ccResolverWrapper) close() { ccr.resolver.Close() - close(ccr.done) + atomic.StoreUint32(&ccr.done, 1) } -// NewAddress is called by the resolver implemenetion to send addresses to gRPC. +func (ccr *ccResolverWrapper) isDone() bool { + return atomic.LoadUint32(&ccr.done) == 1 +} + +func (ccr *ccResolverWrapper) UpdateState(s resolver.State) { + if ccr.isDone() { + return + } + grpclog.Infof("ccResolverWrapper: sending update to cc: %v", s) + if channelz.IsOn() { + ccr.addChannelzTraceEvent(s) + } + ccr.cc.updateResolverState(s) + ccr.curState = s +} + +// NewAddress is called by the resolver implementation to send addresses to gRPC. func (ccr *ccResolverWrapper) NewAddress(addrs []resolver.Address) { - select { - case <-ccr.done: + if ccr.isDone() { return - default: } grpclog.Infof("ccResolverWrapper: sending new addresses to cc: %v", addrs) if channelz.IsOn() { - ccr.addChannelzTraceEvent(addrs) + ccr.addChannelzTraceEvent(resolver.State{Addresses: addrs, ServiceConfig: ccr.curState.ServiceConfig}) } - ccr.cc.handleResolvedAddrs(addrs, nil) + ccr.curState.Addresses = addrs + ccr.cc.updateResolverState(ccr.curState) } -// NewServiceConfig is called by the resolver implemenetion to send service +// NewServiceConfig is called by the resolver implementation to send service // configs to gRPC. func (ccr *ccResolverWrapper) NewServiceConfig(sc string) { - select { - case <-ccr.done: + if ccr.isDone() { return - default: } grpclog.Infof("ccResolverWrapper: got new service config: %v", sc) - ccr.cc.handleServiceConfig(sc) + if channelz.IsOn() { + ccr.addChannelzTraceEvent(resolver.State{Addresses: ccr.curState.Addresses, ServiceConfig: sc}) + } + ccr.curState.ServiceConfig = sc + ccr.cc.updateResolverState(ccr.curState) } -func (ccr *ccResolverWrapper) addChannelzTraceEvent(addrs []resolver.Address) { - if len(addrs) == 0 && ccr.lastAddressesCount != 0 { - channelz.AddTraceEvent(ccr.cc.channelzID, &channelz.TraceEventDesc{ - Desc: "Resolver returns an empty address list", - Severity: channelz.CtWarning, - }) - } else if len(addrs) != 0 && ccr.lastAddressesCount == 0 { - var s string - for i, a := range addrs { - if a.ServerName != "" { - s += a.Addr + "(" + a.ServerName + ")" - } else { - s += a.Addr - } - if i != len(addrs)-1 { - s += " " - } - } - channelz.AddTraceEvent(ccr.cc.channelzID, &channelz.TraceEventDesc{ - Desc: fmt.Sprintf("Resolver returns a non-empty address list (previous one was empty) %q", s), - Severity: channelz.CtINFO, - }) +func (ccr *ccResolverWrapper) addChannelzTraceEvent(s resolver.State) { + if s.ServiceConfig == ccr.curState.ServiceConfig && (len(ccr.curState.Addresses) == 0) == (len(s.Addresses) == 0) { + return + } + var updates []string + if s.ServiceConfig != ccr.curState.ServiceConfig { + updates = append(updates, "service config updated") + } + if len(ccr.curState.Addresses) > 0 && len(s.Addresses) == 0 { + updates = append(updates, "resolver returned an empty address list") + } else if len(ccr.curState.Addresses) == 0 && len(s.Addresses) > 0 { + updates = append(updates, "resolver returned new addresses") } - ccr.lastAddressesCount = len(addrs) + channelz.AddTraceEvent(ccr.cc.channelzID, &channelz.TraceEventDesc{ + Desc: fmt.Sprintf("Resolver state updated: %+v (%v)", s, strings.Join(updates, "; ")), + Severity: channelz.CtINFO, + }) } diff --git a/vendor/google.golang.org/grpc/rpc_util.go b/vendor/google.golang.org/grpc/rpc_util.go index 86f00e5a2d..2a595622d3 100644 --- a/vendor/google.golang.org/grpc/rpc_util.go +++ b/vendor/google.golang.org/grpc/rpc_util.go @@ -253,8 +253,8 @@ func (o PeerCallOption) after(c *callInfo) { } } -// FailFast configures the action to take when an RPC is attempted on broken -// connections or unreachable servers. If failFast is true, the RPC will fail +// WaitForReady configures the action to take when an RPC is attempted on broken +// connections or unreachable servers. If waitForReady is false, the RPC will fail // immediately. Otherwise, the RPC client will block the call until a // connection is available (or the call is canceled or times out) and will // retry the call if it fails due to a transient error. gRPC will not retry if @@ -262,7 +262,14 @@ func (o PeerCallOption) after(c *callInfo) { // the data. Please refer to // https://github.com/grpc/grpc/blob/master/doc/wait-for-ready.md. // -// By default, RPCs are "Fail Fast". +// By default, RPCs don't "wait for ready". +func WaitForReady(waitForReady bool) CallOption { + return FailFastCallOption{FailFast: !waitForReady} +} + +// FailFast is the opposite of WaitForReady. +// +// Deprecated: use WaitForReady. func FailFast(failFast bool) CallOption { return FailFastCallOption{FailFast: failFast} } @@ -363,13 +370,13 @@ func (o CompressorCallOption) after(c *callInfo) {} // https://github.com/grpc/grpc/blob/master/doc/PROTOCOL-HTTP2.md#requests for // more details. // -// If CallCustomCodec is not also used, the content-subtype will be used to -// look up the Codec to use in the registry controlled by RegisterCodec. See -// the documentation on RegisterCodec for details on registration. The lookup -// of content-subtype is case-insensitive. If no such Codec is found, the call +// If ForceCodec is not also used, the content-subtype will be used to look up +// the Codec to use in the registry controlled by RegisterCodec. See the +// documentation on RegisterCodec for details on registration. The lookup of +// content-subtype is case-insensitive. If no such Codec is found, the call // will result in an error with code codes.Internal. // -// If CallCustomCodec is also used, that Codec will be used for all request and +// If ForceCodec is also used, that Codec will be used for all request and // response messages, with the content-subtype set to the given contentSubtype // here for requests. func CallContentSubtype(contentSubtype string) CallOption { @@ -389,7 +396,7 @@ func (o ContentSubtypeCallOption) before(c *callInfo) error { } func (o ContentSubtypeCallOption) after(c *callInfo) {} -// CallCustomCodec returns a CallOption that will set the given Codec to be +// ForceCodec returns a CallOption that will set the given Codec to be // used for all request and response messages for a call. The result of calling // String() will be used as the content-subtype in a case-insensitive manner. // @@ -401,12 +408,37 @@ func (o ContentSubtypeCallOption) after(c *callInfo) {} // // This function is provided for advanced users; prefer to use only // CallContentSubtype to select a registered codec instead. +// +// This is an EXPERIMENTAL API. +func ForceCodec(codec encoding.Codec) CallOption { + return ForceCodecCallOption{Codec: codec} +} + +// ForceCodecCallOption is a CallOption that indicates the codec used for +// marshaling messages. +// +// This is an EXPERIMENTAL API. +type ForceCodecCallOption struct { + Codec encoding.Codec +} + +func (o ForceCodecCallOption) before(c *callInfo) error { + c.codec = o.Codec + return nil +} +func (o ForceCodecCallOption) after(c *callInfo) {} + +// CallCustomCodec behaves like ForceCodec, but accepts a grpc.Codec instead of +// an encoding.Codec. +// +// Deprecated: use ForceCodec instead. func CallCustomCodec(codec Codec) CallOption { return CustomCodecCallOption{Codec: codec} } // CustomCodecCallOption is a CallOption that indicates the codec used for // marshaling messages. +// // This is an EXPERIMENTAL API. type CustomCodecCallOption struct { Codec Codec @@ -629,7 +661,9 @@ func recvAndDecompress(p *parser, s *transport.Stream, dc Decompressor, maxRecei if err != nil { return nil, status.Errorf(codes.Internal, "grpc: failed to decompress the received message %v", err) } - d, err = ioutil.ReadAll(dcReader) + // Read from LimitReader with limit max+1. So if the underlying + // reader is over limit, the result will be bigger than max. + d, err = ioutil.ReadAll(io.LimitReader(dcReader, int64(maxReceiveMessageSize)+1)) if err != nil { return nil, status.Errorf(codes.Internal, "grpc: failed to decompress the received message %v", err) } @@ -678,23 +712,17 @@ func rpcInfoFromContext(ctx context.Context) (s *rpcInfo, ok bool) { // Code returns the error code for err if it was produced by the rpc system. // Otherwise, it returns codes.Unknown. // -// Deprecated: use status.FromError and Code method instead. +// Deprecated: use status.Code instead. func Code(err error) codes.Code { - if s, ok := status.FromError(err); ok { - return s.Code() - } - return codes.Unknown + return status.Code(err) } // ErrorDesc returns the error description of err if it was produced by the rpc system. // Otherwise, it returns err.Error() or empty string when err is nil. // -// Deprecated: use status.FromError and Message method instead. +// Deprecated: use status.Convert and Message method instead. func ErrorDesc(err error) string { - if s, ok := status.FromError(err); ok { - return s.Message() - } - return err.Error() + return status.Convert(err).Message() } // Errorf returns an error containing an error code and a description; diff --git a/vendor/google.golang.org/grpc/server.go b/vendor/google.golang.org/grpc/server.go index d705d7a80c..8115828fdf 100644 --- a/vendor/google.golang.org/grpc/server.go +++ b/vendor/google.golang.org/grpc/server.go @@ -182,6 +182,11 @@ func InitialConnWindowSize(s int32) ServerOption { // KeepaliveParams returns a ServerOption that sets keepalive and max-age parameters for the server. func KeepaliveParams(kp keepalive.ServerParameters) ServerOption { + if kp.Time > 0 && kp.Time < time.Second { + grpclog.Warning("Adjusting keepalive ping interval to minimum period of 1s") + kp.Time = time.Second + } + return func(o *options) { o.keepaliveParams = kp } @@ -244,7 +249,7 @@ func MaxRecvMsgSize(m int) ServerOption { } // MaxSendMsgSize returns a ServerOption to set the max message size in bytes the server can send. -// If this is not set, gRPC uses the default 4MB. +// If this is not set, gRPC uses the default `math.MaxInt32`. func MaxSendMsgSize(m int) ServerOption { return func(o *options) { o.maxSendMessageSize = m @@ -609,12 +614,13 @@ func (s *Server) handleRawConn(rawConn net.Conn) { rawConn.SetDeadline(time.Now().Add(s.opts.connectionTimeout)) conn, authInfo, err := s.useTransportAuthenticator(rawConn) if err != nil { - s.mu.Lock() - s.errorf("ServerHandshake(%q) failed: %v", rawConn.RemoteAddr(), err) - s.mu.Unlock() - grpclog.Warningf("grpc: Server.Serve failed to complete security handshake from %q: %v", rawConn.RemoteAddr(), err) - // If serverHandshake returns ErrConnDispatched, keep rawConn open. + // ErrConnDispatched means that the connection was dispatched away from + // gRPC; those connections should be left open. if err != credentials.ErrConnDispatched { + s.mu.Lock() + s.errorf("ServerHandshake(%q) failed: %v", rawConn.RemoteAddr(), err) + s.mu.Unlock() + grpclog.Warningf("grpc: Server.Serve failed to complete security handshake from %q: %v", rawConn.RemoteAddr(), err) rawConn.Close() } rawConn.SetDeadline(time.Time{}) @@ -743,12 +749,13 @@ func (s *Server) traceInfo(st transport.ServerTransport, stream *transport.Strea trInfo = &traceInfo{ tr: tr, + firstLine: firstLine{ + client: false, + remoteAddr: st.RemoteAddr(), + }, } - trInfo.firstLine.client = false - trInfo.firstLine.remoteAddr = st.RemoteAddr() - if dl, ok := stream.Context().Deadline(); ok { - trInfo.firstLine.deadline = dl.Sub(time.Now()) + trInfo.firstLine.deadline = time.Until(dl) } return trInfo } @@ -854,7 +861,6 @@ func (s *Server) processUnaryRPC(t transport.ServerTransport, stream *transport. } if trInfo != nil { defer trInfo.tr.Finish() - trInfo.firstLine.client = false trInfo.tr.LazyLog(&trInfo.firstLine, false) defer func() { if err != nil && err != io.EOF { @@ -874,7 +880,7 @@ func (s *Server) processUnaryRPC(t transport.ServerTransport, stream *transport. PeerAddr: nil, } if deadline, ok := ctx.Deadline(); ok { - logEntry.Timeout = deadline.Sub(time.Now()) + logEntry.Timeout = time.Until(deadline) if logEntry.Timeout < 0 { logEntry.Timeout = 0 } @@ -1106,7 +1112,7 @@ func (s *Server) processStreamingRPC(t transport.ServerTransport, stream *transp PeerAddr: nil, } if deadline, ok := ctx.Deadline(); ok { - logEntry.Timeout = deadline.Sub(time.Now()) + logEntry.Timeout = time.Until(deadline) if logEntry.Timeout < 0 { logEntry.Timeout = 0 } @@ -1240,7 +1246,8 @@ func (s *Server) handleStream(t transport.ServerTransport, stream *transport.Str service := sm[:pos] method := sm[pos+1:] - if srv, ok := s.m[service]; ok { + srv, knownService := s.m[service] + if knownService { if md, ok := srv.md[method]; ok { s.processUnaryRPC(t, stream, srv, md, trInfo) return @@ -1255,11 +1262,16 @@ func (s *Server) handleStream(t transport.ServerTransport, stream *transport.Str s.processStreamingRPC(t, stream, nil, unknownDesc, trInfo) return } + var errDesc string + if !knownService { + errDesc = fmt.Sprintf("unknown service %v", service) + } else { + errDesc = fmt.Sprintf("unknown method %v for service %v", method, service) + } if trInfo != nil { - trInfo.tr.LazyLog(&fmtStringer{"Unknown service %v", []interface{}{service}}, true) + trInfo.tr.LazyPrintf("%s", errDesc) trInfo.tr.SetError() } - errDesc := fmt.Sprintf("unknown service %v", service) if err := t.WriteStatus(stream, status.New(codes.Unimplemented, errDesc)); err != nil { if trInfo != nil { trInfo.tr.LazyLog(&fmtStringer{"%v", []interface{}{err}}, true) diff --git a/vendor/google.golang.org/grpc/service_config.go b/vendor/google.golang.org/grpc/service_config.go index 162857e204..1c5227426f 100644 --- a/vendor/google.golang.org/grpc/service_config.go +++ b/vendor/google.golang.org/grpc/service_config.go @@ -99,6 +99,9 @@ type ServiceConfig struct { // healthCheckConfig must be set as one of the requirement to enable LB channel // health check. healthCheckConfig *healthCheckConfig + // rawJSONString stores service config json string that get parsed into + // this service config struct. + rawJSONString string } // healthCheckConfig defines the go-native version of the LB channel health check config. @@ -238,24 +241,22 @@ type jsonSC struct { HealthCheckConfig *healthCheckConfig } -func parseServiceConfig(js string) (ServiceConfig, error) { - if len(js) == 0 { - return ServiceConfig{}, fmt.Errorf("no JSON service config provided") - } +func parseServiceConfig(js string) (*ServiceConfig, error) { var rsc jsonSC err := json.Unmarshal([]byte(js), &rsc) if err != nil { grpclog.Warningf("grpc: parseServiceConfig error unmarshaling %s due to %v", js, err) - return ServiceConfig{}, err + return nil, err } sc := ServiceConfig{ LB: rsc.LoadBalancingPolicy, Methods: make(map[string]MethodConfig), retryThrottling: rsc.RetryThrottling, healthCheckConfig: rsc.HealthCheckConfig, + rawJSONString: js, } if rsc.MethodConfig == nil { - return sc, nil + return &sc, nil } for _, m := range *rsc.MethodConfig { @@ -265,7 +266,7 @@ func parseServiceConfig(js string) (ServiceConfig, error) { d, err := parseDuration(m.Timeout) if err != nil { grpclog.Warningf("grpc: parseServiceConfig error unmarshaling %s due to %v", js, err) - return ServiceConfig{}, err + return nil, err } mc := MethodConfig{ @@ -274,7 +275,7 @@ func parseServiceConfig(js string) (ServiceConfig, error) { } if mc.retryPolicy, err = convertRetryPolicy(m.RetryPolicy); err != nil { grpclog.Warningf("grpc: parseServiceConfig error unmarshaling %s due to %v", js, err) - return ServiceConfig{}, err + return nil, err } if m.MaxRequestMessageBytes != nil { if *m.MaxRequestMessageBytes > int64(maxInt) { @@ -299,13 +300,13 @@ func parseServiceConfig(js string) (ServiceConfig, error) { if sc.retryThrottling != nil { if sc.retryThrottling.MaxTokens <= 0 || - sc.retryThrottling.MaxTokens >= 1000 || + sc.retryThrottling.MaxTokens > 1000 || sc.retryThrottling.TokenRatio <= 0 { // Illegal throttling config; disable throttling. sc.retryThrottling = nil } } - return sc, nil + return &sc, nil } func convertRetryPolicy(jrp *jsonRetryPolicy) (p *retryPolicy, err error) { diff --git a/vendor/google.golang.org/grpc/stats/stats.go b/vendor/google.golang.org/grpc/stats/stats.go index 84f77dafa5..f3f593c844 100644 --- a/vendor/google.golang.org/grpc/stats/stats.go +++ b/vendor/google.golang.org/grpc/stats/stats.go @@ -27,6 +27,8 @@ import ( "context" "net" "time" + + "google.golang.org/grpc/metadata" ) // RPCStats contains stats information about RPCs. @@ -172,6 +174,9 @@ type End struct { BeginTime time.Time // EndTime is the time when the RPC ends. EndTime time.Time + // Trailer contains the trailer metadata received from the server. This + // field is only valid if this End is from the client side. + Trailer metadata.MD // Error is the error the RPC ended with. It is an error generated from // status.Status and can be converted back to status.Status using // status.FromError if non-nil. diff --git a/vendor/google.golang.org/grpc/stream.go b/vendor/google.golang.org/grpc/stream.go index 0c266d6f9a..6e2bf51e0a 100644 --- a/vendor/google.golang.org/grpc/stream.go +++ b/vendor/google.golang.org/grpc/stream.go @@ -33,6 +33,7 @@ import ( "google.golang.org/grpc/connectivity" "google.golang.org/grpc/encoding" "google.golang.org/grpc/grpclog" + "google.golang.org/grpc/internal/balancerload" "google.golang.org/grpc/internal/binarylog" "google.golang.org/grpc/internal/channelz" "google.golang.org/grpc/internal/grpcrand" @@ -230,12 +231,16 @@ func newClientStream(ctx context.Context, desc *StreamDesc, cc *ClientConn, meth if c.creds != nil { callHdr.Creds = c.creds } - var trInfo traceInfo + var trInfo *traceInfo if EnableTracing { - trInfo.tr = trace.New("grpc.Sent."+methodFamily(method), method) - trInfo.firstLine.client = true + trInfo = &traceInfo{ + tr: trace.New("grpc.Sent."+methodFamily(method), method), + firstLine: firstLine{ + client: true, + }, + } if deadline, ok := ctx.Deadline(); ok { - trInfo.firstLine.deadline = deadline.Sub(time.Now()) + trInfo.firstLine.deadline = time.Until(deadline) } trInfo.tr.LazyLog(&trInfo.firstLine, false) ctx = trace.NewContext(ctx, trInfo.tr) @@ -297,7 +302,7 @@ func newClientStream(ctx context.Context, desc *StreamDesc, cc *ClientConn, meth Authority: cs.cc.authority, } if deadline, ok := ctx.Deadline(); ok { - logEntry.Timeout = deadline.Sub(time.Now()) + logEntry.Timeout = time.Until(deadline) if logEntry.Timeout < 0 { logEntry.Timeout = 0 } @@ -323,7 +328,7 @@ func newClientStream(ctx context.Context, desc *StreamDesc, cc *ClientConn, meth return cs, nil } -func (cs *clientStream) newAttemptLocked(sh stats.Handler, trInfo traceInfo) error { +func (cs *clientStream) newAttemptLocked(sh stats.Handler, trInfo *traceInfo) error { cs.attempt = &csAttempt{ cs: cs, dc: cs.cc.dopts.dc, @@ -338,6 +343,9 @@ func (cs *clientStream) newAttemptLocked(sh stats.Handler, trInfo traceInfo) err if err != nil { return err } + if trInfo != nil { + trInfo.firstLine.SetRemoteAddr(t.RemoteAddr()) + } cs.attempt.t = t cs.attempt.done = done return nil @@ -414,9 +422,10 @@ type csAttempt struct { decompSet bool mu sync.Mutex // guards trInfo.tr + // trInfo may be nil (if EnableTracing is false). // trInfo.tr is set when created (if EnableTracing is true), // and cleared when the finish method is called. - trInfo traceInfo + trInfo *traceInfo statsHandler stats.Handler } @@ -462,10 +471,7 @@ func (cs *clientStream) shouldRetry(err error) error { pushback := 0 hasPushback := false if cs.attempt.s != nil { - if to, toErr := cs.attempt.s.TrailersOnly(); toErr != nil { - // Context error; stop now. - return toErr - } else if !to { + if to, toErr := cs.attempt.s.TrailersOnly(); toErr != nil || !to { return err } @@ -543,7 +549,7 @@ func (cs *clientStream) retryLocked(lastErr error) error { cs.commitAttemptLocked() return err } - if err := cs.newAttemptLocked(nil, traceInfo{}); err != nil { + if err := cs.newAttemptLocked(nil, nil); err != nil { return err } if lastErr = cs.replayBufferLocked(); lastErr == nil { @@ -814,7 +820,7 @@ func (cs *clientStream) finish(err error) { func (a *csAttempt) sendMsg(m interface{}, hdr, payld, data []byte) error { cs := a.cs - if EnableTracing { + if a.trInfo != nil { a.mu.Lock() if a.trInfo.tr != nil { a.trInfo.tr.LazyLog(&payload{sent: true, msg: m}, true) @@ -871,7 +877,7 @@ func (a *csAttempt) recvMsg(m interface{}, payInfo *payloadInfo) (err error) { } return toRPCErr(err) } - if EnableTracing { + if a.trInfo != nil { a.mu.Lock() if a.trInfo.tr != nil { a.trInfo.tr.LazyLog(&payload{sent: false, msg: m}, true) @@ -884,8 +890,9 @@ func (a *csAttempt) recvMsg(m interface{}, payInfo *payloadInfo) (err error) { RecvTime: time.Now(), Payload: m, // TODO truncate large payload. - Data: payInfo.uncompressedBytes, - Length: len(payInfo.uncompressedBytes), + Data: payInfo.uncompressedBytes, + WireLength: payInfo.wireLength, + Length: len(payInfo.uncompressedBytes), }) } if channelz.IsOn() { @@ -918,22 +925,23 @@ func (a *csAttempt) finish(err error) { // Ending a stream with EOF indicates a success. err = nil } + var tr metadata.MD if a.s != nil { a.t.CloseStream(a.s, err) + tr = a.s.Trailer() } if a.done != nil { br := false - var tr metadata.MD if a.s != nil { br = a.s.BytesReceived() - tr = a.s.Trailer() } a.done(balancer.DoneInfo{ Err: err, Trailer: tr, BytesSent: a.s != nil, BytesReceived: br, + ServerLoad: balancerload.Parse(tr), }) } if a.statsHandler != nil { @@ -941,11 +949,12 @@ func (a *csAttempt) finish(err error) { Client: true, BeginTime: a.cs.beginTime, EndTime: time.Now(), + Trailer: tr, Error: err, } a.statsHandler.HandleRPC(a.cs.ctx, end) } - if a.trInfo.tr != nil { + if a.trInfo != nil && a.trInfo.tr != nil { if err == nil { a.trInfo.tr.LazyPrintf("RPC: [OK]") } else { @@ -1089,7 +1098,6 @@ type addrConnStream struct { dc Decompressor decomp encoding.Compressor p *parser - done func(balancer.DoneInfo) mu sync.Mutex finished bool } @@ -1470,8 +1478,9 @@ func (ss *serverStream) RecvMsg(m interface{}) (err error) { RecvTime: time.Now(), Payload: m, // TODO truncate large payload. - Data: payInfo.uncompressedBytes, - Length: len(payInfo.uncompressedBytes), + Data: payInfo.uncompressedBytes, + WireLength: payInfo.wireLength, + Length: len(payInfo.uncompressedBytes), }) } if ss.binlog != nil { diff --git a/vendor/google.golang.org/grpc/trace.go b/vendor/google.golang.org/grpc/trace.go index c1c96dedcb..0a57b99948 100644 --- a/vendor/google.golang.org/grpc/trace.go +++ b/vendor/google.golang.org/grpc/trace.go @@ -24,6 +24,7 @@ import ( "io" "net" "strings" + "sync" "time" "golang.org/x/net/trace" @@ -53,13 +54,25 @@ type traceInfo struct { } // firstLine is the first line of an RPC trace. +// It may be mutated after construction; remoteAddr specifically may change +// during client-side use. type firstLine struct { + mu sync.Mutex client bool // whether this is a client (outgoing) RPC remoteAddr net.Addr deadline time.Duration // may be zero } +func (f *firstLine) SetRemoteAddr(addr net.Addr) { + f.mu.Lock() + f.remoteAddr = addr + f.mu.Unlock() +} + func (f *firstLine) String() string { + f.mu.Lock() + defer f.mu.Unlock() + var line bytes.Buffer io.WriteString(&line, "RPC: ") if f.client { diff --git a/vendor/google.golang.org/grpc/version.go b/vendor/google.golang.org/grpc/version.go index 260f27c880..092e088258 100644 --- a/vendor/google.golang.org/grpc/version.go +++ b/vendor/google.golang.org/grpc/version.go @@ -19,4 +19,4 @@ package grpc // Version is the current grpc version. -const Version = "1.17.0" +const Version = "1.20.1" diff --git a/vendor/google.golang.org/grpc/vet.sh b/vendor/google.golang.org/grpc/vet.sh index 94d3d54e2f..bd5c8de90c 100644 --- a/vendor/google.golang.org/grpc/vet.sh +++ b/vendor/google.golang.org/grpc/vet.sh @@ -13,26 +13,19 @@ die() { exit 1 } -# Check to make sure it's safe to modify the user's git repo. -if git status --porcelain | read; then - die "Uncommitted or untracked files found; commit changes first" -fi +fail_on_output() { + tee /dev/stderr | (! read) +} -if [[ -d "${GOPATH}/src" ]]; then - die "\${GOPATH}/src (${GOPATH}/src) exists; this script will delete it." -fi +# Check to make sure it's safe to modify the user's git repo. +git status --porcelain | fail_on_output # Undo any edits made by this script. cleanup() { - rm -rf "${GOPATH}/src" git reset --hard HEAD } trap cleanup EXIT -fail_on_output() { - tee /dev/stderr | (! read) -} - PATH="${GOPATH}/bin:${GOROOT}/bin:${PATH}" if [[ "$1" = "-install" ]]; then @@ -76,6 +69,10 @@ fi # - Ensure all source files contain a copyright message. git ls-files "*.go" | xargs grep -L "\(Copyright [0-9]\{4,\} gRPC authors\)\|DO NOT EDIT" 2>&1 | fail_on_output +# - Make sure all tests in grpc and grpc/test use leakcheck via Teardown. +(! grep 'func Test[^(]' *_test.go) +(! grep 'func Test[^(]' test/*.go) + # - Do not import math/rand for real library code. Use internal/grpcrand for # thread safety. git ls-files "*.go" | xargs grep -l '"math/rand"' 2>&1 | (! grep -v '^examples\|^stress\|grpcrand') @@ -89,7 +86,7 @@ go list -f {{.Dir}} ./... | xargs go run test/go_vet/vet.go # - gofmt, goimports, golint (with exceptions for generated code), go vet. gofmt -s -d -l . 2>&1 | fail_on_output -goimports -l . 2>&1 | fail_on_output +goimports -l . 2>&1 | (! grep -vE "(_mock|\.pb)\.go:") | fail_on_output golint ./... 2>&1 | (! grep -vE "(_mock|\.pb)\.go:") go tool vet -all . @@ -108,29 +105,25 @@ if go help mod >& /dev/null; then fi # - Collection of static analysis checks -### HACK HACK HACK: Remove once staticcheck works with modules. -# Make a symlink in ${GOPATH}/src to its ${GOPATH}/pkg/mod equivalent for every package we use. -for x in $(find "${GOPATH}/pkg/mod" -name '*@*' | grep -v \/mod\/cache\/); do - pkg="$(echo ${x#"${GOPATH}/pkg/mod/"} | cut -f1 -d@)"; - # If multiple versions exist, just use the existing one. - if [[ -L "${GOPATH}/src/${pkg}" ]]; then continue; fi - mkdir -p "$(dirname "${GOPATH}/src/${pkg}")"; - ln -s $x "${GOPATH}/src/${pkg}"; -done -### END HACK HACK HACK - # TODO(menghanl): fix errors in transport_test. -staticcheck -ignore ' -balancer.go:SA1019 -balancer_test.go:SA1019 -clientconn_test.go:SA1019 -balancer/roundrobin/roundrobin_test.go:SA1019 -benchmark/benchmain/main.go:SA1019 -internal/transport/handler_server.go:SA1019 -internal/transport/handler_server_test.go:SA1019 -internal/transport/transport_test.go:SA2002 -stats/stats_test.go:SA1019 -test/channelz_test.go:SA1019 -test/end2end_test.go:SA1019 +staticcheck -go 1.9 -checks 'inherit,-ST1015' -ignore ' +google.golang.org/grpc/balancer.go:SA1019 +google.golang.org/grpc/balancer/roundrobin/roundrobin_test.go:SA1019 +google.golang.org/grpc/balancer/xds/edsbalancer/balancergroup.go:SA1019 +google.golang.org/grpc/balancer/xds/xds.go:SA1019 +google.golang.org/grpc/balancer_conn_wrappers.go:SA1019 +google.golang.org/grpc/balancer_test.go:SA1019 +google.golang.org/grpc/benchmark/benchmain/main.go:SA1019 +google.golang.org/grpc/benchmark/worker/benchmark_client.go:SA1019 +google.golang.org/grpc/clientconn.go:S1024 +google.golang.org/grpc/clientconn_state_transition_test.go:SA1019 +google.golang.org/grpc/clientconn_test.go:SA1019 +google.golang.org/grpc/internal/transport/handler_server.go:SA1019 +google.golang.org/grpc/internal/transport/handler_server_test.go:SA1019 +google.golang.org/grpc/resolver/dns/dns_resolver.go:SA1019 +google.golang.org/grpc/stats/stats_test.go:SA1019 +google.golang.org/grpc/test/channelz_test.go:SA1019 +google.golang.org/grpc/test/end2end_test.go:SA1019 +google.golang.org/grpc/test/healthcheck_test.go:SA1019 ' ./... misspell -error . diff --git a/vendor/gopkg.in/yaml.v2/decode.go b/vendor/gopkg.in/yaml.v2/decode.go index e4e56e28e0..5310876555 100644 --- a/vendor/gopkg.in/yaml.v2/decode.go +++ b/vendor/gopkg.in/yaml.v2/decode.go @@ -229,6 +229,10 @@ type decoder struct { mapType reflect.Type terrors []string strict bool + + decodeCount int + aliasCount int + aliasDepth int } var ( @@ -314,7 +318,39 @@ func (d *decoder) prepare(n *node, out reflect.Value) (newout reflect.Value, unm return out, false, false } +const ( + // 400,000 decode operations is ~500kb of dense object declarations, or ~5kb of dense object declarations with 10000% alias expansion + alias_ratio_range_low = 400000 + // 4,000,000 decode operations is ~5MB of dense object declarations, or ~4.5MB of dense object declarations with 10% alias expansion + alias_ratio_range_high = 4000000 + // alias_ratio_range is the range over which we scale allowed alias ratios + alias_ratio_range = float64(alias_ratio_range_high - alias_ratio_range_low) +) + +func allowedAliasRatio(decodeCount int) float64 { + switch { + case decodeCount <= alias_ratio_range_low: + // allow 99% to come from alias expansion for small-to-medium documents + return 0.99 + case decodeCount >= alias_ratio_range_high: + // allow 10% to come from alias expansion for very large documents + return 0.10 + default: + // scale smoothly from 99% down to 10% over the range. + // this maps to 396,000 - 400,000 allowed alias-driven decodes over the range. + // 400,000 decode operations is ~100MB of allocations in worst-case scenarios (single-item maps). + return 0.99 - 0.89*(float64(decodeCount-alias_ratio_range_low)/alias_ratio_range) + } +} + func (d *decoder) unmarshal(n *node, out reflect.Value) (good bool) { + d.decodeCount++ + if d.aliasDepth > 0 { + d.aliasCount++ + } + if d.aliasCount > 100 && d.decodeCount > 1000 && float64(d.aliasCount)/float64(d.decodeCount) > allowedAliasRatio(d.decodeCount) { + failf("document contains excessive aliasing") + } switch n.kind { case documentNode: return d.document(n, out) @@ -353,7 +389,9 @@ func (d *decoder) alias(n *node, out reflect.Value) (good bool) { failf("anchor '%s' value contains itself", n.value) } d.aliases[n] = true + d.aliasDepth++ good = d.unmarshal(n.alias, out) + d.aliasDepth-- delete(d.aliases, n) return good } diff --git a/vendor/gopkg.in/yaml.v2/resolve.go b/vendor/gopkg.in/yaml.v2/resolve.go index 6c151db6fb..4120e0c916 100644 --- a/vendor/gopkg.in/yaml.v2/resolve.go +++ b/vendor/gopkg.in/yaml.v2/resolve.go @@ -81,7 +81,7 @@ func resolvableTag(tag string) bool { return false } -var yamlStyleFloat = regexp.MustCompile(`^[-+]?[0-9]*\.?[0-9]+([eE][-+][0-9]+)?$`) +var yamlStyleFloat = regexp.MustCompile(`^[-+]?(\.[0-9]+|[0-9]+(\.[0-9]*)?)([eE][-+]?[0-9]+)?$`) func resolve(tag string, in string) (rtag string, out interface{}) { if !resolvableTag(tag) { diff --git a/vendor/gopkg.in/yaml.v2/scannerc.go b/vendor/gopkg.in/yaml.v2/scannerc.go index 077fd1dd2d..570b8ecd10 100644 --- a/vendor/gopkg.in/yaml.v2/scannerc.go +++ b/vendor/gopkg.in/yaml.v2/scannerc.go @@ -906,6 +906,9 @@ func yaml_parser_remove_simple_key(parser *yaml_parser_t) bool { return true } +// max_flow_level limits the flow_level +const max_flow_level = 10000 + // Increase the flow level and resize the simple key list if needed. func yaml_parser_increase_flow_level(parser *yaml_parser_t) bool { // Reset the simple key on the next level. @@ -913,6 +916,11 @@ func yaml_parser_increase_flow_level(parser *yaml_parser_t) bool { // Increase the flow level. parser.flow_level++ + if parser.flow_level > max_flow_level { + return yaml_parser_set_scanner_error(parser, + "while increasing flow level", parser.simple_keys[len(parser.simple_keys)-1].mark, + fmt.Sprintf("exceeded max depth of %d", max_flow_level)) + } return true } @@ -925,6 +933,9 @@ func yaml_parser_decrease_flow_level(parser *yaml_parser_t) bool { return true } +// max_indents limits the indents stack size +const max_indents = 10000 + // Push the current indentation level to the stack and set the new level // the current column is greater than the indentation level. In this case, // append or insert the specified token into the token queue. @@ -939,6 +950,11 @@ func yaml_parser_roll_indent(parser *yaml_parser_t, column, number int, typ yaml // indentation level. parser.indents = append(parser.indents, parser.indent) parser.indent = column + if len(parser.indents) > max_indents { + return yaml_parser_set_scanner_error(parser, + "while increasing indent level", parser.simple_keys[len(parser.simple_keys)-1].mark, + fmt.Sprintf("exceeded max depth of %d", max_indents)) + } // Create a token and insert it into the queue. token := yaml_token_t{ diff --git a/vendor/modules.txt b/vendor/modules.txt index a658f8786a..262ea304de 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,16 +1,16 @@ # cloud.google.com/go v0.34.0 +cloud.google.com/go/compute/metadata cloud.google.com/go/monitoring/apiv3 cloud.google.com/go/trace/apiv2 -cloud.google.com/go/compute/metadata # contrib.go.opencensus.io/exporter/stackdriver v0.8.0 contrib.go.opencensus.io/exporter/stackdriver contrib.go.opencensus.io/exporter/stackdriver/monitoredresource # fortio.org/fortio v1.3.1 fortio.org/fortio/fhttp -fortio.org/fortio/stats fortio.org/fortio/fnet fortio.org/fortio/log fortio.org/fortio/periodic +fortio.org/fortio/stats fortio.org/fortio/version # github.com/PuerkitoBio/purell v1.1.0 github.com/PuerkitoBio/purell @@ -19,35 +19,35 @@ github.com/PuerkitoBio/urlesc # github.com/ahmetb/gen-crd-api-reference-docs v0.1.1 github.com/ahmetb/gen-crd-api-reference-docs # github.com/aws/aws-sdk-go v1.16.20 -github.com/aws/aws-sdk-go/aws/ec2metadata -github.com/aws/aws-sdk-go/aws/session github.com/aws/aws-sdk-go/aws github.com/aws/aws-sdk-go/aws/awserr +github.com/aws/aws-sdk-go/aws/awsutil github.com/aws/aws-sdk-go/aws/client github.com/aws/aws-sdk-go/aws/client/metadata github.com/aws/aws-sdk-go/aws/corehandlers -github.com/aws/aws-sdk-go/aws/request -github.com/aws/aws-sdk-go/internal/sdkuri github.com/aws/aws-sdk-go/aws/credentials +github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds +github.com/aws/aws-sdk-go/aws/credentials/endpointcreds github.com/aws/aws-sdk-go/aws/credentials/processcreds github.com/aws/aws-sdk-go/aws/credentials/stscreds github.com/aws/aws-sdk-go/aws/csm github.com/aws/aws-sdk-go/aws/defaults +github.com/aws/aws-sdk-go/aws/ec2metadata github.com/aws/aws-sdk-go/aws/endpoints +github.com/aws/aws-sdk-go/aws/request +github.com/aws/aws-sdk-go/aws/session +github.com/aws/aws-sdk-go/aws/signer/v4 github.com/aws/aws-sdk-go/internal/ini -github.com/aws/aws-sdk-go/internal/shareddefaults github.com/aws/aws-sdk-go/internal/sdkio github.com/aws/aws-sdk-go/internal/sdkrand -github.com/aws/aws-sdk-go/aws/awsutil -github.com/aws/aws-sdk-go/service/sts -github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds -github.com/aws/aws-sdk-go/aws/credentials/endpointcreds -github.com/aws/aws-sdk-go/aws/signer/v4 +github.com/aws/aws-sdk-go/internal/sdkuri +github.com/aws/aws-sdk-go/internal/shareddefaults +github.com/aws/aws-sdk-go/private/protocol github.com/aws/aws-sdk-go/private/protocol/query -github.com/aws/aws-sdk-go/private/protocol/rest github.com/aws/aws-sdk-go/private/protocol/query/queryutil +github.com/aws/aws-sdk-go/private/protocol/rest github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil -github.com/aws/aws-sdk-go/private/protocol +github.com/aws/aws-sdk-go/service/sts # github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 github.com/beorn7/perks/quantile # github.com/davecgh/go-spew v1.1.1 @@ -73,22 +73,32 @@ github.com/gogo/protobuf/sortkeys github.com/golang/glog # github.com/golang/groupcache v0.0.0-20171101203131-84a468cf14b4 github.com/golang/groupcache/lru -# github.com/golang/protobuf v1.2.0 -github.com/golang/protobuf/protoc-gen-go +# github.com/golang/protobuf v1.3.2 +github.com/golang/protobuf/descriptor +github.com/golang/protobuf/jsonpb github.com/golang/protobuf/proto +github.com/golang/protobuf/protoc-gen-go +github.com/golang/protobuf/protoc-gen-go/descriptor github.com/golang/protobuf/protoc-gen-go/generator +github.com/golang/protobuf/protoc-gen-go/generator/internal/remap github.com/golang/protobuf/protoc-gen-go/grpc github.com/golang/protobuf/protoc-gen-go/plugin -github.com/golang/protobuf/jsonpb +github.com/golang/protobuf/ptypes github.com/golang/protobuf/ptypes/any github.com/golang/protobuf/ptypes/duration +github.com/golang/protobuf/ptypes/empty +github.com/golang/protobuf/ptypes/struct github.com/golang/protobuf/ptypes/timestamp +<<<<<<< HEAD github.com/golang/protobuf/protoc-gen-go/descriptor github.com/golang/protobuf/ptypes github.com/golang/protobuf/ptypes/wrappers github.com/golang/protobuf/protoc-gen-go/generator/internal/remap github.com/golang/protobuf/ptypes/struct github.com/golang/protobuf/ptypes/empty +======= +github.com/golang/protobuf/ptypes/wrappers +>>>>>>> Update GRPC to v1.20.1 # github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c github.com/google/btree # github.com/google/gofuzz v1.0.0 @@ -104,31 +114,31 @@ github.com/googleapis/gnostic/extensions # github.com/gregjones/httpcache v0.0.0-20181110185634-c63ab54fda8f github.com/gregjones/httpcache github.com/gregjones/httpcache/diskcache -# github.com/grpc-ecosystem/grpc-gateway v1.5.1 -github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway -github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger -github.com/grpc-ecosystem/grpc-gateway/runtime -github.com/grpc-ecosystem/grpc-gateway/utilities +# github.com/grpc-ecosystem/grpc-gateway v1.11.3 github.com/grpc-ecosystem/grpc-gateway/codegenerator +github.com/grpc-ecosystem/grpc-gateway/internal +github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/descriptor +github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/generator github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/gengateway -github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/genswagger -github.com/grpc-ecosystem/grpc-gateway/runtime/internal github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/httprule -github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/generator +github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger +github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/genswagger github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/options +github.com/grpc-ecosystem/grpc-gateway/runtime +github.com/grpc-ecosystem/grpc-gateway/utilities # github.com/hashicorp/golang-lru v0.5.1 github.com/hashicorp/golang-lru github.com/hashicorp/golang-lru/simplelru # github.com/hashicorp/hcl v1.0.0 github.com/hashicorp/hcl -github.com/hashicorp/hcl/hcl/printer github.com/hashicorp/hcl/hcl/ast github.com/hashicorp/hcl/hcl/parser -github.com/hashicorp/hcl/hcl/token -github.com/hashicorp/hcl/json/parser +github.com/hashicorp/hcl/hcl/printer github.com/hashicorp/hcl/hcl/scanner github.com/hashicorp/hcl/hcl/strconv +github.com/hashicorp/hcl/hcl/token +github.com/hashicorp/hcl/json/parser github.com/hashicorp/hcl/json/scanner github.com/hashicorp/hcl/json/token # github.com/heptiolabs/healthcheck v0.0.0-20171201210846-da5fdee475fb @@ -146,9 +156,9 @@ github.com/konsorten/go-windows-terminal-sequences # github.com/magiconair/properties v1.8.0 github.com/magiconair/properties # github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329 +github.com/mailru/easyjson/buffer github.com/mailru/easyjson/jlexer github.com/mailru/easyjson/jwriter -github.com/mailru/easyjson/buffer # github.com/mattbaird/jsonpatch v0.0.0-20171005235357-81af80346b1a github.com/mattbaird/jsonpatch # github.com/matttproud/golang_protobuf_extensions v1.0.1 @@ -180,13 +190,13 @@ github.com/prometheus/client_golang/prometheus/testutil github.com/prometheus/client_model/go # github.com/prometheus/common v0.0.0-20181126121408-4724e9255275 github.com/prometheus/common/expfmt -github.com/prometheus/common/model github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg +github.com/prometheus/common/model # github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a github.com/prometheus/procfs +github.com/prometheus/procfs/internal/util github.com/prometheus/procfs/nfs github.com/prometheus/procfs/xfs -github.com/prometheus/procfs/internal/util # github.com/russross/blackfriday/v2 v2.0.1 github.com/russross/blackfriday/v2 # github.com/shurcooL/sanitized_anchor_name v1.0.0 @@ -207,10 +217,24 @@ github.com/spf13/viper # github.com/stretchr/testify v1.3.0 github.com/stretchr/testify/assert # go.opencensus.io v0.18.0 +<<<<<<< HEAD go.opencensus.io/plugin/ochttp +======= +go.opencensus.io +go.opencensus.io/exemplar +go.opencensus.io/exporter/prometheus +go.opencensus.io/internal +go.opencensus.io/internal/tagencoding +go.opencensus.io/plugin/ocgrpc +go.opencensus.io/plugin/ochttp +go.opencensus.io/plugin/ochttp/propagation/b3 +go.opencensus.io/stats +go.opencensus.io/stats/internal +>>>>>>> Update GRPC to v1.20.1 go.opencensus.io/stats/view go.opencensus.io/stats go.opencensus.io/tag +<<<<<<< HEAD go.opencensus.io/exporter/prometheus go.opencensus.io/plugin/ochttp/propagation/b3 go.opencensus.io/trace @@ -220,20 +244,23 @@ go.opencensus.io/internal/tagencoding go.opencensus.io/stats/internal go.opencensus.io go.opencensus.io/internal +======= +go.opencensus.io/trace +>>>>>>> Update GRPC to v1.20.1 go.opencensus.io/trace/internal +go.opencensus.io/trace/propagation go.opencensus.io/trace/tracestate -go.opencensus.io/plugin/ocgrpc # golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 golang.org/x/crypto/ssh/terminal # golang.org/x/net v0.0.0-20190311183353-d8887717615a golang.org/x/net/context -golang.org/x/net/http2 -golang.org/x/net/trace +golang.org/x/net/context/ctxhttp golang.org/x/net/http/httpguts +golang.org/x/net/http2 golang.org/x/net/http2/hpack golang.org/x/net/idna golang.org/x/net/internal/timeseries -golang.org/x/net/context/ctxhttp +golang.org/x/net/trace # golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890 golang.org/x/oauth2/google golang.org/x/oauth2 @@ -245,87 +272,108 @@ golang.org/x/sync/semaphore # golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a golang.org/x/sys/unix golang.org/x/sys/windows +<<<<<<< HEAD # golang.org/x/text v0.3.0 golang.org/x/text/transform golang.org/x/text/unicode/norm +======= +# golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db +>>>>>>> Update GRPC to v1.20.1 golang.org/x/text/secure/bidirule +golang.org/x/text/transform golang.org/x/text/unicode/bidi +golang.org/x/text/unicode/norm golang.org/x/text/width # golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2 golang.org/x/time/rate # golang.org/x/tools v0.0.0-20190328211700-ab21143f2384 golang.org/x/tools/cmd/goimports -golang.org/x/tools/imports golang.org/x/tools/go/ast/astutil +golang.org/x/tools/go/gcexportdata +golang.org/x/tools/go/internal/gcimporter +golang.org/x/tools/go/internal/packagesdriver golang.org/x/tools/go/packages +golang.org/x/tools/imports +golang.org/x/tools/internal/fastwalk golang.org/x/tools/internal/gopathwalk golang.org/x/tools/internal/module -golang.org/x/tools/go/gcexportdata -golang.org/x/tools/go/internal/packagesdriver golang.org/x/tools/internal/semver -golang.org/x/tools/internal/fastwalk -golang.org/x/tools/go/internal/gcimporter # google.golang.org/api v0.0.0-20190117000611-43037ff31f69 +google.golang.org/api/googleapi/transport +google.golang.org/api/internal +google.golang.org/api/iterator google.golang.org/api/option google.golang.org/api/support/bundler -google.golang.org/api/iterator google.golang.org/api/transport -google.golang.org/api/internal google.golang.org/api/transport/grpc google.golang.org/api/transport/http -google.golang.org/api/googleapi/transport google.golang.org/api/transport/http/internal/propagation -# google.golang.org/appengine v1.3.0 +# google.golang.org/appengine v1.4.0 google.golang.org/appengine -google.golang.org/appengine/urlfetch google.golang.org/appengine/internal google.golang.org/appengine/internal/app_identity +<<<<<<< HEAD google.golang.org/appengine/internal/modules google.golang.org/appengine/socket google.golang.org/appengine/internal/urlfetch +======= +>>>>>>> Update GRPC to v1.20.1 google.golang.org/appengine/internal/base google.golang.org/appengine/internal/datastore google.golang.org/appengine/internal/log +google.golang.org/appengine/internal/modules google.golang.org/appengine/internal/remote_api google.golang.org/appengine/internal/socket -# google.golang.org/genproto v0.0.0-20190111180523-db91494dd46c +google.golang.org/appengine/internal/urlfetch +google.golang.org/appengine/socket +google.golang.org/appengine/urlfetch +# google.golang.org/genproto v0.0.0-20191009194640-548a555dbc03 +google.golang.org/genproto/googleapis/api google.golang.org/genproto/googleapis/api/annotations google.golang.org/genproto/googleapis/rpc/status google.golang.org/genproto/googleapis/api/distribution +google.golang.org/genproto/googleapis/api/httpbody google.golang.org/genproto/googleapis/api/label google.golang.org/genproto/googleapis/api/metric google.golang.org/genproto/googleapis/api/monitoredres google.golang.org/genproto/googleapis/devtools/cloudtrace/v2 google.golang.org/genproto/googleapis/monitoring/v3 google.golang.org/genproto/protobuf/field_mask -# google.golang.org/grpc v1.17.0 +# google.golang.org/grpc v1.20.1 google.golang.org/grpc -google.golang.org/grpc/codes -google.golang.org/grpc/grpclog -google.golang.org/grpc/status -google.golang.org/grpc/metadata google.golang.org/grpc/balancer +google.golang.org/grpc/balancer/base google.golang.org/grpc/balancer/roundrobin +google.golang.org/grpc/binarylog/grpc_binarylog_v1 +google.golang.org/grpc/codes google.golang.org/grpc/connectivity google.golang.org/grpc/credentials +google.golang.org/grpc/credentials/internal +google.golang.org/grpc/credentials/oauth google.golang.org/grpc/encoding google.golang.org/grpc/encoding/proto +google.golang.org/grpc/grpclog google.golang.org/grpc/internal google.golang.org/grpc/internal/backoff +google.golang.org/grpc/internal/balancerload google.golang.org/grpc/internal/binarylog google.golang.org/grpc/internal/channelz google.golang.org/grpc/internal/envconfig google.golang.org/grpc/internal/grpcrand google.golang.org/grpc/internal/grpcsync +google.golang.org/grpc/internal/syscall google.golang.org/grpc/internal/transport google.golang.org/grpc/keepalive +google.golang.org/grpc/metadata google.golang.org/grpc/naming google.golang.org/grpc/peer google.golang.org/grpc/resolver google.golang.org/grpc/resolver/dns google.golang.org/grpc/resolver/passthrough google.golang.org/grpc/stats +google.golang.org/grpc/status google.golang.org/grpc/tap +<<<<<<< HEAD google.golang.org/grpc/balancer/base google.golang.org/grpc/credentials/internal google.golang.org/grpc/binarylog/grpc_binarylog_v1 @@ -333,23 +381,38 @@ google.golang.org/grpc/internal/syscall google.golang.org/grpc/credentials/oauth # gopkg.in/fsnotify.v1 v1.4.7 gopkg.in/fsnotify.v1 +======= +>>>>>>> Update GRPC to v1.20.1 # gopkg.in/inf.v0 v0.9.1 gopkg.in/inf.v0 # gopkg.in/natefinch/lumberjack.v2 v2.0.0-20170531160350-a96e63847dc3 gopkg.in/natefinch/lumberjack.v2 -# gopkg.in/yaml.v2 v2.2.2 +# gopkg.in/yaml.v2 v2.2.4 gopkg.in/yaml.v2 +<<<<<<< HEAD # k8s.io/api v0.0.0-20191004102255-dacd7df5a50b k8s.io/api/apps/v1 k8s.io/api/core/v1 k8s.io/api/admissionregistration/v1beta1 k8s.io/api/extensions/v1beta1 +======= +# k8s.io/api v0.0.0-20190708094356-59223ed9f6ce +>>>>>>> Update GRPC to v1.20.1 k8s.io/api/admission/v1beta1 k8s.io/api/rbac/v1 k8s.io/api/admissionregistration/v1alpha1 +k8s.io/api/admissionregistration/v1beta1 +k8s.io/api/apps/v1 k8s.io/api/apps/v1beta1 k8s.io/api/apps/v1beta2 +<<<<<<< HEAD k8s.io/api/auditregistration/v1alpha1 +======= +k8s.io/api/authentication/v1 +k8s.io/api/authentication/v1beta1 +k8s.io/api/authorization/v1 +k8s.io/api/authorization/v1beta1 +>>>>>>> Update GRPC to v1.20.1 k8s.io/api/autoscaling/v1 k8s.io/api/autoscaling/v2beta1 k8s.io/api/autoscaling/v2beta2 @@ -358,7 +421,9 @@ k8s.io/api/batch/v1beta1 k8s.io/api/batch/v2alpha1 k8s.io/api/certificates/v1beta1 k8s.io/api/coordination/v1beta1 +k8s.io/api/core/v1 k8s.io/api/events/v1beta1 +k8s.io/api/extensions/v1beta1 k8s.io/api/networking/v1 k8s.io/api/policy/v1beta1 k8s.io/api/rbac/v1alpha1 @@ -369,6 +434,7 @@ k8s.io/api/settings/v1alpha1 k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 +<<<<<<< HEAD k8s.io/api/authentication/v1 k8s.io/api/authentication/v1beta1 k8s.io/api/authorization/v1 @@ -376,11 +442,17 @@ k8s.io/api/authorization/v1beta1 # k8s.io/apiextensions-apiserver v0.0.0-20191004105443-a7d558db75c6 k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1 +======= +# k8s.io/apiextensions-apiserver v0.0.0-20190708094842-2e94e9ac9840 +k8s.io/apiextensions-apiserver/pkg/apis/apiextensions +>>>>>>> Update GRPC to v1.20.1 k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1 +k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme -k8s.io/apiextensions-apiserver/pkg/apis/apiextensions +k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1 k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake +<<<<<<< HEAD # k8s.io/apimachinery v0.0.0-20191004074956-01f8b7d1121a => ./vendor_fixes/k8s.io/apimachinery k8s.io/apimachinery/pkg/api/errors k8s.io/apimachinery/pkg/apis/meta/v1 @@ -388,8 +460,23 @@ k8s.io/apimachinery/pkg/runtime k8s.io/apimachinery/pkg/api/resource k8s.io/apimachinery/pkg/util/clock k8s.io/apimachinery/pkg/util/wait +======= +# k8s.io/apimachinery v0.0.0-20190221084156-01f179d85dbc => ./vendor_fixes/k8s.io/apimachinery +k8s.io/apimachinery/pkg/api/equality +k8s.io/apimachinery/pkg/api/errors +k8s.io/apimachinery/pkg/api/meta +k8s.io/apimachinery/pkg/api/resource +k8s.io/apimachinery/pkg/apis/meta/internalversion +k8s.io/apimachinery/pkg/apis/meta/v1 +k8s.io/apimachinery/pkg/apis/meta/v1/unstructured +k8s.io/apimachinery/pkg/apis/meta/v1beta1 +k8s.io/apimachinery/pkg/conversion +k8s.io/apimachinery/pkg/conversion/queryparams +k8s.io/apimachinery/pkg/fields +>>>>>>> Update GRPC to v1.20.1 k8s.io/apimachinery/pkg/labels k8s.io/apimachinery/pkg/runtime/schema +<<<<<<< HEAD k8s.io/apimachinery/pkg/util/intstr k8s.io/apimachinery/pkg/util/validation k8s.io/apimachinery/pkg/types @@ -411,21 +498,39 @@ k8s.io/apimachinery/pkg/util/sets k8s.io/apimachinery/pkg/runtime/serializer/streaming k8s.io/apimachinery/pkg/util/net k8s.io/apimachinery/pkg/version +======= +k8s.io/apimachinery/pkg/runtime/serializer +>>>>>>> Update GRPC to v1.20.1 k8s.io/apimachinery/pkg/runtime/serializer/json k8s.io/apimachinery/pkg/runtime/serializer/protobuf k8s.io/apimachinery/pkg/runtime/serializer/recognizer +k8s.io/apimachinery/pkg/runtime/serializer/streaming k8s.io/apimachinery/pkg/runtime/serializer/versioning -k8s.io/apimachinery/pkg/api/meta -k8s.io/apimachinery/pkg/util/strategicpatch +k8s.io/apimachinery/pkg/selection +k8s.io/apimachinery/pkg/types k8s.io/apimachinery/pkg/util/cache +k8s.io/apimachinery/pkg/util/clock k8s.io/apimachinery/pkg/util/diff -k8s.io/apimachinery/pkg/util/rand -k8s.io/apimachinery/third_party/forked/golang/reflect +k8s.io/apimachinery/pkg/util/errors k8s.io/apimachinery/pkg/util/framer -k8s.io/apimachinery/pkg/apis/meta/v1/unstructured -k8s.io/apimachinery/pkg/apis/meta/v1beta1 +k8s.io/apimachinery/pkg/util/intstr +k8s.io/apimachinery/pkg/util/json k8s.io/apimachinery/pkg/util/mergepatch +k8s.io/apimachinery/pkg/util/naming +k8s.io/apimachinery/pkg/util/net +k8s.io/apimachinery/pkg/util/rand +k8s.io/apimachinery/pkg/util/runtime +k8s.io/apimachinery/pkg/util/sets +k8s.io/apimachinery/pkg/util/strategicpatch +k8s.io/apimachinery/pkg/util/uuid +k8s.io/apimachinery/pkg/util/validation +k8s.io/apimachinery/pkg/util/validation/field +k8s.io/apimachinery/pkg/util/wait +k8s.io/apimachinery/pkg/util/yaml +k8s.io/apimachinery/pkg/version +k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json +<<<<<<< HEAD k8s.io/apimachinery/pkg/apis/meta/internalversion # k8s.io/client-go v0.0.0-20191004102537-eb5b9a8cfde7 k8s.io/client-go/informers @@ -433,9 +538,13 @@ k8s.io/client-go/kubernetes k8s.io/client-go/rest k8s.io/client-go/tools/clientcmd k8s.io/client-go/kubernetes/scheme +======= +k8s.io/apimachinery/third_party/forked/golang/reflect +# k8s.io/client-go v9.0.0+incompatible +>>>>>>> Update GRPC to v1.20.1 k8s.io/client-go/discovery -k8s.io/client-go/util/flowcontrol k8s.io/client-go/discovery/fake +<<<<<<< HEAD k8s.io/client-go/testing k8s.io/client-go/tools/cache k8s.io/client-go/kubernetes/typed/core/v1 @@ -446,24 +555,61 @@ k8s.io/client-go/util/workqueue k8s.io/client-go/tools/metrics k8s.io/client-go/kubernetes/fake k8s.io/client-go/plugin/pkg/client/auth/gcp +======= +k8s.io/client-go/informers +>>>>>>> Update GRPC to v1.20.1 k8s.io/client-go/informers/admissionregistration +k8s.io/client-go/informers/admissionregistration/v1alpha1 +k8s.io/client-go/informers/admissionregistration/v1beta1 k8s.io/client-go/informers/apps +<<<<<<< HEAD k8s.io/client-go/informers/auditregistration +======= +k8s.io/client-go/informers/apps/v1 +k8s.io/client-go/informers/apps/v1beta1 +k8s.io/client-go/informers/apps/v1beta2 +>>>>>>> Update GRPC to v1.20.1 k8s.io/client-go/informers/autoscaling +k8s.io/client-go/informers/autoscaling/v1 +k8s.io/client-go/informers/autoscaling/v2beta1 +k8s.io/client-go/informers/autoscaling/v2beta2 k8s.io/client-go/informers/batch +k8s.io/client-go/informers/batch/v1 +k8s.io/client-go/informers/batch/v1beta1 +k8s.io/client-go/informers/batch/v2alpha1 k8s.io/client-go/informers/certificates +k8s.io/client-go/informers/certificates/v1beta1 k8s.io/client-go/informers/coordination +k8s.io/client-go/informers/coordination/v1beta1 k8s.io/client-go/informers/core +k8s.io/client-go/informers/core/v1 k8s.io/client-go/informers/events +k8s.io/client-go/informers/events/v1beta1 k8s.io/client-go/informers/extensions +k8s.io/client-go/informers/extensions/v1beta1 k8s.io/client-go/informers/internalinterfaces k8s.io/client-go/informers/networking +k8s.io/client-go/informers/networking/v1 k8s.io/client-go/informers/policy +k8s.io/client-go/informers/policy/v1beta1 k8s.io/client-go/informers/rbac +k8s.io/client-go/informers/rbac/v1 +k8s.io/client-go/informers/rbac/v1alpha1 +k8s.io/client-go/informers/rbac/v1beta1 k8s.io/client-go/informers/scheduling +k8s.io/client-go/informers/scheduling/v1alpha1 +k8s.io/client-go/informers/scheduling/v1beta1 k8s.io/client-go/informers/settings +k8s.io/client-go/informers/settings/v1alpha1 k8s.io/client-go/informers/storage +k8s.io/client-go/informers/storage/v1 +k8s.io/client-go/informers/storage/v1alpha1 +k8s.io/client-go/informers/storage/v1beta1 +k8s.io/client-go/kubernetes +k8s.io/client-go/kubernetes/fake +k8s.io/client-go/kubernetes/scheme k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1 +<<<<<<< HEAD k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1 k8s.io/client-go/kubernetes/typed/apps/v1 k8s.io/client-go/kubernetes/typed/apps/v1beta1 @@ -508,38 +654,74 @@ k8s.io/client-go/tools/pager k8s.io/client-go/util/buffer k8s.io/client-go/util/retry k8s.io/client-go/tools/reference +======= +>>>>>>> Update GRPC to v1.20.1 k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/fake +k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1 k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1/fake +k8s.io/client-go/kubernetes/typed/apps/v1 k8s.io/client-go/kubernetes/typed/apps/v1/fake +k8s.io/client-go/kubernetes/typed/apps/v1beta1 k8s.io/client-go/kubernetes/typed/apps/v1beta1/fake +k8s.io/client-go/kubernetes/typed/apps/v1beta2 k8s.io/client-go/kubernetes/typed/apps/v1beta2/fake +<<<<<<< HEAD k8s.io/client-go/kubernetes/typed/auditregistration/v1alpha1/fake +======= +k8s.io/client-go/kubernetes/typed/authentication/v1 +>>>>>>> Update GRPC to v1.20.1 k8s.io/client-go/kubernetes/typed/authentication/v1/fake +k8s.io/client-go/kubernetes/typed/authentication/v1beta1 k8s.io/client-go/kubernetes/typed/authentication/v1beta1/fake +k8s.io/client-go/kubernetes/typed/authorization/v1 k8s.io/client-go/kubernetes/typed/authorization/v1/fake +k8s.io/client-go/kubernetes/typed/authorization/v1beta1 k8s.io/client-go/kubernetes/typed/authorization/v1beta1/fake +k8s.io/client-go/kubernetes/typed/autoscaling/v1 k8s.io/client-go/kubernetes/typed/autoscaling/v1/fake +k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1 k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1/fake +k8s.io/client-go/kubernetes/typed/autoscaling/v2beta2 k8s.io/client-go/kubernetes/typed/autoscaling/v2beta2/fake +k8s.io/client-go/kubernetes/typed/batch/v1 k8s.io/client-go/kubernetes/typed/batch/v1/fake +k8s.io/client-go/kubernetes/typed/batch/v1beta1 k8s.io/client-go/kubernetes/typed/batch/v1beta1/fake +k8s.io/client-go/kubernetes/typed/batch/v2alpha1 k8s.io/client-go/kubernetes/typed/batch/v2alpha1/fake +k8s.io/client-go/kubernetes/typed/certificates/v1beta1 k8s.io/client-go/kubernetes/typed/certificates/v1beta1/fake +k8s.io/client-go/kubernetes/typed/coordination/v1beta1 k8s.io/client-go/kubernetes/typed/coordination/v1beta1/fake +k8s.io/client-go/kubernetes/typed/core/v1 k8s.io/client-go/kubernetes/typed/core/v1/fake +k8s.io/client-go/kubernetes/typed/events/v1beta1 k8s.io/client-go/kubernetes/typed/events/v1beta1/fake +k8s.io/client-go/kubernetes/typed/extensions/v1beta1 k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake +k8s.io/client-go/kubernetes/typed/networking/v1 k8s.io/client-go/kubernetes/typed/networking/v1/fake +k8s.io/client-go/kubernetes/typed/policy/v1beta1 k8s.io/client-go/kubernetes/typed/policy/v1beta1/fake +k8s.io/client-go/kubernetes/typed/rbac/v1 k8s.io/client-go/kubernetes/typed/rbac/v1/fake +k8s.io/client-go/kubernetes/typed/rbac/v1alpha1 k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/fake +k8s.io/client-go/kubernetes/typed/rbac/v1beta1 k8s.io/client-go/kubernetes/typed/rbac/v1beta1/fake +k8s.io/client-go/kubernetes/typed/scheduling/v1alpha1 k8s.io/client-go/kubernetes/typed/scheduling/v1alpha1/fake +k8s.io/client-go/kubernetes/typed/scheduling/v1beta1 k8s.io/client-go/kubernetes/typed/scheduling/v1beta1/fake +k8s.io/client-go/kubernetes/typed/settings/v1alpha1 k8s.io/client-go/kubernetes/typed/settings/v1alpha1/fake +k8s.io/client-go/kubernetes/typed/storage/v1 k8s.io/client-go/kubernetes/typed/storage/v1/fake +k8s.io/client-go/kubernetes/typed/storage/v1alpha1 k8s.io/client-go/kubernetes/typed/storage/v1alpha1/fake +k8s.io/client-go/kubernetes/typed/storage/v1beta1 k8s.io/client-go/kubernetes/typed/storage/v1beta1/fake +<<<<<<< HEAD k8s.io/client-go/util/jsonpath k8s.io/client-go/informers/admissionregistration/v1alpha1 k8s.io/client-go/informers/admissionregistration/v1beta1 @@ -574,6 +756,8 @@ k8s.io/client-go/pkg/apis/clientauthentication/v1beta1 k8s.io/client-go/util/connrotation k8s.io/client-go/tools/clientcmd/api/v1 k8s.io/client-go/third_party/forked/golang/template +======= +>>>>>>> Update GRPC to v1.20.1 k8s.io/client-go/listers/admissionregistration/v1alpha1 k8s.io/client-go/listers/admissionregistration/v1beta1 k8s.io/client-go/listers/apps/v1 @@ -588,6 +772,7 @@ k8s.io/client-go/listers/batch/v1beta1 k8s.io/client-go/listers/batch/v2alpha1 k8s.io/client-go/listers/certificates/v1beta1 k8s.io/client-go/listers/coordination/v1beta1 +k8s.io/client-go/listers/core/v1 k8s.io/client-go/listers/events/v1beta1 k8s.io/client-go/listers/extensions/v1beta1 k8s.io/client-go/listers/networking/v1 @@ -601,6 +786,36 @@ k8s.io/client-go/listers/settings/v1alpha1 k8s.io/client-go/listers/storage/v1 k8s.io/client-go/listers/storage/v1alpha1 k8s.io/client-go/listers/storage/v1beta1 +k8s.io/client-go/pkg/apis/clientauthentication +k8s.io/client-go/pkg/apis/clientauthentication/v1alpha1 +k8s.io/client-go/pkg/apis/clientauthentication/v1beta1 +k8s.io/client-go/pkg/version +k8s.io/client-go/plugin/pkg/client/auth/exec +k8s.io/client-go/plugin/pkg/client/auth/gcp +k8s.io/client-go/rest +k8s.io/client-go/rest/watch +k8s.io/client-go/testing +k8s.io/client-go/third_party/forked/golang/template +k8s.io/client-go/tools/auth +k8s.io/client-go/tools/cache +k8s.io/client-go/tools/clientcmd +k8s.io/client-go/tools/clientcmd/api +k8s.io/client-go/tools/clientcmd/api/latest +k8s.io/client-go/tools/clientcmd/api/v1 +k8s.io/client-go/tools/metrics +k8s.io/client-go/tools/pager +k8s.io/client-go/tools/record +k8s.io/client-go/tools/reference +k8s.io/client-go/transport +k8s.io/client-go/util/buffer +k8s.io/client-go/util/cert +k8s.io/client-go/util/connrotation +k8s.io/client-go/util/flowcontrol +k8s.io/client-go/util/homedir +k8s.io/client-go/util/integer +k8s.io/client-go/util/jsonpath +k8s.io/client-go/util/retry +k8s.io/client-go/util/workqueue # k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6 k8s.io/gengo/parser k8s.io/gengo/types From c98c79e1db421b8768bbca5cf3e7fbaa69590122 Mon Sep 17 00:00:00 2001 From: Cyril Tovena Date: Tue, 5 Nov 2019 18:45:43 -0500 Subject: [PATCH 3/9] update cmake prerequistes to use the env variable. Signed-off-by: Cyril Tovena --- sdks/cpp/cmake/prerequisites.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdks/cpp/cmake/prerequisites.cmake b/sdks/cpp/cmake/prerequisites.cmake index 15e76d0fb7..79669c6c4b 100644 --- a/sdks/cpp/cmake/prerequisites.cmake +++ b/sdks/cpp/cmake/prerequisites.cmake @@ -31,7 +31,7 @@ endif() # gRPC repo and version set(gRPC_GIT_REPO "https://github.com/gRPC/gRPC.git") -set(gRPC_GIT_TAG "v1.16.1") +set(gRPC_GIT_TAG $ENV{GRPC_RELEASE_TAG}) # OpenSSL required only for successful build gRPC set(OPENSSL_GIT_REPO "https://github.com/openssl/openssl.git") From 2ce1a3420c1a632abdae9bc97ca453431ae63bf8 Mon Sep 17 00:00:00 2001 From: Cyril Tovena Date: Tue, 5 Nov 2019 18:49:21 -0500 Subject: [PATCH 4/9] go mod vendor Signed-off-by: Cyril Tovena --- go.mod | 1 + go.sum | 1 + vendor/github.com/google/btree/btree_mem.go | 76 +++ .../googleapis/README.grpc-gateway | 23 - .../googleapis/google/api/httpbody.proto | 78 --- vendor/golang.org/x/sys/unix/mkasm_darwin.go | 61 ++ vendor/golang.org/x/sys/unix/mkpost.go | 106 +++ vendor/golang.org/x/sys/unix/mksyscall.go | 4 + .../x/sys/unix/mksyscall_aix_ppc.go | 404 ++++++++++++ .../x/sys/unix/mksyscall_aix_ppc64.go | 602 ++++++++++++++++++ .../x/sys/unix/mksyscall_solaris.go | 335 ++++++++++ vendor/golang.org/x/sys/unix/mksysnum.go | 190 ++++++ vendor/golang.org/x/sys/unix/types_aix.go | 236 +++++++ vendor/golang.org/x/sys/unix/types_darwin.go | 277 ++++++++ .../golang.org/x/sys/unix/types_dragonfly.go | 263 ++++++++ vendor/golang.org/x/sys/unix/types_freebsd.go | 356 +++++++++++ vendor/golang.org/x/sys/unix/types_netbsd.go | 289 +++++++++ vendor/golang.org/x/sys/unix/types_openbsd.go | 276 ++++++++ vendor/golang.org/x/sys/unix/types_solaris.go | 266 ++++++++ vendor/golang.org/x/text/unicode/bidi/gen.go | 4 + .../x/text/unicode/bidi/gen_ranges.go | 4 + .../x/text/unicode/bidi/gen_trieval.go | 64 ++ .../x/text/unicode/norm/maketables.go | 35 + .../golang.org/x/text/unicode/norm/triegen.go | 117 ++++ vendor/golang.org/x/text/width/gen.go | 115 ++++ vendor/golang.org/x/text/width/gen_common.go | 96 +++ vendor/golang.org/x/text/width/gen_trieval.go | 34 + .../x/tools/go/gcexportdata/main.go | 99 +++ vendor/golang.org/x/tools/imports/mkindex.go | 173 +++++ vendor/golang.org/x/tools/imports/mkstdlib.go | 112 ++++ vendor/modules.txt | 388 ++++++----- 31 files changed, 4810 insertions(+), 275 deletions(-) create mode 100644 vendor/github.com/google/btree/btree_mem.go delete mode 100644 vendor/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis/README.grpc-gateway delete mode 100644 vendor/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis/google/api/httpbody.proto create mode 100644 vendor/golang.org/x/sys/unix/mkasm_darwin.go create mode 100644 vendor/golang.org/x/sys/unix/mkpost.go create mode 100644 vendor/golang.org/x/sys/unix/mksyscall_aix_ppc.go create mode 100644 vendor/golang.org/x/sys/unix/mksyscall_aix_ppc64.go create mode 100644 vendor/golang.org/x/sys/unix/mksyscall_solaris.go create mode 100644 vendor/golang.org/x/sys/unix/mksysnum.go create mode 100644 vendor/golang.org/x/sys/unix/types_aix.go create mode 100644 vendor/golang.org/x/sys/unix/types_darwin.go create mode 100644 vendor/golang.org/x/sys/unix/types_dragonfly.go create mode 100644 vendor/golang.org/x/sys/unix/types_freebsd.go create mode 100644 vendor/golang.org/x/sys/unix/types_netbsd.go create mode 100644 vendor/golang.org/x/sys/unix/types_openbsd.go create mode 100644 vendor/golang.org/x/sys/unix/types_solaris.go create mode 100644 vendor/golang.org/x/text/unicode/bidi/gen_trieval.go create mode 100644 vendor/golang.org/x/text/unicode/norm/triegen.go create mode 100644 vendor/golang.org/x/text/width/gen.go create mode 100644 vendor/golang.org/x/text/width/gen_common.go create mode 100644 vendor/golang.org/x/text/width/gen_trieval.go create mode 100644 vendor/golang.org/x/tools/go/gcexportdata/main.go create mode 100644 vendor/golang.org/x/tools/imports/mkindex.go create mode 100644 vendor/golang.org/x/tools/imports/mkstdlib.go diff --git a/go.mod b/go.mod index 933d430744..099c449379 100644 --- a/go.mod +++ b/go.mod @@ -43,6 +43,7 @@ require ( golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384 google.golang.org/api v0.0.0-20190117000611-43037ff31f69 // indirect + google.golang.org/appengine v1.4.0 // indirect google.golang.org/genproto v0.0.0-20191009194640-548a555dbc03 google.golang.org/grpc v1.20.1 gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0 // indirect diff --git a/go.sum b/go.sum index 713b7aff7c..f0082d0fff 100644 --- a/go.sum +++ b/go.sum @@ -268,6 +268,7 @@ google.golang.org/appengine v1.0.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9Ywl google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.3.0 h1:FBSsiFRMz3LBeXIomRnVzrQwSDj4ibvcRexLG0LZGQk= google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180601223552-81158efcc9f2/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= diff --git a/vendor/github.com/google/btree/btree_mem.go b/vendor/github.com/google/btree/btree_mem.go new file mode 100644 index 0000000000..cb95b7fa1b --- /dev/null +++ b/vendor/github.com/google/btree/btree_mem.go @@ -0,0 +1,76 @@ +// Copyright 2014 Google Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// +build ignore + +// This binary compares memory usage between btree and gollrb. +package main + +import ( + "flag" + "fmt" + "math/rand" + "runtime" + "time" + + "github.com/google/btree" + "github.com/petar/GoLLRB/llrb" +) + +var ( + size = flag.Int("size", 1000000, "size of the tree to build") + degree = flag.Int("degree", 8, "degree of btree") + gollrb = flag.Bool("llrb", false, "use llrb instead of btree") +) + +func main() { + flag.Parse() + vals := rand.Perm(*size) + var t, v interface{} + v = vals + var stats runtime.MemStats + for i := 0; i < 10; i++ { + runtime.GC() + } + fmt.Println("-------- BEFORE ----------") + runtime.ReadMemStats(&stats) + fmt.Printf("%+v\n", stats) + start := time.Now() + if *gollrb { + tr := llrb.New() + for _, v := range vals { + tr.ReplaceOrInsert(llrb.Int(v)) + } + t = tr // keep it around + } else { + tr := btree.New(*degree) + for _, v := range vals { + tr.ReplaceOrInsert(btree.Int(v)) + } + t = tr // keep it around + } + fmt.Printf("%v inserts in %v\n", *size, time.Since(start)) + fmt.Println("-------- AFTER ----------") + runtime.ReadMemStats(&stats) + fmt.Printf("%+v\n", stats) + for i := 0; i < 10; i++ { + runtime.GC() + } + fmt.Println("-------- AFTER GC ----------") + runtime.ReadMemStats(&stats) + fmt.Printf("%+v\n", stats) + if t == v { + fmt.Println("to make sure vals and tree aren't GC'd") + } +} diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis/README.grpc-gateway b/vendor/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis/README.grpc-gateway deleted file mode 100644 index b7d1bea36c..0000000000 --- a/vendor/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis/README.grpc-gateway +++ /dev/null @@ -1,23 +0,0 @@ -Google APIs -============ - -Project: Google APIs -URL: https://github.com/google/googleapis -Revision: 3544ab16c3342d790b00764251e348705991ea4b -License: Apache License 2.0 - - -Imported Files ---------------- - -- google/api/annotations.proto -- google/api/http.proto -- google/api/httpbody.proto - - -Generated Files ----------------- - -They are generated from the .proto files by protoc-gen-go. -- google/api/annotations.pb.go -- google/api/http.pb.go diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis/google/api/httpbody.proto b/vendor/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis/google/api/httpbody.proto deleted file mode 100644 index 4428515c12..0000000000 --- a/vendor/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis/google/api/httpbody.proto +++ /dev/null @@ -1,78 +0,0 @@ -// Copyright 2018 Google LLC. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// - -syntax = "proto3"; - -package google.api; - -import "google/protobuf/any.proto"; - -option cc_enable_arenas = true; -option go_package = "google.golang.org/genproto/googleapis/api/httpbody;httpbody"; -option java_multiple_files = true; -option java_outer_classname = "HttpBodyProto"; -option java_package = "com.google.api"; -option objc_class_prefix = "GAPI"; - -// Message that represents an arbitrary HTTP body. It should only be used for -// payload formats that can't be represented as JSON, such as raw binary or -// an HTML page. -// -// -// This message can be used both in streaming and non-streaming API methods in -// the request as well as the response. -// -// It can be used as a top-level request field, which is convenient if one -// wants to extract parameters from either the URL or HTTP template into the -// request fields and also want access to the raw HTTP body. -// -// Example: -// -// message GetResourceRequest { -// // A unique request id. -// string request_id = 1; -// -// // The raw HTTP body is bound to this field. -// google.api.HttpBody http_body = 2; -// } -// -// service ResourceService { -// rpc GetResource(GetResourceRequest) returns (google.api.HttpBody); -// rpc UpdateResource(google.api.HttpBody) returns -// (google.protobuf.Empty); -// } -// -// Example with streaming methods: -// -// service CaldavService { -// rpc GetCalendar(stream google.api.HttpBody) -// returns (stream google.api.HttpBody); -// rpc UpdateCalendar(stream google.api.HttpBody) -// returns (stream google.api.HttpBody); -// } -// -// Use of this type only changes how the request and response bodies are -// handled, all other features will continue to work unchanged. -message HttpBody { - // The HTTP Content-Type header value specifying the content type of the body. - string content_type = 1; - - // The HTTP request/response body as raw binary. - bytes data = 2; - - // Application specific response metadata. Must be set in the first response - // for streaming APIs. - repeated google.protobuf.Any extensions = 3; -} \ No newline at end of file diff --git a/vendor/golang.org/x/sys/unix/mkasm_darwin.go b/vendor/golang.org/x/sys/unix/mkasm_darwin.go new file mode 100644 index 0000000000..4548b993db --- /dev/null +++ b/vendor/golang.org/x/sys/unix/mkasm_darwin.go @@ -0,0 +1,61 @@ +// Copyright 2018 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// +build ignore + +// mkasm_darwin.go generates assembly trampolines to call libSystem routines from Go. +//This program must be run after mksyscall.go. +package main + +import ( + "bytes" + "fmt" + "io/ioutil" + "log" + "os" + "strings" +) + +func main() { + in1, err := ioutil.ReadFile("syscall_darwin.go") + if err != nil { + log.Fatalf("can't open syscall_darwin.go: %s", err) + } + arch := os.Args[1] + in2, err := ioutil.ReadFile(fmt.Sprintf("syscall_darwin_%s.go", arch)) + if err != nil { + log.Fatalf("can't open syscall_darwin_%s.go: %s", arch, err) + } + in3, err := ioutil.ReadFile(fmt.Sprintf("zsyscall_darwin_%s.go", arch)) + if err != nil { + log.Fatalf("can't open zsyscall_darwin_%s.go: %s", arch, err) + } + in := string(in1) + string(in2) + string(in3) + + trampolines := map[string]bool{} + + var out bytes.Buffer + + fmt.Fprintf(&out, "// go run mkasm_darwin.go %s\n", strings.Join(os.Args[1:], " ")) + fmt.Fprintf(&out, "// Code generated by the command above; DO NOT EDIT.\n") + fmt.Fprintf(&out, "\n") + fmt.Fprintf(&out, "// +build go1.12\n") + fmt.Fprintf(&out, "\n") + fmt.Fprintf(&out, "#include \"textflag.h\"\n") + for _, line := range strings.Split(in, "\n") { + if !strings.HasPrefix(line, "func ") || !strings.HasSuffix(line, "_trampoline()") { + continue + } + fn := line[5 : len(line)-13] + if !trampolines[fn] { + trampolines[fn] = true + fmt.Fprintf(&out, "TEXT ·%s_trampoline(SB),NOSPLIT,$0-0\n", fn) + fmt.Fprintf(&out, "\tJMP\t%s(SB)\n", fn) + } + } + err = ioutil.WriteFile(fmt.Sprintf("zsyscall_darwin_%s.s", arch), out.Bytes(), 0644) + if err != nil { + log.Fatalf("can't write zsyscall_darwin_%s.s: %s", arch, err) + } +} diff --git a/vendor/golang.org/x/sys/unix/mkpost.go b/vendor/golang.org/x/sys/unix/mkpost.go new file mode 100644 index 0000000000..9feddd00c4 --- /dev/null +++ b/vendor/golang.org/x/sys/unix/mkpost.go @@ -0,0 +1,106 @@ +// Copyright 2016 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// +build ignore + +// mkpost processes the output of cgo -godefs to +// modify the generated types. It is used to clean up +// the sys API in an architecture specific manner. +// +// mkpost is run after cgo -godefs; see README.md. +package main + +import ( + "bytes" + "fmt" + "go/format" + "io/ioutil" + "log" + "os" + "regexp" +) + +func main() { + // Get the OS and architecture (using GOARCH_TARGET if it exists) + goos := os.Getenv("GOOS") + goarch := os.Getenv("GOARCH_TARGET") + if goarch == "" { + goarch = os.Getenv("GOARCH") + } + // Check that we are using the Docker-based build system if we should be. + if goos == "linux" { + if os.Getenv("GOLANG_SYS_BUILD") != "docker" { + os.Stderr.WriteString("In the Docker-based build system, mkpost should not be called directly.\n") + os.Stderr.WriteString("See README.md\n") + os.Exit(1) + } + } + + b, err := ioutil.ReadAll(os.Stdin) + if err != nil { + log.Fatal(err) + } + + // Intentionally export __val fields in Fsid and Sigset_t + valRegex := regexp.MustCompile(`type (Fsid|Sigset_t) struct {(\s+)X__val(\s+\S+\s+)}`) + b = valRegex.ReplaceAll(b, []byte("type $1 struct {${2}Val$3}")) + + // Intentionally export __fds_bits field in FdSet + fdSetRegex := regexp.MustCompile(`type (FdSet) struct {(\s+)X__fds_bits(\s+\S+\s+)}`) + b = fdSetRegex.ReplaceAll(b, []byte("type $1 struct {${2}Bits$3}")) + + // If we have empty Ptrace structs, we should delete them. Only s390x emits + // nonempty Ptrace structs. + ptraceRexexp := regexp.MustCompile(`type Ptrace((Psw|Fpregs|Per) struct {\s*})`) + b = ptraceRexexp.ReplaceAll(b, nil) + + // Replace the control_regs union with a blank identifier for now. + controlRegsRegex := regexp.MustCompile(`(Control_regs)\s+\[0\]uint64`) + b = controlRegsRegex.ReplaceAll(b, []byte("_ [0]uint64")) + + // Remove fields that are added by glibc + // Note that this is unstable as the identifers are private. + removeFieldsRegex := regexp.MustCompile(`X__glibc\S*`) + b = removeFieldsRegex.ReplaceAll(b, []byte("_")) + + // Convert [65]int8 to [65]byte in Utsname members to simplify + // conversion to string; see golang.org/issue/20753 + convertUtsnameRegex := regexp.MustCompile(`((Sys|Node|Domain)name|Release|Version|Machine)(\s+)\[(\d+)\]u?int8`) + b = convertUtsnameRegex.ReplaceAll(b, []byte("$1$3[$4]byte")) + + // Convert [1024]int8 to [1024]byte in Ptmget members + convertPtmget := regexp.MustCompile(`([SC]n)(\s+)\[(\d+)\]u?int8`) + b = convertPtmget.ReplaceAll(b, []byte("$1[$3]byte")) + + // Remove spare fields (e.g. in Statx_t) + spareFieldsRegex := regexp.MustCompile(`X__spare\S*`) + b = spareFieldsRegex.ReplaceAll(b, []byte("_")) + + // Remove cgo padding fields + removePaddingFieldsRegex := regexp.MustCompile(`Pad_cgo_\d+`) + b = removePaddingFieldsRegex.ReplaceAll(b, []byte("_")) + + // Remove padding, hidden, or unused fields + removeFieldsRegex = regexp.MustCompile(`\b(X_\S+|Padding)`) + b = removeFieldsRegex.ReplaceAll(b, []byte("_")) + + // Remove the first line of warning from cgo + b = b[bytes.IndexByte(b, '\n')+1:] + // Modify the command in the header to include: + // mkpost, our own warning, and a build tag. + replacement := fmt.Sprintf(`$1 | go run mkpost.go +// Code generated by the command above; see README.md. DO NOT EDIT. + +// +build %s,%s`, goarch, goos) + cgoCommandRegex := regexp.MustCompile(`(cgo -godefs .*)`) + b = cgoCommandRegex.ReplaceAll(b, []byte(replacement)) + + // gofmt + b, err = format.Source(b) + if err != nil { + log.Fatal(err) + } + + os.Stdout.Write(b) +} diff --git a/vendor/golang.org/x/sys/unix/mksyscall.go b/vendor/golang.org/x/sys/unix/mksyscall.go index e06e4253ea..7a939887b6 100644 --- a/vendor/golang.org/x/sys/unix/mksyscall.go +++ b/vendor/golang.org/x/sys/unix/mksyscall.go @@ -228,7 +228,11 @@ func main() { } else { args = append(args, fmt.Sprintf("uintptr(%s)", p.Name)) } +<<<<<<< HEAD } else if p.Type == "int64" && endianness != "" { +======= + } else if (p.Type == "int64" || p.Type == "uint64") && endianness != "" { +>>>>>>> go mod vendor if len(args)%2 == 1 && *arm { // arm abi specifies 64-bit argument uses // (even, odd) pair diff --git a/vendor/golang.org/x/sys/unix/mksyscall_aix_ppc.go b/vendor/golang.org/x/sys/unix/mksyscall_aix_ppc.go new file mode 100644 index 0000000000..f2c58fb7cc --- /dev/null +++ b/vendor/golang.org/x/sys/unix/mksyscall_aix_ppc.go @@ -0,0 +1,404 @@ +// Copyright 2019 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// +build ignore + +/* +This program reads a file containing function prototypes +(like syscall_aix.go) and generates system call bodies. +The prototypes are marked by lines beginning with "//sys" +and read like func declarations if //sys is replaced by func, but: + * The parameter lists must give a name for each argument. + This includes return parameters. + * The parameter lists must give a type for each argument: + the (x, y, z int) shorthand is not allowed. + * If the return parameter is an error number, it must be named err. + * If go func name needs to be different than its libc name, + * or the function is not in libc, name could be specified + * at the end, after "=" sign, like + //sys getsockopt(s int, level int, name int, val uintptr, vallen *_Socklen) (err error) = libsocket.getsockopt +*/ +package main + +import ( + "bufio" + "flag" + "fmt" + "os" + "regexp" + "strings" +) + +var ( + b32 = flag.Bool("b32", false, "32bit big-endian") + l32 = flag.Bool("l32", false, "32bit little-endian") + aix = flag.Bool("aix", false, "aix") + tags = flag.String("tags", "", "build tags") +) + +// cmdLine returns this programs's commandline arguments +func cmdLine() string { + return "go run mksyscall_aix_ppc.go " + strings.Join(os.Args[1:], " ") +} + +// buildTags returns build tags +func buildTags() string { + return *tags +} + +// Param is function parameter +type Param struct { + Name string + Type string +} + +// usage prints the program usage +func usage() { + fmt.Fprintf(os.Stderr, "usage: go run mksyscall_aix_ppc.go [-b32 | -l32] [-tags x,y] [file ...]\n") + os.Exit(1) +} + +// parseParamList parses parameter list and returns a slice of parameters +func parseParamList(list string) []string { + list = strings.TrimSpace(list) + if list == "" { + return []string{} + } + return regexp.MustCompile(`\s*,\s*`).Split(list, -1) +} + +// parseParam splits a parameter into name and type +func parseParam(p string) Param { + ps := regexp.MustCompile(`^(\S*) (\S*)$`).FindStringSubmatch(p) + if ps == nil { + fmt.Fprintf(os.Stderr, "malformed parameter: %s\n", p) + os.Exit(1) + } + return Param{ps[1], ps[2]} +} + +func main() { + flag.Usage = usage + flag.Parse() + if len(flag.Args()) <= 0 { + fmt.Fprintf(os.Stderr, "no files to parse provided\n") + usage() + } + + endianness := "" + if *b32 { + endianness = "big-endian" + } else if *l32 { + endianness = "little-endian" + } + + pack := "" + text := "" + cExtern := "/*\n#include \n#include \n" + for _, path := range flag.Args() { + file, err := os.Open(path) + if err != nil { + fmt.Fprintf(os.Stderr, err.Error()) + os.Exit(1) + } + s := bufio.NewScanner(file) + for s.Scan() { + t := s.Text() + t = strings.TrimSpace(t) + t = regexp.MustCompile(`\s+`).ReplaceAllString(t, ` `) + if p := regexp.MustCompile(`^package (\S+)$`).FindStringSubmatch(t); p != nil && pack == "" { + pack = p[1] + } + nonblock := regexp.MustCompile(`^\/\/sysnb `).FindStringSubmatch(t) + if regexp.MustCompile(`^\/\/sys `).FindStringSubmatch(t) == nil && nonblock == nil { + continue + } + + // Line must be of the form + // func Open(path string, mode int, perm int) (fd int, err error) + // Split into name, in params, out params. + f := regexp.MustCompile(`^\/\/sys(nb)? (\w+)\(([^()]*)\)\s*(?:\(([^()]+)\))?\s*(?:=\s*(?:(\w*)\.)?(\w*))?$`).FindStringSubmatch(t) + if f == nil { + fmt.Fprintf(os.Stderr, "%s:%s\nmalformed //sys declaration\n", path, t) + os.Exit(1) + } + funct, inps, outps, modname, sysname := f[2], f[3], f[4], f[5], f[6] + + // Split argument lists on comma. + in := parseParamList(inps) + out := parseParamList(outps) + + inps = strings.Join(in, ", ") + outps = strings.Join(out, ", ") + + // Try in vain to keep people from editing this file. + // The theory is that they jump into the middle of the file + // without reading the header. + text += "// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT\n\n" + + // Check if value return, err return available + errvar := "" + retvar := "" + rettype := "" + for _, param := range out { + p := parseParam(param) + if p.Type == "error" { + errvar = p.Name + } else { + retvar = p.Name + rettype = p.Type + } + } + + // System call name. + if sysname == "" { + sysname = funct + } + sysname = regexp.MustCompile(`([a-z])([A-Z])`).ReplaceAllString(sysname, `${1}_$2`) + sysname = strings.ToLower(sysname) // All libc functions are lowercase. + + cRettype := "" + if rettype == "unsafe.Pointer" { + cRettype = "uintptr_t" + } else if rettype == "uintptr" { + cRettype = "uintptr_t" + } else if regexp.MustCompile(`^_`).FindStringSubmatch(rettype) != nil { + cRettype = "uintptr_t" + } else if rettype == "int" { + cRettype = "int" + } else if rettype == "int32" { + cRettype = "int" + } else if rettype == "int64" { + cRettype = "long long" + } else if rettype == "uint32" { + cRettype = "unsigned int" + } else if rettype == "uint64" { + cRettype = "unsigned long long" + } else { + cRettype = "int" + } + if sysname == "exit" { + cRettype = "void" + } + + // Change p.Types to c + var cIn []string + for _, param := range in { + p := parseParam(param) + if regexp.MustCompile(`^\*`).FindStringSubmatch(p.Type) != nil { + cIn = append(cIn, "uintptr_t") + } else if p.Type == "string" { + cIn = append(cIn, "uintptr_t") + } else if regexp.MustCompile(`^\[\](.*)`).FindStringSubmatch(p.Type) != nil { + cIn = append(cIn, "uintptr_t", "size_t") + } else if p.Type == "unsafe.Pointer" { + cIn = append(cIn, "uintptr_t") + } else if p.Type == "uintptr" { + cIn = append(cIn, "uintptr_t") + } else if regexp.MustCompile(`^_`).FindStringSubmatch(p.Type) != nil { + cIn = append(cIn, "uintptr_t") + } else if p.Type == "int" { + cIn = append(cIn, "int") + } else if p.Type == "int32" { + cIn = append(cIn, "int") + } else if p.Type == "int64" { + cIn = append(cIn, "long long") + } else if p.Type == "uint32" { + cIn = append(cIn, "unsigned int") + } else if p.Type == "uint64" { + cIn = append(cIn, "unsigned long long") + } else { + cIn = append(cIn, "int") + } + } + + if funct != "fcntl" && funct != "FcntlInt" && funct != "readlen" && funct != "writelen" { + // Imports of system calls from libc + cExtern += fmt.Sprintf("%s %s", cRettype, sysname) + cIn := strings.Join(cIn, ", ") + cExtern += fmt.Sprintf("(%s);\n", cIn) + } + + // So file name. + if *aix { + if modname == "" { + modname = "libc.a/shr_64.o" + } else { + fmt.Fprintf(os.Stderr, "%s: only syscall using libc are available\n", funct) + os.Exit(1) + } + } + + strconvfunc := "C.CString" + + // Go function header. + if outps != "" { + outps = fmt.Sprintf(" (%s)", outps) + } + if text != "" { + text += "\n" + } + + text += fmt.Sprintf("func %s(%s)%s {\n", funct, strings.Join(in, ", "), outps) + + // Prepare arguments to Syscall. + var args []string + n := 0 + argN := 0 + for _, param := range in { + p := parseParam(param) + if regexp.MustCompile(`^\*`).FindStringSubmatch(p.Type) != nil { + args = append(args, "C.uintptr_t(uintptr(unsafe.Pointer("+p.Name+")))") + } else if p.Type == "string" && errvar != "" { + text += fmt.Sprintf("\t_p%d := uintptr(unsafe.Pointer(%s(%s)))\n", n, strconvfunc, p.Name) + args = append(args, fmt.Sprintf("C.uintptr_t(_p%d)", n)) + n++ + } else if p.Type == "string" { + fmt.Fprintf(os.Stderr, path+":"+funct+" uses string arguments, but has no error return\n") + text += fmt.Sprintf("\t_p%d := uintptr(unsafe.Pointer(%s(%s)))\n", n, strconvfunc, p.Name) + args = append(args, fmt.Sprintf("C.uintptr_t(_p%d)", n)) + n++ + } else if m := regexp.MustCompile(`^\[\](.*)`).FindStringSubmatch(p.Type); m != nil { + // Convert slice into pointer, length. + // Have to be careful not to take address of &a[0] if len == 0: + // pass nil in that case. + text += fmt.Sprintf("\tvar _p%d *%s\n", n, m[1]) + text += fmt.Sprintf("\tif len(%s) > 0 {\n\t\t_p%d = &%s[0]\n\t}\n", p.Name, n, p.Name) + args = append(args, fmt.Sprintf("C.uintptr_t(uintptr(unsafe.Pointer(_p%d)))", n)) + n++ + text += fmt.Sprintf("\tvar _p%d int\n", n) + text += fmt.Sprintf("\t_p%d = len(%s)\n", n, p.Name) + args = append(args, fmt.Sprintf("C.size_t(_p%d)", n)) + n++ + } else if p.Type == "int64" && endianness != "" { + if endianness == "big-endian" { + args = append(args, fmt.Sprintf("uintptr(%s>>32)", p.Name), fmt.Sprintf("uintptr(%s)", p.Name)) + } else { + args = append(args, fmt.Sprintf("uintptr(%s)", p.Name), fmt.Sprintf("uintptr(%s>>32)", p.Name)) + } + n++ + } else if p.Type == "bool" { + text += fmt.Sprintf("\tvar _p%d uint32\n", n) + text += fmt.Sprintf("\tif %s {\n\t\t_p%d = 1\n\t} else {\n\t\t_p%d = 0\n\t}\n", p.Name, n, n) + args = append(args, fmt.Sprintf("_p%d", n)) + } else if regexp.MustCompile(`^_`).FindStringSubmatch(p.Type) != nil { + args = append(args, fmt.Sprintf("C.uintptr_t(uintptr(%s))", p.Name)) + } else if p.Type == "unsafe.Pointer" { + args = append(args, fmt.Sprintf("C.uintptr_t(uintptr(%s))", p.Name)) + } else if p.Type == "int" { + if (argN == 2) && ((funct == "readlen") || (funct == "writelen")) { + args = append(args, fmt.Sprintf("C.size_t(%s)", p.Name)) + } else if argN == 0 && funct == "fcntl" { + args = append(args, fmt.Sprintf("C.uintptr_t(%s)", p.Name)) + } else if (argN == 2) && ((funct == "fcntl") || (funct == "FcntlInt")) { + args = append(args, fmt.Sprintf("C.uintptr_t(%s)", p.Name)) + } else { + args = append(args, fmt.Sprintf("C.int(%s)", p.Name)) + } + } else if p.Type == "int32" { + args = append(args, fmt.Sprintf("C.int(%s)", p.Name)) + } else if p.Type == "int64" { + args = append(args, fmt.Sprintf("C.longlong(%s)", p.Name)) + } else if p.Type == "uint32" { + args = append(args, fmt.Sprintf("C.uint(%s)", p.Name)) + } else if p.Type == "uint64" { + args = append(args, fmt.Sprintf("C.ulonglong(%s)", p.Name)) + } else if p.Type == "uintptr" { + args = append(args, fmt.Sprintf("C.uintptr_t(%s)", p.Name)) + } else { + args = append(args, fmt.Sprintf("C.int(%s)", p.Name)) + } + argN++ + } + + // Actual call. + arglist := strings.Join(args, ", ") + call := "" + if sysname == "exit" { + if errvar != "" { + call += "er :=" + } else { + call += "" + } + } else if errvar != "" { + call += "r0,er :=" + } else if retvar != "" { + call += "r0,_ :=" + } else { + call += "" + } + call += fmt.Sprintf("C.%s(%s)", sysname, arglist) + + // Assign return values. + body := "" + for i := 0; i < len(out); i++ { + p := parseParam(out[i]) + reg := "" + if p.Name == "err" { + reg = "e1" + } else { + reg = "r0" + } + if reg != "e1" { + body += fmt.Sprintf("\t%s = %s(%s)\n", p.Name, p.Type, reg) + } + } + + // verify return + if sysname != "exit" && errvar != "" { + if regexp.MustCompile(`^uintptr`).FindStringSubmatch(cRettype) != nil { + body += "\tif (uintptr(r0) ==^uintptr(0) && er != nil) {\n" + body += fmt.Sprintf("\t\t%s = er\n", errvar) + body += "\t}\n" + } else { + body += "\tif (r0 ==-1 && er != nil) {\n" + body += fmt.Sprintf("\t\t%s = er\n", errvar) + body += "\t}\n" + } + } else if errvar != "" { + body += "\tif (er != nil) {\n" + body += fmt.Sprintf("\t\t%s = er\n", errvar) + body += "\t}\n" + } + + text += fmt.Sprintf("\t%s\n", call) + text += body + + text += "\treturn\n" + text += "}\n" + } + if err := s.Err(); err != nil { + fmt.Fprintf(os.Stderr, err.Error()) + os.Exit(1) + } + file.Close() + } + imp := "" + if pack != "unix" { + imp = "import \"golang.org/x/sys/unix\"\n" + + } + fmt.Printf(srcTemplate, cmdLine(), buildTags(), pack, cExtern, imp, text) +} + +const srcTemplate = `// %s +// Code generated by the command above; see README.md. DO NOT EDIT. + +// +build %s + +package %s + + +%s +*/ +import "C" +import ( + "unsafe" +) + + +%s + +%s +` diff --git a/vendor/golang.org/x/sys/unix/mksyscall_aix_ppc64.go b/vendor/golang.org/x/sys/unix/mksyscall_aix_ppc64.go new file mode 100644 index 0000000000..45b4429088 --- /dev/null +++ b/vendor/golang.org/x/sys/unix/mksyscall_aix_ppc64.go @@ -0,0 +1,602 @@ +// Copyright 2019 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// +build ignore + +/* +This program reads a file containing function prototypes +(like syscall_aix.go) and generates system call bodies. +The prototypes are marked by lines beginning with "//sys" +and read like func declarations if //sys is replaced by func, but: + * The parameter lists must give a name for each argument. + This includes return parameters. + * The parameter lists must give a type for each argument: + the (x, y, z int) shorthand is not allowed. + * If the return parameter is an error number, it must be named err. + * If go func name needs to be different than its libc name, + * or the function is not in libc, name could be specified + * at the end, after "=" sign, like + //sys getsockopt(s int, level int, name int, val uintptr, vallen *_Socklen) (err error) = libsocket.getsockopt + + +This program will generate three files and handle both gc and gccgo implementation: + - zsyscall_aix_ppc64.go: the common part of each implementation (error handler, pointer creation) + - zsyscall_aix_ppc64_gc.go: gc part with //go_cgo_import_dynamic and a call to syscall6 + - zsyscall_aix_ppc64_gccgo.go: gccgo part with C function and conversion to C type. + + The generated code looks like this + +zsyscall_aix_ppc64.go +func asyscall(...) (n int, err error) { + // Pointer Creation + r1, e1 := callasyscall(...) + // Type Conversion + // Error Handler + return +} + +zsyscall_aix_ppc64_gc.go +//go:cgo_import_dynamic libc_asyscall asyscall "libc.a/shr_64.o" +//go:linkname libc_asyscall libc_asyscall +var asyscall syscallFunc + +func callasyscall(...) (r1 uintptr, e1 Errno) { + r1, _, e1 = syscall6(uintptr(unsafe.Pointer(&libc_asyscall)), "nb_args", ... ) + return +} + +zsyscall_aix_ppc64_ggcgo.go + +// int asyscall(...) + +import "C" + +func callasyscall(...) (r1 uintptr, e1 Errno) { + r1 = uintptr(C.asyscall(...)) + e1 = syscall.GetErrno() + return +} +*/ + +package main + +import ( + "bufio" + "flag" + "fmt" + "io/ioutil" + "os" + "regexp" + "strings" +) + +var ( + b32 = flag.Bool("b32", false, "32bit big-endian") + l32 = flag.Bool("l32", false, "32bit little-endian") + aix = flag.Bool("aix", false, "aix") + tags = flag.String("tags", "", "build tags") +) + +// cmdLine returns this programs's commandline arguments +func cmdLine() string { + return "go run mksyscall_aix_ppc64.go " + strings.Join(os.Args[1:], " ") +} + +// buildTags returns build tags +func buildTags() string { + return *tags +} + +// Param is function parameter +type Param struct { + Name string + Type string +} + +// usage prints the program usage +func usage() { + fmt.Fprintf(os.Stderr, "usage: go run mksyscall_aix_ppc64.go [-b32 | -l32] [-tags x,y] [file ...]\n") + os.Exit(1) +} + +// parseParamList parses parameter list and returns a slice of parameters +func parseParamList(list string) []string { + list = strings.TrimSpace(list) + if list == "" { + return []string{} + } + return regexp.MustCompile(`\s*,\s*`).Split(list, -1) +} + +// parseParam splits a parameter into name and type +func parseParam(p string) Param { + ps := regexp.MustCompile(`^(\S*) (\S*)$`).FindStringSubmatch(p) + if ps == nil { + fmt.Fprintf(os.Stderr, "malformed parameter: %s\n", p) + os.Exit(1) + } + return Param{ps[1], ps[2]} +} + +func main() { + flag.Usage = usage + flag.Parse() + if len(flag.Args()) <= 0 { + fmt.Fprintf(os.Stderr, "no files to parse provided\n") + usage() + } + + endianness := "" + if *b32 { + endianness = "big-endian" + } else if *l32 { + endianness = "little-endian" + } + + pack := "" + // GCCGO + textgccgo := "" + cExtern := "/*\n#include \n" + // GC + textgc := "" + dynimports := "" + linknames := "" + var vars []string + // COMMON + textcommon := "" + for _, path := range flag.Args() { + file, err := os.Open(path) + if err != nil { + fmt.Fprintf(os.Stderr, err.Error()) + os.Exit(1) + } + s := bufio.NewScanner(file) + for s.Scan() { + t := s.Text() + t = strings.TrimSpace(t) + t = regexp.MustCompile(`\s+`).ReplaceAllString(t, ` `) + if p := regexp.MustCompile(`^package (\S+)$`).FindStringSubmatch(t); p != nil && pack == "" { + pack = p[1] + } + nonblock := regexp.MustCompile(`^\/\/sysnb `).FindStringSubmatch(t) + if regexp.MustCompile(`^\/\/sys `).FindStringSubmatch(t) == nil && nonblock == nil { + continue + } + + // Line must be of the form + // func Open(path string, mode int, perm int) (fd int, err error) + // Split into name, in params, out params. + f := regexp.MustCompile(`^\/\/sys(nb)? (\w+)\(([^()]*)\)\s*(?:\(([^()]+)\))?\s*(?:=\s*(?:(\w*)\.)?(\w*))?$`).FindStringSubmatch(t) + if f == nil { + fmt.Fprintf(os.Stderr, "%s:%s\nmalformed //sys declaration\n", path, t) + os.Exit(1) + } + funct, inps, outps, modname, sysname := f[2], f[3], f[4], f[5], f[6] + + // Split argument lists on comma. + in := parseParamList(inps) + out := parseParamList(outps) + + inps = strings.Join(in, ", ") + outps = strings.Join(out, ", ") + + if sysname == "" { + sysname = funct + } + + onlyCommon := false + if funct == "readlen" || funct == "writelen" || funct == "FcntlInt" || funct == "FcntlFlock" { + // This function call another syscall which is already implemented. + // Therefore, the gc and gccgo part must not be generated. + onlyCommon = true + } + + // Try in vain to keep people from editing this file. + // The theory is that they jump into the middle of the file + // without reading the header. + + textcommon += "// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT\n\n" + if !onlyCommon { + textgccgo += "// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT\n\n" + textgc += "// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT\n\n" + } + + // Check if value return, err return available + errvar := "" + rettype := "" + for _, param := range out { + p := parseParam(param) + if p.Type == "error" { + errvar = p.Name + } else { + rettype = p.Type + } + } + + sysname = regexp.MustCompile(`([a-z])([A-Z])`).ReplaceAllString(sysname, `${1}_$2`) + sysname = strings.ToLower(sysname) // All libc functions are lowercase. + + // GCCGO Prototype return type + cRettype := "" + if rettype == "unsafe.Pointer" { + cRettype = "uintptr_t" + } else if rettype == "uintptr" { + cRettype = "uintptr_t" + } else if regexp.MustCompile(`^_`).FindStringSubmatch(rettype) != nil { + cRettype = "uintptr_t" + } else if rettype == "int" { + cRettype = "int" + } else if rettype == "int32" { + cRettype = "int" + } else if rettype == "int64" { + cRettype = "long long" + } else if rettype == "uint32" { + cRettype = "unsigned int" + } else if rettype == "uint64" { + cRettype = "unsigned long long" + } else { + cRettype = "int" + } + if sysname == "exit" { + cRettype = "void" + } + + // GCCGO Prototype arguments type + var cIn []string + for i, param := range in { + p := parseParam(param) + if regexp.MustCompile(`^\*`).FindStringSubmatch(p.Type) != nil { + cIn = append(cIn, "uintptr_t") + } else if p.Type == "string" { + cIn = append(cIn, "uintptr_t") + } else if regexp.MustCompile(`^\[\](.*)`).FindStringSubmatch(p.Type) != nil { + cIn = append(cIn, "uintptr_t", "size_t") + } else if p.Type == "unsafe.Pointer" { + cIn = append(cIn, "uintptr_t") + } else if p.Type == "uintptr" { + cIn = append(cIn, "uintptr_t") + } else if regexp.MustCompile(`^_`).FindStringSubmatch(p.Type) != nil { + cIn = append(cIn, "uintptr_t") + } else if p.Type == "int" { + if (i == 0 || i == 2) && funct == "fcntl" { + // These fcntl arguments needs to be uintptr to be able to call FcntlInt and FcntlFlock + cIn = append(cIn, "uintptr_t") + } else { + cIn = append(cIn, "int") + } + + } else if p.Type == "int32" { + cIn = append(cIn, "int") + } else if p.Type == "int64" { + cIn = append(cIn, "long long") + } else if p.Type == "uint32" { + cIn = append(cIn, "unsigned int") + } else if p.Type == "uint64" { + cIn = append(cIn, "unsigned long long") + } else { + cIn = append(cIn, "int") + } + } + + if !onlyCommon { + // GCCGO Prototype Generation + // Imports of system calls from libc + cExtern += fmt.Sprintf("%s %s", cRettype, sysname) + cIn := strings.Join(cIn, ", ") + cExtern += fmt.Sprintf("(%s);\n", cIn) + } + // GC Library name + if modname == "" { + modname = "libc.a/shr_64.o" + } else { + fmt.Fprintf(os.Stderr, "%s: only syscall using libc are available\n", funct) + os.Exit(1) + } + sysvarname := fmt.Sprintf("libc_%s", sysname) + + if !onlyCommon { + // GC Runtime import of function to allow cross-platform builds. + dynimports += fmt.Sprintf("//go:cgo_import_dynamic %s %s \"%s\"\n", sysvarname, sysname, modname) + // GC Link symbol to proc address variable. + linknames += fmt.Sprintf("//go:linkname %s %s\n", sysvarname, sysvarname) + // GC Library proc address variable. + vars = append(vars, sysvarname) + } + + strconvfunc := "BytePtrFromString" + strconvtype := "*byte" + + // Go function header. + if outps != "" { + outps = fmt.Sprintf(" (%s)", outps) + } + if textcommon != "" { + textcommon += "\n" + } + + textcommon += fmt.Sprintf("func %s(%s)%s {\n", funct, strings.Join(in, ", "), outps) + + // Prepare arguments tocall. + var argscommon []string // Arguments in the common part + var argscall []string // Arguments for call prototype + var argsgc []string // Arguments for gc call (with syscall6) + var argsgccgo []string // Arguments for gccgo call (with C.name_of_syscall) + n := 0 + argN := 0 + for _, param := range in { + p := parseParam(param) + if regexp.MustCompile(`^\*`).FindStringSubmatch(p.Type) != nil { + argscommon = append(argscommon, fmt.Sprintf("uintptr(unsafe.Pointer(%s))", p.Name)) + argscall = append(argscall, fmt.Sprintf("%s uintptr", p.Name)) + argsgc = append(argsgc, p.Name) + argsgccgo = append(argsgccgo, fmt.Sprintf("C.uintptr_t(%s)", p.Name)) + } else if p.Type == "string" && errvar != "" { + textcommon += fmt.Sprintf("\tvar _p%d %s\n", n, strconvtype) + textcommon += fmt.Sprintf("\t_p%d, %s = %s(%s)\n", n, errvar, strconvfunc, p.Name) + textcommon += fmt.Sprintf("\tif %s != nil {\n\t\treturn\n\t}\n", errvar) + + argscommon = append(argscommon, fmt.Sprintf("uintptr(unsafe.Pointer(_p%d))", n)) + argscall = append(argscall, fmt.Sprintf("_p%d uintptr ", n)) + argsgc = append(argsgc, fmt.Sprintf("_p%d", n)) + argsgccgo = append(argsgccgo, fmt.Sprintf("C.uintptr_t(_p%d)", n)) + n++ + } else if p.Type == "string" { + fmt.Fprintf(os.Stderr, path+":"+funct+" uses string arguments, but has no error return\n") + textcommon += fmt.Sprintf("\tvar _p%d %s\n", n, strconvtype) + textcommon += fmt.Sprintf("\t_p%d, %s = %s(%s)\n", n, errvar, strconvfunc, p.Name) + textcommon += fmt.Sprintf("\tif %s != nil {\n\t\treturn\n\t}\n", errvar) + + argscommon = append(argscommon, fmt.Sprintf("uintptr(unsafe.Pointer(_p%d))", n)) + argscall = append(argscall, fmt.Sprintf("_p%d uintptr", n)) + argsgc = append(argsgc, fmt.Sprintf("_p%d", n)) + argsgccgo = append(argsgccgo, fmt.Sprintf("C.uintptr_t(_p%d)", n)) + n++ + } else if m := regexp.MustCompile(`^\[\](.*)`).FindStringSubmatch(p.Type); m != nil { + // Convert slice into pointer, length. + // Have to be careful not to take address of &a[0] if len == 0: + // pass nil in that case. + textcommon += fmt.Sprintf("\tvar _p%d *%s\n", n, m[1]) + textcommon += fmt.Sprintf("\tif len(%s) > 0 {\n\t\t_p%d = &%s[0]\n\t}\n", p.Name, n, p.Name) + argscommon = append(argscommon, fmt.Sprintf("uintptr(unsafe.Pointer(_p%d))", n), fmt.Sprintf("len(%s)", p.Name)) + argscall = append(argscall, fmt.Sprintf("_p%d uintptr", n), fmt.Sprintf("_lenp%d int", n)) + argsgc = append(argsgc, fmt.Sprintf("_p%d", n), fmt.Sprintf("uintptr(_lenp%d)", n)) + argsgccgo = append(argsgccgo, fmt.Sprintf("C.uintptr_t(_p%d)", n), fmt.Sprintf("C.size_t(_lenp%d)", n)) + n++ + } else if p.Type == "int64" && endianness != "" { + fmt.Fprintf(os.Stderr, path+":"+funct+" uses int64 with 32 bits mode. Case not yet implemented\n") + } else if p.Type == "bool" { + fmt.Fprintf(os.Stderr, path+":"+funct+" uses bool. Case not yet implemented\n") + } else if regexp.MustCompile(`^_`).FindStringSubmatch(p.Type) != nil || p.Type == "unsafe.Pointer" { + argscommon = append(argscommon, fmt.Sprintf("uintptr(%s)", p.Name)) + argscall = append(argscall, fmt.Sprintf("%s uintptr", p.Name)) + argsgc = append(argsgc, p.Name) + argsgccgo = append(argsgccgo, fmt.Sprintf("C.uintptr_t(%s)", p.Name)) + } else if p.Type == "int" { + if (argN == 0 || argN == 2) && ((funct == "fcntl") || (funct == "FcntlInt") || (funct == "FcntlFlock")) { + // These fcntl arguments need to be uintptr to be able to call FcntlInt and FcntlFlock + argscommon = append(argscommon, fmt.Sprintf("uintptr(%s)", p.Name)) + argscall = append(argscall, fmt.Sprintf("%s uintptr", p.Name)) + argsgc = append(argsgc, p.Name) + argsgccgo = append(argsgccgo, fmt.Sprintf("C.uintptr_t(%s)", p.Name)) + + } else { + argscommon = append(argscommon, p.Name) + argscall = append(argscall, fmt.Sprintf("%s int", p.Name)) + argsgc = append(argsgc, fmt.Sprintf("uintptr(%s)", p.Name)) + argsgccgo = append(argsgccgo, fmt.Sprintf("C.int(%s)", p.Name)) + } + } else if p.Type == "int32" { + argscommon = append(argscommon, p.Name) + argscall = append(argscall, fmt.Sprintf("%s int32", p.Name)) + argsgc = append(argsgc, fmt.Sprintf("uintptr(%s)", p.Name)) + argsgccgo = append(argsgccgo, fmt.Sprintf("C.int(%s)", p.Name)) + } else if p.Type == "int64" { + argscommon = append(argscommon, p.Name) + argscall = append(argscall, fmt.Sprintf("%s int64", p.Name)) + argsgc = append(argsgc, fmt.Sprintf("uintptr(%s)", p.Name)) + argsgccgo = append(argsgccgo, fmt.Sprintf("C.longlong(%s)", p.Name)) + } else if p.Type == "uint32" { + argscommon = append(argscommon, p.Name) + argscall = append(argscall, fmt.Sprintf("%s uint32", p.Name)) + argsgc = append(argsgc, fmt.Sprintf("uintptr(%s)", p.Name)) + argsgccgo = append(argsgccgo, fmt.Sprintf("C.uint(%s)", p.Name)) + } else if p.Type == "uint64" { + argscommon = append(argscommon, p.Name) + argscall = append(argscall, fmt.Sprintf("%s uint64", p.Name)) + argsgc = append(argsgc, fmt.Sprintf("uintptr(%s)", p.Name)) + argsgccgo = append(argsgccgo, fmt.Sprintf("C.ulonglong(%s)", p.Name)) + } else if p.Type == "uintptr" { + argscommon = append(argscommon, p.Name) + argscall = append(argscall, fmt.Sprintf("%s uintptr", p.Name)) + argsgc = append(argsgc, p.Name) + argsgccgo = append(argsgccgo, fmt.Sprintf("C.uintptr_t(%s)", p.Name)) + } else { + argscommon = append(argscommon, fmt.Sprintf("int(%s)", p.Name)) + argscall = append(argscall, fmt.Sprintf("%s int", p.Name)) + argsgc = append(argsgc, fmt.Sprintf("uintptr(%s)", p.Name)) + argsgccgo = append(argsgccgo, fmt.Sprintf("C.int(%s)", p.Name)) + } + argN++ + } + nargs := len(argsgc) + + // COMMON function generation + argscommonlist := strings.Join(argscommon, ", ") + callcommon := fmt.Sprintf("call%s(%s)", sysname, argscommonlist) + ret := []string{"_", "_"} + body := "" + doErrno := false + for i := 0; i < len(out); i++ { + p := parseParam(out[i]) + reg := "" + if p.Name == "err" { + reg = "e1" + ret[1] = reg + doErrno = true + } else { + reg = "r0" + ret[0] = reg + } + if p.Type == "bool" { + reg = fmt.Sprintf("%s != 0", reg) + } + if reg != "e1" { + body += fmt.Sprintf("\t%s = %s(%s)\n", p.Name, p.Type, reg) + } + } + if ret[0] == "_" && ret[1] == "_" { + textcommon += fmt.Sprintf("\t%s\n", callcommon) + } else { + textcommon += fmt.Sprintf("\t%s, %s := %s\n", ret[0], ret[1], callcommon) + } + textcommon += body + + if doErrno { + textcommon += "\tif e1 != 0 {\n" + textcommon += "\t\terr = errnoErr(e1)\n" + textcommon += "\t}\n" + } + textcommon += "\treturn\n" + textcommon += "}\n" + + if onlyCommon { + continue + } + + // CALL Prototype + callProto := fmt.Sprintf("func call%s(%s) (r1 uintptr, e1 Errno) {\n", sysname, strings.Join(argscall, ", ")) + + // GC function generation + asm := "syscall6" + if nonblock != nil { + asm = "rawSyscall6" + } + + if len(argsgc) <= 6 { + for len(argsgc) < 6 { + argsgc = append(argsgc, "0") + } + } else { + fmt.Fprintf(os.Stderr, "%s: too many arguments to system call", funct) + os.Exit(1) + } + argsgclist := strings.Join(argsgc, ", ") + callgc := fmt.Sprintf("%s(uintptr(unsafe.Pointer(&%s)), %d, %s)", asm, sysvarname, nargs, argsgclist) + + textgc += callProto + textgc += fmt.Sprintf("\tr1, _, e1 = %s\n", callgc) + textgc += "\treturn\n}\n" + + // GCCGO function generation + argsgccgolist := strings.Join(argsgccgo, ", ") + callgccgo := fmt.Sprintf("C.%s(%s)", sysname, argsgccgolist) + textgccgo += callProto + textgccgo += fmt.Sprintf("\tr1 = uintptr(%s)\n", callgccgo) + textgccgo += "\te1 = syscall.GetErrno()\n" + textgccgo += "\treturn\n}\n" + } + if err := s.Err(); err != nil { + fmt.Fprintf(os.Stderr, err.Error()) + os.Exit(1) + } + file.Close() + } + imp := "" + if pack != "unix" { + imp = "import \"golang.org/x/sys/unix\"\n" + + } + + // Print zsyscall_aix_ppc64.go + err := ioutil.WriteFile("zsyscall_aix_ppc64.go", + []byte(fmt.Sprintf(srcTemplate1, cmdLine(), buildTags(), pack, imp, textcommon)), + 0644) + if err != nil { + fmt.Fprintf(os.Stderr, err.Error()) + os.Exit(1) + } + + // Print zsyscall_aix_ppc64_gc.go + vardecls := "\t" + strings.Join(vars, ",\n\t") + vardecls += " syscallFunc" + err = ioutil.WriteFile("zsyscall_aix_ppc64_gc.go", + []byte(fmt.Sprintf(srcTemplate2, cmdLine(), buildTags(), pack, imp, dynimports, linknames, vardecls, textgc)), + 0644) + if err != nil { + fmt.Fprintf(os.Stderr, err.Error()) + os.Exit(1) + } + + // Print zsyscall_aix_ppc64_gccgo.go + err = ioutil.WriteFile("zsyscall_aix_ppc64_gccgo.go", + []byte(fmt.Sprintf(srcTemplate3, cmdLine(), buildTags(), pack, cExtern, imp, textgccgo)), + 0644) + if err != nil { + fmt.Fprintf(os.Stderr, err.Error()) + os.Exit(1) + } +} + +const srcTemplate1 = `// %s +// Code generated by the command above; see README.md. DO NOT EDIT. + +// +build %s + +package %s + +import ( + "unsafe" +) + + +%s + +%s +` +const srcTemplate2 = `// %s +// Code generated by the command above; see README.md. DO NOT EDIT. + +// +build %s +// +build !gccgo + +package %s + +import ( + "unsafe" +) +%s +%s +%s +type syscallFunc uintptr + +var ( +%s +) + +// Implemented in runtime/syscall_aix.go. +func rawSyscall6(trap, nargs, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err Errno) +func syscall6(trap, nargs, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err Errno) + +%s +` +const srcTemplate3 = `// %s +// Code generated by the command above; see README.md. DO NOT EDIT. + +// +build %s +// +build gccgo + +package %s + +%s +*/ +import "C" +import ( + "syscall" +) + + +%s + +%s +` diff --git a/vendor/golang.org/x/sys/unix/mksyscall_solaris.go b/vendor/golang.org/x/sys/unix/mksyscall_solaris.go new file mode 100644 index 0000000000..3d864738b6 --- /dev/null +++ b/vendor/golang.org/x/sys/unix/mksyscall_solaris.go @@ -0,0 +1,335 @@ +// Copyright 2019 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// +build ignore + +/* + This program reads a file containing function prototypes + (like syscall_solaris.go) and generates system call bodies. + The prototypes are marked by lines beginning with "//sys" + and read like func declarations if //sys is replaced by func, but: + * The parameter lists must give a name for each argument. + This includes return parameters. + * The parameter lists must give a type for each argument: + the (x, y, z int) shorthand is not allowed. + * If the return parameter is an error number, it must be named err. + * If go func name needs to be different than its libc name, + * or the function is not in libc, name could be specified + * at the end, after "=" sign, like + //sys getsockopt(s int, level int, name int, val uintptr, vallen *_Socklen) (err error) = libsocket.getsockopt +*/ + +package main + +import ( + "bufio" + "flag" + "fmt" + "os" + "regexp" + "strings" +) + +var ( + b32 = flag.Bool("b32", false, "32bit big-endian") + l32 = flag.Bool("l32", false, "32bit little-endian") + tags = flag.String("tags", "", "build tags") +) + +// cmdLine returns this programs's commandline arguments +func cmdLine() string { + return "go run mksyscall_solaris.go " + strings.Join(os.Args[1:], " ") +} + +// buildTags returns build tags +func buildTags() string { + return *tags +} + +// Param is function parameter +type Param struct { + Name string + Type string +} + +// usage prints the program usage +func usage() { + fmt.Fprintf(os.Stderr, "usage: go run mksyscall_solaris.go [-b32 | -l32] [-tags x,y] [file ...]\n") + os.Exit(1) +} + +// parseParamList parses parameter list and returns a slice of parameters +func parseParamList(list string) []string { + list = strings.TrimSpace(list) + if list == "" { + return []string{} + } + return regexp.MustCompile(`\s*,\s*`).Split(list, -1) +} + +// parseParam splits a parameter into name and type +func parseParam(p string) Param { + ps := regexp.MustCompile(`^(\S*) (\S*)$`).FindStringSubmatch(p) + if ps == nil { + fmt.Fprintf(os.Stderr, "malformed parameter: %s\n", p) + os.Exit(1) + } + return Param{ps[1], ps[2]} +} + +func main() { + flag.Usage = usage + flag.Parse() + if len(flag.Args()) <= 0 { + fmt.Fprintf(os.Stderr, "no files to parse provided\n") + usage() + } + + endianness := "" + if *b32 { + endianness = "big-endian" + } else if *l32 { + endianness = "little-endian" + } + + pack := "" + text := "" + dynimports := "" + linknames := "" + var vars []string + for _, path := range flag.Args() { + file, err := os.Open(path) + if err != nil { + fmt.Fprintf(os.Stderr, err.Error()) + os.Exit(1) + } + s := bufio.NewScanner(file) + for s.Scan() { + t := s.Text() + t = strings.TrimSpace(t) + t = regexp.MustCompile(`\s+`).ReplaceAllString(t, ` `) + if p := regexp.MustCompile(`^package (\S+)$`).FindStringSubmatch(t); p != nil && pack == "" { + pack = p[1] + } + nonblock := regexp.MustCompile(`^\/\/sysnb `).FindStringSubmatch(t) + if regexp.MustCompile(`^\/\/sys `).FindStringSubmatch(t) == nil && nonblock == nil { + continue + } + + // Line must be of the form + // func Open(path string, mode int, perm int) (fd int, err error) + // Split into name, in params, out params. + f := regexp.MustCompile(`^\/\/sys(nb)? (\w+)\(([^()]*)\)\s*(?:\(([^()]+)\))?\s*(?:=\s*(?:(\w*)\.)?(\w*))?$`).FindStringSubmatch(t) + if f == nil { + fmt.Fprintf(os.Stderr, "%s:%s\nmalformed //sys declaration\n", path, t) + os.Exit(1) + } + funct, inps, outps, modname, sysname := f[2], f[3], f[4], f[5], f[6] + + // Split argument lists on comma. + in := parseParamList(inps) + out := parseParamList(outps) + + inps = strings.Join(in, ", ") + outps = strings.Join(out, ", ") + + // Try in vain to keep people from editing this file. + // The theory is that they jump into the middle of the file + // without reading the header. + text += "// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT\n\n" + + // So file name. + if modname == "" { + modname = "libc" + } + + // System call name. + if sysname == "" { + sysname = funct + } + + // System call pointer variable name. + sysvarname := fmt.Sprintf("proc%s", sysname) + + strconvfunc := "BytePtrFromString" + strconvtype := "*byte" + + sysname = strings.ToLower(sysname) // All libc functions are lowercase. + + // Runtime import of function to allow cross-platform builds. + dynimports += fmt.Sprintf("//go:cgo_import_dynamic libc_%s %s \"%s.so\"\n", sysname, sysname, modname) + // Link symbol to proc address variable. + linknames += fmt.Sprintf("//go:linkname %s libc_%s\n", sysvarname, sysname) + // Library proc address variable. + vars = append(vars, sysvarname) + + // Go function header. + outlist := strings.Join(out, ", ") + if outlist != "" { + outlist = fmt.Sprintf(" (%s)", outlist) + } + if text != "" { + text += "\n" + } + text += fmt.Sprintf("func %s(%s)%s {\n", funct, strings.Join(in, ", "), outlist) + + // Check if err return available + errvar := "" + for _, param := range out { + p := parseParam(param) + if p.Type == "error" { + errvar = p.Name + continue + } + } + + // Prepare arguments to Syscall. + var args []string + n := 0 + for _, param := range in { + p := parseParam(param) + if regexp.MustCompile(`^\*`).FindStringSubmatch(p.Type) != nil { + args = append(args, "uintptr(unsafe.Pointer("+p.Name+"))") + } else if p.Type == "string" && errvar != "" { + text += fmt.Sprintf("\tvar _p%d %s\n", n, strconvtype) + text += fmt.Sprintf("\t_p%d, %s = %s(%s)\n", n, errvar, strconvfunc, p.Name) + text += fmt.Sprintf("\tif %s != nil {\n\t\treturn\n\t}\n", errvar) + args = append(args, fmt.Sprintf("uintptr(unsafe.Pointer(_p%d))", n)) + n++ + } else if p.Type == "string" { + fmt.Fprintf(os.Stderr, path+":"+funct+" uses string arguments, but has no error return\n") + text += fmt.Sprintf("\tvar _p%d %s\n", n, strconvtype) + text += fmt.Sprintf("\t_p%d, _ = %s(%s)\n", n, strconvfunc, p.Name) + args = append(args, fmt.Sprintf("uintptr(unsafe.Pointer(_p%d))", n)) + n++ + } else if s := regexp.MustCompile(`^\[\](.*)`).FindStringSubmatch(p.Type); s != nil { + // Convert slice into pointer, length. + // Have to be careful not to take address of &a[0] if len == 0: + // pass nil in that case. + text += fmt.Sprintf("\tvar _p%d *%s\n", n, s[1]) + text += fmt.Sprintf("\tif len(%s) > 0 {\n\t\t_p%d = &%s[0]\n\t}\n", p.Name, n, p.Name) + args = append(args, fmt.Sprintf("uintptr(unsafe.Pointer(_p%d))", n), fmt.Sprintf("uintptr(len(%s))", p.Name)) + n++ + } else if p.Type == "int64" && endianness != "" { + if endianness == "big-endian" { + args = append(args, fmt.Sprintf("uintptr(%s>>32)", p.Name), fmt.Sprintf("uintptr(%s)", p.Name)) + } else { + args = append(args, fmt.Sprintf("uintptr(%s)", p.Name), fmt.Sprintf("uintptr(%s>>32)", p.Name)) + } + } else if p.Type == "bool" { + text += fmt.Sprintf("\tvar _p%d uint32\n", n) + text += fmt.Sprintf("\tif %s {\n\t\t_p%d = 1\n\t} else {\n\t\t_p%d = 0\n\t}\n", p.Name, n, n) + args = append(args, fmt.Sprintf("uintptr(_p%d)", n)) + n++ + } else { + args = append(args, fmt.Sprintf("uintptr(%s)", p.Name)) + } + } + nargs := len(args) + + // Determine which form to use; pad args with zeros. + asm := "sysvicall6" + if nonblock != nil { + asm = "rawSysvicall6" + } + if len(args) <= 6 { + for len(args) < 6 { + args = append(args, "0") + } + } else { + fmt.Fprintf(os.Stderr, "%s: too many arguments to system call\n", path) + os.Exit(1) + } + + // Actual call. + arglist := strings.Join(args, ", ") + call := fmt.Sprintf("%s(uintptr(unsafe.Pointer(&%s)), %d, %s)", asm, sysvarname, nargs, arglist) + + // Assign return values. + body := "" + ret := []string{"_", "_", "_"} + doErrno := false + for i := 0; i < len(out); i++ { + p := parseParam(out[i]) + reg := "" + if p.Name == "err" { + reg = "e1" + ret[2] = reg + doErrno = true + } else { + reg = fmt.Sprintf("r%d", i) + ret[i] = reg + } + if p.Type == "bool" { + reg = fmt.Sprintf("%d != 0", reg) + } + if p.Type == "int64" && endianness != "" { + // 64-bit number in r1:r0 or r0:r1. + if i+2 > len(out) { + fmt.Fprintf(os.Stderr, "%s: not enough registers for int64 return\n", path) + os.Exit(1) + } + if endianness == "big-endian" { + reg = fmt.Sprintf("int64(r%d)<<32 | int64(r%d)", i, i+1) + } else { + reg = fmt.Sprintf("int64(r%d)<<32 | int64(r%d)", i+1, i) + } + ret[i] = fmt.Sprintf("r%d", i) + ret[i+1] = fmt.Sprintf("r%d", i+1) + } + if reg != "e1" { + body += fmt.Sprintf("\t%s = %s(%s)\n", p.Name, p.Type, reg) + } + } + if ret[0] == "_" && ret[1] == "_" && ret[2] == "_" { + text += fmt.Sprintf("\t%s\n", call) + } else { + text += fmt.Sprintf("\t%s, %s, %s := %s\n", ret[0], ret[1], ret[2], call) + } + text += body + + if doErrno { + text += "\tif e1 != 0 {\n" + text += "\t\terr = e1\n" + text += "\t}\n" + } + text += "\treturn\n" + text += "}\n" + } + if err := s.Err(); err != nil { + fmt.Fprintf(os.Stderr, err.Error()) + os.Exit(1) + } + file.Close() + } + imp := "" + if pack != "unix" { + imp = "import \"golang.org/x/sys/unix\"\n" + + } + vardecls := "\t" + strings.Join(vars, ",\n\t") + vardecls += " syscallFunc" + fmt.Printf(srcTemplate, cmdLine(), buildTags(), pack, imp, dynimports, linknames, vardecls, text) +} + +const srcTemplate = `// %s +// Code generated by the command above; see README.md. DO NOT EDIT. + +// +build %s + +package %s + +import ( + "syscall" + "unsafe" +) +%s +%s +%s +var ( +%s +) + +%s +` diff --git a/vendor/golang.org/x/sys/unix/mksysnum.go b/vendor/golang.org/x/sys/unix/mksysnum.go new file mode 100644 index 0000000000..07f8960ff3 --- /dev/null +++ b/vendor/golang.org/x/sys/unix/mksysnum.go @@ -0,0 +1,190 @@ +// Copyright 2018 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// +build ignore + +// Generate system call table for DragonFly, NetBSD, +// FreeBSD, OpenBSD or Darwin from master list +// (for example, /usr/src/sys/kern/syscalls.master or +// sys/syscall.h). +package main + +import ( + "bufio" + "fmt" + "io" + "io/ioutil" + "net/http" + "os" + "regexp" + "strings" +) + +var ( + goos, goarch string +) + +// cmdLine returns this programs's commandline arguments +func cmdLine() string { + return "go run mksysnum.go " + strings.Join(os.Args[1:], " ") +} + +// buildTags returns build tags +func buildTags() string { + return fmt.Sprintf("%s,%s", goarch, goos) +} + +func checkErr(err error) { + if err != nil { + fmt.Fprintf(os.Stderr, "%v\n", err) + os.Exit(1) + } +} + +// source string and substring slice for regexp +type re struct { + str string // source string + sub []string // matched sub-string +} + +// Match performs regular expression match +func (r *re) Match(exp string) bool { + r.sub = regexp.MustCompile(exp).FindStringSubmatch(r.str) + if r.sub != nil { + return true + } + return false +} + +// fetchFile fetches a text file from URL +func fetchFile(URL string) io.Reader { + resp, err := http.Get(URL) + checkErr(err) + defer resp.Body.Close() + body, err := ioutil.ReadAll(resp.Body) + checkErr(err) + return strings.NewReader(string(body)) +} + +// readFile reads a text file from path +func readFile(path string) io.Reader { + file, err := os.Open(os.Args[1]) + checkErr(err) + return file +} + +func format(name, num, proto string) string { + name = strings.ToUpper(name) + // There are multiple entries for enosys and nosys, so comment them out. + nm := re{str: name} + if nm.Match(`^SYS_E?NOSYS$`) { + name = fmt.Sprintf("// %s", name) + } + if name == `SYS_SYS_EXIT` { + name = `SYS_EXIT` + } + return fmt.Sprintf(" %s = %s; // %s\n", name, num, proto) +} + +func main() { + // Get the OS (using GOOS_TARGET if it exist) + goos = os.Getenv("GOOS_TARGET") + if goos == "" { + goos = os.Getenv("GOOS") + } + // Get the architecture (using GOARCH_TARGET if it exists) + goarch = os.Getenv("GOARCH_TARGET") + if goarch == "" { + goarch = os.Getenv("GOARCH") + } + // Check if GOOS and GOARCH environment variables are defined + if goarch == "" || goos == "" { + fmt.Fprintf(os.Stderr, "GOARCH or GOOS not defined in environment\n") + os.Exit(1) + } + + file := strings.TrimSpace(os.Args[1]) + var syscalls io.Reader + if strings.HasPrefix(file, "https://") || strings.HasPrefix(file, "http://") { + // Download syscalls.master file + syscalls = fetchFile(file) + } else { + syscalls = readFile(file) + } + + var text, line string + s := bufio.NewScanner(syscalls) + for s.Scan() { + t := re{str: line} + if t.Match(`^(.*)\\$`) { + // Handle continuation + line = t.sub[1] + line += strings.TrimLeft(s.Text(), " \t") + } else { + // New line + line = s.Text() + } + t = re{str: line} + if t.Match(`\\$`) { + continue + } + t = re{str: line} + + switch goos { + case "dragonfly": + if t.Match(`^([0-9]+)\s+STD\s+({ \S+\s+(\w+).*)$`) { + num, proto := t.sub[1], t.sub[2] + name := fmt.Sprintf("SYS_%s", t.sub[3]) + text += format(name, num, proto) + } + case "freebsd": + if t.Match(`^([0-9]+)\s+\S+\s+(?:NO)?STD\s+({ \S+\s+(\w+).*)$`) { + num, proto := t.sub[1], t.sub[2] + name := fmt.Sprintf("SYS_%s", t.sub[3]) + text += format(name, num, proto) + } + case "openbsd": + if t.Match(`^([0-9]+)\s+STD\s+(NOLOCK\s+)?({ \S+\s+\*?(\w+).*)$`) { + num, proto, name := t.sub[1], t.sub[3], t.sub[4] + text += format(name, num, proto) + } + case "netbsd": + if t.Match(`^([0-9]+)\s+((STD)|(NOERR))\s+(RUMP\s+)?({\s+\S+\s*\*?\s*\|(\S+)\|(\S*)\|(\w+).*\s+})(\s+(\S+))?$`) { + num, proto, compat := t.sub[1], t.sub[6], t.sub[8] + name := t.sub[7] + "_" + t.sub[9] + if t.sub[11] != "" { + name = t.sub[7] + "_" + t.sub[11] + } + name = strings.ToUpper(name) + if compat == "" || compat == "13" || compat == "30" || compat == "50" { + text += fmt.Sprintf(" %s = %s; // %s\n", name, num, proto) + } + } + case "darwin": + if t.Match(`^#define\s+SYS_(\w+)\s+([0-9]+)`) { + name, num := t.sub[1], t.sub[2] + name = strings.ToUpper(name) + text += fmt.Sprintf(" SYS_%s = %s;\n", name, num) + } + default: + fmt.Fprintf(os.Stderr, "unrecognized GOOS=%s\n", goos) + os.Exit(1) + + } + } + err := s.Err() + checkErr(err) + + fmt.Printf(template, cmdLine(), buildTags(), text) +} + +const template = `// %s +// Code generated by the command above; see README.md. DO NOT EDIT. + +// +build %s + +package unix + +const( +%s)` diff --git a/vendor/golang.org/x/sys/unix/types_aix.go b/vendor/golang.org/x/sys/unix/types_aix.go new file mode 100644 index 0000000000..25e834940d --- /dev/null +++ b/vendor/golang.org/x/sys/unix/types_aix.go @@ -0,0 +1,236 @@ +// Copyright 2018 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// +build ignore +// +build aix + +/* +Input to cgo -godefs. See also mkerrors.sh and mkall.sh +*/ + +// +godefs map struct_in_addr [4]byte /* in_addr */ +// +godefs map struct_in6_addr [16]byte /* in6_addr */ + +package unix + +/* +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include +#include +#include +#include + + +#include +#include + +enum { + sizeofPtr = sizeof(void*), +}; + +union sockaddr_all { + struct sockaddr s1; // this one gets used for fields + struct sockaddr_in s2; // these pad it out + struct sockaddr_in6 s3; + struct sockaddr_un s4; + struct sockaddr_dl s5; +}; + +struct sockaddr_any { + struct sockaddr addr; + char pad[sizeof(union sockaddr_all) - sizeof(struct sockaddr)]; +}; + +*/ +import "C" + +// Machine characteristics + +const ( + SizeofPtr = C.sizeofPtr + SizeofShort = C.sizeof_short + SizeofInt = C.sizeof_int + SizeofLong = C.sizeof_long + SizeofLongLong = C.sizeof_longlong + PathMax = C.PATH_MAX +) + +// Basic types + +type ( + _C_short C.short + _C_int C.int + _C_long C.long + _C_long_long C.longlong +) + +type off64 C.off64_t +type off C.off_t +type Mode_t C.mode_t + +// Time + +type Timespec C.struct_timespec + +type StTimespec C.struct_st_timespec + +type Timeval C.struct_timeval + +type Timeval32 C.struct_timeval32 + +type Timex C.struct_timex + +type Time_t C.time_t + +type Tms C.struct_tms + +type Utimbuf C.struct_utimbuf + +type Timezone C.struct_timezone + +// Processes + +type Rusage C.struct_rusage + +type Rlimit C.struct_rlimit64 + +type Pid_t C.pid_t + +type _Gid_t C.gid_t + +type dev_t C.dev_t + +// Files + +type Stat_t C.struct_stat + +type StatxTimestamp C.struct_statx_timestamp + +type Statx_t C.struct_statx + +type Dirent C.struct_dirent + +// Sockets + +type RawSockaddrInet4 C.struct_sockaddr_in + +type RawSockaddrInet6 C.struct_sockaddr_in6 + +type RawSockaddrUnix C.struct_sockaddr_un + +type RawSockaddr C.struct_sockaddr + +type RawSockaddrAny C.struct_sockaddr_any + +type _Socklen C.socklen_t + +type Cmsghdr C.struct_cmsghdr + +type ICMPv6Filter C.struct_icmp6_filter + +type Iovec C.struct_iovec + +type IPMreq C.struct_ip_mreq + +type IPv6Mreq C.struct_ipv6_mreq + +type IPv6MTUInfo C.struct_ip6_mtuinfo + +type Linger C.struct_linger + +type Msghdr C.struct_msghdr + +const ( + SizeofSockaddrInet4 = C.sizeof_struct_sockaddr_in + SizeofSockaddrInet6 = C.sizeof_struct_sockaddr_in6 + SizeofSockaddrAny = C.sizeof_struct_sockaddr_any + SizeofSockaddrUnix = C.sizeof_struct_sockaddr_un + SizeofLinger = C.sizeof_struct_linger + SizeofIPMreq = C.sizeof_struct_ip_mreq + SizeofIPv6Mreq = C.sizeof_struct_ipv6_mreq + SizeofIPv6MTUInfo = C.sizeof_struct_ip6_mtuinfo + SizeofMsghdr = C.sizeof_struct_msghdr + SizeofCmsghdr = C.sizeof_struct_cmsghdr + SizeofICMPv6Filter = C.sizeof_struct_icmp6_filter +) + +// Routing and interface messages + +const ( + SizeofIfMsghdr = C.sizeof_struct_if_msghdr +) + +type IfMsgHdr C.struct_if_msghdr + +// Misc + +type FdSet C.fd_set + +type Utsname C.struct_utsname + +type Ustat_t C.struct_ustat + +type Sigset_t C.sigset_t + +const ( + AT_FDCWD = C.AT_FDCWD + AT_REMOVEDIR = C.AT_REMOVEDIR + AT_SYMLINK_NOFOLLOW = C.AT_SYMLINK_NOFOLLOW +) + +// Terminal handling + +type Termios C.struct_termios + +type Termio C.struct_termio + +type Winsize C.struct_winsize + +//poll + +type PollFd struct { + Fd int32 + Events uint16 + Revents uint16 +} + +const ( + POLLERR = C.POLLERR + POLLHUP = C.POLLHUP + POLLIN = C.POLLIN + POLLNVAL = C.POLLNVAL + POLLOUT = C.POLLOUT + POLLPRI = C.POLLPRI + POLLRDBAND = C.POLLRDBAND + POLLRDNORM = C.POLLRDNORM + POLLWRBAND = C.POLLWRBAND + POLLWRNORM = C.POLLWRNORM +) + +//flock_t + +type Flock_t C.struct_flock64 + +// Statfs + +type Fsid_t C.struct_fsid_t +type Fsid64_t C.struct_fsid64_t + +type Statfs_t C.struct_statfs + +const RNDGETENTCNT = 0x80045200 diff --git a/vendor/golang.org/x/sys/unix/types_darwin.go b/vendor/golang.org/x/sys/unix/types_darwin.go new file mode 100644 index 0000000000..9fd2aaa6a2 --- /dev/null +++ b/vendor/golang.org/x/sys/unix/types_darwin.go @@ -0,0 +1,277 @@ +// Copyright 2009 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// +build ignore + +/* +Input to cgo -godefs. See README.md +*/ + +// +godefs map struct_in_addr [4]byte /* in_addr */ +// +godefs map struct_in6_addr [16]byte /* in6_addr */ + +package unix + +/* +#define __DARWIN_UNIX03 0 +#define KERNEL +#define _DARWIN_USE_64_BIT_INODE +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +enum { + sizeofPtr = sizeof(void*), +}; + +union sockaddr_all { + struct sockaddr s1; // this one gets used for fields + struct sockaddr_in s2; // these pad it out + struct sockaddr_in6 s3; + struct sockaddr_un s4; + struct sockaddr_dl s5; +}; + +struct sockaddr_any { + struct sockaddr addr; + char pad[sizeof(union sockaddr_all) - sizeof(struct sockaddr)]; +}; + +*/ +import "C" + +// Machine characteristics + +const ( + SizeofPtr = C.sizeofPtr + SizeofShort = C.sizeof_short + SizeofInt = C.sizeof_int + SizeofLong = C.sizeof_long + SizeofLongLong = C.sizeof_longlong +) + +// Basic types + +type ( + _C_short C.short + _C_int C.int + _C_long C.long + _C_long_long C.longlong +) + +// Time + +type Timespec C.struct_timespec + +type Timeval C.struct_timeval + +type Timeval32 C.struct_timeval32 + +// Processes + +type Rusage C.struct_rusage + +type Rlimit C.struct_rlimit + +type _Gid_t C.gid_t + +// Files + +type Stat_t C.struct_stat64 + +type Statfs_t C.struct_statfs64 + +type Flock_t C.struct_flock + +type Fstore_t C.struct_fstore + +type Radvisory_t C.struct_radvisory + +type Fbootstraptransfer_t C.struct_fbootstraptransfer + +type Log2phys_t C.struct_log2phys + +type Fsid C.struct_fsid + +type Dirent C.struct_dirent + +// Sockets + +type RawSockaddrInet4 C.struct_sockaddr_in + +type RawSockaddrInet6 C.struct_sockaddr_in6 + +type RawSockaddrUnix C.struct_sockaddr_un + +type RawSockaddrDatalink C.struct_sockaddr_dl + +type RawSockaddr C.struct_sockaddr + +type RawSockaddrAny C.struct_sockaddr_any + +type _Socklen C.socklen_t + +type Linger C.struct_linger + +type Iovec C.struct_iovec + +type IPMreq C.struct_ip_mreq + +type IPv6Mreq C.struct_ipv6_mreq + +type Msghdr C.struct_msghdr + +type Cmsghdr C.struct_cmsghdr + +type Inet4Pktinfo C.struct_in_pktinfo + +type Inet6Pktinfo C.struct_in6_pktinfo + +type IPv6MTUInfo C.struct_ip6_mtuinfo + +type ICMPv6Filter C.struct_icmp6_filter + +const ( + SizeofSockaddrInet4 = C.sizeof_struct_sockaddr_in + SizeofSockaddrInet6 = C.sizeof_struct_sockaddr_in6 + SizeofSockaddrAny = C.sizeof_struct_sockaddr_any + SizeofSockaddrUnix = C.sizeof_struct_sockaddr_un + SizeofSockaddrDatalink = C.sizeof_struct_sockaddr_dl + SizeofLinger = C.sizeof_struct_linger + SizeofIPMreq = C.sizeof_struct_ip_mreq + SizeofIPv6Mreq = C.sizeof_struct_ipv6_mreq + SizeofMsghdr = C.sizeof_struct_msghdr + SizeofCmsghdr = C.sizeof_struct_cmsghdr + SizeofInet4Pktinfo = C.sizeof_struct_in_pktinfo + SizeofInet6Pktinfo = C.sizeof_struct_in6_pktinfo + SizeofIPv6MTUInfo = C.sizeof_struct_ip6_mtuinfo + SizeofICMPv6Filter = C.sizeof_struct_icmp6_filter +) + +// Ptrace requests + +const ( + PTRACE_TRACEME = C.PT_TRACE_ME + PTRACE_CONT = C.PT_CONTINUE + PTRACE_KILL = C.PT_KILL +) + +// Events (kqueue, kevent) + +type Kevent_t C.struct_kevent + +// Select + +type FdSet C.fd_set + +// Routing and interface messages + +const ( + SizeofIfMsghdr = C.sizeof_struct_if_msghdr + SizeofIfData = C.sizeof_struct_if_data + SizeofIfaMsghdr = C.sizeof_struct_ifa_msghdr + SizeofIfmaMsghdr = C.sizeof_struct_ifma_msghdr + SizeofIfmaMsghdr2 = C.sizeof_struct_ifma_msghdr2 + SizeofRtMsghdr = C.sizeof_struct_rt_msghdr + SizeofRtMetrics = C.sizeof_struct_rt_metrics +) + +type IfMsghdr C.struct_if_msghdr + +type IfData C.struct_if_data + +type IfaMsghdr C.struct_ifa_msghdr + +type IfmaMsghdr C.struct_ifma_msghdr + +type IfmaMsghdr2 C.struct_ifma_msghdr2 + +type RtMsghdr C.struct_rt_msghdr + +type RtMetrics C.struct_rt_metrics + +// Berkeley packet filter + +const ( + SizeofBpfVersion = C.sizeof_struct_bpf_version + SizeofBpfStat = C.sizeof_struct_bpf_stat + SizeofBpfProgram = C.sizeof_struct_bpf_program + SizeofBpfInsn = C.sizeof_struct_bpf_insn + SizeofBpfHdr = C.sizeof_struct_bpf_hdr +) + +type BpfVersion C.struct_bpf_version + +type BpfStat C.struct_bpf_stat + +type BpfProgram C.struct_bpf_program + +type BpfInsn C.struct_bpf_insn + +type BpfHdr C.struct_bpf_hdr + +// Terminal handling + +type Termios C.struct_termios + +type Winsize C.struct_winsize + +// fchmodat-like syscalls. + +const ( + AT_FDCWD = C.AT_FDCWD + AT_REMOVEDIR = C.AT_REMOVEDIR + AT_SYMLINK_FOLLOW = C.AT_SYMLINK_FOLLOW + AT_SYMLINK_NOFOLLOW = C.AT_SYMLINK_NOFOLLOW +) + +// poll + +type PollFd C.struct_pollfd + +const ( + POLLERR = C.POLLERR + POLLHUP = C.POLLHUP + POLLIN = C.POLLIN + POLLNVAL = C.POLLNVAL + POLLOUT = C.POLLOUT + POLLPRI = C.POLLPRI + POLLRDBAND = C.POLLRDBAND + POLLRDNORM = C.POLLRDNORM + POLLWRBAND = C.POLLWRBAND + POLLWRNORM = C.POLLWRNORM +) + +// uname + +type Utsname C.struct_utsname diff --git a/vendor/golang.org/x/sys/unix/types_dragonfly.go b/vendor/golang.org/x/sys/unix/types_dragonfly.go new file mode 100644 index 0000000000..3365dd79d0 --- /dev/null +++ b/vendor/golang.org/x/sys/unix/types_dragonfly.go @@ -0,0 +1,263 @@ +// Copyright 2009 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// +build ignore + +/* +Input to cgo -godefs. See README.md +*/ + +// +godefs map struct_in_addr [4]byte /* in_addr */ +// +godefs map struct_in6_addr [16]byte /* in6_addr */ + +package unix + +/* +#define KERNEL +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +enum { + sizeofPtr = sizeof(void*), +}; + +union sockaddr_all { + struct sockaddr s1; // this one gets used for fields + struct sockaddr_in s2; // these pad it out + struct sockaddr_in6 s3; + struct sockaddr_un s4; + struct sockaddr_dl s5; +}; + +struct sockaddr_any { + struct sockaddr addr; + char pad[sizeof(union sockaddr_all) - sizeof(struct sockaddr)]; +}; + +*/ +import "C" + +// Machine characteristics + +const ( + SizeofPtr = C.sizeofPtr + SizeofShort = C.sizeof_short + SizeofInt = C.sizeof_int + SizeofLong = C.sizeof_long + SizeofLongLong = C.sizeof_longlong +) + +// Basic types + +type ( + _C_short C.short + _C_int C.int + _C_long C.long + _C_long_long C.longlong +) + +// Time + +type Timespec C.struct_timespec + +type Timeval C.struct_timeval + +// Processes + +type Rusage C.struct_rusage + +type Rlimit C.struct_rlimit + +type _Gid_t C.gid_t + +// Files + +type Stat_t C.struct_stat + +type Statfs_t C.struct_statfs + +type Flock_t C.struct_flock + +type Dirent C.struct_dirent + +type Fsid C.struct_fsid + +// File system limits + +const ( + PathMax = C.PATH_MAX +) + +// Sockets + +type RawSockaddrInet4 C.struct_sockaddr_in + +type RawSockaddrInet6 C.struct_sockaddr_in6 + +type RawSockaddrUnix C.struct_sockaddr_un + +type RawSockaddrDatalink C.struct_sockaddr_dl + +type RawSockaddr C.struct_sockaddr + +type RawSockaddrAny C.struct_sockaddr_any + +type _Socklen C.socklen_t + +type Linger C.struct_linger + +type Iovec C.struct_iovec + +type IPMreq C.struct_ip_mreq + +type IPv6Mreq C.struct_ipv6_mreq + +type Msghdr C.struct_msghdr + +type Cmsghdr C.struct_cmsghdr + +type Inet6Pktinfo C.struct_in6_pktinfo + +type IPv6MTUInfo C.struct_ip6_mtuinfo + +type ICMPv6Filter C.struct_icmp6_filter + +const ( + SizeofSockaddrInet4 = C.sizeof_struct_sockaddr_in + SizeofSockaddrInet6 = C.sizeof_struct_sockaddr_in6 + SizeofSockaddrAny = C.sizeof_struct_sockaddr_any + SizeofSockaddrUnix = C.sizeof_struct_sockaddr_un + SizeofSockaddrDatalink = C.sizeof_struct_sockaddr_dl + SizeofLinger = C.sizeof_struct_linger + SizeofIPMreq = C.sizeof_struct_ip_mreq + SizeofIPv6Mreq = C.sizeof_struct_ipv6_mreq + SizeofMsghdr = C.sizeof_struct_msghdr + SizeofCmsghdr = C.sizeof_struct_cmsghdr + SizeofInet6Pktinfo = C.sizeof_struct_in6_pktinfo + SizeofIPv6MTUInfo = C.sizeof_struct_ip6_mtuinfo + SizeofICMPv6Filter = C.sizeof_struct_icmp6_filter +) + +// Ptrace requests + +const ( + PTRACE_TRACEME = C.PT_TRACE_ME + PTRACE_CONT = C.PT_CONTINUE + PTRACE_KILL = C.PT_KILL +) + +// Events (kqueue, kevent) + +type Kevent_t C.struct_kevent + +// Select + +type FdSet C.fd_set + +// Routing and interface messages + +const ( + SizeofIfMsghdr = C.sizeof_struct_if_msghdr + SizeofIfData = C.sizeof_struct_if_data + SizeofIfaMsghdr = C.sizeof_struct_ifa_msghdr + SizeofIfmaMsghdr = C.sizeof_struct_ifma_msghdr + SizeofIfAnnounceMsghdr = C.sizeof_struct_if_announcemsghdr + SizeofRtMsghdr = C.sizeof_struct_rt_msghdr + SizeofRtMetrics = C.sizeof_struct_rt_metrics +) + +type IfMsghdr C.struct_if_msghdr + +type IfData C.struct_if_data + +type IfaMsghdr C.struct_ifa_msghdr + +type IfmaMsghdr C.struct_ifma_msghdr + +type IfAnnounceMsghdr C.struct_if_announcemsghdr + +type RtMsghdr C.struct_rt_msghdr + +type RtMetrics C.struct_rt_metrics + +// Berkeley packet filter + +const ( + SizeofBpfVersion = C.sizeof_struct_bpf_version + SizeofBpfStat = C.sizeof_struct_bpf_stat + SizeofBpfProgram = C.sizeof_struct_bpf_program + SizeofBpfInsn = C.sizeof_struct_bpf_insn + SizeofBpfHdr = C.sizeof_struct_bpf_hdr +) + +type BpfVersion C.struct_bpf_version + +type BpfStat C.struct_bpf_stat + +type BpfProgram C.struct_bpf_program + +type BpfInsn C.struct_bpf_insn + +type BpfHdr C.struct_bpf_hdr + +// Terminal handling + +type Termios C.struct_termios + +type Winsize C.struct_winsize + +// fchmodat-like syscalls. + +const ( + AT_FDCWD = C.AT_FDCWD + AT_SYMLINK_NOFOLLOW = C.AT_SYMLINK_NOFOLLOW +) + +// poll + +type PollFd C.struct_pollfd + +const ( + POLLERR = C.POLLERR + POLLHUP = C.POLLHUP + POLLIN = C.POLLIN + POLLNVAL = C.POLLNVAL + POLLOUT = C.POLLOUT + POLLPRI = C.POLLPRI + POLLRDBAND = C.POLLRDBAND + POLLRDNORM = C.POLLRDNORM + POLLWRBAND = C.POLLWRBAND + POLLWRNORM = C.POLLWRNORM +) + +// Uname + +type Utsname C.struct_utsname diff --git a/vendor/golang.org/x/sys/unix/types_freebsd.go b/vendor/golang.org/x/sys/unix/types_freebsd.go new file mode 100644 index 0000000000..7470798951 --- /dev/null +++ b/vendor/golang.org/x/sys/unix/types_freebsd.go @@ -0,0 +1,356 @@ +// Copyright 2009 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// +build ignore + +/* +Input to cgo -godefs. See README.md +*/ + +// +godefs map struct_in_addr [4]byte /* in_addr */ +// +godefs map struct_in6_addr [16]byte /* in6_addr */ + +package unix + +/* +#define _WANT_FREEBSD11_STAT 1 +#define _WANT_FREEBSD11_STATFS 1 +#define _WANT_FREEBSD11_DIRENT 1 +#define _WANT_FREEBSD11_KEVENT 1 + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +enum { + sizeofPtr = sizeof(void*), +}; + +union sockaddr_all { + struct sockaddr s1; // this one gets used for fields + struct sockaddr_in s2; // these pad it out + struct sockaddr_in6 s3; + struct sockaddr_un s4; + struct sockaddr_dl s5; +}; + +struct sockaddr_any { + struct sockaddr addr; + char pad[sizeof(union sockaddr_all) - sizeof(struct sockaddr)]; +}; + +// This structure is a duplicate of if_data on FreeBSD 8-STABLE. +// See /usr/include/net/if.h. +struct if_data8 { + u_char ifi_type; + u_char ifi_physical; + u_char ifi_addrlen; + u_char ifi_hdrlen; + u_char ifi_link_state; + u_char ifi_spare_char1; + u_char ifi_spare_char2; + u_char ifi_datalen; + u_long ifi_mtu; + u_long ifi_metric; + u_long ifi_baudrate; + u_long ifi_ipackets; + u_long ifi_ierrors; + u_long ifi_opackets; + u_long ifi_oerrors; + u_long ifi_collisions; + u_long ifi_ibytes; + u_long ifi_obytes; + u_long ifi_imcasts; + u_long ifi_omcasts; + u_long ifi_iqdrops; + u_long ifi_noproto; + u_long ifi_hwassist; +// FIXME: these are now unions, so maybe need to change definitions? +#undef ifi_epoch + time_t ifi_epoch; +#undef ifi_lastchange + struct timeval ifi_lastchange; +}; + +// This structure is a duplicate of if_msghdr on FreeBSD 8-STABLE. +// See /usr/include/net/if.h. +struct if_msghdr8 { + u_short ifm_msglen; + u_char ifm_version; + u_char ifm_type; + int ifm_addrs; + int ifm_flags; + u_short ifm_index; + struct if_data8 ifm_data; +}; +*/ +import "C" + +// Machine characteristics + +const ( + SizeofPtr = C.sizeofPtr + SizeofShort = C.sizeof_short + SizeofInt = C.sizeof_int + SizeofLong = C.sizeof_long + SizeofLongLong = C.sizeof_longlong +) + +// Basic types + +type ( + _C_short C.short + _C_int C.int + _C_long C.long + _C_long_long C.longlong +) + +// Time + +type Timespec C.struct_timespec + +type Timeval C.struct_timeval + +// Processes + +type Rusage C.struct_rusage + +type Rlimit C.struct_rlimit + +type _Gid_t C.gid_t + +// Files + +const ( + _statfsVersion = C.STATFS_VERSION + _dirblksiz = C.DIRBLKSIZ +) + +type Stat_t C.struct_stat + +type stat_freebsd11_t C.struct_freebsd11_stat + +type Statfs_t C.struct_statfs + +type statfs_freebsd11_t C.struct_freebsd11_statfs + +type Flock_t C.struct_flock + +type Dirent C.struct_dirent + +type dirent_freebsd11 C.struct_freebsd11_dirent + +type Fsid C.struct_fsid + +// File system limits + +const ( + PathMax = C.PATH_MAX +) + +// Advice to Fadvise + +const ( + FADV_NORMAL = C.POSIX_FADV_NORMAL + FADV_RANDOM = C.POSIX_FADV_RANDOM + FADV_SEQUENTIAL = C.POSIX_FADV_SEQUENTIAL + FADV_WILLNEED = C.POSIX_FADV_WILLNEED + FADV_DONTNEED = C.POSIX_FADV_DONTNEED + FADV_NOREUSE = C.POSIX_FADV_NOREUSE +) + +// Sockets + +type RawSockaddrInet4 C.struct_sockaddr_in + +type RawSockaddrInet6 C.struct_sockaddr_in6 + +type RawSockaddrUnix C.struct_sockaddr_un + +type RawSockaddrDatalink C.struct_sockaddr_dl + +type RawSockaddr C.struct_sockaddr + +type RawSockaddrAny C.struct_sockaddr_any + +type _Socklen C.socklen_t + +type Linger C.struct_linger + +type Iovec C.struct_iovec + +type IPMreq C.struct_ip_mreq + +type IPMreqn C.struct_ip_mreqn + +type IPv6Mreq C.struct_ipv6_mreq + +type Msghdr C.struct_msghdr + +type Cmsghdr C.struct_cmsghdr + +type Inet6Pktinfo C.struct_in6_pktinfo + +type IPv6MTUInfo C.struct_ip6_mtuinfo + +type ICMPv6Filter C.struct_icmp6_filter + +const ( + SizeofSockaddrInet4 = C.sizeof_struct_sockaddr_in + SizeofSockaddrInet6 = C.sizeof_struct_sockaddr_in6 + SizeofSockaddrAny = C.sizeof_struct_sockaddr_any + SizeofSockaddrUnix = C.sizeof_struct_sockaddr_un + SizeofSockaddrDatalink = C.sizeof_struct_sockaddr_dl + SizeofLinger = C.sizeof_struct_linger + SizeofIPMreq = C.sizeof_struct_ip_mreq + SizeofIPMreqn = C.sizeof_struct_ip_mreqn + SizeofIPv6Mreq = C.sizeof_struct_ipv6_mreq + SizeofMsghdr = C.sizeof_struct_msghdr + SizeofCmsghdr = C.sizeof_struct_cmsghdr + SizeofInet6Pktinfo = C.sizeof_struct_in6_pktinfo + SizeofIPv6MTUInfo = C.sizeof_struct_ip6_mtuinfo + SizeofICMPv6Filter = C.sizeof_struct_icmp6_filter +) + +// Ptrace requests + +const ( + PTRACE_TRACEME = C.PT_TRACE_ME + PTRACE_CONT = C.PT_CONTINUE + PTRACE_KILL = C.PT_KILL +) + +// Events (kqueue, kevent) + +type Kevent_t C.struct_kevent_freebsd11 + +// Select + +type FdSet C.fd_set + +// Routing and interface messages + +const ( + sizeofIfMsghdr = C.sizeof_struct_if_msghdr + SizeofIfMsghdr = C.sizeof_struct_if_msghdr8 + sizeofIfData = C.sizeof_struct_if_data + SizeofIfData = C.sizeof_struct_if_data8 + SizeofIfaMsghdr = C.sizeof_struct_ifa_msghdr + SizeofIfmaMsghdr = C.sizeof_struct_ifma_msghdr + SizeofIfAnnounceMsghdr = C.sizeof_struct_if_announcemsghdr + SizeofRtMsghdr = C.sizeof_struct_rt_msghdr + SizeofRtMetrics = C.sizeof_struct_rt_metrics +) + +type ifMsghdr C.struct_if_msghdr + +type IfMsghdr C.struct_if_msghdr8 + +type ifData C.struct_if_data + +type IfData C.struct_if_data8 + +type IfaMsghdr C.struct_ifa_msghdr + +type IfmaMsghdr C.struct_ifma_msghdr + +type IfAnnounceMsghdr C.struct_if_announcemsghdr + +type RtMsghdr C.struct_rt_msghdr + +type RtMetrics C.struct_rt_metrics + +// Berkeley packet filter + +const ( + SizeofBpfVersion = C.sizeof_struct_bpf_version + SizeofBpfStat = C.sizeof_struct_bpf_stat + SizeofBpfZbuf = C.sizeof_struct_bpf_zbuf + SizeofBpfProgram = C.sizeof_struct_bpf_program + SizeofBpfInsn = C.sizeof_struct_bpf_insn + SizeofBpfHdr = C.sizeof_struct_bpf_hdr + SizeofBpfZbufHeader = C.sizeof_struct_bpf_zbuf_header +) + +type BpfVersion C.struct_bpf_version + +type BpfStat C.struct_bpf_stat + +type BpfZbuf C.struct_bpf_zbuf + +type BpfProgram C.struct_bpf_program + +type BpfInsn C.struct_bpf_insn + +type BpfHdr C.struct_bpf_hdr + +type BpfZbufHeader C.struct_bpf_zbuf_header + +// Terminal handling + +type Termios C.struct_termios + +type Winsize C.struct_winsize + +// fchmodat-like syscalls. + +const ( + AT_FDCWD = C.AT_FDCWD + AT_REMOVEDIR = C.AT_REMOVEDIR + AT_SYMLINK_FOLLOW = C.AT_SYMLINK_FOLLOW + AT_SYMLINK_NOFOLLOW = C.AT_SYMLINK_NOFOLLOW +) + +// poll + +type PollFd C.struct_pollfd + +const ( + POLLERR = C.POLLERR + POLLHUP = C.POLLHUP + POLLIN = C.POLLIN + POLLINIGNEOF = C.POLLINIGNEOF + POLLNVAL = C.POLLNVAL + POLLOUT = C.POLLOUT + POLLPRI = C.POLLPRI + POLLRDBAND = C.POLLRDBAND + POLLRDNORM = C.POLLRDNORM + POLLWRBAND = C.POLLWRBAND + POLLWRNORM = C.POLLWRNORM +) + +// Capabilities + +type CapRights C.struct_cap_rights + +// Uname + +type Utsname C.struct_utsname diff --git a/vendor/golang.org/x/sys/unix/types_netbsd.go b/vendor/golang.org/x/sys/unix/types_netbsd.go new file mode 100644 index 0000000000..2dd4f9542c --- /dev/null +++ b/vendor/golang.org/x/sys/unix/types_netbsd.go @@ -0,0 +1,289 @@ +// Copyright 2009 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// +build ignore + +/* +Input to cgo -godefs. See README.md +*/ + +// +godefs map struct_in_addr [4]byte /* in_addr */ +// +godefs map struct_in6_addr [16]byte /* in6_addr */ + +package unix + +/* +#define KERNEL +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +enum { + sizeofPtr = sizeof(void*), +}; + +union sockaddr_all { + struct sockaddr s1; // this one gets used for fields + struct sockaddr_in s2; // these pad it out + struct sockaddr_in6 s3; + struct sockaddr_un s4; + struct sockaddr_dl s5; +}; + +struct sockaddr_any { + struct sockaddr addr; + char pad[sizeof(union sockaddr_all) - sizeof(struct sockaddr)]; +}; + +*/ +import "C" + +// Machine characteristics + +const ( + SizeofPtr = C.sizeofPtr + SizeofShort = C.sizeof_short + SizeofInt = C.sizeof_int + SizeofLong = C.sizeof_long + SizeofLongLong = C.sizeof_longlong +) + +// Basic types + +type ( + _C_short C.short + _C_int C.int + _C_long C.long + _C_long_long C.longlong +) + +// Time + +type Timespec C.struct_timespec + +type Timeval C.struct_timeval + +// Processes + +type Rusage C.struct_rusage + +type Rlimit C.struct_rlimit + +type _Gid_t C.gid_t + +// Files + +type Stat_t C.struct_stat + +type Statfs_t C.struct_statfs + +type Flock_t C.struct_flock + +type Dirent C.struct_dirent + +type Fsid C.fsid_t + +// File system limits + +const ( + PathMax = C.PATH_MAX +) + +// Advice to Fadvise + +const ( + FADV_NORMAL = C.POSIX_FADV_NORMAL + FADV_RANDOM = C.POSIX_FADV_RANDOM + FADV_SEQUENTIAL = C.POSIX_FADV_SEQUENTIAL + FADV_WILLNEED = C.POSIX_FADV_WILLNEED + FADV_DONTNEED = C.POSIX_FADV_DONTNEED + FADV_NOREUSE = C.POSIX_FADV_NOREUSE +) + +// Sockets + +type RawSockaddrInet4 C.struct_sockaddr_in + +type RawSockaddrInet6 C.struct_sockaddr_in6 + +type RawSockaddrUnix C.struct_sockaddr_un + +type RawSockaddrDatalink C.struct_sockaddr_dl + +type RawSockaddr C.struct_sockaddr + +type RawSockaddrAny C.struct_sockaddr_any + +type _Socklen C.socklen_t + +type Linger C.struct_linger + +type Iovec C.struct_iovec + +type IPMreq C.struct_ip_mreq + +type IPv6Mreq C.struct_ipv6_mreq + +type Msghdr C.struct_msghdr + +type Cmsghdr C.struct_cmsghdr + +type Inet6Pktinfo C.struct_in6_pktinfo + +type IPv6MTUInfo C.struct_ip6_mtuinfo + +type ICMPv6Filter C.struct_icmp6_filter + +const ( + SizeofSockaddrInet4 = C.sizeof_struct_sockaddr_in + SizeofSockaddrInet6 = C.sizeof_struct_sockaddr_in6 + SizeofSockaddrAny = C.sizeof_struct_sockaddr_any + SizeofSockaddrUnix = C.sizeof_struct_sockaddr_un + SizeofSockaddrDatalink = C.sizeof_struct_sockaddr_dl + SizeofLinger = C.sizeof_struct_linger + SizeofIPMreq = C.sizeof_struct_ip_mreq + SizeofIPv6Mreq = C.sizeof_struct_ipv6_mreq + SizeofMsghdr = C.sizeof_struct_msghdr + SizeofCmsghdr = C.sizeof_struct_cmsghdr + SizeofInet6Pktinfo = C.sizeof_struct_in6_pktinfo + SizeofIPv6MTUInfo = C.sizeof_struct_ip6_mtuinfo + SizeofICMPv6Filter = C.sizeof_struct_icmp6_filter +) + +// Ptrace requests + +const ( + PTRACE_TRACEME = C.PT_TRACE_ME + PTRACE_CONT = C.PT_CONTINUE + PTRACE_KILL = C.PT_KILL +) + +// Events (kqueue, kevent) + +type Kevent_t C.struct_kevent + +// Select + +type FdSet C.fd_set + +// Routing and interface messages + +const ( + SizeofIfMsghdr = C.sizeof_struct_if_msghdr + SizeofIfData = C.sizeof_struct_if_data + SizeofIfaMsghdr = C.sizeof_struct_ifa_msghdr + SizeofIfAnnounceMsghdr = C.sizeof_struct_if_announcemsghdr + SizeofRtMsghdr = C.sizeof_struct_rt_msghdr + SizeofRtMetrics = C.sizeof_struct_rt_metrics +) + +type IfMsghdr C.struct_if_msghdr + +type IfData C.struct_if_data + +type IfaMsghdr C.struct_ifa_msghdr + +type IfAnnounceMsghdr C.struct_if_announcemsghdr + +type RtMsghdr C.struct_rt_msghdr + +type RtMetrics C.struct_rt_metrics + +type Mclpool C.struct_mclpool + +// Berkeley packet filter + +const ( + SizeofBpfVersion = C.sizeof_struct_bpf_version + SizeofBpfStat = C.sizeof_struct_bpf_stat + SizeofBpfProgram = C.sizeof_struct_bpf_program + SizeofBpfInsn = C.sizeof_struct_bpf_insn + SizeofBpfHdr = C.sizeof_struct_bpf_hdr +) + +type BpfVersion C.struct_bpf_version + +type BpfStat C.struct_bpf_stat + +type BpfProgram C.struct_bpf_program + +type BpfInsn C.struct_bpf_insn + +type BpfHdr C.struct_bpf_hdr + +type BpfTimeval C.struct_bpf_timeval + +// Terminal handling + +type Termios C.struct_termios + +type Winsize C.struct_winsize + +type Ptmget C.struct_ptmget + +// fchmodat-like syscalls. + +const ( + AT_FDCWD = C.AT_FDCWD + AT_SYMLINK_NOFOLLOW = C.AT_SYMLINK_NOFOLLOW +) + +// poll + +type PollFd C.struct_pollfd + +const ( + POLLERR = C.POLLERR + POLLHUP = C.POLLHUP + POLLIN = C.POLLIN + POLLNVAL = C.POLLNVAL + POLLOUT = C.POLLOUT + POLLPRI = C.POLLPRI + POLLRDBAND = C.POLLRDBAND + POLLRDNORM = C.POLLRDNORM + POLLWRBAND = C.POLLWRBAND + POLLWRNORM = C.POLLWRNORM +) + +// Sysctl + +type Sysctlnode C.struct_sysctlnode + +// Uname + +type Utsname C.struct_utsname + +// Clockinfo + +const SizeofClockinfo = C.sizeof_struct_clockinfo + +type Clockinfo C.struct_clockinfo diff --git a/vendor/golang.org/x/sys/unix/types_openbsd.go b/vendor/golang.org/x/sys/unix/types_openbsd.go new file mode 100644 index 0000000000..4e5e57f9a6 --- /dev/null +++ b/vendor/golang.org/x/sys/unix/types_openbsd.go @@ -0,0 +1,276 @@ +// Copyright 2009 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// +build ignore + +/* +Input to cgo -godefs. See README.md +*/ + +// +godefs map struct_in_addr [4]byte /* in_addr */ +// +godefs map struct_in6_addr [16]byte /* in6_addr */ + +package unix + +/* +#define KERNEL +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +enum { + sizeofPtr = sizeof(void*), +}; + +union sockaddr_all { + struct sockaddr s1; // this one gets used for fields + struct sockaddr_in s2; // these pad it out + struct sockaddr_in6 s3; + struct sockaddr_un s4; + struct sockaddr_dl s5; +}; + +struct sockaddr_any { + struct sockaddr addr; + char pad[sizeof(union sockaddr_all) - sizeof(struct sockaddr)]; +}; + +*/ +import "C" + +// Machine characteristics + +const ( + SizeofPtr = C.sizeofPtr + SizeofShort = C.sizeof_short + SizeofInt = C.sizeof_int + SizeofLong = C.sizeof_long + SizeofLongLong = C.sizeof_longlong +) + +// Basic types + +type ( + _C_short C.short + _C_int C.int + _C_long C.long + _C_long_long C.longlong +) + +// Time + +type Timespec C.struct_timespec + +type Timeval C.struct_timeval + +// Processes + +type Rusage C.struct_rusage + +type Rlimit C.struct_rlimit + +type _Gid_t C.gid_t + +// Files + +type Stat_t C.struct_stat + +type Statfs_t C.struct_statfs + +type Flock_t C.struct_flock + +type Dirent C.struct_dirent + +type Fsid C.fsid_t + +// File system limits + +const ( + PathMax = C.PATH_MAX +) + +// Sockets + +type RawSockaddrInet4 C.struct_sockaddr_in + +type RawSockaddrInet6 C.struct_sockaddr_in6 + +type RawSockaddrUnix C.struct_sockaddr_un + +type RawSockaddrDatalink C.struct_sockaddr_dl + +type RawSockaddr C.struct_sockaddr + +type RawSockaddrAny C.struct_sockaddr_any + +type _Socklen C.socklen_t + +type Linger C.struct_linger + +type Iovec C.struct_iovec + +type IPMreq C.struct_ip_mreq + +type IPv6Mreq C.struct_ipv6_mreq + +type Msghdr C.struct_msghdr + +type Cmsghdr C.struct_cmsghdr + +type Inet6Pktinfo C.struct_in6_pktinfo + +type IPv6MTUInfo C.struct_ip6_mtuinfo + +type ICMPv6Filter C.struct_icmp6_filter + +const ( + SizeofSockaddrInet4 = C.sizeof_struct_sockaddr_in + SizeofSockaddrInet6 = C.sizeof_struct_sockaddr_in6 + SizeofSockaddrAny = C.sizeof_struct_sockaddr_any + SizeofSockaddrUnix = C.sizeof_struct_sockaddr_un + SizeofSockaddrDatalink = C.sizeof_struct_sockaddr_dl + SizeofLinger = C.sizeof_struct_linger + SizeofIPMreq = C.sizeof_struct_ip_mreq + SizeofIPv6Mreq = C.sizeof_struct_ipv6_mreq + SizeofMsghdr = C.sizeof_struct_msghdr + SizeofCmsghdr = C.sizeof_struct_cmsghdr + SizeofInet6Pktinfo = C.sizeof_struct_in6_pktinfo + SizeofIPv6MTUInfo = C.sizeof_struct_ip6_mtuinfo + SizeofICMPv6Filter = C.sizeof_struct_icmp6_filter +) + +// Ptrace requests + +const ( + PTRACE_TRACEME = C.PT_TRACE_ME + PTRACE_CONT = C.PT_CONTINUE + PTRACE_KILL = C.PT_KILL +) + +// Events (kqueue, kevent) + +type Kevent_t C.struct_kevent + +// Select + +type FdSet C.fd_set + +// Routing and interface messages + +const ( + SizeofIfMsghdr = C.sizeof_struct_if_msghdr + SizeofIfData = C.sizeof_struct_if_data + SizeofIfaMsghdr = C.sizeof_struct_ifa_msghdr + SizeofIfAnnounceMsghdr = C.sizeof_struct_if_announcemsghdr + SizeofRtMsghdr = C.sizeof_struct_rt_msghdr + SizeofRtMetrics = C.sizeof_struct_rt_metrics +) + +type IfMsghdr C.struct_if_msghdr + +type IfData C.struct_if_data + +type IfaMsghdr C.struct_ifa_msghdr + +type IfAnnounceMsghdr C.struct_if_announcemsghdr + +type RtMsghdr C.struct_rt_msghdr + +type RtMetrics C.struct_rt_metrics + +type Mclpool C.struct_mclpool + +// Berkeley packet filter + +const ( + SizeofBpfVersion = C.sizeof_struct_bpf_version + SizeofBpfStat = C.sizeof_struct_bpf_stat + SizeofBpfProgram = C.sizeof_struct_bpf_program + SizeofBpfInsn = C.sizeof_struct_bpf_insn + SizeofBpfHdr = C.sizeof_struct_bpf_hdr +) + +type BpfVersion C.struct_bpf_version + +type BpfStat C.struct_bpf_stat + +type BpfProgram C.struct_bpf_program + +type BpfInsn C.struct_bpf_insn + +type BpfHdr C.struct_bpf_hdr + +type BpfTimeval C.struct_bpf_timeval + +// Terminal handling + +type Termios C.struct_termios + +type Winsize C.struct_winsize + +// fchmodat-like syscalls. + +const ( + AT_FDCWD = C.AT_FDCWD + AT_SYMLINK_NOFOLLOW = C.AT_SYMLINK_NOFOLLOW +) + +// poll + +type PollFd C.struct_pollfd + +const ( + POLLERR = C.POLLERR + POLLHUP = C.POLLHUP + POLLIN = C.POLLIN + POLLNVAL = C.POLLNVAL + POLLOUT = C.POLLOUT + POLLPRI = C.POLLPRI + POLLRDBAND = C.POLLRDBAND + POLLRDNORM = C.POLLRDNORM + POLLWRBAND = C.POLLWRBAND + POLLWRNORM = C.POLLWRNORM +) + +// Signal Sets + +type Sigset_t C.sigset_t + +// Uname + +type Utsname C.struct_utsname + +// Uvmexp + +const SizeofUvmexp = C.sizeof_struct_uvmexp + +type Uvmexp C.struct_uvmexp diff --git a/vendor/golang.org/x/sys/unix/types_solaris.go b/vendor/golang.org/x/sys/unix/types_solaris.go new file mode 100644 index 0000000000..2b716f9348 --- /dev/null +++ b/vendor/golang.org/x/sys/unix/types_solaris.go @@ -0,0 +1,266 @@ +// Copyright 2009 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// +build ignore + +/* +Input to cgo -godefs. See README.md +*/ + +// +godefs map struct_in_addr [4]byte /* in_addr */ +// +godefs map struct_in6_addr [16]byte /* in6_addr */ + +package unix + +/* +#define KERNEL +// These defines ensure that builds done on newer versions of Solaris are +// backwards-compatible with older versions of Solaris and +// OpenSolaris-based derivatives. +#define __USE_SUNOS_SOCKETS__ // msghdr +#define __USE_LEGACY_PROTOTYPES__ // iovec +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +enum { + sizeofPtr = sizeof(void*), +}; + +union sockaddr_all { + struct sockaddr s1; // this one gets used for fields + struct sockaddr_in s2; // these pad it out + struct sockaddr_in6 s3; + struct sockaddr_un s4; + struct sockaddr_dl s5; +}; + +struct sockaddr_any { + struct sockaddr addr; + char pad[sizeof(union sockaddr_all) - sizeof(struct sockaddr)]; +}; + +*/ +import "C" + +// Machine characteristics + +const ( + SizeofPtr = C.sizeofPtr + SizeofShort = C.sizeof_short + SizeofInt = C.sizeof_int + SizeofLong = C.sizeof_long + SizeofLongLong = C.sizeof_longlong + PathMax = C.PATH_MAX + MaxHostNameLen = C.MAXHOSTNAMELEN +) + +// Basic types + +type ( + _C_short C.short + _C_int C.int + _C_long C.long + _C_long_long C.longlong +) + +// Time + +type Timespec C.struct_timespec + +type Timeval C.struct_timeval + +type Timeval32 C.struct_timeval32 + +type Tms C.struct_tms + +type Utimbuf C.struct_utimbuf + +// Processes + +type Rusage C.struct_rusage + +type Rlimit C.struct_rlimit + +type _Gid_t C.gid_t + +// Files + +type Stat_t C.struct_stat + +type Flock_t C.struct_flock + +type Dirent C.struct_dirent + +// Filesystems + +type _Fsblkcnt_t C.fsblkcnt_t + +type Statvfs_t C.struct_statvfs + +// Sockets + +type RawSockaddrInet4 C.struct_sockaddr_in + +type RawSockaddrInet6 C.struct_sockaddr_in6 + +type RawSockaddrUnix C.struct_sockaddr_un + +type RawSockaddrDatalink C.struct_sockaddr_dl + +type RawSockaddr C.struct_sockaddr + +type RawSockaddrAny C.struct_sockaddr_any + +type _Socklen C.socklen_t + +type Linger C.struct_linger + +type Iovec C.struct_iovec + +type IPMreq C.struct_ip_mreq + +type IPv6Mreq C.struct_ipv6_mreq + +type Msghdr C.struct_msghdr + +type Cmsghdr C.struct_cmsghdr + +type Inet6Pktinfo C.struct_in6_pktinfo + +type IPv6MTUInfo C.struct_ip6_mtuinfo + +type ICMPv6Filter C.struct_icmp6_filter + +const ( + SizeofSockaddrInet4 = C.sizeof_struct_sockaddr_in + SizeofSockaddrInet6 = C.sizeof_struct_sockaddr_in6 + SizeofSockaddrAny = C.sizeof_struct_sockaddr_any + SizeofSockaddrUnix = C.sizeof_struct_sockaddr_un + SizeofSockaddrDatalink = C.sizeof_struct_sockaddr_dl + SizeofLinger = C.sizeof_struct_linger + SizeofIPMreq = C.sizeof_struct_ip_mreq + SizeofIPv6Mreq = C.sizeof_struct_ipv6_mreq + SizeofMsghdr = C.sizeof_struct_msghdr + SizeofCmsghdr = C.sizeof_struct_cmsghdr + SizeofInet6Pktinfo = C.sizeof_struct_in6_pktinfo + SizeofIPv6MTUInfo = C.sizeof_struct_ip6_mtuinfo + SizeofICMPv6Filter = C.sizeof_struct_icmp6_filter +) + +// Select + +type FdSet C.fd_set + +// Misc + +type Utsname C.struct_utsname + +type Ustat_t C.struct_ustat + +const ( + AT_FDCWD = C.AT_FDCWD + AT_SYMLINK_NOFOLLOW = C.AT_SYMLINK_NOFOLLOW + AT_SYMLINK_FOLLOW = C.AT_SYMLINK_FOLLOW + AT_REMOVEDIR = C.AT_REMOVEDIR + AT_EACCESS = C.AT_EACCESS +) + +// Routing and interface messages + +const ( + SizeofIfMsghdr = C.sizeof_struct_if_msghdr + SizeofIfData = C.sizeof_struct_if_data + SizeofIfaMsghdr = C.sizeof_struct_ifa_msghdr + SizeofRtMsghdr = C.sizeof_struct_rt_msghdr + SizeofRtMetrics = C.sizeof_struct_rt_metrics +) + +type IfMsghdr C.struct_if_msghdr + +type IfData C.struct_if_data + +type IfaMsghdr C.struct_ifa_msghdr + +type RtMsghdr C.struct_rt_msghdr + +type RtMetrics C.struct_rt_metrics + +// Berkeley packet filter + +const ( + SizeofBpfVersion = C.sizeof_struct_bpf_version + SizeofBpfStat = C.sizeof_struct_bpf_stat + SizeofBpfProgram = C.sizeof_struct_bpf_program + SizeofBpfInsn = C.sizeof_struct_bpf_insn + SizeofBpfHdr = C.sizeof_struct_bpf_hdr +) + +type BpfVersion C.struct_bpf_version + +type BpfStat C.struct_bpf_stat + +type BpfProgram C.struct_bpf_program + +type BpfInsn C.struct_bpf_insn + +type BpfTimeval C.struct_bpf_timeval + +type BpfHdr C.struct_bpf_hdr + +// Terminal handling + +type Termios C.struct_termios + +type Termio C.struct_termio + +type Winsize C.struct_winsize + +// poll + +type PollFd C.struct_pollfd + +const ( + POLLERR = C.POLLERR + POLLHUP = C.POLLHUP + POLLIN = C.POLLIN + POLLNVAL = C.POLLNVAL + POLLOUT = C.POLLOUT + POLLPRI = C.POLLPRI + POLLRDBAND = C.POLLRDBAND + POLLRDNORM = C.POLLRDNORM + POLLWRBAND = C.POLLWRBAND + POLLWRNORM = C.POLLWRNORM +) diff --git a/vendor/golang.org/x/text/unicode/bidi/gen.go b/vendor/golang.org/x/text/unicode/bidi/gen.go index 4e1c7ba0bf..d06558eba7 100644 --- a/vendor/golang.org/x/text/unicode/bidi/gen.go +++ b/vendor/golang.org/x/text/unicode/bidi/gen.go @@ -26,7 +26,11 @@ func main() { } // bidiClass names and codes taken from class "bc" in +<<<<<<< HEAD // http://www.unicode.org/Public/8.0.0/ucd/PropertyValueAliases.txt +======= +// https://www.unicode.org/Public/8.0.0/ucd/PropertyValueAliases.txt +>>>>>>> go mod vendor var bidiClass = map[string]Class{ "AL": AL, // ArabicLetter "AN": AN, // ArabicNumber diff --git a/vendor/golang.org/x/text/unicode/bidi/gen_ranges.go b/vendor/golang.org/x/text/unicode/bidi/gen_ranges.go index 51bd68fa7f..191658a7f0 100644 --- a/vendor/golang.org/x/text/unicode/bidi/gen_ranges.go +++ b/vendor/golang.org/x/text/unicode/bidi/gen_ranges.go @@ -15,7 +15,11 @@ import ( ) // These tables are hand-extracted from: +<<<<<<< HEAD // http://www.unicode.org/Public/8.0.0/ucd/extracted/DerivedBidiClass.txt +======= +// https://www.unicode.org/Public/8.0.0/ucd/extracted/DerivedBidiClass.txt +>>>>>>> go mod vendor func visitDefaults(fn func(r rune, c Class)) { // first write default values for ranges listed above. visitRunes(fn, AL, []rune{ diff --git a/vendor/golang.org/x/text/unicode/bidi/gen_trieval.go b/vendor/golang.org/x/text/unicode/bidi/gen_trieval.go new file mode 100644 index 0000000000..9cb9942894 --- /dev/null +++ b/vendor/golang.org/x/text/unicode/bidi/gen_trieval.go @@ -0,0 +1,64 @@ +// Copyright 2015 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// +build ignore + +package main + +// Class is the Unicode BiDi class. Each rune has a single class. +type Class uint + +const ( + L Class = iota // LeftToRight + R // RightToLeft + EN // EuropeanNumber + ES // EuropeanSeparator + ET // EuropeanTerminator + AN // ArabicNumber + CS // CommonSeparator + B // ParagraphSeparator + S // SegmentSeparator + WS // WhiteSpace + ON // OtherNeutral + BN // BoundaryNeutral + NSM // NonspacingMark + AL // ArabicLetter + Control // Control LRO - PDI + + numClass + + LRO // LeftToRightOverride + RLO // RightToLeftOverride + LRE // LeftToRightEmbedding + RLE // RightToLeftEmbedding + PDF // PopDirectionalFormat + LRI // LeftToRightIsolate + RLI // RightToLeftIsolate + FSI // FirstStrongIsolate + PDI // PopDirectionalIsolate + + unknownClass = ^Class(0) +) + +var controlToClass = map[rune]Class{ + 0x202D: LRO, // LeftToRightOverride, + 0x202E: RLO, // RightToLeftOverride, + 0x202A: LRE, // LeftToRightEmbedding, + 0x202B: RLE, // RightToLeftEmbedding, + 0x202C: PDF, // PopDirectionalFormat, + 0x2066: LRI, // LeftToRightIsolate, + 0x2067: RLI, // RightToLeftIsolate, + 0x2068: FSI, // FirstStrongIsolate, + 0x2069: PDI, // PopDirectionalIsolate, +} + +// A trie entry has the following bits: +// 7..5 XOR mask for brackets +// 4 1: Bracket open, 0: Bracket close +// 3..0 Class type + +const ( + openMask = 0x10 + xorMaskShift = 5 +) diff --git a/vendor/golang.org/x/text/unicode/norm/maketables.go b/vendor/golang.org/x/text/unicode/norm/maketables.go index 338c395ee6..c89f0d9d54 100644 --- a/vendor/golang.org/x/text/unicode/norm/maketables.go +++ b/vendor/golang.org/x/text/unicode/norm/maketables.go @@ -12,6 +12,10 @@ package main import ( "bytes" +<<<<<<< HEAD +======= + "encoding/binary" +>>>>>>> go mod vendor "flag" "fmt" "io" @@ -261,7 +265,11 @@ func compactCCC() { // CompositionExclusions.txt has form: // 0958 # ... +<<<<<<< HEAD // See http://unicode.org/reports/tr44/ for full explanation +======= +// See https://unicode.org/reports/tr44/ for full explanation +>>>>>>> go mod vendor func loadCompositionExclusions() { f := gen.OpenUCDFile("CompositionExclusions.txt") defer f.Close() @@ -735,6 +743,11 @@ func makeTables() { max = n } } +<<<<<<< HEAD +======= + fmt.Fprintln(w, `import "sync"`) + fmt.Fprintln(w) +>>>>>>> go mod vendor fmt.Fprintln(w, "const (") fmt.Fprintln(w, "\t// Version is the Unicode edition from which the tables are derived.") @@ -782,16 +795,34 @@ func makeTables() { sz := nrentries * 8 size += sz fmt.Fprintf(w, "// recompMap: %d bytes (entries only)\n", sz) +<<<<<<< HEAD fmt.Fprintln(w, "var recompMap = map[uint32]rune{") +======= + fmt.Fprintln(w, "var recompMap map[uint32]rune") + fmt.Fprintln(w, "var recompMapOnce sync.Once\n") + fmt.Fprintln(w, `const recompMapPacked = "" +`) + var buf [8]byte +>>>>>>> go mod vendor for i, c := range chars { f := c.forms[FCanonical] d := f.decomp if !f.isOneWay && len(d) > 0 { key := uint32(uint16(d[0]))<<16 + uint32(uint16(d[1])) +<<<<<<< HEAD fmt.Fprintf(w, "0x%.8X: 0x%.4X,\n", key, i) } } fmt.Fprintf(w, "}\n\n") +======= + binary.BigEndian.PutUint32(buf[:4], key) + binary.BigEndian.PutUint32(buf[4:], uint32(i)) + fmt.Fprintf(w, "\t\t%q + // 0x%.8X: 0x%.8X\n", string(buf[:]), key, uint32(i)) + } + } + // hack so we don't have to special case the trailing plus sign + fmt.Fprintf(w, ` ""`) + fmt.Fprintln(w) +>>>>>>> go mod vendor } fmt.Fprintf(w, "// Total size of tables: %dKB (%d bytes)\n", (size+512)/1024, size) @@ -857,7 +888,11 @@ func verifyComputed() { // DerivedNormalizationProps.txt has form: // 00C0..00C5 ; NFD_QC; N # ... // 0374 ; NFD_QC; N # ... +<<<<<<< HEAD // See http://unicode.org/reports/tr44/ for full explanation +======= +// See https://unicode.org/reports/tr44/ for full explanation +>>>>>>> go mod vendor func testDerived() { f := gen.OpenUCDFile("DerivedNormalizationProps.txt") defer f.Close() diff --git a/vendor/golang.org/x/text/unicode/norm/triegen.go b/vendor/golang.org/x/text/unicode/norm/triegen.go new file mode 100644 index 0000000000..45d711900d --- /dev/null +++ b/vendor/golang.org/x/text/unicode/norm/triegen.go @@ -0,0 +1,117 @@ +// Copyright 2011 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// +build ignore + +// Trie table generator. +// Used by make*tables tools to generate a go file with trie data structures +// for mapping UTF-8 to a 16-bit value. All but the last byte in a UTF-8 byte +// sequence are used to lookup offsets in the index table to be used for the +// next byte. The last byte is used to index into a table with 16-bit values. + +package main + +import ( + "fmt" + "io" +) + +const maxSparseEntries = 16 + +type normCompacter struct { + sparseBlocks [][]uint64 + sparseOffset []uint16 + sparseCount int + name string +} + +func mostFrequentStride(a []uint64) int { + counts := make(map[int]int) + var v int + for _, x := range a { + if stride := int(x) - v; v != 0 && stride >= 0 { + counts[stride]++ + } + v = int(x) + } + var maxs, maxc int + for stride, cnt := range counts { + if cnt > maxc || (cnt == maxc && stride < maxs) { + maxs, maxc = stride, cnt + } + } + return maxs +} + +func countSparseEntries(a []uint64) int { + stride := mostFrequentStride(a) + var v, count int + for _, tv := range a { + if int(tv)-v != stride { + if tv != 0 { + count++ + } + } + v = int(tv) + } + return count +} + +func (c *normCompacter) Size(v []uint64) (sz int, ok bool) { + if n := countSparseEntries(v); n <= maxSparseEntries { + return (n+1)*4 + 2, true + } + return 0, false +} + +func (c *normCompacter) Store(v []uint64) uint32 { + h := uint32(len(c.sparseOffset)) + c.sparseBlocks = append(c.sparseBlocks, v) + c.sparseOffset = append(c.sparseOffset, uint16(c.sparseCount)) + c.sparseCount += countSparseEntries(v) + 1 + return h +} + +func (c *normCompacter) Handler() string { + return c.name + "Sparse.lookup" +} + +func (c *normCompacter) Print(w io.Writer) (retErr error) { + p := func(f string, x ...interface{}) { + if _, err := fmt.Fprintf(w, f, x...); retErr == nil && err != nil { + retErr = err + } + } + + ls := len(c.sparseBlocks) + p("// %sSparseOffset: %d entries, %d bytes\n", c.name, ls, ls*2) + p("var %sSparseOffset = %#v\n\n", c.name, c.sparseOffset) + + ns := c.sparseCount + p("// %sSparseValues: %d entries, %d bytes\n", c.name, ns, ns*4) + p("var %sSparseValues = [%d]valueRange {", c.name, ns) + for i, b := range c.sparseBlocks { + p("\n// Block %#x, offset %#x", i, c.sparseOffset[i]) + var v int + stride := mostFrequentStride(b) + n := countSparseEntries(b) + p("\n{value:%#04x,lo:%#02x},", stride, uint8(n)) + for i, nv := range b { + if int(nv)-v != stride { + if v != 0 { + p(",hi:%#02x},", 0x80+i-1) + } + if nv != 0 { + p("\n{value:%#04x,lo:%#02x", nv, 0x80+i) + } + } + v = int(nv) + } + if v != 0 { + p(",hi:%#02x},", 0x80+len(b)-1) + } + } + p("\n}\n\n") + return +} diff --git a/vendor/golang.org/x/text/width/gen.go b/vendor/golang.org/x/text/width/gen.go new file mode 100644 index 0000000000..092277e1f6 --- /dev/null +++ b/vendor/golang.org/x/text/width/gen.go @@ -0,0 +1,115 @@ +// Copyright 2015 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// +build ignore + +// This program generates the trie for width operations. The generated table +// includes width category information as well as the normalization mappings. +package main + +import ( + "bytes" + "fmt" + "io" + "log" + "math" + "unicode/utf8" + + "golang.org/x/text/internal/gen" + "golang.org/x/text/internal/triegen" +) + +// See gen_common.go for flags. + +func main() { + gen.Init() + genTables() + genTests() + gen.Repackage("gen_trieval.go", "trieval.go", "width") + gen.Repackage("gen_common.go", "common_test.go", "width") +} + +func genTables() { + t := triegen.NewTrie("width") + // fold and inverse mappings. See mapComment for a description of the format + // of each entry. Add dummy value to make an index of 0 mean no mapping. + inverse := [][4]byte{{}} + mapping := map[[4]byte]int{[4]byte{}: 0} + + getWidthData(func(r rune, tag elem, alt rune) { + idx := 0 + if alt != 0 { + var buf [4]byte + buf[0] = byte(utf8.EncodeRune(buf[1:], alt)) + s := string(r) + buf[buf[0]] ^= s[len(s)-1] + var ok bool + if idx, ok = mapping[buf]; !ok { + idx = len(mapping) + if idx > math.MaxUint8 { + log.Fatalf("Index %d does not fit in a byte.", idx) + } + mapping[buf] = idx + inverse = append(inverse, buf) + } + } + t.Insert(r, uint64(tag|elem(idx))) + }) + + w := &bytes.Buffer{} + gen.WriteUnicodeVersion(w) + + sz, err := t.Gen(w) + if err != nil { + log.Fatal(err) + } + + sz += writeMappings(w, inverse) + + fmt.Fprintf(w, "// Total table size %d bytes (%dKiB)\n", sz, sz/1024) + + gen.WriteVersionedGoFile(*outputFile, "width", w.Bytes()) +} + +const inverseDataComment = ` +// inverseData contains 4-byte entries of the following format: +// <0 padding> +// The last byte of the UTF-8-encoded rune is xor-ed with the last byte of the +// UTF-8 encoding of the original rune. Mappings often have the following +// pattern: +// Ａ -> A (U+FF21 -> U+0041) +// Ｂ -> B (U+FF22 -> U+0042) +// ... +// By xor-ing the last byte the same entry can be shared by many mappings. This +// reduces the total number of distinct entries by about two thirds. +// The resulting entry for the aforementioned mappings is +// { 0x01, 0xE0, 0x00, 0x00 } +// Using this entry to map U+FF21 (UTF-8 [EF BC A1]), we get +// E0 ^ A1 = 41. +// Similarly, for U+FF22 (UTF-8 [EF BC A2]), we get +// E0 ^ A2 = 42. +// Note that because of the xor-ing, the byte sequence stored in the entry is +// not valid UTF-8.` + +func writeMappings(w io.Writer, data [][4]byte) int { + fmt.Fprintln(w, inverseDataComment) + fmt.Fprintf(w, "var inverseData = [%d][4]byte{\n", len(data)) + for _, x := range data { + fmt.Fprintf(w, "{ 0x%02x, 0x%02x, 0x%02x, 0x%02x },\n", x[0], x[1], x[2], x[3]) + } + fmt.Fprintln(w, "}") + return len(data) * 4 +} + +func genTests() { + w := &bytes.Buffer{} + fmt.Fprintf(w, "\nvar mapRunes = map[rune]struct{r rune; e elem}{\n") + getWidthData(func(r rune, tag elem, alt rune) { + if alt != 0 { + fmt.Fprintf(w, "\t0x%X: {0x%X, 0x%X},\n", r, alt, tag) + } + }) + fmt.Fprintln(w, "}") + gen.WriteGoFile("runes_test.go", "width", w.Bytes()) +} diff --git a/vendor/golang.org/x/text/width/gen_common.go b/vendor/golang.org/x/text/width/gen_common.go new file mode 100644 index 0000000000..601e752684 --- /dev/null +++ b/vendor/golang.org/x/text/width/gen_common.go @@ -0,0 +1,96 @@ +// Copyright 2015 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// +build ignore + +package main + +// This code is shared between the main code generator and the test code. + +import ( + "flag" + "log" + "strconv" + "strings" + + "golang.org/x/text/internal/gen" + "golang.org/x/text/internal/ucd" +) + +var ( + outputFile = flag.String("out", "tables.go", "output file") +) + +var typeMap = map[string]elem{ + "A": tagAmbiguous, + "N": tagNeutral, + "Na": tagNarrow, + "W": tagWide, + "F": tagFullwidth, + "H": tagHalfwidth, +} + +// getWidthData calls f for every entry for which it is defined. +// +// f may be called multiple times for the same rune. The last call to f is the +// correct value. f is not called for all runes. The default tag type is +// Neutral. +func getWidthData(f func(r rune, tag elem, alt rune)) { + // Set the default values for Unified Ideographs. In line with Annex 11, + // we encode full ranges instead of the defined runes in Unified_Ideograph. + for _, b := range []struct{ lo, hi rune }{ + {0x4E00, 0x9FFF}, // the CJK Unified Ideographs block, + {0x3400, 0x4DBF}, // the CJK Unified Ideographs Externsion A block, + {0xF900, 0xFAFF}, // the CJK Compatibility Ideographs block, + {0x20000, 0x2FFFF}, // the Supplementary Ideographic Plane, + {0x30000, 0x3FFFF}, // the Tertiary Ideographic Plane, + } { + for r := b.lo; r <= b.hi; r++ { + f(r, tagWide, 0) + } + } + + inverse := map[rune]rune{} + maps := map[string]bool{ + "": true, + "": true, + } + + // We cannot reuse package norm's decomposition, as we need an unexpanded + // decomposition. We make use of the opportunity to verify that the + // decomposition type is as expected. + ucd.Parse(gen.OpenUCDFile("UnicodeData.txt"), func(p *ucd.Parser) { + r := p.Rune(0) + s := strings.SplitN(p.String(ucd.DecompMapping), " ", 2) + if !maps[s[0]] { + return + } + x, err := strconv.ParseUint(s[1], 16, 32) + if err != nil { + log.Fatalf("Error parsing rune %q", s[1]) + } + if inverse[r] != 0 || inverse[rune(x)] != 0 { + log.Fatalf("Circular dependency in mapping between %U and %U", r, x) + } + inverse[r] = rune(x) + inverse[rune(x)] = r + }) + + // ; + ucd.Parse(gen.OpenUCDFile("EastAsianWidth.txt"), func(p *ucd.Parser) { + tag, ok := typeMap[p.String(1)] + if !ok { + log.Fatalf("Unknown width type %q", p.String(1)) + } + r := p.Rune(0) + alt, ok := inverse[r] + if tag == tagFullwidth || tag == tagHalfwidth && r != wonSign { + tag |= tagNeedsFold + if !ok { + log.Fatalf("Narrow or wide rune %U has no decomposition", r) + } + } + f(r, tag, alt) + }) +} diff --git a/vendor/golang.org/x/text/width/gen_trieval.go b/vendor/golang.org/x/text/width/gen_trieval.go new file mode 100644 index 0000000000..c17334aa61 --- /dev/null +++ b/vendor/golang.org/x/text/width/gen_trieval.go @@ -0,0 +1,34 @@ +// Copyright 2015 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// +build ignore + +package main + +// elem is an entry of the width trie. The high byte is used to encode the type +// of the rune. The low byte is used to store the index to a mapping entry in +// the inverseData array. +type elem uint16 + +const ( + tagNeutral elem = iota << typeShift + tagAmbiguous + tagWide + tagNarrow + tagFullwidth + tagHalfwidth +) + +const ( + numTypeBits = 3 + typeShift = 16 - numTypeBits + + // tagNeedsFold is true for all fullwidth and halfwidth runes except for + // the Won sign U+20A9. + tagNeedsFold = 0x1000 + + // The Korean Won sign is halfwidth, but SHOULD NOT be mapped to a wide + // variant. + wonSign rune = 0x20A9 +) diff --git a/vendor/golang.org/x/tools/go/gcexportdata/main.go b/vendor/golang.org/x/tools/go/gcexportdata/main.go new file mode 100644 index 0000000000..2713dce64a --- /dev/null +++ b/vendor/golang.org/x/tools/go/gcexportdata/main.go @@ -0,0 +1,99 @@ +// Copyright 2017 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// +build ignore + +// The gcexportdata command is a diagnostic tool that displays the +// contents of gc export data files. +package main + +import ( + "flag" + "fmt" + "go/token" + "go/types" + "log" + "os" + + "golang.org/x/tools/go/gcexportdata" + "golang.org/x/tools/go/types/typeutil" +) + +var packageFlag = flag.String("package", "", "alternative package to print") + +func main() { + log.SetPrefix("gcexportdata: ") + log.SetFlags(0) + flag.Usage = func() { + fmt.Fprintln(os.Stderr, "usage: gcexportdata [-package path] file.a") + } + flag.Parse() + if flag.NArg() != 1 { + flag.Usage() + os.Exit(2) + } + filename := flag.Args()[0] + + f, err := os.Open(filename) + if err != nil { + log.Fatal(err) + } + + r, err := gcexportdata.NewReader(f) + if err != nil { + log.Fatalf("%s: %s", filename, err) + } + + // Decode the package. + const primary = "" + imports := make(map[string]*types.Package) + fset := token.NewFileSet() + pkg, err := gcexportdata.Read(r, fset, imports, primary) + if err != nil { + log.Fatalf("%s: %s", filename, err) + } + + // Optionally select an indirectly mentioned package. + if *packageFlag != "" { + pkg = imports[*packageFlag] + if pkg == nil { + fmt.Fprintf(os.Stderr, "export data file %s does not mention %s; has:\n", + filename, *packageFlag) + for p := range imports { + if p != primary { + fmt.Fprintf(os.Stderr, "\t%s\n", p) + } + } + os.Exit(1) + } + } + + // Print all package-level declarations, including non-exported ones. + fmt.Printf("package %s\n", pkg.Name()) + for _, imp := range pkg.Imports() { + fmt.Printf("import %q\n", imp.Path()) + } + qual := func(p *types.Package) string { + if pkg == p { + return "" + } + return p.Name() + } + scope := pkg.Scope() + for _, name := range scope.Names() { + obj := scope.Lookup(name) + fmt.Printf("%s: %s\n", + fset.Position(obj.Pos()), + types.ObjectString(obj, qual)) + + // For types, print each method. + if _, ok := obj.(*types.TypeName); ok { + for _, method := range typeutil.IntuitiveMethodSet(obj.Type(), nil) { + fmt.Printf("%s: %s\n", + fset.Position(method.Obj().Pos()), + types.SelectionString(method, qual)) + } + } + } +} diff --git a/vendor/golang.org/x/tools/imports/mkindex.go b/vendor/golang.org/x/tools/imports/mkindex.go new file mode 100644 index 0000000000..755e2394f2 --- /dev/null +++ b/vendor/golang.org/x/tools/imports/mkindex.go @@ -0,0 +1,173 @@ +// +build ignore + +// Copyright 2013 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// Command mkindex creates the file "pkgindex.go" containing an index of the Go +// standard library. The file is intended to be built as part of the imports +// package, so that the package may be used in environments where a GOROOT is +// not available (such as App Engine). +package main + +import ( + "bytes" + "fmt" + "go/ast" + "go/build" + "go/format" + "go/parser" + "go/token" + "io/ioutil" + "log" + "os" + "path" + "path/filepath" + "strings" +) + +var ( + pkgIndex = make(map[string][]pkg) + exports = make(map[string]map[string]bool) +) + +func main() { + // Don't use GOPATH. + ctx := build.Default + ctx.GOPATH = "" + + // Populate pkgIndex global from GOROOT. + for _, path := range ctx.SrcDirs() { + f, err := os.Open(path) + if err != nil { + log.Print(err) + continue + } + children, err := f.Readdir(-1) + f.Close() + if err != nil { + log.Print(err) + continue + } + for _, child := range children { + if child.IsDir() { + loadPkg(path, child.Name()) + } + } + } + // Populate exports global. + for _, ps := range pkgIndex { + for _, p := range ps { + e := loadExports(p.dir) + if e != nil { + exports[p.dir] = e + } + } + } + + // Construct source file. + var buf bytes.Buffer + fmt.Fprint(&buf, pkgIndexHead) + fmt.Fprintf(&buf, "var pkgIndexMaster = %#v\n", pkgIndex) + fmt.Fprintf(&buf, "var exportsMaster = %#v\n", exports) + src := buf.Bytes() + + // Replace main.pkg type name with pkg. + src = bytes.Replace(src, []byte("main.pkg"), []byte("pkg"), -1) + // Replace actual GOROOT with "/go". + src = bytes.Replace(src, []byte(ctx.GOROOT), []byte("/go"), -1) + // Add some line wrapping. + src = bytes.Replace(src, []byte("}, "), []byte("},\n"), -1) + src = bytes.Replace(src, []byte("true, "), []byte("true,\n"), -1) + + var err error + src, err = format.Source(src) + if err != nil { + log.Fatal(err) + } + + // Write out source file. + err = ioutil.WriteFile("pkgindex.go", src, 0644) + if err != nil { + log.Fatal(err) + } +} + +const pkgIndexHead = `package imports + +func init() { + pkgIndexOnce.Do(func() { + pkgIndex.m = pkgIndexMaster + }) + loadExports = func(dir string) map[string]bool { + return exportsMaster[dir] + } +} +` + +type pkg struct { + importpath string // full pkg import path, e.g. "net/http" + dir string // absolute file path to pkg directory e.g. "/usr/lib/go/src/fmt" +} + +var fset = token.NewFileSet() + +func loadPkg(root, importpath string) { + shortName := path.Base(importpath) + if shortName == "testdata" { + return + } + + dir := filepath.Join(root, importpath) + pkgIndex[shortName] = append(pkgIndex[shortName], pkg{ + importpath: importpath, + dir: dir, + }) + + pkgDir, err := os.Open(dir) + if err != nil { + return + } + children, err := pkgDir.Readdir(-1) + pkgDir.Close() + if err != nil { + return + } + for _, child := range children { + name := child.Name() + if name == "" { + continue + } + if c := name[0]; c == '.' || ('0' <= c && c <= '9') { + continue + } + if child.IsDir() { + loadPkg(root, filepath.Join(importpath, name)) + } + } +} + +func loadExports(dir string) map[string]bool { + exports := make(map[string]bool) + buildPkg, err := build.ImportDir(dir, 0) + if err != nil { + if strings.Contains(err.Error(), "no buildable Go source files in") { + return nil + } + log.Printf("could not import %q: %v", dir, err) + return nil + } + for _, file := range buildPkg.GoFiles { + f, err := parser.ParseFile(fset, filepath.Join(dir, file), nil, 0) + if err != nil { + log.Printf("could not parse %q: %v", file, err) + continue + } + for name := range f.Scope.Objects { + if ast.IsExported(name) { + exports[name] = true + } + } + } + return exports +} diff --git a/vendor/golang.org/x/tools/imports/mkstdlib.go b/vendor/golang.org/x/tools/imports/mkstdlib.go new file mode 100644 index 0000000000..5059ad4d7d --- /dev/null +++ b/vendor/golang.org/x/tools/imports/mkstdlib.go @@ -0,0 +1,112 @@ +// +build ignore + +// mkstdlib generates the zstdlib.go file, containing the Go standard +// library API symbols. It's baked into the binary to avoid scanning +// GOPATH in the common case. +package main + +import ( + "bufio" + "bytes" + "fmt" + "go/format" + "io" + "io/ioutil" + "log" + "os" + "path/filepath" + "regexp" + "runtime" + "sort" + "strings" +) + +func mustOpen(name string) io.Reader { + f, err := os.Open(name) + if err != nil { + log.Fatal(err) + } + return f +} + +func api(base string) string { + return filepath.Join(runtime.GOROOT(), "api", base) +} + +var sym = regexp.MustCompile(`^pkg (\S+).*?, (?:var|func|type|const) ([A-Z]\w*)`) + +var unsafeSyms = map[string]bool{"Alignof": true, "ArbitraryType": true, "Offsetof": true, "Pointer": true, "Sizeof": true} + +func main() { + var buf bytes.Buffer + outf := func(format string, args ...interface{}) { + fmt.Fprintf(&buf, format, args...) + } + outf("// Code generated by mkstdlib.go. DO NOT EDIT.\n\n") + outf("package imports\n") + outf("var stdlib = map[string]map[string]bool{\n") + f := io.MultiReader( + mustOpen(api("go1.txt")), + mustOpen(api("go1.1.txt")), + mustOpen(api("go1.2.txt")), + mustOpen(api("go1.3.txt")), + mustOpen(api("go1.4.txt")), + mustOpen(api("go1.5.txt")), + mustOpen(api("go1.6.txt")), + mustOpen(api("go1.7.txt")), + mustOpen(api("go1.8.txt")), + mustOpen(api("go1.9.txt")), + mustOpen(api("go1.10.txt")), + mustOpen(api("go1.11.txt")), + mustOpen(api("go1.12.txt")), + ) + sc := bufio.NewScanner(f) + + pkgs := map[string]map[string]bool{ + "unsafe": unsafeSyms, + } + paths := []string{"unsafe"} + + for sc.Scan() { + l := sc.Text() + has := func(v string) bool { return strings.Contains(l, v) } + if has("struct, ") || has("interface, ") || has(", method (") { + continue + } + if m := sym.FindStringSubmatch(l); m != nil { + path, sym := m[1], m[2] + + if _, ok := pkgs[path]; !ok { + pkgs[path] = map[string]bool{} + paths = append(paths, path) + } + pkgs[path][sym] = true + } + } + if err := sc.Err(); err != nil { + log.Fatal(err) + } + sort.Strings(paths) + for _, path := range paths { + outf("\t%q: map[string]bool{\n", path) + pkg := pkgs[path] + var syms []string + for sym := range pkg { + syms = append(syms, sym) + } + sort.Strings(syms) + for _, sym := range syms { + outf("\t\t%q: true,\n", sym) + } + outf("},\n") + } + outf("}\n") + fmtbuf, err := format.Source(buf.Bytes()) + if err != nil { + log.Fatal(err) + } + err = ioutil.WriteFile("zstdlib.go", fmtbuf, 0666) + if err != nil { + log.Fatal(err) + } +} diff --git a/vendor/modules.txt b/vendor/modules.txt index 262ea304de..535ec60fb5 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,16 +1,16 @@ # cloud.google.com/go v0.34.0 -cloud.google.com/go/compute/metadata cloud.google.com/go/monitoring/apiv3 cloud.google.com/go/trace/apiv2 +cloud.google.com/go/compute/metadata # contrib.go.opencensus.io/exporter/stackdriver v0.8.0 contrib.go.opencensus.io/exporter/stackdriver contrib.go.opencensus.io/exporter/stackdriver/monitoredresource # fortio.org/fortio v1.3.1 fortio.org/fortio/fhttp +fortio.org/fortio/stats fortio.org/fortio/fnet fortio.org/fortio/log fortio.org/fortio/periodic -fortio.org/fortio/stats fortio.org/fortio/version # github.com/PuerkitoBio/purell v1.1.0 github.com/PuerkitoBio/purell @@ -19,35 +19,35 @@ github.com/PuerkitoBio/urlesc # github.com/ahmetb/gen-crd-api-reference-docs v0.1.1 github.com/ahmetb/gen-crd-api-reference-docs # github.com/aws/aws-sdk-go v1.16.20 +github.com/aws/aws-sdk-go/aws/ec2metadata +github.com/aws/aws-sdk-go/aws/session github.com/aws/aws-sdk-go/aws github.com/aws/aws-sdk-go/aws/awserr -github.com/aws/aws-sdk-go/aws/awsutil github.com/aws/aws-sdk-go/aws/client github.com/aws/aws-sdk-go/aws/client/metadata github.com/aws/aws-sdk-go/aws/corehandlers +github.com/aws/aws-sdk-go/aws/request +github.com/aws/aws-sdk-go/internal/sdkuri github.com/aws/aws-sdk-go/aws/credentials -github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds -github.com/aws/aws-sdk-go/aws/credentials/endpointcreds github.com/aws/aws-sdk-go/aws/credentials/processcreds github.com/aws/aws-sdk-go/aws/credentials/stscreds github.com/aws/aws-sdk-go/aws/csm github.com/aws/aws-sdk-go/aws/defaults -github.com/aws/aws-sdk-go/aws/ec2metadata github.com/aws/aws-sdk-go/aws/endpoints -github.com/aws/aws-sdk-go/aws/request -github.com/aws/aws-sdk-go/aws/session -github.com/aws/aws-sdk-go/aws/signer/v4 github.com/aws/aws-sdk-go/internal/ini +github.com/aws/aws-sdk-go/internal/shareddefaults github.com/aws/aws-sdk-go/internal/sdkio github.com/aws/aws-sdk-go/internal/sdkrand -github.com/aws/aws-sdk-go/internal/sdkuri -github.com/aws/aws-sdk-go/internal/shareddefaults -github.com/aws/aws-sdk-go/private/protocol +github.com/aws/aws-sdk-go/aws/awsutil +github.com/aws/aws-sdk-go/service/sts +github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds +github.com/aws/aws-sdk-go/aws/credentials/endpointcreds +github.com/aws/aws-sdk-go/aws/signer/v4 github.com/aws/aws-sdk-go/private/protocol/query -github.com/aws/aws-sdk-go/private/protocol/query/queryutil github.com/aws/aws-sdk-go/private/protocol/rest +github.com/aws/aws-sdk-go/private/protocol/query/queryutil github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil -github.com/aws/aws-sdk-go/service/sts +github.com/aws/aws-sdk-go/private/protocol # github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 github.com/beorn7/perks/quantile # github.com/davecgh/go-spew v1.1.1 @@ -74,20 +74,16 @@ github.com/golang/glog # github.com/golang/groupcache v0.0.0-20171101203131-84a468cf14b4 github.com/golang/groupcache/lru # github.com/golang/protobuf v1.3.2 +github.com/golang/protobuf/protoc-gen-go github.com/golang/protobuf/descriptor -github.com/golang/protobuf/jsonpb github.com/golang/protobuf/proto -github.com/golang/protobuf/protoc-gen-go -github.com/golang/protobuf/protoc-gen-go/descriptor github.com/golang/protobuf/protoc-gen-go/generator -github.com/golang/protobuf/protoc-gen-go/generator/internal/remap github.com/golang/protobuf/protoc-gen-go/grpc github.com/golang/protobuf/protoc-gen-go/plugin -github.com/golang/protobuf/ptypes +github.com/golang/protobuf/jsonpb +github.com/golang/protobuf/protoc-gen-go/descriptor github.com/golang/protobuf/ptypes/any github.com/golang/protobuf/ptypes/duration -github.com/golang/protobuf/ptypes/empty -github.com/golang/protobuf/ptypes/struct github.com/golang/protobuf/ptypes/timestamp <<<<<<< HEAD github.com/golang/protobuf/protoc-gen-go/descriptor @@ -98,7 +94,14 @@ github.com/golang/protobuf/ptypes/struct github.com/golang/protobuf/ptypes/empty ======= github.com/golang/protobuf/ptypes/wrappers +<<<<<<< HEAD >>>>>>> Update GRPC to v1.20.1 +======= +github.com/golang/protobuf/ptypes +github.com/golang/protobuf/protoc-gen-go/generator/internal/remap +github.com/golang/protobuf/ptypes/struct +github.com/golang/protobuf/ptypes/empty +>>>>>>> go mod vendor # github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c github.com/google/btree # github.com/google/gofuzz v1.0.0 @@ -115,30 +118,30 @@ github.com/googleapis/gnostic/extensions github.com/gregjones/httpcache github.com/gregjones/httpcache/diskcache # github.com/grpc-ecosystem/grpc-gateway v1.11.3 -github.com/grpc-ecosystem/grpc-gateway/codegenerator -github.com/grpc-ecosystem/grpc-gateway/internal github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway +github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger +github.com/grpc-ecosystem/grpc-gateway/runtime +github.com/grpc-ecosystem/grpc-gateway/utilities +github.com/grpc-ecosystem/grpc-gateway/codegenerator github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/descriptor -github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/generator github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/gengateway -github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/httprule -github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/genswagger +github.com/grpc-ecosystem/grpc-gateway/internal +github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/httprule +github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/generator github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/options -github.com/grpc-ecosystem/grpc-gateway/runtime -github.com/grpc-ecosystem/grpc-gateway/utilities # github.com/hashicorp/golang-lru v0.5.1 github.com/hashicorp/golang-lru github.com/hashicorp/golang-lru/simplelru # github.com/hashicorp/hcl v1.0.0 github.com/hashicorp/hcl +github.com/hashicorp/hcl/hcl/printer github.com/hashicorp/hcl/hcl/ast github.com/hashicorp/hcl/hcl/parser -github.com/hashicorp/hcl/hcl/printer -github.com/hashicorp/hcl/hcl/scanner -github.com/hashicorp/hcl/hcl/strconv github.com/hashicorp/hcl/hcl/token github.com/hashicorp/hcl/json/parser +github.com/hashicorp/hcl/hcl/scanner +github.com/hashicorp/hcl/hcl/strconv github.com/hashicorp/hcl/json/scanner github.com/hashicorp/hcl/json/token # github.com/heptiolabs/healthcheck v0.0.0-20171201210846-da5fdee475fb @@ -156,9 +159,9 @@ github.com/konsorten/go-windows-terminal-sequences # github.com/magiconair/properties v1.8.0 github.com/magiconair/properties # github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329 -github.com/mailru/easyjson/buffer github.com/mailru/easyjson/jlexer github.com/mailru/easyjson/jwriter +github.com/mailru/easyjson/buffer # github.com/mattbaird/jsonpatch v0.0.0-20171005235357-81af80346b1a github.com/mattbaird/jsonpatch # github.com/matttproud/golang_protobuf_extensions v1.0.1 @@ -190,13 +193,13 @@ github.com/prometheus/client_golang/prometheus/testutil github.com/prometheus/client_model/go # github.com/prometheus/common v0.0.0-20181126121408-4724e9255275 github.com/prometheus/common/expfmt -github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg github.com/prometheus/common/model +github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg # github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a github.com/prometheus/procfs -github.com/prometheus/procfs/internal/util github.com/prometheus/procfs/nfs github.com/prometheus/procfs/xfs +github.com/prometheus/procfs/internal/util # github.com/russross/blackfriday/v2 v2.0.1 github.com/russross/blackfriday/v2 # github.com/shurcooL/sanitized_anchor_name v1.0.0 @@ -218,6 +221,7 @@ github.com/spf13/viper github.com/stretchr/testify/assert # go.opencensus.io v0.18.0 <<<<<<< HEAD +<<<<<<< HEAD go.opencensus.io/plugin/ochttp ======= go.opencensus.io @@ -248,19 +252,35 @@ go.opencensus.io/internal go.opencensus.io/trace >>>>>>> Update GRPC to v1.20.1 go.opencensus.io/trace/internal +======= +go.opencensus.io/plugin/ochttp +go.opencensus.io/stats/view +go.opencensus.io/stats +go.opencensus.io/tag +go.opencensus.io/exporter/prometheus +go.opencensus.io/plugin/ochttp/propagation/b3 +go.opencensus.io/trace +>>>>>>> go mod vendor go.opencensus.io/trace/propagation +go.opencensus.io/exemplar +go.opencensus.io/internal/tagencoding +go.opencensus.io/stats/internal +go.opencensus.io +go.opencensus.io/internal +go.opencensus.io/trace/internal go.opencensus.io/trace/tracestate +go.opencensus.io/plugin/ocgrpc # golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 golang.org/x/crypto/ssh/terminal # golang.org/x/net v0.0.0-20190311183353-d8887717615a golang.org/x/net/context -golang.org/x/net/context/ctxhttp -golang.org/x/net/http/httpguts golang.org/x/net/http2 +golang.org/x/net/trace +golang.org/x/net/http/httpguts golang.org/x/net/http2/hpack golang.org/x/net/idna golang.org/x/net/internal/timeseries -golang.org/x/net/trace +golang.org/x/net/context/ctxhttp # golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890 golang.org/x/oauth2/google golang.org/x/oauth2 @@ -278,81 +298,95 @@ golang.org/x/text/transform golang.org/x/text/unicode/norm ======= # golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db +<<<<<<< HEAD >>>>>>> Update GRPC to v1.20.1 golang.org/x/text/secure/bidirule +======= +>>>>>>> go mod vendor golang.org/x/text/transform -golang.org/x/text/unicode/bidi golang.org/x/text/unicode/norm +golang.org/x/text/secure/bidirule +golang.org/x/text/unicode/bidi golang.org/x/text/width # golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2 golang.org/x/time/rate # golang.org/x/tools v0.0.0-20190328211700-ab21143f2384 golang.org/x/tools/cmd/goimports +golang.org/x/tools/imports golang.org/x/tools/go/ast/astutil -golang.org/x/tools/go/gcexportdata -golang.org/x/tools/go/internal/gcimporter -golang.org/x/tools/go/internal/packagesdriver golang.org/x/tools/go/packages -golang.org/x/tools/imports -golang.org/x/tools/internal/fastwalk golang.org/x/tools/internal/gopathwalk golang.org/x/tools/internal/module +golang.org/x/tools/go/gcexportdata +golang.org/x/tools/go/internal/packagesdriver golang.org/x/tools/internal/semver +golang.org/x/tools/internal/fastwalk +golang.org/x/tools/go/internal/gcimporter # google.golang.org/api v0.0.0-20190117000611-43037ff31f69 -google.golang.org/api/googleapi/transport -google.golang.org/api/internal -google.golang.org/api/iterator google.golang.org/api/option google.golang.org/api/support/bundler +google.golang.org/api/iterator google.golang.org/api/transport +google.golang.org/api/internal google.golang.org/api/transport/grpc google.golang.org/api/transport/http +google.golang.org/api/googleapi/transport google.golang.org/api/transport/http/internal/propagation # google.golang.org/appengine v1.4.0 google.golang.org/appengine +google.golang.org/appengine/urlfetch google.golang.org/appengine/internal google.golang.org/appengine/internal/app_identity <<<<<<< HEAD +<<<<<<< HEAD google.golang.org/appengine/internal/modules google.golang.org/appengine/socket google.golang.org/appengine/internal/urlfetch ======= >>>>>>> Update GRPC to v1.20.1 +======= +google.golang.org/appengine/internal/modules +google.golang.org/appengine/internal/urlfetch +google.golang.org/appengine/socket +>>>>>>> go mod vendor google.golang.org/appengine/internal/base google.golang.org/appengine/internal/datastore google.golang.org/appengine/internal/log -google.golang.org/appengine/internal/modules google.golang.org/appengine/internal/remote_api google.golang.org/appengine/internal/socket -google.golang.org/appengine/internal/urlfetch -google.golang.org/appengine/socket -google.golang.org/appengine/urlfetch # google.golang.org/genproto v0.0.0-20191009194640-548a555dbc03 -google.golang.org/genproto/googleapis/api google.golang.org/genproto/googleapis/api/annotations +<<<<<<< HEAD google.golang.org/genproto/googleapis/rpc/status google.golang.org/genproto/googleapis/api/distribution +======= +>>>>>>> go mod vendor google.golang.org/genproto/googleapis/api/httpbody +google.golang.org/genproto/protobuf/field_mask +google.golang.org/genproto/googleapis/rpc/status +google.golang.org/genproto/googleapis/api/distribution google.golang.org/genproto/googleapis/api/label google.golang.org/genproto/googleapis/api/metric google.golang.org/genproto/googleapis/api/monitoredres google.golang.org/genproto/googleapis/devtools/cloudtrace/v2 google.golang.org/genproto/googleapis/monitoring/v3 +<<<<<<< HEAD google.golang.org/genproto/protobuf/field_mask +======= +google.golang.org/genproto/googleapis/api +>>>>>>> go mod vendor # google.golang.org/grpc v1.20.1 google.golang.org/grpc +google.golang.org/grpc/codes +google.golang.org/grpc/grpclog +google.golang.org/grpc/status +google.golang.org/grpc/metadata google.golang.org/grpc/balancer -google.golang.org/grpc/balancer/base google.golang.org/grpc/balancer/roundrobin -google.golang.org/grpc/binarylog/grpc_binarylog_v1 -google.golang.org/grpc/codes google.golang.org/grpc/connectivity google.golang.org/grpc/credentials -google.golang.org/grpc/credentials/internal -google.golang.org/grpc/credentials/oauth google.golang.org/grpc/encoding google.golang.org/grpc/encoding/proto -google.golang.org/grpc/grpclog google.golang.org/grpc/internal google.golang.org/grpc/internal/backoff google.golang.org/grpc/internal/balancerload @@ -361,28 +395,31 @@ google.golang.org/grpc/internal/channelz google.golang.org/grpc/internal/envconfig google.golang.org/grpc/internal/grpcrand google.golang.org/grpc/internal/grpcsync -google.golang.org/grpc/internal/syscall google.golang.org/grpc/internal/transport google.golang.org/grpc/keepalive -google.golang.org/grpc/metadata google.golang.org/grpc/naming google.golang.org/grpc/peer google.golang.org/grpc/resolver google.golang.org/grpc/resolver/dns google.golang.org/grpc/resolver/passthrough google.golang.org/grpc/stats -google.golang.org/grpc/status google.golang.org/grpc/tap <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> go mod vendor google.golang.org/grpc/balancer/base google.golang.org/grpc/credentials/internal google.golang.org/grpc/binarylog/grpc_binarylog_v1 google.golang.org/grpc/internal/syscall google.golang.org/grpc/credentials/oauth +<<<<<<< HEAD # gopkg.in/fsnotify.v1 v1.4.7 gopkg.in/fsnotify.v1 ======= >>>>>>> Update GRPC to v1.20.1 +======= +>>>>>>> go mod vendor # gopkg.in/inf.v0 v0.9.1 gopkg.in/inf.v0 # gopkg.in/natefinch/lumberjack.v2 v2.0.0-20170531160350-a96e63847dc3 @@ -397,15 +434,21 @@ k8s.io/api/admissionregistration/v1beta1 k8s.io/api/extensions/v1beta1 ======= # k8s.io/api v0.0.0-20190708094356-59223ed9f6ce +<<<<<<< HEAD >>>>>>> Update GRPC to v1.20.1 +======= +k8s.io/api/apps/v1 +k8s.io/api/core/v1 +k8s.io/api/admissionregistration/v1beta1 +k8s.io/api/extensions/v1beta1 +>>>>>>> go mod vendor k8s.io/api/admission/v1beta1 k8s.io/api/rbac/v1 k8s.io/api/admissionregistration/v1alpha1 -k8s.io/api/admissionregistration/v1beta1 -k8s.io/api/apps/v1 k8s.io/api/apps/v1beta1 k8s.io/api/apps/v1beta2 <<<<<<< HEAD +<<<<<<< HEAD k8s.io/api/auditregistration/v1alpha1 ======= k8s.io/api/authentication/v1 @@ -413,6 +456,8 @@ k8s.io/api/authentication/v1beta1 k8s.io/api/authorization/v1 k8s.io/api/authorization/v1beta1 >>>>>>> Update GRPC to v1.20.1 +======= +>>>>>>> go mod vendor k8s.io/api/autoscaling/v1 k8s.io/api/autoscaling/v2beta1 k8s.io/api/autoscaling/v2beta2 @@ -421,9 +466,7 @@ k8s.io/api/batch/v1beta1 k8s.io/api/batch/v2alpha1 k8s.io/api/certificates/v1beta1 k8s.io/api/coordination/v1beta1 -k8s.io/api/core/v1 k8s.io/api/events/v1beta1 -k8s.io/api/extensions/v1beta1 k8s.io/api/networking/v1 k8s.io/api/policy/v1beta1 k8s.io/api/rbac/v1alpha1 @@ -435,10 +478,14 @@ k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> go mod vendor k8s.io/api/authentication/v1 k8s.io/api/authentication/v1beta1 k8s.io/api/authorization/v1 k8s.io/api/authorization/v1beta1 +<<<<<<< HEAD # k8s.io/apiextensions-apiserver v0.0.0-20191004105443-a7d558db75c6 k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1 @@ -447,10 +494,15 @@ k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextension k8s.io/apiextensions-apiserver/pkg/apis/apiextensions >>>>>>> Update GRPC to v1.20.1 k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1 +======= +# k8s.io/apiextensions-apiserver v0.0.0-20190708094842-2e94e9ac9840 +>>>>>>> go mod vendor k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset +k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1 +k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1 k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme -k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1 +k8s.io/apiextensions-apiserver/pkg/apis/apiextensions k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake <<<<<<< HEAD # k8s.io/apimachinery v0.0.0-20191004074956-01f8b7d1121a => ./vendor_fixes/k8s.io/apimachinery @@ -462,12 +514,9 @@ k8s.io/apimachinery/pkg/util/clock k8s.io/apimachinery/pkg/util/wait ======= # k8s.io/apimachinery v0.0.0-20190221084156-01f179d85dbc => ./vendor_fixes/k8s.io/apimachinery -k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors -k8s.io/apimachinery/pkg/api/meta -k8s.io/apimachinery/pkg/api/resource -k8s.io/apimachinery/pkg/apis/meta/internalversion k8s.io/apimachinery/pkg/apis/meta/v1 +<<<<<<< HEAD k8s.io/apimachinery/pkg/apis/meta/v1/unstructured k8s.io/apimachinery/pkg/apis/meta/v1beta1 k8s.io/apimachinery/pkg/conversion @@ -477,6 +526,14 @@ k8s.io/apimachinery/pkg/fields k8s.io/apimachinery/pkg/labels k8s.io/apimachinery/pkg/runtime/schema <<<<<<< HEAD +======= +k8s.io/apimachinery/pkg/runtime +k8s.io/apimachinery/pkg/api/resource +k8s.io/apimachinery/pkg/util/clock +k8s.io/apimachinery/pkg/util/wait +k8s.io/apimachinery/pkg/labels +k8s.io/apimachinery/pkg/runtime/schema +>>>>>>> go mod vendor k8s.io/apimachinery/pkg/util/intstr k8s.io/apimachinery/pkg/util/validation k8s.io/apimachinery/pkg/types @@ -498,39 +555,29 @@ k8s.io/apimachinery/pkg/util/sets k8s.io/apimachinery/pkg/runtime/serializer/streaming k8s.io/apimachinery/pkg/util/net k8s.io/apimachinery/pkg/version +<<<<<<< HEAD ======= k8s.io/apimachinery/pkg/runtime/serializer >>>>>>> Update GRPC to v1.20.1 +======= +>>>>>>> go mod vendor k8s.io/apimachinery/pkg/runtime/serializer/json k8s.io/apimachinery/pkg/runtime/serializer/protobuf k8s.io/apimachinery/pkg/runtime/serializer/recognizer -k8s.io/apimachinery/pkg/runtime/serializer/streaming k8s.io/apimachinery/pkg/runtime/serializer/versioning -k8s.io/apimachinery/pkg/selection -k8s.io/apimachinery/pkg/types +k8s.io/apimachinery/pkg/api/meta +k8s.io/apimachinery/pkg/util/strategicpatch k8s.io/apimachinery/pkg/util/cache -k8s.io/apimachinery/pkg/util/clock k8s.io/apimachinery/pkg/util/diff -k8s.io/apimachinery/pkg/util/errors +k8s.io/apimachinery/pkg/util/rand +k8s.io/apimachinery/third_party/forked/golang/reflect k8s.io/apimachinery/pkg/util/framer -k8s.io/apimachinery/pkg/util/intstr -k8s.io/apimachinery/pkg/util/json +k8s.io/apimachinery/pkg/apis/meta/v1/unstructured +k8s.io/apimachinery/pkg/apis/meta/v1beta1 k8s.io/apimachinery/pkg/util/mergepatch -k8s.io/apimachinery/pkg/util/naming -k8s.io/apimachinery/pkg/util/net -k8s.io/apimachinery/pkg/util/rand -k8s.io/apimachinery/pkg/util/runtime -k8s.io/apimachinery/pkg/util/sets -k8s.io/apimachinery/pkg/util/strategicpatch -k8s.io/apimachinery/pkg/util/uuid -k8s.io/apimachinery/pkg/util/validation -k8s.io/apimachinery/pkg/util/validation/field -k8s.io/apimachinery/pkg/util/wait -k8s.io/apimachinery/pkg/util/yaml -k8s.io/apimachinery/pkg/version -k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json <<<<<<< HEAD +<<<<<<< HEAD k8s.io/apimachinery/pkg/apis/meta/internalversion # k8s.io/client-go v0.0.0-20191004102537-eb5b9a8cfde7 k8s.io/client-go/informers @@ -542,9 +589,22 @@ k8s.io/client-go/kubernetes/scheme k8s.io/apimachinery/third_party/forked/golang/reflect # k8s.io/client-go v9.0.0+incompatible >>>>>>> Update GRPC to v1.20.1 +======= +k8s.io/apimachinery/pkg/apis/meta/internalversion +# k8s.io/client-go v9.0.0+incompatible +k8s.io/client-go/informers +k8s.io/client-go/kubernetes +k8s.io/client-go/rest +k8s.io/client-go/tools/clientcmd +k8s.io/client-go/kubernetes/scheme +>>>>>>> go mod vendor k8s.io/client-go/discovery +k8s.io/client-go/util/flowcontrol k8s.io/client-go/discovery/fake <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> go mod vendor k8s.io/client-go/testing k8s.io/client-go/tools/cache k8s.io/client-go/kubernetes/typed/core/v1 @@ -555,61 +615,41 @@ k8s.io/client-go/util/workqueue k8s.io/client-go/tools/metrics k8s.io/client-go/kubernetes/fake k8s.io/client-go/plugin/pkg/client/auth/gcp +<<<<<<< HEAD ======= k8s.io/client-go/informers >>>>>>> Update GRPC to v1.20.1 +======= +>>>>>>> go mod vendor k8s.io/client-go/informers/admissionregistration -k8s.io/client-go/informers/admissionregistration/v1alpha1 -k8s.io/client-go/informers/admissionregistration/v1beta1 k8s.io/client-go/informers/apps <<<<<<< HEAD +<<<<<<< HEAD k8s.io/client-go/informers/auditregistration ======= k8s.io/client-go/informers/apps/v1 k8s.io/client-go/informers/apps/v1beta1 k8s.io/client-go/informers/apps/v1beta2 >>>>>>> Update GRPC to v1.20.1 +======= +>>>>>>> go mod vendor k8s.io/client-go/informers/autoscaling -k8s.io/client-go/informers/autoscaling/v1 -k8s.io/client-go/informers/autoscaling/v2beta1 -k8s.io/client-go/informers/autoscaling/v2beta2 k8s.io/client-go/informers/batch -k8s.io/client-go/informers/batch/v1 -k8s.io/client-go/informers/batch/v1beta1 -k8s.io/client-go/informers/batch/v2alpha1 k8s.io/client-go/informers/certificates -k8s.io/client-go/informers/certificates/v1beta1 k8s.io/client-go/informers/coordination -k8s.io/client-go/informers/coordination/v1beta1 k8s.io/client-go/informers/core -k8s.io/client-go/informers/core/v1 k8s.io/client-go/informers/events -k8s.io/client-go/informers/events/v1beta1 k8s.io/client-go/informers/extensions -k8s.io/client-go/informers/extensions/v1beta1 k8s.io/client-go/informers/internalinterfaces k8s.io/client-go/informers/networking -k8s.io/client-go/informers/networking/v1 k8s.io/client-go/informers/policy -k8s.io/client-go/informers/policy/v1beta1 k8s.io/client-go/informers/rbac -k8s.io/client-go/informers/rbac/v1 -k8s.io/client-go/informers/rbac/v1alpha1 -k8s.io/client-go/informers/rbac/v1beta1 k8s.io/client-go/informers/scheduling -k8s.io/client-go/informers/scheduling/v1alpha1 -k8s.io/client-go/informers/scheduling/v1beta1 k8s.io/client-go/informers/settings -k8s.io/client-go/informers/settings/v1alpha1 k8s.io/client-go/informers/storage -k8s.io/client-go/informers/storage/v1 -k8s.io/client-go/informers/storage/v1alpha1 -k8s.io/client-go/informers/storage/v1beta1 -k8s.io/client-go/kubernetes -k8s.io/client-go/kubernetes/fake -k8s.io/client-go/kubernetes/scheme k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1 <<<<<<< HEAD +<<<<<<< HEAD k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1 k8s.io/client-go/kubernetes/typed/apps/v1 k8s.io/client-go/kubernetes/typed/apps/v1beta1 @@ -657,13 +697,13 @@ k8s.io/client-go/tools/reference ======= >>>>>>> Update GRPC to v1.20.1 k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/fake +======= +>>>>>>> go mod vendor k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1 -k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1/fake k8s.io/client-go/kubernetes/typed/apps/v1 -k8s.io/client-go/kubernetes/typed/apps/v1/fake k8s.io/client-go/kubernetes/typed/apps/v1beta1 -k8s.io/client-go/kubernetes/typed/apps/v1beta1/fake k8s.io/client-go/kubernetes/typed/apps/v1beta2 +<<<<<<< HEAD k8s.io/client-go/kubernetes/typed/apps/v1beta2/fake <<<<<<< HEAD k8s.io/client-go/kubernetes/typed/auditregistration/v1alpha1/fake @@ -671,64 +711,92 @@ k8s.io/client-go/kubernetes/typed/auditregistration/v1alpha1/fake k8s.io/client-go/kubernetes/typed/authentication/v1 >>>>>>> Update GRPC to v1.20.1 k8s.io/client-go/kubernetes/typed/authentication/v1/fake +======= +k8s.io/client-go/kubernetes/typed/authentication/v1 +>>>>>>> go mod vendor k8s.io/client-go/kubernetes/typed/authentication/v1beta1 -k8s.io/client-go/kubernetes/typed/authentication/v1beta1/fake k8s.io/client-go/kubernetes/typed/authorization/v1 -k8s.io/client-go/kubernetes/typed/authorization/v1/fake k8s.io/client-go/kubernetes/typed/authorization/v1beta1 -k8s.io/client-go/kubernetes/typed/authorization/v1beta1/fake k8s.io/client-go/kubernetes/typed/autoscaling/v1 -k8s.io/client-go/kubernetes/typed/autoscaling/v1/fake k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1 -k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1/fake k8s.io/client-go/kubernetes/typed/autoscaling/v2beta2 -k8s.io/client-go/kubernetes/typed/autoscaling/v2beta2/fake k8s.io/client-go/kubernetes/typed/batch/v1 -k8s.io/client-go/kubernetes/typed/batch/v1/fake k8s.io/client-go/kubernetes/typed/batch/v1beta1 -k8s.io/client-go/kubernetes/typed/batch/v1beta1/fake k8s.io/client-go/kubernetes/typed/batch/v2alpha1 -k8s.io/client-go/kubernetes/typed/batch/v2alpha1/fake k8s.io/client-go/kubernetes/typed/certificates/v1beta1 -k8s.io/client-go/kubernetes/typed/certificates/v1beta1/fake k8s.io/client-go/kubernetes/typed/coordination/v1beta1 +k8s.io/client-go/kubernetes/typed/events/v1beta1 +k8s.io/client-go/kubernetes/typed/extensions/v1beta1 +k8s.io/client-go/kubernetes/typed/networking/v1 +k8s.io/client-go/kubernetes/typed/policy/v1beta1 +k8s.io/client-go/kubernetes/typed/rbac/v1 +k8s.io/client-go/kubernetes/typed/rbac/v1alpha1 +k8s.io/client-go/kubernetes/typed/rbac/v1beta1 +k8s.io/client-go/kubernetes/typed/scheduling/v1alpha1 +k8s.io/client-go/kubernetes/typed/scheduling/v1beta1 +k8s.io/client-go/kubernetes/typed/settings/v1alpha1 +k8s.io/client-go/kubernetes/typed/storage/v1 +k8s.io/client-go/kubernetes/typed/storage/v1alpha1 +k8s.io/client-go/kubernetes/typed/storage/v1beta1 +k8s.io/client-go/pkg/version +k8s.io/client-go/plugin/pkg/client/auth/exec +k8s.io/client-go/rest/watch +k8s.io/client-go/tools/clientcmd/api +k8s.io/client-go/transport +k8s.io/client-go/util/cert +k8s.io/client-go/tools/auth +k8s.io/client-go/tools/clientcmd/api/latest +k8s.io/client-go/util/homedir +k8s.io/client-go/util/integer +k8s.io/client-go/tools/pager +k8s.io/client-go/util/buffer +k8s.io/client-go/util/retry +k8s.io/client-go/tools/reference +k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/fake +k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1/fake +k8s.io/client-go/kubernetes/typed/apps/v1/fake +k8s.io/client-go/kubernetes/typed/apps/v1beta1/fake +k8s.io/client-go/kubernetes/typed/apps/v1beta2/fake +k8s.io/client-go/kubernetes/typed/authentication/v1/fake +k8s.io/client-go/kubernetes/typed/authentication/v1beta1/fake +k8s.io/client-go/kubernetes/typed/authorization/v1/fake +k8s.io/client-go/kubernetes/typed/authorization/v1beta1/fake +k8s.io/client-go/kubernetes/typed/autoscaling/v1/fake +k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1/fake +k8s.io/client-go/kubernetes/typed/autoscaling/v2beta2/fake +k8s.io/client-go/kubernetes/typed/batch/v1/fake +k8s.io/client-go/kubernetes/typed/batch/v1beta1/fake +k8s.io/client-go/kubernetes/typed/batch/v2alpha1/fake +k8s.io/client-go/kubernetes/typed/certificates/v1beta1/fake k8s.io/client-go/kubernetes/typed/coordination/v1beta1/fake -k8s.io/client-go/kubernetes/typed/core/v1 k8s.io/client-go/kubernetes/typed/core/v1/fake -k8s.io/client-go/kubernetes/typed/events/v1beta1 k8s.io/client-go/kubernetes/typed/events/v1beta1/fake -k8s.io/client-go/kubernetes/typed/extensions/v1beta1 k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake -k8s.io/client-go/kubernetes/typed/networking/v1 k8s.io/client-go/kubernetes/typed/networking/v1/fake -k8s.io/client-go/kubernetes/typed/policy/v1beta1 k8s.io/client-go/kubernetes/typed/policy/v1beta1/fake -k8s.io/client-go/kubernetes/typed/rbac/v1 k8s.io/client-go/kubernetes/typed/rbac/v1/fake -k8s.io/client-go/kubernetes/typed/rbac/v1alpha1 k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/fake -k8s.io/client-go/kubernetes/typed/rbac/v1beta1 k8s.io/client-go/kubernetes/typed/rbac/v1beta1/fake -k8s.io/client-go/kubernetes/typed/scheduling/v1alpha1 k8s.io/client-go/kubernetes/typed/scheduling/v1alpha1/fake -k8s.io/client-go/kubernetes/typed/scheduling/v1beta1 k8s.io/client-go/kubernetes/typed/scheduling/v1beta1/fake -k8s.io/client-go/kubernetes/typed/settings/v1alpha1 k8s.io/client-go/kubernetes/typed/settings/v1alpha1/fake -k8s.io/client-go/kubernetes/typed/storage/v1 k8s.io/client-go/kubernetes/typed/storage/v1/fake -k8s.io/client-go/kubernetes/typed/storage/v1alpha1 k8s.io/client-go/kubernetes/typed/storage/v1alpha1/fake -k8s.io/client-go/kubernetes/typed/storage/v1beta1 k8s.io/client-go/kubernetes/typed/storage/v1beta1/fake <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> go mod vendor k8s.io/client-go/util/jsonpath k8s.io/client-go/informers/admissionregistration/v1alpha1 k8s.io/client-go/informers/admissionregistration/v1beta1 k8s.io/client-go/informers/apps/v1 k8s.io/client-go/informers/apps/v1beta1 k8s.io/client-go/informers/apps/v1beta2 +<<<<<<< HEAD k8s.io/client-go/informers/auditregistration/v1alpha1 +======= +>>>>>>> go mod vendor k8s.io/client-go/informers/autoscaling/v1 k8s.io/client-go/informers/autoscaling/v2beta1 k8s.io/client-go/informers/autoscaling/v2beta2 @@ -756,8 +824,11 @@ k8s.io/client-go/pkg/apis/clientauthentication/v1beta1 k8s.io/client-go/util/connrotation k8s.io/client-go/tools/clientcmd/api/v1 k8s.io/client-go/third_party/forked/golang/template +<<<<<<< HEAD ======= >>>>>>> Update GRPC to v1.20.1 +======= +>>>>>>> go mod vendor k8s.io/client-go/listers/admissionregistration/v1alpha1 k8s.io/client-go/listers/admissionregistration/v1beta1 k8s.io/client-go/listers/apps/v1 @@ -772,7 +843,6 @@ k8s.io/client-go/listers/batch/v1beta1 k8s.io/client-go/listers/batch/v2alpha1 k8s.io/client-go/listers/certificates/v1beta1 k8s.io/client-go/listers/coordination/v1beta1 -k8s.io/client-go/listers/core/v1 k8s.io/client-go/listers/events/v1beta1 k8s.io/client-go/listers/extensions/v1beta1 k8s.io/client-go/listers/networking/v1 @@ -786,36 +856,6 @@ k8s.io/client-go/listers/settings/v1alpha1 k8s.io/client-go/listers/storage/v1 k8s.io/client-go/listers/storage/v1alpha1 k8s.io/client-go/listers/storage/v1beta1 -k8s.io/client-go/pkg/apis/clientauthentication -k8s.io/client-go/pkg/apis/clientauthentication/v1alpha1 -k8s.io/client-go/pkg/apis/clientauthentication/v1beta1 -k8s.io/client-go/pkg/version -k8s.io/client-go/plugin/pkg/client/auth/exec -k8s.io/client-go/plugin/pkg/client/auth/gcp -k8s.io/client-go/rest -k8s.io/client-go/rest/watch -k8s.io/client-go/testing -k8s.io/client-go/third_party/forked/golang/template -k8s.io/client-go/tools/auth -k8s.io/client-go/tools/cache -k8s.io/client-go/tools/clientcmd -k8s.io/client-go/tools/clientcmd/api -k8s.io/client-go/tools/clientcmd/api/latest -k8s.io/client-go/tools/clientcmd/api/v1 -k8s.io/client-go/tools/metrics -k8s.io/client-go/tools/pager -k8s.io/client-go/tools/record -k8s.io/client-go/tools/reference -k8s.io/client-go/transport -k8s.io/client-go/util/buffer -k8s.io/client-go/util/cert -k8s.io/client-go/util/connrotation -k8s.io/client-go/util/flowcontrol -k8s.io/client-go/util/homedir -k8s.io/client-go/util/integer -k8s.io/client-go/util/jsonpath -k8s.io/client-go/util/retry -k8s.io/client-go/util/workqueue # k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6 k8s.io/gengo/parser k8s.io/gengo/types From 3d3bad5efbb6158d5687ead96204ac33fb6cac6f Mon Sep 17 00:00:00 2001 From: Cyril Tovena Date: Tue, 5 Nov 2019 19:20:23 -0500 Subject: [PATCH 5/9] bump the sha of the base dockerfile to force a rebuild --- build/build-sdk-images/tool/base/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/build-sdk-images/tool/base/Dockerfile b/build/build-sdk-images/tool/base/Dockerfile index ec92133e45..5004f555a3 100644 --- a/build/build-sdk-images/tool/base/Dockerfile +++ b/build/build-sdk-images/tool/base/Dockerfile @@ -14,7 +14,7 @@ # -# Base images for SDKs +# Base images for SDKs Bump: 1 # FROM debian:stretch From a451922e4bd919e5615dd505d9553cf5f8c7ceb3 Mon Sep 17 00:00:00 2001 From: Cyril Tovena Date: Sat, 23 Nov 2019 20:29:12 -0500 Subject: [PATCH 6/9] Fixed conflict and regen everything. Signed-off-by: Cyril Tovena --- go.mod | 2 +- pkg/sdk/sdk.pb.go | 22 +- sdks/cpp/include/agones/sdk.pb.h | 1872 ++++++---- sdks/cpp/include/google/api/annotations.pb.h | 40 +- sdks/cpp/include/google/api/http.pb.h | 1406 ++++--- sdks/cpp/src/agones/sdk.pb.cc | 3267 +++++------------ sdks/cpp/src/google/annotations.pb.cc | 67 +- sdks/cpp/src/google/http.pb.cc | 1610 +++----- sdks/nodejs/lib/google/api/annotations_pb.js | 1 + sdks/nodejs/lib/google/api/http_pb.js | 178 +- sdks/nodejs/lib/sdk_pb.js | 337 +- sdks/rust/src/grpc/sdk.rs | 211 +- vendor/github.com/google/btree/btree_mem.go | 76 - vendor/golang.org/x/sys/unix/mkasm_darwin.go | 61 - vendor/golang.org/x/sys/unix/mkpost.go | 106 - .../x/sys/unix/mksyscall_aix_ppc.go | 404 -- .../x/sys/unix/mksyscall_aix_ppc64.go | 602 --- .../x/sys/unix/mksyscall_solaris.go | 335 -- vendor/golang.org/x/sys/unix/mksysnum.go | 190 - vendor/golang.org/x/sys/unix/types_aix.go | 236 -- vendor/golang.org/x/sys/unix/types_darwin.go | 277 -- .../golang.org/x/sys/unix/types_dragonfly.go | 263 -- vendor/golang.org/x/sys/unix/types_freebsd.go | 356 -- vendor/golang.org/x/sys/unix/types_netbsd.go | 289 -- vendor/golang.org/x/sys/unix/types_openbsd.go | 276 -- vendor/golang.org/x/sys/unix/types_solaris.go | 266 -- .../x/text/unicode/bidi/gen_trieval.go | 64 - .../golang.org/x/text/unicode/norm/triegen.go | 117 - vendor/golang.org/x/text/width/gen.go | 115 - vendor/golang.org/x/text/width/gen_common.go | 96 - vendor/golang.org/x/text/width/gen_trieval.go | 34 - .../x/tools/go/gcexportdata/main.go | 99 - vendor/golang.org/x/tools/imports/mkindex.go | 173 - vendor/golang.org/x/tools/imports/mkstdlib.go | 112 - vendor/modules.txt | 394 +- 35 files changed, 4054 insertions(+), 9900 deletions(-) delete mode 100644 vendor/github.com/google/btree/btree_mem.go delete mode 100644 vendor/golang.org/x/sys/unix/mkasm_darwin.go delete mode 100644 vendor/golang.org/x/sys/unix/mkpost.go delete mode 100644 vendor/golang.org/x/sys/unix/mksyscall_aix_ppc.go delete mode 100644 vendor/golang.org/x/sys/unix/mksyscall_aix_ppc64.go delete mode 100644 vendor/golang.org/x/sys/unix/mksyscall_solaris.go delete mode 100644 vendor/golang.org/x/sys/unix/mksysnum.go delete mode 100644 vendor/golang.org/x/sys/unix/types_aix.go delete mode 100644 vendor/golang.org/x/sys/unix/types_darwin.go delete mode 100644 vendor/golang.org/x/sys/unix/types_dragonfly.go delete mode 100644 vendor/golang.org/x/sys/unix/types_freebsd.go delete mode 100644 vendor/golang.org/x/sys/unix/types_netbsd.go delete mode 100644 vendor/golang.org/x/sys/unix/types_openbsd.go delete mode 100644 vendor/golang.org/x/sys/unix/types_solaris.go delete mode 100644 vendor/golang.org/x/text/unicode/bidi/gen_trieval.go delete mode 100644 vendor/golang.org/x/text/unicode/norm/triegen.go delete mode 100644 vendor/golang.org/x/text/width/gen.go delete mode 100644 vendor/golang.org/x/text/width/gen_common.go delete mode 100644 vendor/golang.org/x/text/width/gen_trieval.go delete mode 100644 vendor/golang.org/x/tools/go/gcexportdata/main.go delete mode 100644 vendor/golang.org/x/tools/imports/mkindex.go delete mode 100644 vendor/golang.org/x/tools/imports/mkstdlib.go diff --git a/go.mod b/go.mod index 099c449379..88ffcad6bf 100644 --- a/go.mod +++ b/go.mod @@ -43,10 +43,10 @@ require ( golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384 google.golang.org/api v0.0.0-20190117000611-43037ff31f69 // indirect - google.golang.org/appengine v1.4.0 // indirect google.golang.org/genproto v0.0.0-20191009194640-548a555dbc03 google.golang.org/grpc v1.20.1 gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0 // indirect + gopkg.in/fsnotify.v1 v1.4.7 gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/natefinch/lumberjack.v2 v2.0.0-20170531160350-a96e63847dc3 gopkg.in/yaml.v2 v2.2.2 diff --git a/pkg/sdk/sdk.pb.go b/pkg/sdk/sdk.pb.go index 5b2ac72eb9..b1fe512b00 100644 --- a/pkg/sdk/sdk.pb.go +++ b/pkg/sdk/sdk.pb.go @@ -54,7 +54,7 @@ func (m *Empty) Reset() { *m = Empty{} } func (m *Empty) String() string { return proto.CompactTextString(m) } func (*Empty) ProtoMessage() {} func (*Empty) Descriptor() ([]byte, []int) { - return fileDescriptor_sdk_74162870a323c7c1, []int{0} + return fileDescriptor_sdk_a78acec69435dcb9, []int{0} } func (m *Empty) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Empty.Unmarshal(m, b) @@ -87,7 +87,7 @@ func (m *KeyValue) Reset() { *m = KeyValue{} } func (m *KeyValue) String() string { return proto.CompactTextString(m) } func (*KeyValue) ProtoMessage() {} func (*KeyValue) Descriptor() ([]byte, []int) { - return fileDescriptor_sdk_74162870a323c7c1, []int{1} + return fileDescriptor_sdk_a78acec69435dcb9, []int{1} } func (m *KeyValue) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_KeyValue.Unmarshal(m, b) @@ -133,7 +133,7 @@ func (m *Duration) Reset() { *m = Duration{} } func (m *Duration) String() string { return proto.CompactTextString(m) } func (*Duration) ProtoMessage() {} func (*Duration) Descriptor() ([]byte, []int) { - return fileDescriptor_sdk_74162870a323c7c1, []int{2} + return fileDescriptor_sdk_a78acec69435dcb9, []int{2} } func (m *Duration) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Duration.Unmarshal(m, b) @@ -176,7 +176,7 @@ func (m *GameServer) Reset() { *m = GameServer{} } func (m *GameServer) String() string { return proto.CompactTextString(m) } func (*GameServer) ProtoMessage() {} func (*GameServer) Descriptor() ([]byte, []int) { - return fileDescriptor_sdk_74162870a323c7c1, []int{3} + return fileDescriptor_sdk_a78acec69435dcb9, []int{3} } func (m *GameServer) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GameServer.Unmarshal(m, b) @@ -239,7 +239,7 @@ func (m *GameServer_ObjectMeta) Reset() { *m = GameServer_ObjectMeta{} } func (m *GameServer_ObjectMeta) String() string { return proto.CompactTextString(m) } func (*GameServer_ObjectMeta) ProtoMessage() {} func (*GameServer_ObjectMeta) Descriptor() ([]byte, []int) { - return fileDescriptor_sdk_74162870a323c7c1, []int{3, 0} + return fileDescriptor_sdk_a78acec69435dcb9, []int{3, 0} } func (m *GameServer_ObjectMeta) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GameServer_ObjectMeta.Unmarshal(m, b) @@ -333,7 +333,7 @@ func (m *GameServer_Spec) Reset() { *m = GameServer_Spec{} } func (m *GameServer_Spec) String() string { return proto.CompactTextString(m) } func (*GameServer_Spec) ProtoMessage() {} func (*GameServer_Spec) Descriptor() ([]byte, []int) { - return fileDescriptor_sdk_74162870a323c7c1, []int{3, 1} + return fileDescriptor_sdk_a78acec69435dcb9, []int{3, 1} } func (m *GameServer_Spec) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GameServer_Spec.Unmarshal(m, b) @@ -374,7 +374,7 @@ func (m *GameServer_Spec_Health) Reset() { *m = GameServer_Spec_Health{} func (m *GameServer_Spec_Health) String() string { return proto.CompactTextString(m) } func (*GameServer_Spec_Health) ProtoMessage() {} func (*GameServer_Spec_Health) Descriptor() ([]byte, []int) { - return fileDescriptor_sdk_74162870a323c7c1, []int{3, 1, 0} + return fileDescriptor_sdk_a78acec69435dcb9, []int{3, 1, 0} } func (m *GameServer_Spec_Health) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GameServer_Spec_Health.Unmarshal(m, b) @@ -435,7 +435,7 @@ func (m *GameServer_Status) Reset() { *m = GameServer_Status{} } func (m *GameServer_Status) String() string { return proto.CompactTextString(m) } func (*GameServer_Status) ProtoMessage() {} func (*GameServer_Status) Descriptor() ([]byte, []int) { - return fileDescriptor_sdk_74162870a323c7c1, []int{3, 2} + return fileDescriptor_sdk_a78acec69435dcb9, []int{3, 2} } func (m *GameServer_Status) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GameServer_Status.Unmarshal(m, b) @@ -488,7 +488,7 @@ func (m *GameServer_Status_Port) Reset() { *m = GameServer_Status_Port{} func (m *GameServer_Status_Port) String() string { return proto.CompactTextString(m) } func (*GameServer_Status_Port) ProtoMessage() {} func (*GameServer_Status_Port) Descriptor() ([]byte, []int) { - return fileDescriptor_sdk_74162870a323c7c1, []int{3, 2, 0} + return fileDescriptor_sdk_a78acec69435dcb9, []int{3, 2, 0} } func (m *GameServer_Status_Port) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GameServer_Status_Port.Unmarshal(m, b) @@ -952,9 +952,9 @@ var _SDK_serviceDesc = grpc.ServiceDesc{ Metadata: "sdk.proto", } -func init() { proto.RegisterFile("sdk.proto", fileDescriptor_sdk_74162870a323c7c1) } +func init() { proto.RegisterFile("sdk.proto", fileDescriptor_sdk_a78acec69435dcb9) } -var fileDescriptor_sdk_74162870a323c7c1 = []byte{ +var fileDescriptor_sdk_a78acec69435dcb9 = []byte{ // 843 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0x5f, 0x8f, 0xdb, 0x44, 0x10, 0xc0, 0xe5, 0x4b, 0xe2, 0x24, 0x13, 0xee, 0xdf, 0xde, 0x55, 0x72, 0xad, 0x8a, 0x16, 0x8b, diff --git a/sdks/cpp/include/agones/sdk.pb.h b/sdks/cpp/include/agones/sdk.pb.h index e00103961e..99e310241e 100644 --- a/sdks/cpp/include/agones/sdk.pb.h +++ b/sdks/cpp/include/agones/sdk.pb.h @@ -16,19 +16,19 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: sdk.proto -#ifndef PROTOBUF_INCLUDED_sdk_2eproto -#define PROTOBUF_INCLUDED_sdk_2eproto +#ifndef GOOGLE_PROTOBUF_INCLUDED_sdk_2eproto +#define GOOGLE_PROTOBUF_INCLUDED_sdk_2eproto #include #include #include -#if PROTOBUF_VERSION < 3007000 +#if PROTOBUF_VERSION < 3010000 #error This file was generated by a newer version of protoc which is #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3007000 < PROTOBUF_MIN_PROTOC_VERSION +#if 3010001 < PROTOBUF_MIN_PROTOC_VERSION #error This file was generated by an older version of protoc which is #error incompatible with your Protocol Buffer headers. Please #error regenerate this file with a newer version of protoc. @@ -42,6 +42,7 @@ #include #include #include +#include #include #include // IWYU pragma: export #include // IWYU pragma: export @@ -53,20 +54,25 @@ // @@protoc_insertion_point(includes) #include #define PROTOBUF_INTERNAL_EXPORT_sdk_2eproto AGONES_EXPORT +PROTOBUF_NAMESPACE_OPEN +namespace internal { +class AnyMetadata; +} // namespace internal +PROTOBUF_NAMESPACE_CLOSE // Internal implementation detail -- do not use these members. struct AGONES_EXPORT TableStruct_sdk_2eproto { - static const ::google::protobuf::internal::ParseTableField entries[] + static const ::PROTOBUF_NAMESPACE_ID::internal::ParseTableField entries[] PROTOBUF_SECTION_VARIABLE(protodesc_cold); - static const ::google::protobuf::internal::AuxillaryParseTableField aux[] + static const ::PROTOBUF_NAMESPACE_ID::internal::AuxillaryParseTableField aux[] PROTOBUF_SECTION_VARIABLE(protodesc_cold); - static const ::google::protobuf::internal::ParseTable schema[11] + static const ::PROTOBUF_NAMESPACE_ID::internal::ParseTable schema[11] PROTOBUF_SECTION_VARIABLE(protodesc_cold); - static const ::google::protobuf::internal::FieldMetadata field_metadata[]; - static const ::google::protobuf::internal::SerializationTable serialization_table[]; - static const ::google::protobuf::uint32 offsets[]; + static const ::PROTOBUF_NAMESPACE_ID::internal::FieldMetadata field_metadata[]; + static const ::PROTOBUF_NAMESPACE_ID::internal::SerializationTable serialization_table[]; + static const ::PROTOBUF_NAMESPACE_ID::uint32 offsets[]; }; -void AGONES_EXPORT AddDescriptors_sdk_2eproto(); +extern AGONES_EXPORT const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_sdk_2eproto; namespace agones { namespace dev { namespace sdk { @@ -106,8 +112,7 @@ AGONES_EXPORT extern KeyValueDefaultTypeInternal _KeyValue_default_instance_; } // namespace sdk } // namespace dev } // namespace agones -namespace google { -namespace protobuf { +PROTOBUF_NAMESPACE_OPEN template<> AGONES_EXPORT ::agones::dev::sdk::Duration* Arena::CreateMaybeMessage<::agones::dev::sdk::Duration>(Arena*); template<> AGONES_EXPORT ::agones::dev::sdk::Empty* Arena::CreateMaybeMessage<::agones::dev::sdk::Empty>(Arena*); template<> AGONES_EXPORT ::agones::dev::sdk::GameServer* Arena::CreateMaybeMessage<::agones::dev::sdk::GameServer>(Arena*); @@ -119,32 +124,29 @@ template<> AGONES_EXPORT ::agones::dev::sdk::GameServer_Spec_Health* Arena::Crea template<> AGONES_EXPORT ::agones::dev::sdk::GameServer_Status* Arena::CreateMaybeMessage<::agones::dev::sdk::GameServer_Status>(Arena*); template<> AGONES_EXPORT ::agones::dev::sdk::GameServer_Status_Port* Arena::CreateMaybeMessage<::agones::dev::sdk::GameServer_Status_Port>(Arena*); template<> AGONES_EXPORT ::agones::dev::sdk::KeyValue* Arena::CreateMaybeMessage<::agones::dev::sdk::KeyValue>(Arena*); -} // namespace protobuf -} // namespace google +PROTOBUF_NAMESPACE_CLOSE namespace agones { namespace dev { namespace sdk { // =================================================================== -class AGONES_EXPORT Empty final : - public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:agones.dev.sdk.Empty) */ { +class AGONES_EXPORT Empty : + public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:agones.dev.sdk.Empty) */ { public: Empty(); virtual ~Empty(); Empty(const Empty& from); - - inline Empty& operator=(const Empty& from) { - CopyFrom(from); - return *this; - } - #if LANG_CXX11 Empty(Empty&& from) noexcept : Empty() { *this = ::std::move(from); } + inline Empty& operator=(const Empty& from) { + CopyFrom(from); + return *this; + } inline Empty& operator=(Empty&& from) noexcept { if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) { if (this != &from) InternalSwap(&from); @@ -153,9 +155,15 @@ class AGONES_EXPORT Empty final : } return *this; } - #endif - static const ::google::protobuf::Descriptor* descriptor() { - return default_instance().GetDescriptor(); + + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { + return GetDescriptor(); + } + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { + return GetMetadataStatic().descriptor; + } + static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { + return GetMetadataStatic().reflection; } static const Empty& default_instance(); @@ -167,10 +175,13 @@ class AGONES_EXPORT Empty final : static constexpr int kIndexInFileMessages = 0; - void Swap(Empty* other); friend void swap(Empty& a, Empty& b) { a.Swap(&b); } + inline void Swap(Empty* other) { + if (other == this) return; + InternalSwap(other); + } // implements Message ---------------------------------------------- @@ -178,37 +189,33 @@ class AGONES_EXPORT Empty final : return CreateMaybeMessage(nullptr); } - Empty* New(::google::protobuf::Arena* arena) const final { + Empty* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { return CreateMaybeMessage(arena); } - void CopyFrom(const ::google::protobuf::Message& from) final; - void MergeFrom(const ::google::protobuf::Message& from) final; + void CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final; + void MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final; void CopyFrom(const Empty& from); void MergeFrom(const Empty& from); PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; size_t ByteSizeLong() const final; - #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER - static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); - ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } - #else - bool MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) final; - #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER - void SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const final; - ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const final; + const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; + ::PROTOBUF_NAMESPACE_ID::uint8* InternalSerializeWithCachedSizesToArray( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: - void SharedCtor(); - void SharedDtor(); + inline void SharedCtor(); + inline void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(Empty* other); + friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; + static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { + return "agones.dev.sdk.Empty"; + } private: - inline ::google::protobuf::Arena* GetArenaNoVirtual() const { + inline ::PROTOBUF_NAMESPACE_ID::Arena* GetArenaNoVirtual() const { return nullptr; } inline void* MaybeArenaPtr() const { @@ -216,7 +223,14 @@ class AGONES_EXPORT Empty final : } public: - ::google::protobuf::Metadata GetMetadata() const final; + ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; + private: + static ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadataStatic() { + ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&::descriptor_table_sdk_2eproto); + return ::descriptor_table_sdk_2eproto.file_level_metadata[kIndexInFileMessages]; + } + + public: // nested types ---------------------------------------------------- @@ -224,32 +238,30 @@ class AGONES_EXPORT Empty final : // @@protoc_insertion_point(class_scope:agones.dev.sdk.Empty) private: - class HasBitSetters; + class _Internal; - ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; - mutable ::google::protobuf::internal::CachedSize _cached_size_; + ::PROTOBUF_NAMESPACE_ID::internal::InternalMetadataWithArena _internal_metadata_; + mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; friend struct ::TableStruct_sdk_2eproto; }; // ------------------------------------------------------------------- -class AGONES_EXPORT KeyValue final : - public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:agones.dev.sdk.KeyValue) */ { +class AGONES_EXPORT KeyValue : + public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:agones.dev.sdk.KeyValue) */ { public: KeyValue(); virtual ~KeyValue(); KeyValue(const KeyValue& from); - - inline KeyValue& operator=(const KeyValue& from) { - CopyFrom(from); - return *this; - } - #if LANG_CXX11 KeyValue(KeyValue&& from) noexcept : KeyValue() { *this = ::std::move(from); } + inline KeyValue& operator=(const KeyValue& from) { + CopyFrom(from); + return *this; + } inline KeyValue& operator=(KeyValue&& from) noexcept { if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) { if (this != &from) InternalSwap(&from); @@ -258,9 +270,15 @@ class AGONES_EXPORT KeyValue final : } return *this; } - #endif - static const ::google::protobuf::Descriptor* descriptor() { - return default_instance().GetDescriptor(); + + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { + return GetDescriptor(); + } + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { + return GetMetadataStatic().descriptor; + } + static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { + return GetMetadataStatic().reflection; } static const KeyValue& default_instance(); @@ -272,10 +290,13 @@ class AGONES_EXPORT KeyValue final : static constexpr int kIndexInFileMessages = 1; - void Swap(KeyValue* other); friend void swap(KeyValue& a, KeyValue& b) { a.Swap(&b); } + inline void Swap(KeyValue* other) { + if (other == this) return; + InternalSwap(other); + } // implements Message ---------------------------------------------- @@ -283,37 +304,33 @@ class AGONES_EXPORT KeyValue final : return CreateMaybeMessage(nullptr); } - KeyValue* New(::google::protobuf::Arena* arena) const final { + KeyValue* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { return CreateMaybeMessage(arena); } - void CopyFrom(const ::google::protobuf::Message& from) final; - void MergeFrom(const ::google::protobuf::Message& from) final; + void CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final; + void MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final; void CopyFrom(const KeyValue& from); void MergeFrom(const KeyValue& from); PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; size_t ByteSizeLong() const final; - #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER - static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); - ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } - #else - bool MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) final; - #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER - void SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const final; - ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const final; + const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; + ::PROTOBUF_NAMESPACE_ID::uint8* InternalSerializeWithCachedSizesToArray( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: - void SharedCtor(); - void SharedDtor(); + inline void SharedCtor(); + inline void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(KeyValue* other); + friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; + static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { + return "agones.dev.sdk.KeyValue"; + } private: - inline ::google::protobuf::Arena* GetArenaNoVirtual() const { + inline ::PROTOBUF_NAMESPACE_ID::Arena* GetArenaNoVirtual() const { return nullptr; } inline void* MaybeArenaPtr() const { @@ -321,70 +338,83 @@ class AGONES_EXPORT KeyValue final : } public: - ::google::protobuf::Metadata GetMetadata() const final; + ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; + private: + static ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadataStatic() { + ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&::descriptor_table_sdk_2eproto); + return ::descriptor_table_sdk_2eproto.file_level_metadata[kIndexInFileMessages]; + } + + public: // nested types ---------------------------------------------------- // accessors ------------------------------------------------------- + enum : int { + kKeyFieldNumber = 1, + kValueFieldNumber = 2, + }; // string key = 1; void clear_key(); - static const int kKeyFieldNumber = 1; - const ::std::string& key() const; - void set_key(const ::std::string& value); - #if LANG_CXX11 - void set_key(::std::string&& value); - #endif + const std::string& key() const; + void set_key(const std::string& value); + void set_key(std::string&& value); void set_key(const char* value); void set_key(const char* value, size_t size); - ::std::string* mutable_key(); - ::std::string* release_key(); - void set_allocated_key(::std::string* key); + std::string* mutable_key(); + std::string* release_key(); + void set_allocated_key(std::string* key); + private: + const std::string& _internal_key() const; + void _internal_set_key(const std::string& value); + std::string* _internal_mutable_key(); + public: // string value = 2; void clear_value(); - static const int kValueFieldNumber = 2; - const ::std::string& value() const; - void set_value(const ::std::string& value); - #if LANG_CXX11 - void set_value(::std::string&& value); - #endif + const std::string& value() const; + void set_value(const std::string& value); + void set_value(std::string&& value); void set_value(const char* value); void set_value(const char* value, size_t size); - ::std::string* mutable_value(); - ::std::string* release_value(); - void set_allocated_value(::std::string* value); + std::string* mutable_value(); + std::string* release_value(); + void set_allocated_value(std::string* value); + private: + const std::string& _internal_value() const; + void _internal_set_value(const std::string& value); + std::string* _internal_mutable_value(); + public: // @@protoc_insertion_point(class_scope:agones.dev.sdk.KeyValue) private: - class HasBitSetters; + class _Internal; - ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; - ::google::protobuf::internal::ArenaStringPtr key_; - ::google::protobuf::internal::ArenaStringPtr value_; - mutable ::google::protobuf::internal::CachedSize _cached_size_; + ::PROTOBUF_NAMESPACE_ID::internal::InternalMetadataWithArena _internal_metadata_; + ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr key_; + ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr value_; + mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; friend struct ::TableStruct_sdk_2eproto; }; // ------------------------------------------------------------------- -class AGONES_EXPORT Duration final : - public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:agones.dev.sdk.Duration) */ { +class AGONES_EXPORT Duration : + public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:agones.dev.sdk.Duration) */ { public: Duration(); virtual ~Duration(); Duration(const Duration& from); - - inline Duration& operator=(const Duration& from) { - CopyFrom(from); - return *this; - } - #if LANG_CXX11 Duration(Duration&& from) noexcept : Duration() { *this = ::std::move(from); } + inline Duration& operator=(const Duration& from) { + CopyFrom(from); + return *this; + } inline Duration& operator=(Duration&& from) noexcept { if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) { if (this != &from) InternalSwap(&from); @@ -393,9 +423,15 @@ class AGONES_EXPORT Duration final : } return *this; } - #endif - static const ::google::protobuf::Descriptor* descriptor() { - return default_instance().GetDescriptor(); + + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { + return GetDescriptor(); + } + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { + return GetMetadataStatic().descriptor; + } + static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { + return GetMetadataStatic().reflection; } static const Duration& default_instance(); @@ -407,10 +443,13 @@ class AGONES_EXPORT Duration final : static constexpr int kIndexInFileMessages = 2; - void Swap(Duration* other); friend void swap(Duration& a, Duration& b) { a.Swap(&b); } + inline void Swap(Duration* other) { + if (other == this) return; + InternalSwap(other); + } // implements Message ---------------------------------------------- @@ -418,37 +457,33 @@ class AGONES_EXPORT Duration final : return CreateMaybeMessage(nullptr); } - Duration* New(::google::protobuf::Arena* arena) const final { + Duration* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { return CreateMaybeMessage(arena); } - void CopyFrom(const ::google::protobuf::Message& from) final; - void MergeFrom(const ::google::protobuf::Message& from) final; + void CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final; + void MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final; void CopyFrom(const Duration& from); void MergeFrom(const Duration& from); PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; size_t ByteSizeLong() const final; - #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER - static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); - ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } - #else - bool MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) final; - #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER - void SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const final; - ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const final; + const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; + ::PROTOBUF_NAMESPACE_ID::uint8* InternalSerializeWithCachedSizesToArray( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: - void SharedCtor(); - void SharedDtor(); + inline void SharedCtor(); + inline void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(Duration* other); + friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; + static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { + return "agones.dev.sdk.Duration"; + } private: - inline ::google::protobuf::Arena* GetArenaNoVirtual() const { + inline ::PROTOBUF_NAMESPACE_ID::Arena* GetArenaNoVirtual() const { return nullptr; } inline void* MaybeArenaPtr() const { @@ -456,95 +491,126 @@ class AGONES_EXPORT Duration final : } public: - ::google::protobuf::Metadata GetMetadata() const final; + ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; + private: + static ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadataStatic() { + ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&::descriptor_table_sdk_2eproto); + return ::descriptor_table_sdk_2eproto.file_level_metadata[kIndexInFileMessages]; + } + + public: // nested types ---------------------------------------------------- // accessors ------------------------------------------------------- + enum : int { + kSecondsFieldNumber = 1, + }; // int64 seconds = 1; void clear_seconds(); - static const int kSecondsFieldNumber = 1; - ::google::protobuf::int64 seconds() const; - void set_seconds(::google::protobuf::int64 value); + ::PROTOBUF_NAMESPACE_ID::int64 seconds() const; + void set_seconds(::PROTOBUF_NAMESPACE_ID::int64 value); + private: + ::PROTOBUF_NAMESPACE_ID::int64 _internal_seconds() const; + void _internal_set_seconds(::PROTOBUF_NAMESPACE_ID::int64 value); + public: // @@protoc_insertion_point(class_scope:agones.dev.sdk.Duration) private: - class HasBitSetters; + class _Internal; - ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; - ::google::protobuf::int64 seconds_; - mutable ::google::protobuf::internal::CachedSize _cached_size_; + ::PROTOBUF_NAMESPACE_ID::internal::InternalMetadataWithArena _internal_metadata_; + ::PROTOBUF_NAMESPACE_ID::int64 seconds_; + mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; friend struct ::TableStruct_sdk_2eproto; }; // ------------------------------------------------------------------- -class GameServer_ObjectMeta_AnnotationsEntry_DoNotUse : public ::google::protobuf::internal::MapEntry { public: -#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -static bool _ParseMap(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); -#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER - typedef ::google::protobuf::internal::MapEntry SuperType; GameServer_ObjectMeta_AnnotationsEntry_DoNotUse(); - GameServer_ObjectMeta_AnnotationsEntry_DoNotUse(::google::protobuf::Arena* arena); + GameServer_ObjectMeta_AnnotationsEntry_DoNotUse(::PROTOBUF_NAMESPACE_ID::Arena* arena); void MergeFrom(const GameServer_ObjectMeta_AnnotationsEntry_DoNotUse& other); static const GameServer_ObjectMeta_AnnotationsEntry_DoNotUse* internal_default_instance() { return reinterpret_cast(&_GameServer_ObjectMeta_AnnotationsEntry_DoNotUse_default_instance_); } - void MergeFrom(const ::google::protobuf::Message& other) final; - ::google::protobuf::Metadata GetMetadata() const; + static bool ValidateKey(std::string* s) { + return ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(s->data(), s->size(), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::PARSE, "agones.dev.sdk.GameServer.ObjectMeta.AnnotationsEntry.key"); + } + static bool ValidateValue(std::string* s) { + return ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(s->data(), s->size(), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::PARSE, "agones.dev.sdk.GameServer.ObjectMeta.AnnotationsEntry.value"); + } + void MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& other) final; + ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; + private: + static ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadataStatic() { + ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&::descriptor_table_sdk_2eproto); + return ::descriptor_table_sdk_2eproto.file_level_metadata[3]; + } + + public: }; // ------------------------------------------------------------------- -class GameServer_ObjectMeta_LabelsEntry_DoNotUse : public ::google::protobuf::internal::MapEntry { public: -#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -static bool _ParseMap(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); -#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER - typedef ::google::protobuf::internal::MapEntry SuperType; GameServer_ObjectMeta_LabelsEntry_DoNotUse(); - GameServer_ObjectMeta_LabelsEntry_DoNotUse(::google::protobuf::Arena* arena); + GameServer_ObjectMeta_LabelsEntry_DoNotUse(::PROTOBUF_NAMESPACE_ID::Arena* arena); void MergeFrom(const GameServer_ObjectMeta_LabelsEntry_DoNotUse& other); static const GameServer_ObjectMeta_LabelsEntry_DoNotUse* internal_default_instance() { return reinterpret_cast(&_GameServer_ObjectMeta_LabelsEntry_DoNotUse_default_instance_); } - void MergeFrom(const ::google::protobuf::Message& other) final; - ::google::protobuf::Metadata GetMetadata() const; + static bool ValidateKey(std::string* s) { + return ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(s->data(), s->size(), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::PARSE, "agones.dev.sdk.GameServer.ObjectMeta.LabelsEntry.key"); + } + static bool ValidateValue(std::string* s) { + return ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(s->data(), s->size(), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::PARSE, "agones.dev.sdk.GameServer.ObjectMeta.LabelsEntry.value"); + } + void MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& other) final; + ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; + private: + static ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadataStatic() { + ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&::descriptor_table_sdk_2eproto); + return ::descriptor_table_sdk_2eproto.file_level_metadata[4]; + } + + public: }; // ------------------------------------------------------------------- -class AGONES_EXPORT GameServer_ObjectMeta final : - public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:agones.dev.sdk.GameServer.ObjectMeta) */ { +class AGONES_EXPORT GameServer_ObjectMeta : + public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:agones.dev.sdk.GameServer.ObjectMeta) */ { public: GameServer_ObjectMeta(); virtual ~GameServer_ObjectMeta(); GameServer_ObjectMeta(const GameServer_ObjectMeta& from); - - inline GameServer_ObjectMeta& operator=(const GameServer_ObjectMeta& from) { - CopyFrom(from); - return *this; - } - #if LANG_CXX11 GameServer_ObjectMeta(GameServer_ObjectMeta&& from) noexcept : GameServer_ObjectMeta() { *this = ::std::move(from); } + inline GameServer_ObjectMeta& operator=(const GameServer_ObjectMeta& from) { + CopyFrom(from); + return *this; + } inline GameServer_ObjectMeta& operator=(GameServer_ObjectMeta&& from) noexcept { if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) { if (this != &from) InternalSwap(&from); @@ -553,9 +619,15 @@ class AGONES_EXPORT GameServer_ObjectMeta final : } return *this; } - #endif - static const ::google::protobuf::Descriptor* descriptor() { - return default_instance().GetDescriptor(); + + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { + return GetDescriptor(); + } + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { + return GetMetadataStatic().descriptor; + } + static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { + return GetMetadataStatic().reflection; } static const GameServer_ObjectMeta& default_instance(); @@ -567,10 +639,13 @@ class AGONES_EXPORT GameServer_ObjectMeta final : static constexpr int kIndexInFileMessages = 5; - void Swap(GameServer_ObjectMeta* other); friend void swap(GameServer_ObjectMeta& a, GameServer_ObjectMeta& b) { a.Swap(&b); } + inline void Swap(GameServer_ObjectMeta* other) { + if (other == this) return; + InternalSwap(other); + } // implements Message ---------------------------------------------- @@ -578,37 +653,33 @@ class AGONES_EXPORT GameServer_ObjectMeta final : return CreateMaybeMessage(nullptr); } - GameServer_ObjectMeta* New(::google::protobuf::Arena* arena) const final { + GameServer_ObjectMeta* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { return CreateMaybeMessage(arena); } - void CopyFrom(const ::google::protobuf::Message& from) final; - void MergeFrom(const ::google::protobuf::Message& from) final; + void CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final; + void MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final; void CopyFrom(const GameServer_ObjectMeta& from); void MergeFrom(const GameServer_ObjectMeta& from); PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; size_t ByteSizeLong() const final; - #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER - static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); - ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } - #else - bool MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) final; - #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER - void SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const final; - ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const final; + const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; + ::PROTOBUF_NAMESPACE_ID::uint8* InternalSerializeWithCachedSizesToArray( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: - void SharedCtor(); - void SharedDtor(); + inline void SharedCtor(); + inline void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(GameServer_ObjectMeta* other); + friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; + static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { + return "agones.dev.sdk.GameServer.ObjectMeta"; + } private: - inline ::google::protobuf::Arena* GetArenaNoVirtual() const { + inline ::PROTOBUF_NAMESPACE_ID::Arena* GetArenaNoVirtual() const { return nullptr; } inline void* MaybeArenaPtr() const { @@ -616,152 +687,201 @@ class AGONES_EXPORT GameServer_ObjectMeta final : } public: - ::google::protobuf::Metadata GetMetadata() const final; + ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; + private: + static ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadataStatic() { + ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&::descriptor_table_sdk_2eproto); + return ::descriptor_table_sdk_2eproto.file_level_metadata[kIndexInFileMessages]; + } + + public: // nested types ---------------------------------------------------- // accessors ------------------------------------------------------- + enum : int { + kAnnotationsFieldNumber = 8, + kLabelsFieldNumber = 9, + kNameFieldNumber = 1, + kNamespaceFieldNumber = 2, + kUidFieldNumber = 3, + kResourceVersionFieldNumber = 4, + kGenerationFieldNumber = 5, + kCreationTimestampFieldNumber = 6, + kDeletionTimestampFieldNumber = 7, + }; // map annotations = 8; int annotations_size() const; + private: + int _internal_annotations_size() const; + public: void clear_annotations(); - static const int kAnnotationsFieldNumber = 8; - const ::google::protobuf::Map< ::std::string, ::std::string >& + private: + const ::PROTOBUF_NAMESPACE_ID::Map< std::string, std::string >& + _internal_annotations() const; + ::PROTOBUF_NAMESPACE_ID::Map< std::string, std::string >* + _internal_mutable_annotations(); + public: + const ::PROTOBUF_NAMESPACE_ID::Map< std::string, std::string >& annotations() const; - ::google::protobuf::Map< ::std::string, ::std::string >* + ::PROTOBUF_NAMESPACE_ID::Map< std::string, std::string >* mutable_annotations(); // map labels = 9; int labels_size() const; + private: + int _internal_labels_size() const; + public: void clear_labels(); - static const int kLabelsFieldNumber = 9; - const ::google::protobuf::Map< ::std::string, ::std::string >& + private: + const ::PROTOBUF_NAMESPACE_ID::Map< std::string, std::string >& + _internal_labels() const; + ::PROTOBUF_NAMESPACE_ID::Map< std::string, std::string >* + _internal_mutable_labels(); + public: + const ::PROTOBUF_NAMESPACE_ID::Map< std::string, std::string >& labels() const; - ::google::protobuf::Map< ::std::string, ::std::string >* + ::PROTOBUF_NAMESPACE_ID::Map< std::string, std::string >* mutable_labels(); // string name = 1; void clear_name(); - static const int kNameFieldNumber = 1; - const ::std::string& name() const; - void set_name(const ::std::string& value); - #if LANG_CXX11 - void set_name(::std::string&& value); - #endif + const std::string& name() const; + void set_name(const std::string& value); + void set_name(std::string&& value); void set_name(const char* value); void set_name(const char* value, size_t size); - ::std::string* mutable_name(); - ::std::string* release_name(); - void set_allocated_name(::std::string* name); + std::string* mutable_name(); + std::string* release_name(); + void set_allocated_name(std::string* name); + private: + const std::string& _internal_name() const; + void _internal_set_name(const std::string& value); + std::string* _internal_mutable_name(); + public: // string namespace = 2; void clear_namespace_(); - static const int kNamespaceFieldNumber = 2; - const ::std::string& namespace_() const; - void set_namespace_(const ::std::string& value); - #if LANG_CXX11 - void set_namespace_(::std::string&& value); - #endif + const std::string& namespace_() const; + void set_namespace_(const std::string& value); + void set_namespace_(std::string&& value); void set_namespace_(const char* value); void set_namespace_(const char* value, size_t size); - ::std::string* mutable_namespace_(); - ::std::string* release_namespace_(); - void set_allocated_namespace_(::std::string* namespace_); + std::string* mutable_namespace_(); + std::string* release_namespace_(); + void set_allocated_namespace_(std::string* namespace_); + private: + const std::string& _internal_namespace_() const; + void _internal_set_namespace_(const std::string& value); + std::string* _internal_mutable_namespace_(); + public: // string uid = 3; void clear_uid(); - static const int kUidFieldNumber = 3; - const ::std::string& uid() const; - void set_uid(const ::std::string& value); - #if LANG_CXX11 - void set_uid(::std::string&& value); - #endif + const std::string& uid() const; + void set_uid(const std::string& value); + void set_uid(std::string&& value); void set_uid(const char* value); void set_uid(const char* value, size_t size); - ::std::string* mutable_uid(); - ::std::string* release_uid(); - void set_allocated_uid(::std::string* uid); + std::string* mutable_uid(); + std::string* release_uid(); + void set_allocated_uid(std::string* uid); + private: + const std::string& _internal_uid() const; + void _internal_set_uid(const std::string& value); + std::string* _internal_mutable_uid(); + public: // string resource_version = 4; void clear_resource_version(); - static const int kResourceVersionFieldNumber = 4; - const ::std::string& resource_version() const; - void set_resource_version(const ::std::string& value); - #if LANG_CXX11 - void set_resource_version(::std::string&& value); - #endif + const std::string& resource_version() const; + void set_resource_version(const std::string& value); + void set_resource_version(std::string&& value); void set_resource_version(const char* value); void set_resource_version(const char* value, size_t size); - ::std::string* mutable_resource_version(); - ::std::string* release_resource_version(); - void set_allocated_resource_version(::std::string* resource_version); + std::string* mutable_resource_version(); + std::string* release_resource_version(); + void set_allocated_resource_version(std::string* resource_version); + private: + const std::string& _internal_resource_version() const; + void _internal_set_resource_version(const std::string& value); + std::string* _internal_mutable_resource_version(); + public: // int64 generation = 5; void clear_generation(); - static const int kGenerationFieldNumber = 5; - ::google::protobuf::int64 generation() const; - void set_generation(::google::protobuf::int64 value); + ::PROTOBUF_NAMESPACE_ID::int64 generation() const; + void set_generation(::PROTOBUF_NAMESPACE_ID::int64 value); + private: + ::PROTOBUF_NAMESPACE_ID::int64 _internal_generation() const; + void _internal_set_generation(::PROTOBUF_NAMESPACE_ID::int64 value); + public: // int64 creation_timestamp = 6; void clear_creation_timestamp(); - static const int kCreationTimestampFieldNumber = 6; - ::google::protobuf::int64 creation_timestamp() const; - void set_creation_timestamp(::google::protobuf::int64 value); + ::PROTOBUF_NAMESPACE_ID::int64 creation_timestamp() const; + void set_creation_timestamp(::PROTOBUF_NAMESPACE_ID::int64 value); + private: + ::PROTOBUF_NAMESPACE_ID::int64 _internal_creation_timestamp() const; + void _internal_set_creation_timestamp(::PROTOBUF_NAMESPACE_ID::int64 value); + public: // int64 deletion_timestamp = 7; void clear_deletion_timestamp(); - static const int kDeletionTimestampFieldNumber = 7; - ::google::protobuf::int64 deletion_timestamp() const; - void set_deletion_timestamp(::google::protobuf::int64 value); + ::PROTOBUF_NAMESPACE_ID::int64 deletion_timestamp() const; + void set_deletion_timestamp(::PROTOBUF_NAMESPACE_ID::int64 value); + private: + ::PROTOBUF_NAMESPACE_ID::int64 _internal_deletion_timestamp() const; + void _internal_set_deletion_timestamp(::PROTOBUF_NAMESPACE_ID::int64 value); + public: // @@protoc_insertion_point(class_scope:agones.dev.sdk.GameServer.ObjectMeta) private: - class HasBitSetters; + class _Internal; - ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; - ::google::protobuf::internal::MapField< + ::PROTOBUF_NAMESPACE_ID::internal::InternalMetadataWithArena _internal_metadata_; + ::PROTOBUF_NAMESPACE_ID::internal::MapField< GameServer_ObjectMeta_AnnotationsEntry_DoNotUse, - ::std::string, ::std::string, - ::google::protobuf::internal::WireFormatLite::TYPE_STRING, - ::google::protobuf::internal::WireFormatLite::TYPE_STRING, + std::string, std::string, + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::TYPE_STRING, + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::TYPE_STRING, 0 > annotations_; - ::google::protobuf::internal::MapField< + ::PROTOBUF_NAMESPACE_ID::internal::MapField< GameServer_ObjectMeta_LabelsEntry_DoNotUse, - ::std::string, ::std::string, - ::google::protobuf::internal::WireFormatLite::TYPE_STRING, - ::google::protobuf::internal::WireFormatLite::TYPE_STRING, + std::string, std::string, + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::TYPE_STRING, + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::TYPE_STRING, 0 > labels_; - ::google::protobuf::internal::ArenaStringPtr name_; - ::google::protobuf::internal::ArenaStringPtr namespace__; - ::google::protobuf::internal::ArenaStringPtr uid_; - ::google::protobuf::internal::ArenaStringPtr resource_version_; - ::google::protobuf::int64 generation_; - ::google::protobuf::int64 creation_timestamp_; - ::google::protobuf::int64 deletion_timestamp_; - mutable ::google::protobuf::internal::CachedSize _cached_size_; + ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr name_; + ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr namespace__; + ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr uid_; + ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr resource_version_; + ::PROTOBUF_NAMESPACE_ID::int64 generation_; + ::PROTOBUF_NAMESPACE_ID::int64 creation_timestamp_; + ::PROTOBUF_NAMESPACE_ID::int64 deletion_timestamp_; + mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; friend struct ::TableStruct_sdk_2eproto; }; // ------------------------------------------------------------------- -class AGONES_EXPORT GameServer_Spec_Health final : - public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:agones.dev.sdk.GameServer.Spec.Health) */ { +class AGONES_EXPORT GameServer_Spec_Health : + public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:agones.dev.sdk.GameServer.Spec.Health) */ { public: GameServer_Spec_Health(); virtual ~GameServer_Spec_Health(); GameServer_Spec_Health(const GameServer_Spec_Health& from); - - inline GameServer_Spec_Health& operator=(const GameServer_Spec_Health& from) { - CopyFrom(from); - return *this; - } - #if LANG_CXX11 GameServer_Spec_Health(GameServer_Spec_Health&& from) noexcept : GameServer_Spec_Health() { *this = ::std::move(from); } + inline GameServer_Spec_Health& operator=(const GameServer_Spec_Health& from) { + CopyFrom(from); + return *this; + } inline GameServer_Spec_Health& operator=(GameServer_Spec_Health&& from) noexcept { if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) { if (this != &from) InternalSwap(&from); @@ -770,9 +890,15 @@ class AGONES_EXPORT GameServer_Spec_Health final : } return *this; } - #endif - static const ::google::protobuf::Descriptor* descriptor() { - return default_instance().GetDescriptor(); + + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { + return GetDescriptor(); + } + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { + return GetMetadataStatic().descriptor; + } + static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { + return GetMetadataStatic().reflection; } static const GameServer_Spec_Health& default_instance(); @@ -784,10 +910,13 @@ class AGONES_EXPORT GameServer_Spec_Health final : static constexpr int kIndexInFileMessages = 6; - void Swap(GameServer_Spec_Health* other); friend void swap(GameServer_Spec_Health& a, GameServer_Spec_Health& b) { a.Swap(&b); } + inline void Swap(GameServer_Spec_Health* other) { + if (other == this) return; + InternalSwap(other); + } // implements Message ---------------------------------------------- @@ -795,37 +924,33 @@ class AGONES_EXPORT GameServer_Spec_Health final : return CreateMaybeMessage(nullptr); } - GameServer_Spec_Health* New(::google::protobuf::Arena* arena) const final { + GameServer_Spec_Health* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { return CreateMaybeMessage(arena); } - void CopyFrom(const ::google::protobuf::Message& from) final; - void MergeFrom(const ::google::protobuf::Message& from) final; + void CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final; + void MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final; void CopyFrom(const GameServer_Spec_Health& from); void MergeFrom(const GameServer_Spec_Health& from); PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; size_t ByteSizeLong() const final; - #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER - static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); - ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } - #else - bool MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) final; - #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER - void SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const final; - ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const final; + const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; + ::PROTOBUF_NAMESPACE_ID::uint8* InternalSerializeWithCachedSizesToArray( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: - void SharedCtor(); - void SharedDtor(); + inline void SharedCtor(); + inline void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(GameServer_Spec_Health* other); + friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; + static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { + return "agones.dev.sdk.GameServer.Spec.Health"; + } private: - inline ::google::protobuf::Arena* GetArenaNoVirtual() const { + inline ::PROTOBUF_NAMESPACE_ID::Arena* GetArenaNoVirtual() const { return nullptr; } inline void* MaybeArenaPtr() const { @@ -833,68 +958,91 @@ class AGONES_EXPORT GameServer_Spec_Health final : } public: - ::google::protobuf::Metadata GetMetadata() const final; + ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; + private: + static ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadataStatic() { + ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&::descriptor_table_sdk_2eproto); + return ::descriptor_table_sdk_2eproto.file_level_metadata[kIndexInFileMessages]; + } + + public: // nested types ---------------------------------------------------- // accessors ------------------------------------------------------- + enum : int { + kDisabledFieldNumber = 1, + kPeriodSecondsFieldNumber = 2, + kFailureThresholdFieldNumber = 3, + kInitialDelaySecondsFieldNumber = 4, + }; // bool disabled = 1; void clear_disabled(); - static const int kDisabledFieldNumber = 1; bool disabled() const; void set_disabled(bool value); + private: + bool _internal_disabled() const; + void _internal_set_disabled(bool value); + public: // int32 period_seconds = 2; void clear_period_seconds(); - static const int kPeriodSecondsFieldNumber = 2; - ::google::protobuf::int32 period_seconds() const; - void set_period_seconds(::google::protobuf::int32 value); + ::PROTOBUF_NAMESPACE_ID::int32 period_seconds() const; + void set_period_seconds(::PROTOBUF_NAMESPACE_ID::int32 value); + private: + ::PROTOBUF_NAMESPACE_ID::int32 _internal_period_seconds() const; + void _internal_set_period_seconds(::PROTOBUF_NAMESPACE_ID::int32 value); + public: // int32 failure_threshold = 3; void clear_failure_threshold(); - static const int kFailureThresholdFieldNumber = 3; - ::google::protobuf::int32 failure_threshold() const; - void set_failure_threshold(::google::protobuf::int32 value); + ::PROTOBUF_NAMESPACE_ID::int32 failure_threshold() const; + void set_failure_threshold(::PROTOBUF_NAMESPACE_ID::int32 value); + private: + ::PROTOBUF_NAMESPACE_ID::int32 _internal_failure_threshold() const; + void _internal_set_failure_threshold(::PROTOBUF_NAMESPACE_ID::int32 value); + public: // int32 initial_delay_seconds = 4; void clear_initial_delay_seconds(); - static const int kInitialDelaySecondsFieldNumber = 4; - ::google::protobuf::int32 initial_delay_seconds() const; - void set_initial_delay_seconds(::google::protobuf::int32 value); + ::PROTOBUF_NAMESPACE_ID::int32 initial_delay_seconds() const; + void set_initial_delay_seconds(::PROTOBUF_NAMESPACE_ID::int32 value); + private: + ::PROTOBUF_NAMESPACE_ID::int32 _internal_initial_delay_seconds() const; + void _internal_set_initial_delay_seconds(::PROTOBUF_NAMESPACE_ID::int32 value); + public: // @@protoc_insertion_point(class_scope:agones.dev.sdk.GameServer.Spec.Health) private: - class HasBitSetters; + class _Internal; - ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; + ::PROTOBUF_NAMESPACE_ID::internal::InternalMetadataWithArena _internal_metadata_; bool disabled_; - ::google::protobuf::int32 period_seconds_; - ::google::protobuf::int32 failure_threshold_; - ::google::protobuf::int32 initial_delay_seconds_; - mutable ::google::protobuf::internal::CachedSize _cached_size_; + ::PROTOBUF_NAMESPACE_ID::int32 period_seconds_; + ::PROTOBUF_NAMESPACE_ID::int32 failure_threshold_; + ::PROTOBUF_NAMESPACE_ID::int32 initial_delay_seconds_; + mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; friend struct ::TableStruct_sdk_2eproto; }; // ------------------------------------------------------------------- -class AGONES_EXPORT GameServer_Spec final : - public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:agones.dev.sdk.GameServer.Spec) */ { +class AGONES_EXPORT GameServer_Spec : + public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:agones.dev.sdk.GameServer.Spec) */ { public: GameServer_Spec(); virtual ~GameServer_Spec(); GameServer_Spec(const GameServer_Spec& from); - - inline GameServer_Spec& operator=(const GameServer_Spec& from) { - CopyFrom(from); - return *this; - } - #if LANG_CXX11 GameServer_Spec(GameServer_Spec&& from) noexcept : GameServer_Spec() { *this = ::std::move(from); } + inline GameServer_Spec& operator=(const GameServer_Spec& from) { + CopyFrom(from); + return *this; + } inline GameServer_Spec& operator=(GameServer_Spec&& from) noexcept { if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) { if (this != &from) InternalSwap(&from); @@ -903,9 +1051,15 @@ class AGONES_EXPORT GameServer_Spec final : } return *this; } - #endif - static const ::google::protobuf::Descriptor* descriptor() { - return default_instance().GetDescriptor(); + + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { + return GetDescriptor(); + } + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { + return GetMetadataStatic().descriptor; + } + static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { + return GetMetadataStatic().reflection; } static const GameServer_Spec& default_instance(); @@ -917,10 +1071,13 @@ class AGONES_EXPORT GameServer_Spec final : static constexpr int kIndexInFileMessages = 7; - void Swap(GameServer_Spec* other); friend void swap(GameServer_Spec& a, GameServer_Spec& b) { a.Swap(&b); } + inline void Swap(GameServer_Spec* other) { + if (other == this) return; + InternalSwap(other); + } // implements Message ---------------------------------------------- @@ -928,37 +1085,33 @@ class AGONES_EXPORT GameServer_Spec final : return CreateMaybeMessage(nullptr); } - GameServer_Spec* New(::google::protobuf::Arena* arena) const final { + GameServer_Spec* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { return CreateMaybeMessage(arena); } - void CopyFrom(const ::google::protobuf::Message& from) final; - void MergeFrom(const ::google::protobuf::Message& from) final; + void CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final; + void MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final; void CopyFrom(const GameServer_Spec& from); void MergeFrom(const GameServer_Spec& from); PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; size_t ByteSizeLong() const final; - #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER - static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); - ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } - #else - bool MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) final; - #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER - void SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const final; - ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const final; + const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; + ::PROTOBUF_NAMESPACE_ID::uint8* InternalSerializeWithCachedSizesToArray( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: - void SharedCtor(); - void SharedDtor(); + inline void SharedCtor(); + inline void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(GameServer_Spec* other); + friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; + static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { + return "agones.dev.sdk.GameServer.Spec"; + } private: - inline ::google::protobuf::Arena* GetArenaNoVirtual() const { + inline ::PROTOBUF_NAMESPACE_ID::Arena* GetArenaNoVirtual() const { return nullptr; } inline void* MaybeArenaPtr() const { @@ -966,7 +1119,14 @@ class AGONES_EXPORT GameServer_Spec final : } public: - ::google::protobuf::Metadata GetMetadata() const final; + ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; + private: + static ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadataStatic() { + ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&::descriptor_table_sdk_2eproto); + return ::descriptor_table_sdk_2eproto.file_level_metadata[kIndexInFileMessages]; + } + + public: // nested types ---------------------------------------------------- @@ -974,44 +1134,51 @@ class AGONES_EXPORT GameServer_Spec final : // accessors ------------------------------------------------------- + enum : int { + kHealthFieldNumber = 1, + }; // .agones.dev.sdk.GameServer.Spec.Health health = 1; bool has_health() const; + private: + bool _internal_has_health() const; + public: void clear_health(); - static const int kHealthFieldNumber = 1; const ::agones::dev::sdk::GameServer_Spec_Health& health() const; ::agones::dev::sdk::GameServer_Spec_Health* release_health(); ::agones::dev::sdk::GameServer_Spec_Health* mutable_health(); void set_allocated_health(::agones::dev::sdk::GameServer_Spec_Health* health); + private: + const ::agones::dev::sdk::GameServer_Spec_Health& _internal_health() const; + ::agones::dev::sdk::GameServer_Spec_Health* _internal_mutable_health(); + public: // @@protoc_insertion_point(class_scope:agones.dev.sdk.GameServer.Spec) private: - class HasBitSetters; + class _Internal; - ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; + ::PROTOBUF_NAMESPACE_ID::internal::InternalMetadataWithArena _internal_metadata_; ::agones::dev::sdk::GameServer_Spec_Health* health_; - mutable ::google::protobuf::internal::CachedSize _cached_size_; + mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; friend struct ::TableStruct_sdk_2eproto; }; // ------------------------------------------------------------------- -class AGONES_EXPORT GameServer_Status_Port final : - public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:agones.dev.sdk.GameServer.Status.Port) */ { +class AGONES_EXPORT GameServer_Status_Port : + public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:agones.dev.sdk.GameServer.Status.Port) */ { public: GameServer_Status_Port(); virtual ~GameServer_Status_Port(); GameServer_Status_Port(const GameServer_Status_Port& from); - - inline GameServer_Status_Port& operator=(const GameServer_Status_Port& from) { - CopyFrom(from); - return *this; - } - #if LANG_CXX11 GameServer_Status_Port(GameServer_Status_Port&& from) noexcept : GameServer_Status_Port() { *this = ::std::move(from); } + inline GameServer_Status_Port& operator=(const GameServer_Status_Port& from) { + CopyFrom(from); + return *this; + } inline GameServer_Status_Port& operator=(GameServer_Status_Port&& from) noexcept { if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) { if (this != &from) InternalSwap(&from); @@ -1020,9 +1187,15 @@ class AGONES_EXPORT GameServer_Status_Port final : } return *this; } - #endif - static const ::google::protobuf::Descriptor* descriptor() { - return default_instance().GetDescriptor(); + + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { + return GetDescriptor(); + } + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { + return GetMetadataStatic().descriptor; + } + static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { + return GetMetadataStatic().reflection; } static const GameServer_Status_Port& default_instance(); @@ -1034,10 +1207,13 @@ class AGONES_EXPORT GameServer_Status_Port final : static constexpr int kIndexInFileMessages = 8; - void Swap(GameServer_Status_Port* other); friend void swap(GameServer_Status_Port& a, GameServer_Status_Port& b) { a.Swap(&b); } + inline void Swap(GameServer_Status_Port* other) { + if (other == this) return; + InternalSwap(other); + } // implements Message ---------------------------------------------- @@ -1045,37 +1221,33 @@ class AGONES_EXPORT GameServer_Status_Port final : return CreateMaybeMessage(nullptr); } - GameServer_Status_Port* New(::google::protobuf::Arena* arena) const final { + GameServer_Status_Port* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { return CreateMaybeMessage(arena); } - void CopyFrom(const ::google::protobuf::Message& from) final; - void MergeFrom(const ::google::protobuf::Message& from) final; + void CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final; + void MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final; void CopyFrom(const GameServer_Status_Port& from); void MergeFrom(const GameServer_Status_Port& from); PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; size_t ByteSizeLong() const final; - #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER - static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); - ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } - #else - bool MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) final; - #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER - void SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const final; - ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const final; + const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; + ::PROTOBUF_NAMESPACE_ID::uint8* InternalSerializeWithCachedSizesToArray( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: - void SharedCtor(); - void SharedDtor(); + inline void SharedCtor(); + inline void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(GameServer_Status_Port* other); + friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; + static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { + return "agones.dev.sdk.GameServer.Status.Port"; + } private: - inline ::google::protobuf::Arena* GetArenaNoVirtual() const { + inline ::PROTOBUF_NAMESPACE_ID::Arena* GetArenaNoVirtual() const { return nullptr; } inline void* MaybeArenaPtr() const { @@ -1083,62 +1255,76 @@ class AGONES_EXPORT GameServer_Status_Port final : } public: - ::google::protobuf::Metadata GetMetadata() const final; + ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; + private: + static ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadataStatic() { + ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&::descriptor_table_sdk_2eproto); + return ::descriptor_table_sdk_2eproto.file_level_metadata[kIndexInFileMessages]; + } + + public: // nested types ---------------------------------------------------- // accessors ------------------------------------------------------- + enum : int { + kNameFieldNumber = 1, + kPortFieldNumber = 2, + }; // string name = 1; void clear_name(); - static const int kNameFieldNumber = 1; - const ::std::string& name() const; - void set_name(const ::std::string& value); - #if LANG_CXX11 - void set_name(::std::string&& value); - #endif + const std::string& name() const; + void set_name(const std::string& value); + void set_name(std::string&& value); void set_name(const char* value); void set_name(const char* value, size_t size); - ::std::string* mutable_name(); - ::std::string* release_name(); - void set_allocated_name(::std::string* name); + std::string* mutable_name(); + std::string* release_name(); + void set_allocated_name(std::string* name); + private: + const std::string& _internal_name() const; + void _internal_set_name(const std::string& value); + std::string* _internal_mutable_name(); + public: // int32 port = 2; void clear_port(); - static const int kPortFieldNumber = 2; - ::google::protobuf::int32 port() const; - void set_port(::google::protobuf::int32 value); + ::PROTOBUF_NAMESPACE_ID::int32 port() const; + void set_port(::PROTOBUF_NAMESPACE_ID::int32 value); + private: + ::PROTOBUF_NAMESPACE_ID::int32 _internal_port() const; + void _internal_set_port(::PROTOBUF_NAMESPACE_ID::int32 value); + public: // @@protoc_insertion_point(class_scope:agones.dev.sdk.GameServer.Status.Port) private: - class HasBitSetters; + class _Internal; - ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; - ::google::protobuf::internal::ArenaStringPtr name_; - ::google::protobuf::int32 port_; - mutable ::google::protobuf::internal::CachedSize _cached_size_; + ::PROTOBUF_NAMESPACE_ID::internal::InternalMetadataWithArena _internal_metadata_; + ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr name_; + ::PROTOBUF_NAMESPACE_ID::int32 port_; + mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; friend struct ::TableStruct_sdk_2eproto; }; // ------------------------------------------------------------------- -class AGONES_EXPORT GameServer_Status final : - public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:agones.dev.sdk.GameServer.Status) */ { +class AGONES_EXPORT GameServer_Status : + public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:agones.dev.sdk.GameServer.Status) */ { public: GameServer_Status(); virtual ~GameServer_Status(); GameServer_Status(const GameServer_Status& from); - - inline GameServer_Status& operator=(const GameServer_Status& from) { - CopyFrom(from); - return *this; - } - #if LANG_CXX11 GameServer_Status(GameServer_Status&& from) noexcept : GameServer_Status() { *this = ::std::move(from); } + inline GameServer_Status& operator=(const GameServer_Status& from) { + CopyFrom(from); + return *this; + } inline GameServer_Status& operator=(GameServer_Status&& from) noexcept { if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) { if (this != &from) InternalSwap(&from); @@ -1147,9 +1333,15 @@ class AGONES_EXPORT GameServer_Status final : } return *this; } - #endif - static const ::google::protobuf::Descriptor* descriptor() { - return default_instance().GetDescriptor(); + + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { + return GetDescriptor(); + } + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { + return GetMetadataStatic().descriptor; + } + static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { + return GetMetadataStatic().reflection; } static const GameServer_Status& default_instance(); @@ -1161,10 +1353,13 @@ class AGONES_EXPORT GameServer_Status final : static constexpr int kIndexInFileMessages = 9; - void Swap(GameServer_Status* other); friend void swap(GameServer_Status& a, GameServer_Status& b) { a.Swap(&b); } + inline void Swap(GameServer_Status* other) { + if (other == this) return; + InternalSwap(other); + } // implements Message ---------------------------------------------- @@ -1172,37 +1367,33 @@ class AGONES_EXPORT GameServer_Status final : return CreateMaybeMessage(nullptr); } - GameServer_Status* New(::google::protobuf::Arena* arena) const final { + GameServer_Status* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { return CreateMaybeMessage(arena); } - void CopyFrom(const ::google::protobuf::Message& from) final; - void MergeFrom(const ::google::protobuf::Message& from) final; + void CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final; + void MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final; void CopyFrom(const GameServer_Status& from); void MergeFrom(const GameServer_Status& from); PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; size_t ByteSizeLong() const final; - #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER - static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); - ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } - #else - bool MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) final; - #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER - void SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const final; - ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const final; + const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; + ::PROTOBUF_NAMESPACE_ID::uint8* InternalSerializeWithCachedSizesToArray( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: - void SharedCtor(); - void SharedDtor(); + inline void SharedCtor(); + inline void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(GameServer_Status* other); + friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; + static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { + return "agones.dev.sdk.GameServer.Status"; + } private: - inline ::google::protobuf::Arena* GetArenaNoVirtual() const { + inline ::PROTOBUF_NAMESPACE_ID::Arena* GetArenaNoVirtual() const { return nullptr; } inline void* MaybeArenaPtr() const { @@ -1210,7 +1401,14 @@ class AGONES_EXPORT GameServer_Status final : } public: - ::google::protobuf::Metadata GetMetadata() const final; + ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; + private: + static ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadataStatic() { + ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&::descriptor_table_sdk_2eproto); + return ::descriptor_table_sdk_2eproto.file_level_metadata[kIndexInFileMessages]; + } + + public: // nested types ---------------------------------------------------- @@ -1218,77 +1416,90 @@ class AGONES_EXPORT GameServer_Status final : // accessors ------------------------------------------------------- + enum : int { + kPortsFieldNumber = 3, + kStateFieldNumber = 1, + kAddressFieldNumber = 2, + }; // repeated .agones.dev.sdk.GameServer.Status.Port ports = 3; int ports_size() const; + private: + int _internal_ports_size() const; + public: void clear_ports(); - static const int kPortsFieldNumber = 3; ::agones::dev::sdk::GameServer_Status_Port* mutable_ports(int index); - ::google::protobuf::RepeatedPtrField< ::agones::dev::sdk::GameServer_Status_Port >* + ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::agones::dev::sdk::GameServer_Status_Port >* mutable_ports(); + private: + const ::agones::dev::sdk::GameServer_Status_Port& _internal_ports(int index) const; + ::agones::dev::sdk::GameServer_Status_Port* _internal_add_ports(); + public: const ::agones::dev::sdk::GameServer_Status_Port& ports(int index) const; ::agones::dev::sdk::GameServer_Status_Port* add_ports(); - const ::google::protobuf::RepeatedPtrField< ::agones::dev::sdk::GameServer_Status_Port >& + const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::agones::dev::sdk::GameServer_Status_Port >& ports() const; // string state = 1; void clear_state(); - static const int kStateFieldNumber = 1; - const ::std::string& state() const; - void set_state(const ::std::string& value); - #if LANG_CXX11 - void set_state(::std::string&& value); - #endif + const std::string& state() const; + void set_state(const std::string& value); + void set_state(std::string&& value); void set_state(const char* value); void set_state(const char* value, size_t size); - ::std::string* mutable_state(); - ::std::string* release_state(); - void set_allocated_state(::std::string* state); + std::string* mutable_state(); + std::string* release_state(); + void set_allocated_state(std::string* state); + private: + const std::string& _internal_state() const; + void _internal_set_state(const std::string& value); + std::string* _internal_mutable_state(); + public: // string address = 2; void clear_address(); - static const int kAddressFieldNumber = 2; - const ::std::string& address() const; - void set_address(const ::std::string& value); - #if LANG_CXX11 - void set_address(::std::string&& value); - #endif + const std::string& address() const; + void set_address(const std::string& value); + void set_address(std::string&& value); void set_address(const char* value); void set_address(const char* value, size_t size); - ::std::string* mutable_address(); - ::std::string* release_address(); - void set_allocated_address(::std::string* address); + std::string* mutable_address(); + std::string* release_address(); + void set_allocated_address(std::string* address); + private: + const std::string& _internal_address() const; + void _internal_set_address(const std::string& value); + std::string* _internal_mutable_address(); + public: // @@protoc_insertion_point(class_scope:agones.dev.sdk.GameServer.Status) private: - class HasBitSetters; + class _Internal; - ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; - ::google::protobuf::RepeatedPtrField< ::agones::dev::sdk::GameServer_Status_Port > ports_; - ::google::protobuf::internal::ArenaStringPtr state_; - ::google::protobuf::internal::ArenaStringPtr address_; - mutable ::google::protobuf::internal::CachedSize _cached_size_; + ::PROTOBUF_NAMESPACE_ID::internal::InternalMetadataWithArena _internal_metadata_; + ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::agones::dev::sdk::GameServer_Status_Port > ports_; + ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr state_; + ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr address_; + mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; friend struct ::TableStruct_sdk_2eproto; }; // ------------------------------------------------------------------- -class AGONES_EXPORT GameServer final : - public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:agones.dev.sdk.GameServer) */ { +class AGONES_EXPORT GameServer : + public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:agones.dev.sdk.GameServer) */ { public: GameServer(); virtual ~GameServer(); GameServer(const GameServer& from); - - inline GameServer& operator=(const GameServer& from) { - CopyFrom(from); - return *this; - } - #if LANG_CXX11 GameServer(GameServer&& from) noexcept : GameServer() { *this = ::std::move(from); } + inline GameServer& operator=(const GameServer& from) { + CopyFrom(from); + return *this; + } inline GameServer& operator=(GameServer&& from) noexcept { if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) { if (this != &from) InternalSwap(&from); @@ -1297,9 +1508,15 @@ class AGONES_EXPORT GameServer final : } return *this; } - #endif - static const ::google::protobuf::Descriptor* descriptor() { - return default_instance().GetDescriptor(); + + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { + return GetDescriptor(); + } + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { + return GetMetadataStatic().descriptor; + } + static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { + return GetMetadataStatic().reflection; } static const GameServer& default_instance(); @@ -1311,10 +1528,13 @@ class AGONES_EXPORT GameServer final : static constexpr int kIndexInFileMessages = 10; - void Swap(GameServer* other); friend void swap(GameServer& a, GameServer& b) { a.Swap(&b); } + inline void Swap(GameServer* other) { + if (other == this) return; + InternalSwap(other); + } // implements Message ---------------------------------------------- @@ -1322,37 +1542,33 @@ class AGONES_EXPORT GameServer final : return CreateMaybeMessage(nullptr); } - GameServer* New(::google::protobuf::Arena* arena) const final { + GameServer* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { return CreateMaybeMessage(arena); } - void CopyFrom(const ::google::protobuf::Message& from) final; - void MergeFrom(const ::google::protobuf::Message& from) final; + void CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final; + void MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final; void CopyFrom(const GameServer& from); void MergeFrom(const GameServer& from); PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; size_t ByteSizeLong() const final; - #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER - static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); - ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } - #else - bool MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) final; - #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER - void SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const final; - ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const final; + const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; + ::PROTOBUF_NAMESPACE_ID::uint8* InternalSerializeWithCachedSizesToArray( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: - void SharedCtor(); - void SharedDtor(); + inline void SharedCtor(); + inline void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(GameServer* other); + friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; + static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { + return "agones.dev.sdk.GameServer"; + } private: - inline ::google::protobuf::Arena* GetArenaNoVirtual() const { + inline ::PROTOBUF_NAMESPACE_ID::Arena* GetArenaNoVirtual() const { return nullptr; } inline void* MaybeArenaPtr() const { @@ -1360,7 +1576,14 @@ class AGONES_EXPORT GameServer final : } public: - ::google::protobuf::Metadata GetMetadata() const final; + ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; + private: + static ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadataStatic() { + ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&::descriptor_table_sdk_2eproto); + return ::descriptor_table_sdk_2eproto.file_level_metadata[kIndexInFileMessages]; + } + + public: // nested types ---------------------------------------------------- @@ -1370,42 +1593,65 @@ class AGONES_EXPORT GameServer final : // accessors ------------------------------------------------------- + enum : int { + kObjectMetaFieldNumber = 1, + kSpecFieldNumber = 2, + kStatusFieldNumber = 3, + }; // .agones.dev.sdk.GameServer.ObjectMeta object_meta = 1; bool has_object_meta() const; + private: + bool _internal_has_object_meta() const; + public: void clear_object_meta(); - static const int kObjectMetaFieldNumber = 1; const ::agones::dev::sdk::GameServer_ObjectMeta& object_meta() const; ::agones::dev::sdk::GameServer_ObjectMeta* release_object_meta(); ::agones::dev::sdk::GameServer_ObjectMeta* mutable_object_meta(); void set_allocated_object_meta(::agones::dev::sdk::GameServer_ObjectMeta* object_meta); + private: + const ::agones::dev::sdk::GameServer_ObjectMeta& _internal_object_meta() const; + ::agones::dev::sdk::GameServer_ObjectMeta* _internal_mutable_object_meta(); + public: // .agones.dev.sdk.GameServer.Spec spec = 2; bool has_spec() const; + private: + bool _internal_has_spec() const; + public: void clear_spec(); - static const int kSpecFieldNumber = 2; const ::agones::dev::sdk::GameServer_Spec& spec() const; ::agones::dev::sdk::GameServer_Spec* release_spec(); ::agones::dev::sdk::GameServer_Spec* mutable_spec(); void set_allocated_spec(::agones::dev::sdk::GameServer_Spec* spec); + private: + const ::agones::dev::sdk::GameServer_Spec& _internal_spec() const; + ::agones::dev::sdk::GameServer_Spec* _internal_mutable_spec(); + public: // .agones.dev.sdk.GameServer.Status status = 3; bool has_status() const; + private: + bool _internal_has_status() const; + public: void clear_status(); - static const int kStatusFieldNumber = 3; const ::agones::dev::sdk::GameServer_Status& status() const; ::agones::dev::sdk::GameServer_Status* release_status(); ::agones::dev::sdk::GameServer_Status* mutable_status(); void set_allocated_status(::agones::dev::sdk::GameServer_Status* status); + private: + const ::agones::dev::sdk::GameServer_Status& _internal_status() const; + ::agones::dev::sdk::GameServer_Status* _internal_mutable_status(); + public: // @@protoc_insertion_point(class_scope:agones.dev.sdk.GameServer) private: - class HasBitSetters; + class _Internal; - ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; + ::PROTOBUF_NAMESPACE_ID::internal::InternalMetadataWithArena _internal_metadata_; ::agones::dev::sdk::GameServer_ObjectMeta* object_meta_; ::agones::dev::sdk::GameServer_Spec* spec_; ::agones::dev::sdk::GameServer_Status* status_; - mutable ::google::protobuf::internal::CachedSize _cached_size_; + mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; friend struct ::TableStruct_sdk_2eproto; }; // =================================================================== @@ -1425,107 +1671,121 @@ class AGONES_EXPORT GameServer final : // string key = 1; inline void KeyValue::clear_key() { - key_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + key_.ClearToEmptyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } -inline const ::std::string& KeyValue::key() const { +inline const std::string& KeyValue::key() const { // @@protoc_insertion_point(field_get:agones.dev.sdk.KeyValue.key) + return _internal_key(); +} +inline void KeyValue::set_key(const std::string& value) { + _internal_set_key(value); + // @@protoc_insertion_point(field_set:agones.dev.sdk.KeyValue.key) +} +inline std::string* KeyValue::mutable_key() { + // @@protoc_insertion_point(field_mutable:agones.dev.sdk.KeyValue.key) + return _internal_mutable_key(); +} +inline const std::string& KeyValue::_internal_key() const { return key_.GetNoArena(); } -inline void KeyValue::set_key(const ::std::string& value) { +inline void KeyValue::_internal_set_key(const std::string& value) { - key_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); - // @@protoc_insertion_point(field_set:agones.dev.sdk.KeyValue.key) + key_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value); } -#if LANG_CXX11 -inline void KeyValue::set_key(::std::string&& value) { +inline void KeyValue::set_key(std::string&& value) { key_.SetNoArena( - &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); // @@protoc_insertion_point(field_set_rvalue:agones.dev.sdk.KeyValue.key) } -#endif inline void KeyValue::set_key(const char* value) { GOOGLE_DCHECK(value != nullptr); - key_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); + key_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:agones.dev.sdk.KeyValue.key) } inline void KeyValue::set_key(const char* value, size_t size) { - key_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + key_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:agones.dev.sdk.KeyValue.key) } -inline ::std::string* KeyValue::mutable_key() { +inline std::string* KeyValue::_internal_mutable_key() { - // @@protoc_insertion_point(field_mutable:agones.dev.sdk.KeyValue.key) - return key_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return key_.MutableNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } -inline ::std::string* KeyValue::release_key() { +inline std::string* KeyValue::release_key() { // @@protoc_insertion_point(field_release:agones.dev.sdk.KeyValue.key) - return key_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return key_.ReleaseNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } -inline void KeyValue::set_allocated_key(::std::string* key) { +inline void KeyValue::set_allocated_key(std::string* key) { if (key != nullptr) { } else { } - key_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), key); + key_.SetAllocatedNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), key); // @@protoc_insertion_point(field_set_allocated:agones.dev.sdk.KeyValue.key) } // string value = 2; inline void KeyValue::clear_value() { - value_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + value_.ClearToEmptyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } -inline const ::std::string& KeyValue::value() const { +inline const std::string& KeyValue::value() const { // @@protoc_insertion_point(field_get:agones.dev.sdk.KeyValue.value) + return _internal_value(); +} +inline void KeyValue::set_value(const std::string& value) { + _internal_set_value(value); + // @@protoc_insertion_point(field_set:agones.dev.sdk.KeyValue.value) +} +inline std::string* KeyValue::mutable_value() { + // @@protoc_insertion_point(field_mutable:agones.dev.sdk.KeyValue.value) + return _internal_mutable_value(); +} +inline const std::string& KeyValue::_internal_value() const { return value_.GetNoArena(); } -inline void KeyValue::set_value(const ::std::string& value) { +inline void KeyValue::_internal_set_value(const std::string& value) { - value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); - // @@protoc_insertion_point(field_set:agones.dev.sdk.KeyValue.value) + value_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value); } -#if LANG_CXX11 -inline void KeyValue::set_value(::std::string&& value) { +inline void KeyValue::set_value(std::string&& value) { value_.SetNoArena( - &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); // @@protoc_insertion_point(field_set_rvalue:agones.dev.sdk.KeyValue.value) } -#endif inline void KeyValue::set_value(const char* value) { GOOGLE_DCHECK(value != nullptr); - value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); + value_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:agones.dev.sdk.KeyValue.value) } inline void KeyValue::set_value(const char* value, size_t size) { - value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + value_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:agones.dev.sdk.KeyValue.value) } -inline ::std::string* KeyValue::mutable_value() { +inline std::string* KeyValue::_internal_mutable_value() { - // @@protoc_insertion_point(field_mutable:agones.dev.sdk.KeyValue.value) - return value_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return value_.MutableNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } -inline ::std::string* KeyValue::release_value() { +inline std::string* KeyValue::release_value() { // @@protoc_insertion_point(field_release:agones.dev.sdk.KeyValue.value) - return value_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return value_.ReleaseNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } -inline void KeyValue::set_allocated_value(::std::string* value) { +inline void KeyValue::set_allocated_value(std::string* value) { if (value != nullptr) { } else { } - value_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); + value_.SetAllocatedNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value); // @@protoc_insertion_point(field_set_allocated:agones.dev.sdk.KeyValue.value) } @@ -1537,13 +1797,19 @@ inline void KeyValue::set_allocated_value(::std::string* value) { inline void Duration::clear_seconds() { seconds_ = PROTOBUF_LONGLONG(0); } -inline ::google::protobuf::int64 Duration::seconds() const { - // @@protoc_insertion_point(field_get:agones.dev.sdk.Duration.seconds) +inline ::PROTOBUF_NAMESPACE_ID::int64 Duration::_internal_seconds() const { return seconds_; } -inline void Duration::set_seconds(::google::protobuf::int64 value) { +inline ::PROTOBUF_NAMESPACE_ID::int64 Duration::seconds() const { + // @@protoc_insertion_point(field_get:agones.dev.sdk.Duration.seconds) + return _internal_seconds(); +} +inline void Duration::_internal_set_seconds(::PROTOBUF_NAMESPACE_ID::int64 value) { seconds_ = value; +} +inline void Duration::set_seconds(::PROTOBUF_NAMESPACE_ID::int64 value) { + _internal_set_seconds(value); // @@protoc_insertion_point(field_set:agones.dev.sdk.Duration.seconds) } @@ -1557,213 +1823,241 @@ inline void Duration::set_seconds(::google::protobuf::int64 value) { // string name = 1; inline void GameServer_ObjectMeta::clear_name() { - name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + name_.ClearToEmptyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } -inline const ::std::string& GameServer_ObjectMeta::name() const { +inline const std::string& GameServer_ObjectMeta::name() const { // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.ObjectMeta.name) + return _internal_name(); +} +inline void GameServer_ObjectMeta::set_name(const std::string& value) { + _internal_set_name(value); + // @@protoc_insertion_point(field_set:agones.dev.sdk.GameServer.ObjectMeta.name) +} +inline std::string* GameServer_ObjectMeta::mutable_name() { + // @@protoc_insertion_point(field_mutable:agones.dev.sdk.GameServer.ObjectMeta.name) + return _internal_mutable_name(); +} +inline const std::string& GameServer_ObjectMeta::_internal_name() const { return name_.GetNoArena(); } -inline void GameServer_ObjectMeta::set_name(const ::std::string& value) { +inline void GameServer_ObjectMeta::_internal_set_name(const std::string& value) { - name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); - // @@protoc_insertion_point(field_set:agones.dev.sdk.GameServer.ObjectMeta.name) + name_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value); } -#if LANG_CXX11 -inline void GameServer_ObjectMeta::set_name(::std::string&& value) { +inline void GameServer_ObjectMeta::set_name(std::string&& value) { name_.SetNoArena( - &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); // @@protoc_insertion_point(field_set_rvalue:agones.dev.sdk.GameServer.ObjectMeta.name) } -#endif inline void GameServer_ObjectMeta::set_name(const char* value) { GOOGLE_DCHECK(value != nullptr); - name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); + name_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:agones.dev.sdk.GameServer.ObjectMeta.name) } inline void GameServer_ObjectMeta::set_name(const char* value, size_t size) { - name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + name_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:agones.dev.sdk.GameServer.ObjectMeta.name) } -inline ::std::string* GameServer_ObjectMeta::mutable_name() { +inline std::string* GameServer_ObjectMeta::_internal_mutable_name() { - // @@protoc_insertion_point(field_mutable:agones.dev.sdk.GameServer.ObjectMeta.name) - return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return name_.MutableNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } -inline ::std::string* GameServer_ObjectMeta::release_name() { +inline std::string* GameServer_ObjectMeta::release_name() { // @@protoc_insertion_point(field_release:agones.dev.sdk.GameServer.ObjectMeta.name) - return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return name_.ReleaseNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } -inline void GameServer_ObjectMeta::set_allocated_name(::std::string* name) { +inline void GameServer_ObjectMeta::set_allocated_name(std::string* name) { if (name != nullptr) { } else { } - name_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name); + name_.SetAllocatedNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), name); // @@protoc_insertion_point(field_set_allocated:agones.dev.sdk.GameServer.ObjectMeta.name) } // string namespace = 2; inline void GameServer_ObjectMeta::clear_namespace_() { - namespace__.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + namespace__.ClearToEmptyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } -inline const ::std::string& GameServer_ObjectMeta::namespace_() const { +inline const std::string& GameServer_ObjectMeta::namespace_() const { // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.ObjectMeta.namespace) + return _internal_namespace_(); +} +inline void GameServer_ObjectMeta::set_namespace_(const std::string& value) { + _internal_set_namespace_(value); + // @@protoc_insertion_point(field_set:agones.dev.sdk.GameServer.ObjectMeta.namespace) +} +inline std::string* GameServer_ObjectMeta::mutable_namespace_() { + // @@protoc_insertion_point(field_mutable:agones.dev.sdk.GameServer.ObjectMeta.namespace) + return _internal_mutable_namespace_(); +} +inline const std::string& GameServer_ObjectMeta::_internal_namespace_() const { return namespace__.GetNoArena(); } -inline void GameServer_ObjectMeta::set_namespace_(const ::std::string& value) { +inline void GameServer_ObjectMeta::_internal_set_namespace_(const std::string& value) { - namespace__.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); - // @@protoc_insertion_point(field_set:agones.dev.sdk.GameServer.ObjectMeta.namespace) + namespace__.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value); } -#if LANG_CXX11 -inline void GameServer_ObjectMeta::set_namespace_(::std::string&& value) { +inline void GameServer_ObjectMeta::set_namespace_(std::string&& value) { namespace__.SetNoArena( - &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); // @@protoc_insertion_point(field_set_rvalue:agones.dev.sdk.GameServer.ObjectMeta.namespace) } -#endif inline void GameServer_ObjectMeta::set_namespace_(const char* value) { GOOGLE_DCHECK(value != nullptr); - namespace__.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); + namespace__.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:agones.dev.sdk.GameServer.ObjectMeta.namespace) } inline void GameServer_ObjectMeta::set_namespace_(const char* value, size_t size) { - namespace__.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + namespace__.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:agones.dev.sdk.GameServer.ObjectMeta.namespace) } -inline ::std::string* GameServer_ObjectMeta::mutable_namespace_() { +inline std::string* GameServer_ObjectMeta::_internal_mutable_namespace_() { - // @@protoc_insertion_point(field_mutable:agones.dev.sdk.GameServer.ObjectMeta.namespace) - return namespace__.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return namespace__.MutableNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } -inline ::std::string* GameServer_ObjectMeta::release_namespace_() { +inline std::string* GameServer_ObjectMeta::release_namespace_() { // @@protoc_insertion_point(field_release:agones.dev.sdk.GameServer.ObjectMeta.namespace) - return namespace__.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return namespace__.ReleaseNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } -inline void GameServer_ObjectMeta::set_allocated_namespace_(::std::string* namespace_) { +inline void GameServer_ObjectMeta::set_allocated_namespace_(std::string* namespace_) { if (namespace_ != nullptr) { } else { } - namespace__.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), namespace_); + namespace__.SetAllocatedNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), namespace_); // @@protoc_insertion_point(field_set_allocated:agones.dev.sdk.GameServer.ObjectMeta.namespace) } // string uid = 3; inline void GameServer_ObjectMeta::clear_uid() { - uid_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + uid_.ClearToEmptyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } -inline const ::std::string& GameServer_ObjectMeta::uid() const { +inline const std::string& GameServer_ObjectMeta::uid() const { // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.ObjectMeta.uid) + return _internal_uid(); +} +inline void GameServer_ObjectMeta::set_uid(const std::string& value) { + _internal_set_uid(value); + // @@protoc_insertion_point(field_set:agones.dev.sdk.GameServer.ObjectMeta.uid) +} +inline std::string* GameServer_ObjectMeta::mutable_uid() { + // @@protoc_insertion_point(field_mutable:agones.dev.sdk.GameServer.ObjectMeta.uid) + return _internal_mutable_uid(); +} +inline const std::string& GameServer_ObjectMeta::_internal_uid() const { return uid_.GetNoArena(); } -inline void GameServer_ObjectMeta::set_uid(const ::std::string& value) { +inline void GameServer_ObjectMeta::_internal_set_uid(const std::string& value) { - uid_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); - // @@protoc_insertion_point(field_set:agones.dev.sdk.GameServer.ObjectMeta.uid) + uid_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value); } -#if LANG_CXX11 -inline void GameServer_ObjectMeta::set_uid(::std::string&& value) { +inline void GameServer_ObjectMeta::set_uid(std::string&& value) { uid_.SetNoArena( - &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); // @@protoc_insertion_point(field_set_rvalue:agones.dev.sdk.GameServer.ObjectMeta.uid) } -#endif inline void GameServer_ObjectMeta::set_uid(const char* value) { GOOGLE_DCHECK(value != nullptr); - uid_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); + uid_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:agones.dev.sdk.GameServer.ObjectMeta.uid) } inline void GameServer_ObjectMeta::set_uid(const char* value, size_t size) { - uid_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + uid_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:agones.dev.sdk.GameServer.ObjectMeta.uid) } -inline ::std::string* GameServer_ObjectMeta::mutable_uid() { +inline std::string* GameServer_ObjectMeta::_internal_mutable_uid() { - // @@protoc_insertion_point(field_mutable:agones.dev.sdk.GameServer.ObjectMeta.uid) - return uid_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return uid_.MutableNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } -inline ::std::string* GameServer_ObjectMeta::release_uid() { +inline std::string* GameServer_ObjectMeta::release_uid() { // @@protoc_insertion_point(field_release:agones.dev.sdk.GameServer.ObjectMeta.uid) - return uid_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return uid_.ReleaseNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } -inline void GameServer_ObjectMeta::set_allocated_uid(::std::string* uid) { +inline void GameServer_ObjectMeta::set_allocated_uid(std::string* uid) { if (uid != nullptr) { } else { } - uid_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), uid); + uid_.SetAllocatedNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), uid); // @@protoc_insertion_point(field_set_allocated:agones.dev.sdk.GameServer.ObjectMeta.uid) } // string resource_version = 4; inline void GameServer_ObjectMeta::clear_resource_version() { - resource_version_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + resource_version_.ClearToEmptyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } -inline const ::std::string& GameServer_ObjectMeta::resource_version() const { +inline const std::string& GameServer_ObjectMeta::resource_version() const { // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.ObjectMeta.resource_version) + return _internal_resource_version(); +} +inline void GameServer_ObjectMeta::set_resource_version(const std::string& value) { + _internal_set_resource_version(value); + // @@protoc_insertion_point(field_set:agones.dev.sdk.GameServer.ObjectMeta.resource_version) +} +inline std::string* GameServer_ObjectMeta::mutable_resource_version() { + // @@protoc_insertion_point(field_mutable:agones.dev.sdk.GameServer.ObjectMeta.resource_version) + return _internal_mutable_resource_version(); +} +inline const std::string& GameServer_ObjectMeta::_internal_resource_version() const { return resource_version_.GetNoArena(); } -inline void GameServer_ObjectMeta::set_resource_version(const ::std::string& value) { +inline void GameServer_ObjectMeta::_internal_set_resource_version(const std::string& value) { - resource_version_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); - // @@protoc_insertion_point(field_set:agones.dev.sdk.GameServer.ObjectMeta.resource_version) + resource_version_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value); } -#if LANG_CXX11 -inline void GameServer_ObjectMeta::set_resource_version(::std::string&& value) { +inline void GameServer_ObjectMeta::set_resource_version(std::string&& value) { resource_version_.SetNoArena( - &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); // @@protoc_insertion_point(field_set_rvalue:agones.dev.sdk.GameServer.ObjectMeta.resource_version) } -#endif inline void GameServer_ObjectMeta::set_resource_version(const char* value) { GOOGLE_DCHECK(value != nullptr); - resource_version_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); + resource_version_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:agones.dev.sdk.GameServer.ObjectMeta.resource_version) } inline void GameServer_ObjectMeta::set_resource_version(const char* value, size_t size) { - resource_version_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + resource_version_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:agones.dev.sdk.GameServer.ObjectMeta.resource_version) } -inline ::std::string* GameServer_ObjectMeta::mutable_resource_version() { +inline std::string* GameServer_ObjectMeta::_internal_mutable_resource_version() { - // @@protoc_insertion_point(field_mutable:agones.dev.sdk.GameServer.ObjectMeta.resource_version) - return resource_version_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return resource_version_.MutableNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } -inline ::std::string* GameServer_ObjectMeta::release_resource_version() { +inline std::string* GameServer_ObjectMeta::release_resource_version() { // @@protoc_insertion_point(field_release:agones.dev.sdk.GameServer.ObjectMeta.resource_version) - return resource_version_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return resource_version_.ReleaseNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } -inline void GameServer_ObjectMeta::set_allocated_resource_version(::std::string* resource_version) { +inline void GameServer_ObjectMeta::set_allocated_resource_version(std::string* resource_version) { if (resource_version != nullptr) { } else { } - resource_version_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), resource_version); + resource_version_.SetAllocatedNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), resource_version); // @@protoc_insertion_point(field_set_allocated:agones.dev.sdk.GameServer.ObjectMeta.resource_version) } @@ -1771,13 +2065,19 @@ inline void GameServer_ObjectMeta::set_allocated_resource_version(::std::string* inline void GameServer_ObjectMeta::clear_generation() { generation_ = PROTOBUF_LONGLONG(0); } -inline ::google::protobuf::int64 GameServer_ObjectMeta::generation() const { - // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.ObjectMeta.generation) +inline ::PROTOBUF_NAMESPACE_ID::int64 GameServer_ObjectMeta::_internal_generation() const { return generation_; } -inline void GameServer_ObjectMeta::set_generation(::google::protobuf::int64 value) { +inline ::PROTOBUF_NAMESPACE_ID::int64 GameServer_ObjectMeta::generation() const { + // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.ObjectMeta.generation) + return _internal_generation(); +} +inline void GameServer_ObjectMeta::_internal_set_generation(::PROTOBUF_NAMESPACE_ID::int64 value) { generation_ = value; +} +inline void GameServer_ObjectMeta::set_generation(::PROTOBUF_NAMESPACE_ID::int64 value) { + _internal_set_generation(value); // @@protoc_insertion_point(field_set:agones.dev.sdk.GameServer.ObjectMeta.generation) } @@ -1785,13 +2085,19 @@ inline void GameServer_ObjectMeta::set_generation(::google::protobuf::int64 valu inline void GameServer_ObjectMeta::clear_creation_timestamp() { creation_timestamp_ = PROTOBUF_LONGLONG(0); } -inline ::google::protobuf::int64 GameServer_ObjectMeta::creation_timestamp() const { - // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.ObjectMeta.creation_timestamp) +inline ::PROTOBUF_NAMESPACE_ID::int64 GameServer_ObjectMeta::_internal_creation_timestamp() const { return creation_timestamp_; } -inline void GameServer_ObjectMeta::set_creation_timestamp(::google::protobuf::int64 value) { +inline ::PROTOBUF_NAMESPACE_ID::int64 GameServer_ObjectMeta::creation_timestamp() const { + // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.ObjectMeta.creation_timestamp) + return _internal_creation_timestamp(); +} +inline void GameServer_ObjectMeta::_internal_set_creation_timestamp(::PROTOBUF_NAMESPACE_ID::int64 value) { creation_timestamp_ = value; +} +inline void GameServer_ObjectMeta::set_creation_timestamp(::PROTOBUF_NAMESPACE_ID::int64 value) { + _internal_set_creation_timestamp(value); // @@protoc_insertion_point(field_set:agones.dev.sdk.GameServer.ObjectMeta.creation_timestamp) } @@ -1799,50 +2105,78 @@ inline void GameServer_ObjectMeta::set_creation_timestamp(::google::protobuf::in inline void GameServer_ObjectMeta::clear_deletion_timestamp() { deletion_timestamp_ = PROTOBUF_LONGLONG(0); } -inline ::google::protobuf::int64 GameServer_ObjectMeta::deletion_timestamp() const { - // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.ObjectMeta.deletion_timestamp) +inline ::PROTOBUF_NAMESPACE_ID::int64 GameServer_ObjectMeta::_internal_deletion_timestamp() const { return deletion_timestamp_; } -inline void GameServer_ObjectMeta::set_deletion_timestamp(::google::protobuf::int64 value) { +inline ::PROTOBUF_NAMESPACE_ID::int64 GameServer_ObjectMeta::deletion_timestamp() const { + // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.ObjectMeta.deletion_timestamp) + return _internal_deletion_timestamp(); +} +inline void GameServer_ObjectMeta::_internal_set_deletion_timestamp(::PROTOBUF_NAMESPACE_ID::int64 value) { deletion_timestamp_ = value; +} +inline void GameServer_ObjectMeta::set_deletion_timestamp(::PROTOBUF_NAMESPACE_ID::int64 value) { + _internal_set_deletion_timestamp(value); // @@protoc_insertion_point(field_set:agones.dev.sdk.GameServer.ObjectMeta.deletion_timestamp) } // map annotations = 8; -inline int GameServer_ObjectMeta::annotations_size() const { +inline int GameServer_ObjectMeta::_internal_annotations_size() const { return annotations_.size(); } +inline int GameServer_ObjectMeta::annotations_size() const { + return _internal_annotations_size(); +} inline void GameServer_ObjectMeta::clear_annotations() { annotations_.Clear(); } -inline const ::google::protobuf::Map< ::std::string, ::std::string >& +inline const ::PROTOBUF_NAMESPACE_ID::Map< std::string, std::string >& +GameServer_ObjectMeta::_internal_annotations() const { + return annotations_.GetMap(); +} +inline const ::PROTOBUF_NAMESPACE_ID::Map< std::string, std::string >& GameServer_ObjectMeta::annotations() const { // @@protoc_insertion_point(field_map:agones.dev.sdk.GameServer.ObjectMeta.annotations) - return annotations_.GetMap(); + return _internal_annotations(); +} +inline ::PROTOBUF_NAMESPACE_ID::Map< std::string, std::string >* +GameServer_ObjectMeta::_internal_mutable_annotations() { + return annotations_.MutableMap(); } -inline ::google::protobuf::Map< ::std::string, ::std::string >* +inline ::PROTOBUF_NAMESPACE_ID::Map< std::string, std::string >* GameServer_ObjectMeta::mutable_annotations() { // @@protoc_insertion_point(field_mutable_map:agones.dev.sdk.GameServer.ObjectMeta.annotations) - return annotations_.MutableMap(); + return _internal_mutable_annotations(); } // map labels = 9; -inline int GameServer_ObjectMeta::labels_size() const { +inline int GameServer_ObjectMeta::_internal_labels_size() const { return labels_.size(); } +inline int GameServer_ObjectMeta::labels_size() const { + return _internal_labels_size(); +} inline void GameServer_ObjectMeta::clear_labels() { labels_.Clear(); } -inline const ::google::protobuf::Map< ::std::string, ::std::string >& +inline const ::PROTOBUF_NAMESPACE_ID::Map< std::string, std::string >& +GameServer_ObjectMeta::_internal_labels() const { + return labels_.GetMap(); +} +inline const ::PROTOBUF_NAMESPACE_ID::Map< std::string, std::string >& GameServer_ObjectMeta::labels() const { // @@protoc_insertion_point(field_map:agones.dev.sdk.GameServer.ObjectMeta.labels) - return labels_.GetMap(); + return _internal_labels(); +} +inline ::PROTOBUF_NAMESPACE_ID::Map< std::string, std::string >* +GameServer_ObjectMeta::_internal_mutable_labels() { + return labels_.MutableMap(); } -inline ::google::protobuf::Map< ::std::string, ::std::string >* +inline ::PROTOBUF_NAMESPACE_ID::Map< std::string, std::string >* GameServer_ObjectMeta::mutable_labels() { // @@protoc_insertion_point(field_mutable_map:agones.dev.sdk.GameServer.ObjectMeta.labels) - return labels_.MutableMap(); + return _internal_mutable_labels(); } // ------------------------------------------------------------------- @@ -1853,13 +2187,19 @@ GameServer_ObjectMeta::mutable_labels() { inline void GameServer_Spec_Health::clear_disabled() { disabled_ = false; } +inline bool GameServer_Spec_Health::_internal_disabled() const { + return disabled_; +} inline bool GameServer_Spec_Health::disabled() const { // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.Spec.Health.disabled) - return disabled_; + return _internal_disabled(); } -inline void GameServer_Spec_Health::set_disabled(bool value) { +inline void GameServer_Spec_Health::_internal_set_disabled(bool value) { disabled_ = value; +} +inline void GameServer_Spec_Health::set_disabled(bool value) { + _internal_set_disabled(value); // @@protoc_insertion_point(field_set:agones.dev.sdk.GameServer.Spec.Health.disabled) } @@ -1867,13 +2207,19 @@ inline void GameServer_Spec_Health::set_disabled(bool value) { inline void GameServer_Spec_Health::clear_period_seconds() { period_seconds_ = 0; } -inline ::google::protobuf::int32 GameServer_Spec_Health::period_seconds() const { - // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.Spec.Health.period_seconds) +inline ::PROTOBUF_NAMESPACE_ID::int32 GameServer_Spec_Health::_internal_period_seconds() const { return period_seconds_; } -inline void GameServer_Spec_Health::set_period_seconds(::google::protobuf::int32 value) { +inline ::PROTOBUF_NAMESPACE_ID::int32 GameServer_Spec_Health::period_seconds() const { + // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.Spec.Health.period_seconds) + return _internal_period_seconds(); +} +inline void GameServer_Spec_Health::_internal_set_period_seconds(::PROTOBUF_NAMESPACE_ID::int32 value) { period_seconds_ = value; +} +inline void GameServer_Spec_Health::set_period_seconds(::PROTOBUF_NAMESPACE_ID::int32 value) { + _internal_set_period_seconds(value); // @@protoc_insertion_point(field_set:agones.dev.sdk.GameServer.Spec.Health.period_seconds) } @@ -1881,13 +2227,19 @@ inline void GameServer_Spec_Health::set_period_seconds(::google::protobuf::int32 inline void GameServer_Spec_Health::clear_failure_threshold() { failure_threshold_ = 0; } -inline ::google::protobuf::int32 GameServer_Spec_Health::failure_threshold() const { - // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.Spec.Health.failure_threshold) +inline ::PROTOBUF_NAMESPACE_ID::int32 GameServer_Spec_Health::_internal_failure_threshold() const { return failure_threshold_; } -inline void GameServer_Spec_Health::set_failure_threshold(::google::protobuf::int32 value) { +inline ::PROTOBUF_NAMESPACE_ID::int32 GameServer_Spec_Health::failure_threshold() const { + // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.Spec.Health.failure_threshold) + return _internal_failure_threshold(); +} +inline void GameServer_Spec_Health::_internal_set_failure_threshold(::PROTOBUF_NAMESPACE_ID::int32 value) { failure_threshold_ = value; +} +inline void GameServer_Spec_Health::set_failure_threshold(::PROTOBUF_NAMESPACE_ID::int32 value) { + _internal_set_failure_threshold(value); // @@protoc_insertion_point(field_set:agones.dev.sdk.GameServer.Spec.Health.failure_threshold) } @@ -1895,13 +2247,19 @@ inline void GameServer_Spec_Health::set_failure_threshold(::google::protobuf::in inline void GameServer_Spec_Health::clear_initial_delay_seconds() { initial_delay_seconds_ = 0; } -inline ::google::protobuf::int32 GameServer_Spec_Health::initial_delay_seconds() const { - // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.Spec.Health.initial_delay_seconds) +inline ::PROTOBUF_NAMESPACE_ID::int32 GameServer_Spec_Health::_internal_initial_delay_seconds() const { return initial_delay_seconds_; } -inline void GameServer_Spec_Health::set_initial_delay_seconds(::google::protobuf::int32 value) { +inline ::PROTOBUF_NAMESPACE_ID::int32 GameServer_Spec_Health::initial_delay_seconds() const { + // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.Spec.Health.initial_delay_seconds) + return _internal_initial_delay_seconds(); +} +inline void GameServer_Spec_Health::_internal_set_initial_delay_seconds(::PROTOBUF_NAMESPACE_ID::int32 value) { initial_delay_seconds_ = value; +} +inline void GameServer_Spec_Health::set_initial_delay_seconds(::PROTOBUF_NAMESPACE_ID::int32 value) { + _internal_set_initial_delay_seconds(value); // @@protoc_insertion_point(field_set:agones.dev.sdk.GameServer.Spec.Health.initial_delay_seconds) } @@ -1910,21 +2268,27 @@ inline void GameServer_Spec_Health::set_initial_delay_seconds(::google::protobuf // GameServer_Spec // .agones.dev.sdk.GameServer.Spec.Health health = 1; -inline bool GameServer_Spec::has_health() const { +inline bool GameServer_Spec::_internal_has_health() const { return this != internal_default_instance() && health_ != nullptr; } +inline bool GameServer_Spec::has_health() const { + return _internal_has_health(); +} inline void GameServer_Spec::clear_health() { if (GetArenaNoVirtual() == nullptr && health_ != nullptr) { delete health_; } health_ = nullptr; } -inline const ::agones::dev::sdk::GameServer_Spec_Health& GameServer_Spec::health() const { +inline const ::agones::dev::sdk::GameServer_Spec_Health& GameServer_Spec::_internal_health() const { const ::agones::dev::sdk::GameServer_Spec_Health* p = health_; - // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.Spec.health) return p != nullptr ? *p : *reinterpret_cast( &::agones::dev::sdk::_GameServer_Spec_Health_default_instance_); } +inline const ::agones::dev::sdk::GameServer_Spec_Health& GameServer_Spec::health() const { + // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.Spec.health) + return _internal_health(); +} inline ::agones::dev::sdk::GameServer_Spec_Health* GameServer_Spec::release_health() { // @@protoc_insertion_point(field_release:agones.dev.sdk.GameServer.Spec.health) @@ -1932,24 +2296,27 @@ inline ::agones::dev::sdk::GameServer_Spec_Health* GameServer_Spec::release_heal health_ = nullptr; return temp; } -inline ::agones::dev::sdk::GameServer_Spec_Health* GameServer_Spec::mutable_health() { +inline ::agones::dev::sdk::GameServer_Spec_Health* GameServer_Spec::_internal_mutable_health() { if (health_ == nullptr) { auto* p = CreateMaybeMessage<::agones::dev::sdk::GameServer_Spec_Health>(GetArenaNoVirtual()); health_ = p; } - // @@protoc_insertion_point(field_mutable:agones.dev.sdk.GameServer.Spec.health) return health_; } +inline ::agones::dev::sdk::GameServer_Spec_Health* GameServer_Spec::mutable_health() { + // @@protoc_insertion_point(field_mutable:agones.dev.sdk.GameServer.Spec.health) + return _internal_mutable_health(); +} inline void GameServer_Spec::set_allocated_health(::agones::dev::sdk::GameServer_Spec_Health* health) { - ::google::protobuf::Arena* message_arena = GetArenaNoVirtual(); + ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaNoVirtual(); if (message_arena == nullptr) { delete health_; } if (health) { - ::google::protobuf::Arena* submessage_arena = nullptr; + ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena = nullptr; if (message_arena != submessage_arena) { - health = ::google::protobuf::internal::GetOwnedMessage( + health = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage( message_arena, health, submessage_arena); } @@ -1966,54 +2333,61 @@ inline void GameServer_Spec::set_allocated_health(::agones::dev::sdk::GameServer // string name = 1; inline void GameServer_Status_Port::clear_name() { - name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + name_.ClearToEmptyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } -inline const ::std::string& GameServer_Status_Port::name() const { +inline const std::string& GameServer_Status_Port::name() const { // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.Status.Port.name) + return _internal_name(); +} +inline void GameServer_Status_Port::set_name(const std::string& value) { + _internal_set_name(value); + // @@protoc_insertion_point(field_set:agones.dev.sdk.GameServer.Status.Port.name) +} +inline std::string* GameServer_Status_Port::mutable_name() { + // @@protoc_insertion_point(field_mutable:agones.dev.sdk.GameServer.Status.Port.name) + return _internal_mutable_name(); +} +inline const std::string& GameServer_Status_Port::_internal_name() const { return name_.GetNoArena(); } -inline void GameServer_Status_Port::set_name(const ::std::string& value) { +inline void GameServer_Status_Port::_internal_set_name(const std::string& value) { - name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); - // @@protoc_insertion_point(field_set:agones.dev.sdk.GameServer.Status.Port.name) + name_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value); } -#if LANG_CXX11 -inline void GameServer_Status_Port::set_name(::std::string&& value) { +inline void GameServer_Status_Port::set_name(std::string&& value) { name_.SetNoArena( - &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); // @@protoc_insertion_point(field_set_rvalue:agones.dev.sdk.GameServer.Status.Port.name) } -#endif inline void GameServer_Status_Port::set_name(const char* value) { GOOGLE_DCHECK(value != nullptr); - name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); + name_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:agones.dev.sdk.GameServer.Status.Port.name) } inline void GameServer_Status_Port::set_name(const char* value, size_t size) { - name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + name_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:agones.dev.sdk.GameServer.Status.Port.name) } -inline ::std::string* GameServer_Status_Port::mutable_name() { +inline std::string* GameServer_Status_Port::_internal_mutable_name() { - // @@protoc_insertion_point(field_mutable:agones.dev.sdk.GameServer.Status.Port.name) - return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return name_.MutableNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } -inline ::std::string* GameServer_Status_Port::release_name() { +inline std::string* GameServer_Status_Port::release_name() { // @@protoc_insertion_point(field_release:agones.dev.sdk.GameServer.Status.Port.name) - return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return name_.ReleaseNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } -inline void GameServer_Status_Port::set_allocated_name(::std::string* name) { +inline void GameServer_Status_Port::set_allocated_name(std::string* name) { if (name != nullptr) { } else { } - name_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name); + name_.SetAllocatedNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), name); // @@protoc_insertion_point(field_set_allocated:agones.dev.sdk.GameServer.Status.Port.name) } @@ -2021,13 +2395,19 @@ inline void GameServer_Status_Port::set_allocated_name(::std::string* name) { inline void GameServer_Status_Port::clear_port() { port_ = 0; } -inline ::google::protobuf::int32 GameServer_Status_Port::port() const { - // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.Status.Port.port) +inline ::PROTOBUF_NAMESPACE_ID::int32 GameServer_Status_Port::_internal_port() const { return port_; } -inline void GameServer_Status_Port::set_port(::google::protobuf::int32 value) { +inline ::PROTOBUF_NAMESPACE_ID::int32 GameServer_Status_Port::port() const { + // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.Status.Port.port) + return _internal_port(); +} +inline void GameServer_Status_Port::_internal_set_port(::PROTOBUF_NAMESPACE_ID::int32 value) { port_ = value; +} +inline void GameServer_Status_Port::set_port(::PROTOBUF_NAMESPACE_ID::int32 value) { + _internal_set_port(value); // @@protoc_insertion_point(field_set:agones.dev.sdk.GameServer.Status.Port.port) } @@ -2037,114 +2417,131 @@ inline void GameServer_Status_Port::set_port(::google::protobuf::int32 value) { // string state = 1; inline void GameServer_Status::clear_state() { - state_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + state_.ClearToEmptyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } -inline const ::std::string& GameServer_Status::state() const { +inline const std::string& GameServer_Status::state() const { // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.Status.state) + return _internal_state(); +} +inline void GameServer_Status::set_state(const std::string& value) { + _internal_set_state(value); + // @@protoc_insertion_point(field_set:agones.dev.sdk.GameServer.Status.state) +} +inline std::string* GameServer_Status::mutable_state() { + // @@protoc_insertion_point(field_mutable:agones.dev.sdk.GameServer.Status.state) + return _internal_mutable_state(); +} +inline const std::string& GameServer_Status::_internal_state() const { return state_.GetNoArena(); } -inline void GameServer_Status::set_state(const ::std::string& value) { +inline void GameServer_Status::_internal_set_state(const std::string& value) { - state_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); - // @@protoc_insertion_point(field_set:agones.dev.sdk.GameServer.Status.state) + state_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value); } -#if LANG_CXX11 -inline void GameServer_Status::set_state(::std::string&& value) { +inline void GameServer_Status::set_state(std::string&& value) { state_.SetNoArena( - &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); // @@protoc_insertion_point(field_set_rvalue:agones.dev.sdk.GameServer.Status.state) } -#endif inline void GameServer_Status::set_state(const char* value) { GOOGLE_DCHECK(value != nullptr); - state_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); + state_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:agones.dev.sdk.GameServer.Status.state) } inline void GameServer_Status::set_state(const char* value, size_t size) { - state_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + state_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:agones.dev.sdk.GameServer.Status.state) } -inline ::std::string* GameServer_Status::mutable_state() { +inline std::string* GameServer_Status::_internal_mutable_state() { - // @@protoc_insertion_point(field_mutable:agones.dev.sdk.GameServer.Status.state) - return state_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return state_.MutableNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } -inline ::std::string* GameServer_Status::release_state() { +inline std::string* GameServer_Status::release_state() { // @@protoc_insertion_point(field_release:agones.dev.sdk.GameServer.Status.state) - return state_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return state_.ReleaseNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } -inline void GameServer_Status::set_allocated_state(::std::string* state) { +inline void GameServer_Status::set_allocated_state(std::string* state) { if (state != nullptr) { } else { } - state_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), state); + state_.SetAllocatedNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), state); // @@protoc_insertion_point(field_set_allocated:agones.dev.sdk.GameServer.Status.state) } // string address = 2; inline void GameServer_Status::clear_address() { - address_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + address_.ClearToEmptyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } -inline const ::std::string& GameServer_Status::address() const { +inline const std::string& GameServer_Status::address() const { // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.Status.address) + return _internal_address(); +} +inline void GameServer_Status::set_address(const std::string& value) { + _internal_set_address(value); + // @@protoc_insertion_point(field_set:agones.dev.sdk.GameServer.Status.address) +} +inline std::string* GameServer_Status::mutable_address() { + // @@protoc_insertion_point(field_mutable:agones.dev.sdk.GameServer.Status.address) + return _internal_mutable_address(); +} +inline const std::string& GameServer_Status::_internal_address() const { return address_.GetNoArena(); } -inline void GameServer_Status::set_address(const ::std::string& value) { +inline void GameServer_Status::_internal_set_address(const std::string& value) { - address_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); - // @@protoc_insertion_point(field_set:agones.dev.sdk.GameServer.Status.address) + address_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value); } -#if LANG_CXX11 -inline void GameServer_Status::set_address(::std::string&& value) { +inline void GameServer_Status::set_address(std::string&& value) { address_.SetNoArena( - &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); // @@protoc_insertion_point(field_set_rvalue:agones.dev.sdk.GameServer.Status.address) } -#endif inline void GameServer_Status::set_address(const char* value) { GOOGLE_DCHECK(value != nullptr); - address_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); + address_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:agones.dev.sdk.GameServer.Status.address) } inline void GameServer_Status::set_address(const char* value, size_t size) { - address_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + address_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:agones.dev.sdk.GameServer.Status.address) } -inline ::std::string* GameServer_Status::mutable_address() { +inline std::string* GameServer_Status::_internal_mutable_address() { - // @@protoc_insertion_point(field_mutable:agones.dev.sdk.GameServer.Status.address) - return address_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return address_.MutableNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } -inline ::std::string* GameServer_Status::release_address() { +inline std::string* GameServer_Status::release_address() { // @@protoc_insertion_point(field_release:agones.dev.sdk.GameServer.Status.address) - return address_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return address_.ReleaseNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } -inline void GameServer_Status::set_allocated_address(::std::string* address) { +inline void GameServer_Status::set_allocated_address(std::string* address) { if (address != nullptr) { } else { } - address_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), address); + address_.SetAllocatedNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), address); // @@protoc_insertion_point(field_set_allocated:agones.dev.sdk.GameServer.Status.address) } // repeated .agones.dev.sdk.GameServer.Status.Port ports = 3; -inline int GameServer_Status::ports_size() const { +inline int GameServer_Status::_internal_ports_size() const { return ports_.size(); } +inline int GameServer_Status::ports_size() const { + return _internal_ports_size(); +} inline void GameServer_Status::clear_ports() { ports_.Clear(); } @@ -2152,20 +2549,26 @@ inline ::agones::dev::sdk::GameServer_Status_Port* GameServer_Status::mutable_po // @@protoc_insertion_point(field_mutable:agones.dev.sdk.GameServer.Status.ports) return ports_.Mutable(index); } -inline ::google::protobuf::RepeatedPtrField< ::agones::dev::sdk::GameServer_Status_Port >* +inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::agones::dev::sdk::GameServer_Status_Port >* GameServer_Status::mutable_ports() { // @@protoc_insertion_point(field_mutable_list:agones.dev.sdk.GameServer.Status.ports) return &ports_; } +inline const ::agones::dev::sdk::GameServer_Status_Port& GameServer_Status::_internal_ports(int index) const { + return ports_.Get(index); +} inline const ::agones::dev::sdk::GameServer_Status_Port& GameServer_Status::ports(int index) const { // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.Status.ports) - return ports_.Get(index); + return _internal_ports(index); +} +inline ::agones::dev::sdk::GameServer_Status_Port* GameServer_Status::_internal_add_ports() { + return ports_.Add(); } inline ::agones::dev::sdk::GameServer_Status_Port* GameServer_Status::add_ports() { // @@protoc_insertion_point(field_add:agones.dev.sdk.GameServer.Status.ports) - return ports_.Add(); + return _internal_add_ports(); } -inline const ::google::protobuf::RepeatedPtrField< ::agones::dev::sdk::GameServer_Status_Port >& +inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::agones::dev::sdk::GameServer_Status_Port >& GameServer_Status::ports() const { // @@protoc_insertion_point(field_list:agones.dev.sdk.GameServer.Status.ports) return ports_; @@ -2176,21 +2579,27 @@ GameServer_Status::ports() const { // GameServer // .agones.dev.sdk.GameServer.ObjectMeta object_meta = 1; -inline bool GameServer::has_object_meta() const { +inline bool GameServer::_internal_has_object_meta() const { return this != internal_default_instance() && object_meta_ != nullptr; } +inline bool GameServer::has_object_meta() const { + return _internal_has_object_meta(); +} inline void GameServer::clear_object_meta() { if (GetArenaNoVirtual() == nullptr && object_meta_ != nullptr) { delete object_meta_; } object_meta_ = nullptr; } -inline const ::agones::dev::sdk::GameServer_ObjectMeta& GameServer::object_meta() const { +inline const ::agones::dev::sdk::GameServer_ObjectMeta& GameServer::_internal_object_meta() const { const ::agones::dev::sdk::GameServer_ObjectMeta* p = object_meta_; - // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.object_meta) return p != nullptr ? *p : *reinterpret_cast( &::agones::dev::sdk::_GameServer_ObjectMeta_default_instance_); } +inline const ::agones::dev::sdk::GameServer_ObjectMeta& GameServer::object_meta() const { + // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.object_meta) + return _internal_object_meta(); +} inline ::agones::dev::sdk::GameServer_ObjectMeta* GameServer::release_object_meta() { // @@protoc_insertion_point(field_release:agones.dev.sdk.GameServer.object_meta) @@ -2198,24 +2607,27 @@ inline ::agones::dev::sdk::GameServer_ObjectMeta* GameServer::release_object_met object_meta_ = nullptr; return temp; } -inline ::agones::dev::sdk::GameServer_ObjectMeta* GameServer::mutable_object_meta() { +inline ::agones::dev::sdk::GameServer_ObjectMeta* GameServer::_internal_mutable_object_meta() { if (object_meta_ == nullptr) { auto* p = CreateMaybeMessage<::agones::dev::sdk::GameServer_ObjectMeta>(GetArenaNoVirtual()); object_meta_ = p; } - // @@protoc_insertion_point(field_mutable:agones.dev.sdk.GameServer.object_meta) return object_meta_; } +inline ::agones::dev::sdk::GameServer_ObjectMeta* GameServer::mutable_object_meta() { + // @@protoc_insertion_point(field_mutable:agones.dev.sdk.GameServer.object_meta) + return _internal_mutable_object_meta(); +} inline void GameServer::set_allocated_object_meta(::agones::dev::sdk::GameServer_ObjectMeta* object_meta) { - ::google::protobuf::Arena* message_arena = GetArenaNoVirtual(); + ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaNoVirtual(); if (message_arena == nullptr) { delete object_meta_; } if (object_meta) { - ::google::protobuf::Arena* submessage_arena = nullptr; + ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena = nullptr; if (message_arena != submessage_arena) { - object_meta = ::google::protobuf::internal::GetOwnedMessage( + object_meta = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage( message_arena, object_meta, submessage_arena); } @@ -2227,21 +2639,27 @@ inline void GameServer::set_allocated_object_meta(::agones::dev::sdk::GameServer } // .agones.dev.sdk.GameServer.Spec spec = 2; -inline bool GameServer::has_spec() const { +inline bool GameServer::_internal_has_spec() const { return this != internal_default_instance() && spec_ != nullptr; } +inline bool GameServer::has_spec() const { + return _internal_has_spec(); +} inline void GameServer::clear_spec() { if (GetArenaNoVirtual() == nullptr && spec_ != nullptr) { delete spec_; } spec_ = nullptr; } -inline const ::agones::dev::sdk::GameServer_Spec& GameServer::spec() const { +inline const ::agones::dev::sdk::GameServer_Spec& GameServer::_internal_spec() const { const ::agones::dev::sdk::GameServer_Spec* p = spec_; - // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.spec) return p != nullptr ? *p : *reinterpret_cast( &::agones::dev::sdk::_GameServer_Spec_default_instance_); } +inline const ::agones::dev::sdk::GameServer_Spec& GameServer::spec() const { + // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.spec) + return _internal_spec(); +} inline ::agones::dev::sdk::GameServer_Spec* GameServer::release_spec() { // @@protoc_insertion_point(field_release:agones.dev.sdk.GameServer.spec) @@ -2249,24 +2667,27 @@ inline ::agones::dev::sdk::GameServer_Spec* GameServer::release_spec() { spec_ = nullptr; return temp; } -inline ::agones::dev::sdk::GameServer_Spec* GameServer::mutable_spec() { +inline ::agones::dev::sdk::GameServer_Spec* GameServer::_internal_mutable_spec() { if (spec_ == nullptr) { auto* p = CreateMaybeMessage<::agones::dev::sdk::GameServer_Spec>(GetArenaNoVirtual()); spec_ = p; } - // @@protoc_insertion_point(field_mutable:agones.dev.sdk.GameServer.spec) return spec_; } +inline ::agones::dev::sdk::GameServer_Spec* GameServer::mutable_spec() { + // @@protoc_insertion_point(field_mutable:agones.dev.sdk.GameServer.spec) + return _internal_mutable_spec(); +} inline void GameServer::set_allocated_spec(::agones::dev::sdk::GameServer_Spec* spec) { - ::google::protobuf::Arena* message_arena = GetArenaNoVirtual(); + ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaNoVirtual(); if (message_arena == nullptr) { delete spec_; } if (spec) { - ::google::protobuf::Arena* submessage_arena = nullptr; + ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena = nullptr; if (message_arena != submessage_arena) { - spec = ::google::protobuf::internal::GetOwnedMessage( + spec = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage( message_arena, spec, submessage_arena); } @@ -2278,21 +2699,27 @@ inline void GameServer::set_allocated_spec(::agones::dev::sdk::GameServer_Spec* } // .agones.dev.sdk.GameServer.Status status = 3; -inline bool GameServer::has_status() const { +inline bool GameServer::_internal_has_status() const { return this != internal_default_instance() && status_ != nullptr; } +inline bool GameServer::has_status() const { + return _internal_has_status(); +} inline void GameServer::clear_status() { if (GetArenaNoVirtual() == nullptr && status_ != nullptr) { delete status_; } status_ = nullptr; } -inline const ::agones::dev::sdk::GameServer_Status& GameServer::status() const { +inline const ::agones::dev::sdk::GameServer_Status& GameServer::_internal_status() const { const ::agones::dev::sdk::GameServer_Status* p = status_; - // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.status) return p != nullptr ? *p : *reinterpret_cast( &::agones::dev::sdk::_GameServer_Status_default_instance_); } +inline const ::agones::dev::sdk::GameServer_Status& GameServer::status() const { + // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.status) + return _internal_status(); +} inline ::agones::dev::sdk::GameServer_Status* GameServer::release_status() { // @@protoc_insertion_point(field_release:agones.dev.sdk.GameServer.status) @@ -2300,24 +2727,27 @@ inline ::agones::dev::sdk::GameServer_Status* GameServer::release_status() { status_ = nullptr; return temp; } -inline ::agones::dev::sdk::GameServer_Status* GameServer::mutable_status() { +inline ::agones::dev::sdk::GameServer_Status* GameServer::_internal_mutable_status() { if (status_ == nullptr) { auto* p = CreateMaybeMessage<::agones::dev::sdk::GameServer_Status>(GetArenaNoVirtual()); status_ = p; } - // @@protoc_insertion_point(field_mutable:agones.dev.sdk.GameServer.status) return status_; } +inline ::agones::dev::sdk::GameServer_Status* GameServer::mutable_status() { + // @@protoc_insertion_point(field_mutable:agones.dev.sdk.GameServer.status) + return _internal_mutable_status(); +} inline void GameServer::set_allocated_status(::agones::dev::sdk::GameServer_Status* status) { - ::google::protobuf::Arena* message_arena = GetArenaNoVirtual(); + ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaNoVirtual(); if (message_arena == nullptr) { delete status_; } if (status) { - ::google::protobuf::Arena* submessage_arena = nullptr; + ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena = nullptr; if (message_arena != submessage_arena) { - status = ::google::protobuf::internal::GetOwnedMessage( + status = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage( message_arena, status, submessage_arena); } @@ -2361,4 +2791,4 @@ inline void GameServer::set_allocated_status(::agones::dev::sdk::GameServer_Stat // @@protoc_insertion_point(global_scope) #include -#endif // PROTOBUF_INCLUDED_sdk_2eproto +#endif // GOOGLE_PROTOBUF_INCLUDED_GOOGLE_PROTOBUF_INCLUDED_sdk_2eproto diff --git a/sdks/cpp/include/google/api/annotations.pb.h b/sdks/cpp/include/google/api/annotations.pb.h index 2abd934c4a..abb8fb9dff 100644 --- a/sdks/cpp/include/google/api/annotations.pb.h +++ b/sdks/cpp/include/google/api/annotations.pb.h @@ -16,19 +16,19 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/api/annotations.proto -#ifndef PROTOBUF_INCLUDED_google_2fapi_2fannotations_2eproto -#define PROTOBUF_INCLUDED_google_2fapi_2fannotations_2eproto +#ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fapi_2fannotations_2eproto +#define GOOGLE_PROTOBUF_INCLUDED_google_2fapi_2fannotations_2eproto #include #include #include -#if PROTOBUF_VERSION < 3007000 +#if PROTOBUF_VERSION < 3010000 #error This file was generated by a newer version of protoc which is #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3007000 < PROTOBUF_MIN_PROTOC_VERSION +#if 3010001 < PROTOBUF_MIN_PROTOC_VERSION #error This file was generated by an older version of protoc which is #error incompatible with your Protocol Buffer headers. Please #error regenerate this file with a newer version of protoc. @@ -42,6 +42,7 @@ #include #include #include +#include #include // IWYU pragma: export #include // IWYU pragma: export #include "google/api/http.pb.h" @@ -49,24 +50,27 @@ // @@protoc_insertion_point(includes) #include #define PROTOBUF_INTERNAL_EXPORT_google_2fapi_2fannotations_2eproto AGONES_EXPORT +PROTOBUF_NAMESPACE_OPEN +namespace internal { +class AnyMetadata; +} // namespace internal +PROTOBUF_NAMESPACE_CLOSE // Internal implementation detail -- do not use these members. struct AGONES_EXPORT TableStruct_google_2fapi_2fannotations_2eproto { - static const ::google::protobuf::internal::ParseTableField entries[] + static const ::PROTOBUF_NAMESPACE_ID::internal::ParseTableField entries[] PROTOBUF_SECTION_VARIABLE(protodesc_cold); - static const ::google::protobuf::internal::AuxillaryParseTableField aux[] + static const ::PROTOBUF_NAMESPACE_ID::internal::AuxillaryParseTableField aux[] PROTOBUF_SECTION_VARIABLE(protodesc_cold); - static const ::google::protobuf::internal::ParseTable schema[1] + static const ::PROTOBUF_NAMESPACE_ID::internal::ParseTable schema[1] PROTOBUF_SECTION_VARIABLE(protodesc_cold); - static const ::google::protobuf::internal::FieldMetadata field_metadata[]; - static const ::google::protobuf::internal::SerializationTable serialization_table[]; - static const ::google::protobuf::uint32 offsets[]; + static const ::PROTOBUF_NAMESPACE_ID::internal::FieldMetadata field_metadata[]; + static const ::PROTOBUF_NAMESPACE_ID::internal::SerializationTable serialization_table[]; + static const ::PROTOBUF_NAMESPACE_ID::uint32 offsets[]; }; -void AGONES_EXPORT AddDescriptors_google_2fapi_2fannotations_2eproto(); -namespace google { -namespace protobuf { -} // namespace protobuf -} // namespace google +extern AGONES_EXPORT const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_google_2fapi_2fannotations_2eproto; +PROTOBUF_NAMESPACE_OPEN +PROTOBUF_NAMESPACE_CLOSE namespace google { namespace api { @@ -76,8 +80,8 @@ namespace api { // =================================================================== static const int kHttpFieldNumber = 72295728; -AGONES_EXPORT extern ::google::protobuf::internal::ExtensionIdentifier< ::google::protobuf::MethodOptions, - ::google::protobuf::internal::MessageTypeTraits< ::google::api::HttpRule >, 11, false > +AGONES_EXPORT extern ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier< ::google::protobuf::MethodOptions, + ::PROTOBUF_NAMESPACE_ID::internal::MessageTypeTraits< ::google::api::HttpRule >, 11, false > http; // =================================================================== @@ -98,4 +102,4 @@ AGONES_EXPORT extern ::google::protobuf::internal::ExtensionIdentifier< ::google // @@protoc_insertion_point(global_scope) #include -#endif // PROTOBUF_INCLUDED_google_2fapi_2fannotations_2eproto +#endif // GOOGLE_PROTOBUF_INCLUDED_GOOGLE_PROTOBUF_INCLUDED_google_2fapi_2fannotations_2eproto diff --git a/sdks/cpp/include/google/api/http.pb.h b/sdks/cpp/include/google/api/http.pb.h index 96ac5f5800..2858639d3c 100644 --- a/sdks/cpp/include/google/api/http.pb.h +++ b/sdks/cpp/include/google/api/http.pb.h @@ -16,19 +16,19 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/api/http.proto -#ifndef PROTOBUF_INCLUDED_google_2fapi_2fhttp_2eproto -#define PROTOBUF_INCLUDED_google_2fapi_2fhttp_2eproto +#ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fapi_2fhttp_2eproto +#define GOOGLE_PROTOBUF_INCLUDED_google_2fapi_2fhttp_2eproto #include #include #include -#if PROTOBUF_VERSION < 3007000 +#if PROTOBUF_VERSION < 3010000 #error This file was generated by a newer version of protoc which is #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3007000 < PROTOBUF_MIN_PROTOC_VERSION +#if 3010001 < PROTOBUF_MIN_PROTOC_VERSION #error This file was generated by an older version of protoc which is #error incompatible with your Protocol Buffer headers. Please #error regenerate this file with a newer version of protoc. @@ -42,6 +42,7 @@ #include #include #include +#include #include #include // IWYU pragma: export #include // IWYU pragma: export @@ -49,20 +50,25 @@ // @@protoc_insertion_point(includes) #include #define PROTOBUF_INTERNAL_EXPORT_google_2fapi_2fhttp_2eproto AGONES_EXPORT +PROTOBUF_NAMESPACE_OPEN +namespace internal { +class AnyMetadata; +} // namespace internal +PROTOBUF_NAMESPACE_CLOSE // Internal implementation detail -- do not use these members. struct AGONES_EXPORT TableStruct_google_2fapi_2fhttp_2eproto { - static const ::google::protobuf::internal::ParseTableField entries[] + static const ::PROTOBUF_NAMESPACE_ID::internal::ParseTableField entries[] PROTOBUF_SECTION_VARIABLE(protodesc_cold); - static const ::google::protobuf::internal::AuxillaryParseTableField aux[] + static const ::PROTOBUF_NAMESPACE_ID::internal::AuxillaryParseTableField aux[] PROTOBUF_SECTION_VARIABLE(protodesc_cold); - static const ::google::protobuf::internal::ParseTable schema[3] + static const ::PROTOBUF_NAMESPACE_ID::internal::ParseTable schema[3] PROTOBUF_SECTION_VARIABLE(protodesc_cold); - static const ::google::protobuf::internal::FieldMetadata field_metadata[]; - static const ::google::protobuf::internal::SerializationTable serialization_table[]; - static const ::google::protobuf::uint32 offsets[]; + static const ::PROTOBUF_NAMESPACE_ID::internal::FieldMetadata field_metadata[]; + static const ::PROTOBUF_NAMESPACE_ID::internal::SerializationTable serialization_table[]; + static const ::PROTOBUF_NAMESPACE_ID::uint32 offsets[]; }; -void AGONES_EXPORT AddDescriptors_google_2fapi_2fhttp_2eproto(); +extern AGONES_EXPORT const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_google_2fapi_2fhttp_2eproto; namespace google { namespace api { class CustomHttpPattern; @@ -75,35 +81,33 @@ class HttpRule; class HttpRuleDefaultTypeInternal; AGONES_EXPORT extern HttpRuleDefaultTypeInternal _HttpRule_default_instance_; } // namespace api -namespace protobuf { +} // namespace google +PROTOBUF_NAMESPACE_OPEN template<> AGONES_EXPORT ::google::api::CustomHttpPattern* Arena::CreateMaybeMessage<::google::api::CustomHttpPattern>(Arena*); template<> AGONES_EXPORT ::google::api::Http* Arena::CreateMaybeMessage<::google::api::Http>(Arena*); template<> AGONES_EXPORT ::google::api::HttpRule* Arena::CreateMaybeMessage<::google::api::HttpRule>(Arena*); -} // namespace protobuf -} // namespace google +PROTOBUF_NAMESPACE_CLOSE namespace google { namespace api { // =================================================================== -class AGONES_EXPORT Http final : - public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.api.Http) */ { +class AGONES_EXPORT Http : + public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.api.Http) */ { public: Http(); virtual ~Http(); Http(const Http& from); - - inline Http& operator=(const Http& from) { - CopyFrom(from); - return *this; - } - #if LANG_CXX11 Http(Http&& from) noexcept : Http() { *this = ::std::move(from); } + inline Http& operator=(const Http& from) { + CopyFrom(from); + return *this; + } inline Http& operator=(Http&& from) noexcept { if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) { if (this != &from) InternalSwap(&from); @@ -112,15 +116,21 @@ class AGONES_EXPORT Http final : } return *this; } - #endif - inline ::google::protobuf::Arena* GetArena() const final { + + inline ::PROTOBUF_NAMESPACE_ID::Arena* GetArena() const final { return GetArenaNoVirtual(); } inline void* GetMaybeArenaPointer() const final { return MaybeArenaPtr(); } - static const ::google::protobuf::Descriptor* descriptor() { - return default_instance().GetDescriptor(); + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { + return GetDescriptor(); + } + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { + return GetMetadataStatic().descriptor; + } + static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { + return GetMetadataStatic().reflection; } static const Http& default_instance(); @@ -132,11 +142,22 @@ class AGONES_EXPORT Http final : static constexpr int kIndexInFileMessages = 0; - void UnsafeArenaSwap(Http* other); - void Swap(Http* other); friend void swap(Http& a, Http& b) { a.Swap(&b); } + inline void Swap(Http* other) { + if (other == this) return; + if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) { + InternalSwap(other); + } else { + ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); + } + } + void UnsafeArenaSwap(Http* other) { + if (other == this) return; + GOOGLE_DCHECK(GetArenaNoVirtual() == other->GetArenaNoVirtual()); + InternalSwap(other); + } // implements Message ---------------------------------------------- @@ -144,42 +165,38 @@ class AGONES_EXPORT Http final : return CreateMaybeMessage(nullptr); } - Http* New(::google::protobuf::Arena* arena) const final { + Http* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { return CreateMaybeMessage(arena); } - void CopyFrom(const ::google::protobuf::Message& from) final; - void MergeFrom(const ::google::protobuf::Message& from) final; + void CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final; + void MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final; void CopyFrom(const Http& from); void MergeFrom(const Http& from); PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; size_t ByteSizeLong() const final; - #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER - static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); - ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } - #else - bool MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) final; - #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER - void SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const final; - ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const final; + const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; + ::PROTOBUF_NAMESPACE_ID::uint8* InternalSerializeWithCachedSizesToArray( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: - void SharedCtor(); - void SharedDtor(); + inline void SharedCtor(); + inline void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(Http* other); + friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; + static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { + return "google.api.Http"; + } protected: - explicit Http(::google::protobuf::Arena* arena); + explicit Http(::PROTOBUF_NAMESPACE_ID::Arena* arena); private: static void ArenaDtor(void* object); - inline void RegisterArenaDtor(::google::protobuf::Arena* arena); + inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena); private: - inline ::google::protobuf::Arena* GetArenaNoVirtual() const { + inline ::PROTOBUF_NAMESPACE_ID::Arena* GetArenaNoVirtual() const { return _internal_metadata_.arena(); } inline void* MaybeArenaPtr() const { @@ -187,63 +204,81 @@ class AGONES_EXPORT Http final : } public: - ::google::protobuf::Metadata GetMetadata() const final; + ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; + private: + static ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadataStatic() { + ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&::descriptor_table_google_2fapi_2fhttp_2eproto); + return ::descriptor_table_google_2fapi_2fhttp_2eproto.file_level_metadata[kIndexInFileMessages]; + } + + public: // nested types ---------------------------------------------------- // accessors ------------------------------------------------------- + enum : int { + kRulesFieldNumber = 1, + kFullyDecodeReservedExpansionFieldNumber = 2, + }; // repeated .google.api.HttpRule rules = 1; int rules_size() const; + private: + int _internal_rules_size() const; + public: void clear_rules(); - static const int kRulesFieldNumber = 1; ::google::api::HttpRule* mutable_rules(int index); - ::google::protobuf::RepeatedPtrField< ::google::api::HttpRule >* + ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::google::api::HttpRule >* mutable_rules(); + private: + const ::google::api::HttpRule& _internal_rules(int index) const; + ::google::api::HttpRule* _internal_add_rules(); + public: const ::google::api::HttpRule& rules(int index) const; ::google::api::HttpRule* add_rules(); - const ::google::protobuf::RepeatedPtrField< ::google::api::HttpRule >& + const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::google::api::HttpRule >& rules() const; // bool fully_decode_reserved_expansion = 2; void clear_fully_decode_reserved_expansion(); - static const int kFullyDecodeReservedExpansionFieldNumber = 2; bool fully_decode_reserved_expansion() const; void set_fully_decode_reserved_expansion(bool value); + private: + bool _internal_fully_decode_reserved_expansion() const; + void _internal_set_fully_decode_reserved_expansion(bool value); + public: // @@protoc_insertion_point(class_scope:google.api.Http) private: - class HasBitSetters; + class _Internal; - ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; - template friend class ::google::protobuf::Arena::InternalHelper; + ::PROTOBUF_NAMESPACE_ID::internal::InternalMetadataWithArena _internal_metadata_; + template friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; typedef void InternalArenaConstructable_; typedef void DestructorSkippable_; - ::google::protobuf::RepeatedPtrField< ::google::api::HttpRule > rules_; + ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::google::api::HttpRule > rules_; bool fully_decode_reserved_expansion_; - mutable ::google::protobuf::internal::CachedSize _cached_size_; + mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; friend struct ::TableStruct_google_2fapi_2fhttp_2eproto; }; // ------------------------------------------------------------------- -class AGONES_EXPORT HttpRule final : - public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.api.HttpRule) */ { +class AGONES_EXPORT HttpRule : + public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.api.HttpRule) */ { public: HttpRule(); virtual ~HttpRule(); HttpRule(const HttpRule& from); - - inline HttpRule& operator=(const HttpRule& from) { - CopyFrom(from); - return *this; - } - #if LANG_CXX11 HttpRule(HttpRule&& from) noexcept : HttpRule() { *this = ::std::move(from); } + inline HttpRule& operator=(const HttpRule& from) { + CopyFrom(from); + return *this; + } inline HttpRule& operator=(HttpRule&& from) noexcept { if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) { if (this != &from) InternalSwap(&from); @@ -252,15 +287,21 @@ class AGONES_EXPORT HttpRule final : } return *this; } - #endif - inline ::google::protobuf::Arena* GetArena() const final { + + inline ::PROTOBUF_NAMESPACE_ID::Arena* GetArena() const final { return GetArenaNoVirtual(); } inline void* GetMaybeArenaPointer() const final { return MaybeArenaPtr(); } - static const ::google::protobuf::Descriptor* descriptor() { - return default_instance().GetDescriptor(); + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { + return GetDescriptor(); + } + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { + return GetMetadataStatic().descriptor; + } + static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { + return GetMetadataStatic().reflection; } static const HttpRule& default_instance(); @@ -282,11 +323,22 @@ class AGONES_EXPORT HttpRule final : static constexpr int kIndexInFileMessages = 1; - void UnsafeArenaSwap(HttpRule* other); - void Swap(HttpRule* other); friend void swap(HttpRule& a, HttpRule& b) { a.Swap(&b); } + inline void Swap(HttpRule* other) { + if (other == this) return; + if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) { + InternalSwap(other); + } else { + ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); + } + } + void UnsafeArenaSwap(HttpRule* other) { + if (other == this) return; + GOOGLE_DCHECK(GetArenaNoVirtual() == other->GetArenaNoVirtual()); + InternalSwap(other); + } // implements Message ---------------------------------------------- @@ -294,42 +346,38 @@ class AGONES_EXPORT HttpRule final : return CreateMaybeMessage(nullptr); } - HttpRule* New(::google::protobuf::Arena* arena) const final { + HttpRule* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { return CreateMaybeMessage(arena); } - void CopyFrom(const ::google::protobuf::Message& from) final; - void MergeFrom(const ::google::protobuf::Message& from) final; + void CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final; + void MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final; void CopyFrom(const HttpRule& from); void MergeFrom(const HttpRule& from); PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; size_t ByteSizeLong() const final; - #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER - static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); - ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } - #else - bool MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) final; - #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER - void SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const final; - ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const final; + const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; + ::PROTOBUF_NAMESPACE_ID::uint8* InternalSerializeWithCachedSizesToArray( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: - void SharedCtor(); - void SharedDtor(); + inline void SharedCtor(); + inline void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(HttpRule* other); + friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; + static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { + return "google.api.HttpRule"; + } protected: - explicit HttpRule(::google::protobuf::Arena* arena); + explicit HttpRule(::PROTOBUF_NAMESPACE_ID::Arena* arena); private: static void ArenaDtor(void* object); - inline void RegisterArenaDtor(::google::protobuf::Arena* arena); + inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena); private: - inline ::google::protobuf::Arena* GetArenaNoVirtual() const { + inline ::PROTOBUF_NAMESPACE_ID::Arena* GetArenaNoVirtual() const { return _internal_metadata_.arena(); } inline void* MaybeArenaPtr() const { @@ -337,231 +385,278 @@ class AGONES_EXPORT HttpRule final : } public: - ::google::protobuf::Metadata GetMetadata() const final; + ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; + private: + static ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadataStatic() { + ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&::descriptor_table_google_2fapi_2fhttp_2eproto); + return ::descriptor_table_google_2fapi_2fhttp_2eproto.file_level_metadata[kIndexInFileMessages]; + } + + public: // nested types ---------------------------------------------------- // accessors ------------------------------------------------------- + enum : int { + kAdditionalBindingsFieldNumber = 11, + kSelectorFieldNumber = 1, + kBodyFieldNumber = 7, + kResponseBodyFieldNumber = 12, + kGetFieldNumber = 2, + kPutFieldNumber = 3, + kPostFieldNumber = 4, + kDeleteFieldNumber = 5, + kPatchFieldNumber = 6, + kCustomFieldNumber = 8, + }; // repeated .google.api.HttpRule additional_bindings = 11; int additional_bindings_size() const; + private: + int _internal_additional_bindings_size() const; + public: void clear_additional_bindings(); - static const int kAdditionalBindingsFieldNumber = 11; ::google::api::HttpRule* mutable_additional_bindings(int index); - ::google::protobuf::RepeatedPtrField< ::google::api::HttpRule >* + ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::google::api::HttpRule >* mutable_additional_bindings(); + private: + const ::google::api::HttpRule& _internal_additional_bindings(int index) const; + ::google::api::HttpRule* _internal_add_additional_bindings(); + public: const ::google::api::HttpRule& additional_bindings(int index) const; ::google::api::HttpRule* add_additional_bindings(); - const ::google::protobuf::RepeatedPtrField< ::google::api::HttpRule >& + const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::google::api::HttpRule >& additional_bindings() const; // string selector = 1; void clear_selector(); - static const int kSelectorFieldNumber = 1; - const ::std::string& selector() const; - void set_selector(const ::std::string& value); - #if LANG_CXX11 - void set_selector(::std::string&& value); - #endif + const std::string& selector() const; + void set_selector(const std::string& value); + void set_selector(std::string&& value); void set_selector(const char* value); void set_selector(const char* value, size_t size); - ::std::string* mutable_selector(); - ::std::string* release_selector(); - void set_allocated_selector(::std::string* selector); + std::string* mutable_selector(); + std::string* release_selector(); + void set_allocated_selector(std::string* selector); GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") - ::std::string* unsafe_arena_release_selector(); + std::string* unsafe_arena_release_selector(); GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") void unsafe_arena_set_allocated_selector( - ::std::string* selector); + std::string* selector); + private: + const std::string& _internal_selector() const; + void _internal_set_selector(const std::string& value); + std::string* _internal_mutable_selector(); + public: // string body = 7; void clear_body(); - static const int kBodyFieldNumber = 7; - const ::std::string& body() const; - void set_body(const ::std::string& value); - #if LANG_CXX11 - void set_body(::std::string&& value); - #endif + const std::string& body() const; + void set_body(const std::string& value); + void set_body(std::string&& value); void set_body(const char* value); void set_body(const char* value, size_t size); - ::std::string* mutable_body(); - ::std::string* release_body(); - void set_allocated_body(::std::string* body); + std::string* mutable_body(); + std::string* release_body(); + void set_allocated_body(std::string* body); GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") - ::std::string* unsafe_arena_release_body(); + std::string* unsafe_arena_release_body(); GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") void unsafe_arena_set_allocated_body( - ::std::string* body); + std::string* body); + private: + const std::string& _internal_body() const; + void _internal_set_body(const std::string& value); + std::string* _internal_mutable_body(); + public: // string response_body = 12; void clear_response_body(); - static const int kResponseBodyFieldNumber = 12; - const ::std::string& response_body() const; - void set_response_body(const ::std::string& value); - #if LANG_CXX11 - void set_response_body(::std::string&& value); - #endif + const std::string& response_body() const; + void set_response_body(const std::string& value); + void set_response_body(std::string&& value); void set_response_body(const char* value); void set_response_body(const char* value, size_t size); - ::std::string* mutable_response_body(); - ::std::string* release_response_body(); - void set_allocated_response_body(::std::string* response_body); + std::string* mutable_response_body(); + std::string* release_response_body(); + void set_allocated_response_body(std::string* response_body); GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") - ::std::string* unsafe_arena_release_response_body(); + std::string* unsafe_arena_release_response_body(); GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") void unsafe_arena_set_allocated_response_body( - ::std::string* response_body); + std::string* response_body); + private: + const std::string& _internal_response_body() const; + void _internal_set_response_body(const std::string& value); + std::string* _internal_mutable_response_body(); + public: // string get = 2; private: - bool has_get() const; + bool _internal_has_get() const; public: void clear_get(); - static const int kGetFieldNumber = 2; - const ::std::string& get() const; - void set_get(const ::std::string& value); - #if LANG_CXX11 - void set_get(::std::string&& value); - #endif + const std::string& get() const; + void set_get(const std::string& value); + void set_get(std::string&& value); void set_get(const char* value); void set_get(const char* value, size_t size); - ::std::string* mutable_get(); - ::std::string* release_get(); - void set_allocated_get(::std::string* get); + std::string* mutable_get(); + std::string* release_get(); + void set_allocated_get(std::string* get); GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") - ::std::string* unsafe_arena_release_get(); + std::string* unsafe_arena_release_get(); GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") void unsafe_arena_set_allocated_get( - ::std::string* get); + std::string* get); + private: + const std::string& _internal_get() const; + void _internal_set_get(const std::string& value); + std::string* _internal_mutable_get(); + public: // string put = 3; private: - bool has_put() const; + bool _internal_has_put() const; public: void clear_put(); - static const int kPutFieldNumber = 3; - const ::std::string& put() const; - void set_put(const ::std::string& value); - #if LANG_CXX11 - void set_put(::std::string&& value); - #endif + const std::string& put() const; + void set_put(const std::string& value); + void set_put(std::string&& value); void set_put(const char* value); void set_put(const char* value, size_t size); - ::std::string* mutable_put(); - ::std::string* release_put(); - void set_allocated_put(::std::string* put); + std::string* mutable_put(); + std::string* release_put(); + void set_allocated_put(std::string* put); GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") - ::std::string* unsafe_arena_release_put(); + std::string* unsafe_arena_release_put(); GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") void unsafe_arena_set_allocated_put( - ::std::string* put); + std::string* put); + private: + const std::string& _internal_put() const; + void _internal_set_put(const std::string& value); + std::string* _internal_mutable_put(); + public: // string post = 4; private: - bool has_post() const; + bool _internal_has_post() const; public: void clear_post(); - static const int kPostFieldNumber = 4; - const ::std::string& post() const; - void set_post(const ::std::string& value); - #if LANG_CXX11 - void set_post(::std::string&& value); - #endif + const std::string& post() const; + void set_post(const std::string& value); + void set_post(std::string&& value); void set_post(const char* value); void set_post(const char* value, size_t size); - ::std::string* mutable_post(); - ::std::string* release_post(); - void set_allocated_post(::std::string* post); + std::string* mutable_post(); + std::string* release_post(); + void set_allocated_post(std::string* post); GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") - ::std::string* unsafe_arena_release_post(); + std::string* unsafe_arena_release_post(); GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") void unsafe_arena_set_allocated_post( - ::std::string* post); + std::string* post); + private: + const std::string& _internal_post() const; + void _internal_set_post(const std::string& value); + std::string* _internal_mutable_post(); + public: // string delete = 5; private: - bool has_delete_() const; + bool _internal_has_delete_() const; public: void clear_delete_(); - static const int kDeleteFieldNumber = 5; - const ::std::string& delete_() const; - void set_delete_(const ::std::string& value); - #if LANG_CXX11 - void set_delete_(::std::string&& value); - #endif + const std::string& delete_() const; + void set_delete_(const std::string& value); + void set_delete_(std::string&& value); void set_delete_(const char* value); void set_delete_(const char* value, size_t size); - ::std::string* mutable_delete_(); - ::std::string* release_delete_(); - void set_allocated_delete_(::std::string* delete_); + std::string* mutable_delete_(); + std::string* release_delete_(); + void set_allocated_delete_(std::string* delete_); GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") - ::std::string* unsafe_arena_release_delete_(); + std::string* unsafe_arena_release_delete_(); GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") void unsafe_arena_set_allocated_delete_( - ::std::string* delete_); + std::string* delete_); + private: + const std::string& _internal_delete_() const; + void _internal_set_delete_(const std::string& value); + std::string* _internal_mutable_delete_(); + public: // string patch = 6; private: - bool has_patch() const; + bool _internal_has_patch() const; public: void clear_patch(); - static const int kPatchFieldNumber = 6; - const ::std::string& patch() const; - void set_patch(const ::std::string& value); - #if LANG_CXX11 - void set_patch(::std::string&& value); - #endif + const std::string& patch() const; + void set_patch(const std::string& value); + void set_patch(std::string&& value); void set_patch(const char* value); void set_patch(const char* value, size_t size); - ::std::string* mutable_patch(); - ::std::string* release_patch(); - void set_allocated_patch(::std::string* patch); + std::string* mutable_patch(); + std::string* release_patch(); + void set_allocated_patch(std::string* patch); GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") - ::std::string* unsafe_arena_release_patch(); + std::string* unsafe_arena_release_patch(); GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") void unsafe_arena_set_allocated_patch( - ::std::string* patch); + std::string* patch); + private: + const std::string& _internal_patch() const; + void _internal_set_patch(const std::string& value); + std::string* _internal_mutable_patch(); + public: // .google.api.CustomHttpPattern custom = 8; bool has_custom() const; + private: + bool _internal_has_custom() const; + public: void clear_custom(); - static const int kCustomFieldNumber = 8; const ::google::api::CustomHttpPattern& custom() const; ::google::api::CustomHttpPattern* release_custom(); ::google::api::CustomHttpPattern* mutable_custom(); void set_allocated_custom(::google::api::CustomHttpPattern* custom); + private: + const ::google::api::CustomHttpPattern& _internal_custom() const; + ::google::api::CustomHttpPattern* _internal_mutable_custom(); + public: void unsafe_arena_set_allocated_custom( ::google::api::CustomHttpPattern* custom); ::google::api::CustomHttpPattern* unsafe_arena_release_custom(); @@ -570,7 +665,7 @@ class AGONES_EXPORT HttpRule final : PatternCase pattern_case() const; // @@protoc_insertion_point(class_scope:google.api.HttpRule) private: - class HasBitSetters; + class _Internal; void set_has_get(); void set_has_put(); void set_has_post(); @@ -581,48 +676,46 @@ class AGONES_EXPORT HttpRule final : inline bool has_pattern() const; inline void clear_has_pattern(); - ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; - template friend class ::google::protobuf::Arena::InternalHelper; + ::PROTOBUF_NAMESPACE_ID::internal::InternalMetadataWithArena _internal_metadata_; + template friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; typedef void InternalArenaConstructable_; typedef void DestructorSkippable_; - ::google::protobuf::RepeatedPtrField< ::google::api::HttpRule > additional_bindings_; - ::google::protobuf::internal::ArenaStringPtr selector_; - ::google::protobuf::internal::ArenaStringPtr body_; - ::google::protobuf::internal::ArenaStringPtr response_body_; + ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::google::api::HttpRule > additional_bindings_; + ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr selector_; + ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr body_; + ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr response_body_; union PatternUnion { PatternUnion() {} - ::google::protobuf::internal::ArenaStringPtr get_; - ::google::protobuf::internal::ArenaStringPtr put_; - ::google::protobuf::internal::ArenaStringPtr post_; - ::google::protobuf::internal::ArenaStringPtr delete__; - ::google::protobuf::internal::ArenaStringPtr patch_; + ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr get_; + ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr put_; + ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr post_; + ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr delete__; + ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr patch_; ::google::api::CustomHttpPattern* custom_; } pattern_; - mutable ::google::protobuf::internal::CachedSize _cached_size_; - ::google::protobuf::uint32 _oneof_case_[1]; + mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + ::PROTOBUF_NAMESPACE_ID::uint32 _oneof_case_[1]; friend struct ::TableStruct_google_2fapi_2fhttp_2eproto; }; // ------------------------------------------------------------------- -class AGONES_EXPORT CustomHttpPattern final : - public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.api.CustomHttpPattern) */ { +class AGONES_EXPORT CustomHttpPattern : + public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.api.CustomHttpPattern) */ { public: CustomHttpPattern(); virtual ~CustomHttpPattern(); CustomHttpPattern(const CustomHttpPattern& from); - - inline CustomHttpPattern& operator=(const CustomHttpPattern& from) { - CopyFrom(from); - return *this; - } - #if LANG_CXX11 CustomHttpPattern(CustomHttpPattern&& from) noexcept : CustomHttpPattern() { *this = ::std::move(from); } + inline CustomHttpPattern& operator=(const CustomHttpPattern& from) { + CopyFrom(from); + return *this; + } inline CustomHttpPattern& operator=(CustomHttpPattern&& from) noexcept { if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) { if (this != &from) InternalSwap(&from); @@ -631,15 +724,21 @@ class AGONES_EXPORT CustomHttpPattern final : } return *this; } - #endif - inline ::google::protobuf::Arena* GetArena() const final { + + inline ::PROTOBUF_NAMESPACE_ID::Arena* GetArena() const final { return GetArenaNoVirtual(); } inline void* GetMaybeArenaPointer() const final { return MaybeArenaPtr(); } - static const ::google::protobuf::Descriptor* descriptor() { - return default_instance().GetDescriptor(); + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { + return GetDescriptor(); + } + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { + return GetMetadataStatic().descriptor; + } + static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { + return GetMetadataStatic().reflection; } static const CustomHttpPattern& default_instance(); @@ -651,11 +750,22 @@ class AGONES_EXPORT CustomHttpPattern final : static constexpr int kIndexInFileMessages = 2; - void UnsafeArenaSwap(CustomHttpPattern* other); - void Swap(CustomHttpPattern* other); friend void swap(CustomHttpPattern& a, CustomHttpPattern& b) { a.Swap(&b); } + inline void Swap(CustomHttpPattern* other) { + if (other == this) return; + if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) { + InternalSwap(other); + } else { + ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); + } + } + void UnsafeArenaSwap(CustomHttpPattern* other) { + if (other == this) return; + GOOGLE_DCHECK(GetArenaNoVirtual() == other->GetArenaNoVirtual()); + InternalSwap(other); + } // implements Message ---------------------------------------------- @@ -663,42 +773,38 @@ class AGONES_EXPORT CustomHttpPattern final : return CreateMaybeMessage(nullptr); } - CustomHttpPattern* New(::google::protobuf::Arena* arena) const final { + CustomHttpPattern* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { return CreateMaybeMessage(arena); } - void CopyFrom(const ::google::protobuf::Message& from) final; - void MergeFrom(const ::google::protobuf::Message& from) final; + void CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final; + void MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final; void CopyFrom(const CustomHttpPattern& from); void MergeFrom(const CustomHttpPattern& from); PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; size_t ByteSizeLong() const final; - #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER - static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); - ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } - #else - bool MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) final; - #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER - void SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const final; - ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const final; + const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; + ::PROTOBUF_NAMESPACE_ID::uint8* InternalSerializeWithCachedSizesToArray( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: - void SharedCtor(); - void SharedDtor(); + inline void SharedCtor(); + inline void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(CustomHttpPattern* other); + friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; + static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { + return "google.api.CustomHttpPattern"; + } protected: - explicit CustomHttpPattern(::google::protobuf::Arena* arena); + explicit CustomHttpPattern(::PROTOBUF_NAMESPACE_ID::Arena* arena); private: static void ArenaDtor(void* object); - inline void RegisterArenaDtor(::google::protobuf::Arena* arena); + inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena); private: - inline ::google::protobuf::Arena* GetArenaNoVirtual() const { + inline ::PROTOBUF_NAMESPACE_ID::Arena* GetArenaNoVirtual() const { return _internal_metadata_.arena(); } inline void* MaybeArenaPtr() const { @@ -706,69 +812,84 @@ class AGONES_EXPORT CustomHttpPattern final : } public: - ::google::protobuf::Metadata GetMetadata() const final; + ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; + private: + static ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadataStatic() { + ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&::descriptor_table_google_2fapi_2fhttp_2eproto); + return ::descriptor_table_google_2fapi_2fhttp_2eproto.file_level_metadata[kIndexInFileMessages]; + } + + public: // nested types ---------------------------------------------------- // accessors ------------------------------------------------------- + enum : int { + kKindFieldNumber = 1, + kPathFieldNumber = 2, + }; // string kind = 1; void clear_kind(); - static const int kKindFieldNumber = 1; - const ::std::string& kind() const; - void set_kind(const ::std::string& value); - #if LANG_CXX11 - void set_kind(::std::string&& value); - #endif + const std::string& kind() const; + void set_kind(const std::string& value); + void set_kind(std::string&& value); void set_kind(const char* value); void set_kind(const char* value, size_t size); - ::std::string* mutable_kind(); - ::std::string* release_kind(); - void set_allocated_kind(::std::string* kind); + std::string* mutable_kind(); + std::string* release_kind(); + void set_allocated_kind(std::string* kind); GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") - ::std::string* unsafe_arena_release_kind(); + std::string* unsafe_arena_release_kind(); GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") void unsafe_arena_set_allocated_kind( - ::std::string* kind); + std::string* kind); + private: + const std::string& _internal_kind() const; + void _internal_set_kind(const std::string& value); + std::string* _internal_mutable_kind(); + public: // string path = 2; void clear_path(); - static const int kPathFieldNumber = 2; - const ::std::string& path() const; - void set_path(const ::std::string& value); - #if LANG_CXX11 - void set_path(::std::string&& value); - #endif + const std::string& path() const; + void set_path(const std::string& value); + void set_path(std::string&& value); void set_path(const char* value); void set_path(const char* value, size_t size); - ::std::string* mutable_path(); - ::std::string* release_path(); - void set_allocated_path(::std::string* path); + std::string* mutable_path(); + std::string* release_path(); + void set_allocated_path(std::string* path); GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") - ::std::string* unsafe_arena_release_path(); + std::string* unsafe_arena_release_path(); GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") void unsafe_arena_set_allocated_path( - ::std::string* path); + std::string* path); + private: + const std::string& _internal_path() const; + void _internal_set_path(const std::string& value); + std::string* _internal_mutable_path(); + public: // @@protoc_insertion_point(class_scope:google.api.CustomHttpPattern) private: - class HasBitSetters; + class _Internal; - ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; - template friend class ::google::protobuf::Arena::InternalHelper; + ::PROTOBUF_NAMESPACE_ID::internal::InternalMetadataWithArena _internal_metadata_; + template friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; typedef void InternalArenaConstructable_; typedef void DestructorSkippable_; - ::google::protobuf::internal::ArenaStringPtr kind_; - ::google::protobuf::internal::ArenaStringPtr path_; - mutable ::google::protobuf::internal::CachedSize _cached_size_; + ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr kind_; + ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr path_; + mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; friend struct ::TableStruct_google_2fapi_2fhttp_2eproto; }; // =================================================================== @@ -783,9 +904,12 @@ class AGONES_EXPORT CustomHttpPattern final : // Http // repeated .google.api.HttpRule rules = 1; -inline int Http::rules_size() const { +inline int Http::_internal_rules_size() const { return rules_.size(); } +inline int Http::rules_size() const { + return _internal_rules_size(); +} inline void Http::clear_rules() { rules_.Clear(); } @@ -793,20 +917,26 @@ inline ::google::api::HttpRule* Http::mutable_rules(int index) { // @@protoc_insertion_point(field_mutable:google.api.Http.rules) return rules_.Mutable(index); } -inline ::google::protobuf::RepeatedPtrField< ::google::api::HttpRule >* +inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::google::api::HttpRule >* Http::mutable_rules() { // @@protoc_insertion_point(field_mutable_list:google.api.Http.rules) return &rules_; } +inline const ::google::api::HttpRule& Http::_internal_rules(int index) const { + return rules_.Get(index); +} inline const ::google::api::HttpRule& Http::rules(int index) const { // @@protoc_insertion_point(field_get:google.api.Http.rules) - return rules_.Get(index); + return _internal_rules(index); +} +inline ::google::api::HttpRule* Http::_internal_add_rules() { + return rules_.Add(); } inline ::google::api::HttpRule* Http::add_rules() { // @@protoc_insertion_point(field_add:google.api.Http.rules) - return rules_.Add(); + return _internal_add_rules(); } -inline const ::google::protobuf::RepeatedPtrField< ::google::api::HttpRule >& +inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::google::api::HttpRule >& Http::rules() const { // @@protoc_insertion_point(field_list:google.api.Http.rules) return rules_; @@ -816,13 +946,19 @@ Http::rules() const { inline void Http::clear_fully_decode_reserved_expansion() { fully_decode_reserved_expansion_ = false; } +inline bool Http::_internal_fully_decode_reserved_expansion() const { + return fully_decode_reserved_expansion_; +} inline bool Http::fully_decode_reserved_expansion() const { // @@protoc_insertion_point(field_get:google.api.Http.fully_decode_reserved_expansion) - return fully_decode_reserved_expansion_; + return _internal_fully_decode_reserved_expansion(); } -inline void Http::set_fully_decode_reserved_expansion(bool value) { +inline void Http::_internal_set_fully_decode_reserved_expansion(bool value) { fully_decode_reserved_expansion_ = value; +} +inline void Http::set_fully_decode_reserved_expansion(bool value) { + _internal_set_fully_decode_reserved_expansion(value); // @@protoc_insertion_point(field_set:google.api.Http.fully_decode_reserved_expansion) } @@ -832,168 +968,182 @@ inline void Http::set_fully_decode_reserved_expansion(bool value) { // string selector = 1; inline void HttpRule::clear_selector() { - selector_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + selector_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } -inline const ::std::string& HttpRule::selector() const { +inline const std::string& HttpRule::selector() const { // @@protoc_insertion_point(field_get:google.api.HttpRule.selector) + return _internal_selector(); +} +inline void HttpRule::set_selector(const std::string& value) { + _internal_set_selector(value); + // @@protoc_insertion_point(field_set:google.api.HttpRule.selector) +} +inline std::string* HttpRule::mutable_selector() { + // @@protoc_insertion_point(field_mutable:google.api.HttpRule.selector) + return _internal_mutable_selector(); +} +inline const std::string& HttpRule::_internal_selector() const { return selector_.Get(); } -inline void HttpRule::set_selector(const ::std::string& value) { +inline void HttpRule::_internal_set_selector(const std::string& value) { - selector_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual()); - // @@protoc_insertion_point(field_set:google.api.HttpRule.selector) + selector_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual()); } -#if LANG_CXX11 -inline void HttpRule::set_selector(::std::string&& value) { +inline void HttpRule::set_selector(std::string&& value) { selector_.Set( - &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArenaNoVirtual()); + &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_rvalue:google.api.HttpRule.selector) } -#endif inline void HttpRule::set_selector(const char* value) { GOOGLE_DCHECK(value != nullptr); - selector_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value), + selector_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_char:google.api.HttpRule.selector) } inline void HttpRule::set_selector(const char* value, size_t size) { - selector_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string( + selector_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string( reinterpret_cast(value), size), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_pointer:google.api.HttpRule.selector) } -inline ::std::string* HttpRule::mutable_selector() { +inline std::string* HttpRule::_internal_mutable_selector() { - // @@protoc_insertion_point(field_mutable:google.api.HttpRule.selector) - return selector_.Mutable(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + return selector_.Mutable(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } -inline ::std::string* HttpRule::release_selector() { +inline std::string* HttpRule::release_selector() { // @@protoc_insertion_point(field_release:google.api.HttpRule.selector) - return selector_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + return selector_.Release(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } -inline void HttpRule::set_allocated_selector(::std::string* selector) { +inline void HttpRule::set_allocated_selector(std::string* selector) { if (selector != nullptr) { } else { } - selector_.SetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), selector, + selector_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), selector, GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_allocated:google.api.HttpRule.selector) } -inline ::std::string* HttpRule::unsafe_arena_release_selector() { +inline std::string* HttpRule::unsafe_arena_release_selector() { // @@protoc_insertion_point(field_unsafe_arena_release:google.api.HttpRule.selector) GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); - return selector_.UnsafeArenaRelease(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + return selector_.UnsafeArenaRelease(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } inline void HttpRule::unsafe_arena_set_allocated_selector( - ::std::string* selector) { + std::string* selector) { GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); if (selector != nullptr) { } else { } - selector_.UnsafeArenaSetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + selector_.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), selector, GetArenaNoVirtual()); // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.api.HttpRule.selector) } // string get = 2; -inline bool HttpRule::has_get() const { +inline bool HttpRule::_internal_has_get() const { return pattern_case() == kGet; } inline void HttpRule::set_has_get() { _oneof_case_[0] = kGet; } inline void HttpRule::clear_get() { - if (has_get()) { - pattern_.get_.Destroy(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + if (_internal_has_get()) { + pattern_.get_.Destroy(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); clear_has_pattern(); } } -inline const ::std::string& HttpRule::get() const { +inline const std::string& HttpRule::get() const { // @@protoc_insertion_point(field_get:google.api.HttpRule.get) - if (has_get()) { + return _internal_get(); +} +inline void HttpRule::set_get(const std::string& value) { + _internal_set_get(value); + // @@protoc_insertion_point(field_set:google.api.HttpRule.get) +} +inline std::string* HttpRule::mutable_get() { + // @@protoc_insertion_point(field_mutable:google.api.HttpRule.get) + return _internal_mutable_get(); +} +inline const std::string& HttpRule::_internal_get() const { + if (_internal_has_get()) { return pattern_.get_.Get(); } - return *&::google::protobuf::internal::GetEmptyStringAlreadyInited(); + return *&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(); } -inline void HttpRule::set_get(const ::std::string& value) { - if (!has_get()) { +inline void HttpRule::_internal_set_get(const std::string& value) { + if (!_internal_has_get()) { clear_pattern(); set_has_get(); - pattern_.get_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + pattern_.get_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } - pattern_.get_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value, + pattern_.get_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual()); - // @@protoc_insertion_point(field_set:google.api.HttpRule.get) } -#if LANG_CXX11 -inline void HttpRule::set_get(::std::string&& value) { +inline void HttpRule::set_get(std::string&& value) { // @@protoc_insertion_point(field_set:google.api.HttpRule.get) - if (!has_get()) { + if (!_internal_has_get()) { clear_pattern(); set_has_get(); - pattern_.get_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + pattern_.get_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } pattern_.get_.Set( - &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArenaNoVirtual()); + &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_rvalue:google.api.HttpRule.get) } -#endif inline void HttpRule::set_get(const char* value) { GOOGLE_DCHECK(value != nullptr); - if (!has_get()) { + if (!_internal_has_get()) { clear_pattern(); set_has_get(); - pattern_.get_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + pattern_.get_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } - pattern_.get_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + pattern_.get_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_char:google.api.HttpRule.get) } inline void HttpRule::set_get(const char* value, size_t size) { - if (!has_get()) { + if (!_internal_has_get()) { clear_pattern(); set_has_get(); - pattern_.get_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + pattern_.get_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } pattern_.get_.Set( - &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string( + &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string( reinterpret_cast(value), size), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_pointer:google.api.HttpRule.get) } -inline ::std::string* HttpRule::mutable_get() { - if (!has_get()) { +inline std::string* HttpRule::_internal_mutable_get() { + if (!_internal_has_get()) { clear_pattern(); set_has_get(); - pattern_.get_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + pattern_.get_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } - return pattern_.get_.Mutable(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + return pattern_.get_.Mutable(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); - // @@protoc_insertion_point(field_mutable:google.api.HttpRule.get) } -inline ::std::string* HttpRule::release_get() { +inline std::string* HttpRule::release_get() { // @@protoc_insertion_point(field_release:google.api.HttpRule.get) - if (has_get()) { + if (_internal_has_get()) { clear_has_pattern(); - return pattern_.get_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + return pattern_.get_.Release(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } else { return nullptr; } } -inline void HttpRule::set_allocated_get(::std::string* get) { +inline void HttpRule::set_allocated_get(std::string* get) { if (has_pattern()) { clear_pattern(); } @@ -1003,119 +1153,126 @@ inline void HttpRule::set_allocated_get(::std::string* get) { } // @@protoc_insertion_point(field_set_allocated:google.api.HttpRule.get) } -inline ::std::string* HttpRule::unsafe_arena_release_get() { +inline std::string* HttpRule::unsafe_arena_release_get() { // @@protoc_insertion_point(field_unsafe_arena_release:google.api.HttpRule.get) GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); - if (has_get()) { + if (_internal_has_get()) { clear_has_pattern(); return pattern_.get_.UnsafeArenaRelease( - &::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } else { return nullptr; } } -inline void HttpRule::unsafe_arena_set_allocated_get(::std::string* get) { +inline void HttpRule::unsafe_arena_set_allocated_get(std::string* get) { GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); - if (!has_get()) { - pattern_.get_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (!_internal_has_get()) { + pattern_.get_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } clear_pattern(); if (get) { set_has_get(); - pattern_.get_.UnsafeArenaSetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), get, GetArenaNoVirtual()); + pattern_.get_.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), get, GetArenaNoVirtual()); } // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.api.HttpRule.get) } // string put = 3; -inline bool HttpRule::has_put() const { +inline bool HttpRule::_internal_has_put() const { return pattern_case() == kPut; } inline void HttpRule::set_has_put() { _oneof_case_[0] = kPut; } inline void HttpRule::clear_put() { - if (has_put()) { - pattern_.put_.Destroy(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + if (_internal_has_put()) { + pattern_.put_.Destroy(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); clear_has_pattern(); } } -inline const ::std::string& HttpRule::put() const { +inline const std::string& HttpRule::put() const { // @@protoc_insertion_point(field_get:google.api.HttpRule.put) - if (has_put()) { + return _internal_put(); +} +inline void HttpRule::set_put(const std::string& value) { + _internal_set_put(value); + // @@protoc_insertion_point(field_set:google.api.HttpRule.put) +} +inline std::string* HttpRule::mutable_put() { + // @@protoc_insertion_point(field_mutable:google.api.HttpRule.put) + return _internal_mutable_put(); +} +inline const std::string& HttpRule::_internal_put() const { + if (_internal_has_put()) { return pattern_.put_.Get(); } - return *&::google::protobuf::internal::GetEmptyStringAlreadyInited(); + return *&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(); } -inline void HttpRule::set_put(const ::std::string& value) { - if (!has_put()) { +inline void HttpRule::_internal_set_put(const std::string& value) { + if (!_internal_has_put()) { clear_pattern(); set_has_put(); - pattern_.put_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + pattern_.put_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } - pattern_.put_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value, + pattern_.put_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual()); - // @@protoc_insertion_point(field_set:google.api.HttpRule.put) } -#if LANG_CXX11 -inline void HttpRule::set_put(::std::string&& value) { +inline void HttpRule::set_put(std::string&& value) { // @@protoc_insertion_point(field_set:google.api.HttpRule.put) - if (!has_put()) { + if (!_internal_has_put()) { clear_pattern(); set_has_put(); - pattern_.put_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + pattern_.put_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } pattern_.put_.Set( - &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArenaNoVirtual()); + &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_rvalue:google.api.HttpRule.put) } -#endif inline void HttpRule::set_put(const char* value) { GOOGLE_DCHECK(value != nullptr); - if (!has_put()) { + if (!_internal_has_put()) { clear_pattern(); set_has_put(); - pattern_.put_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + pattern_.put_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } - pattern_.put_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + pattern_.put_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_char:google.api.HttpRule.put) } inline void HttpRule::set_put(const char* value, size_t size) { - if (!has_put()) { + if (!_internal_has_put()) { clear_pattern(); set_has_put(); - pattern_.put_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + pattern_.put_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } pattern_.put_.Set( - &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string( + &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string( reinterpret_cast(value), size), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_pointer:google.api.HttpRule.put) } -inline ::std::string* HttpRule::mutable_put() { - if (!has_put()) { +inline std::string* HttpRule::_internal_mutable_put() { + if (!_internal_has_put()) { clear_pattern(); set_has_put(); - pattern_.put_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + pattern_.put_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } - return pattern_.put_.Mutable(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + return pattern_.put_.Mutable(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); - // @@protoc_insertion_point(field_mutable:google.api.HttpRule.put) } -inline ::std::string* HttpRule::release_put() { +inline std::string* HttpRule::release_put() { // @@protoc_insertion_point(field_release:google.api.HttpRule.put) - if (has_put()) { + if (_internal_has_put()) { clear_has_pattern(); - return pattern_.put_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + return pattern_.put_.Release(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } else { return nullptr; } } -inline void HttpRule::set_allocated_put(::std::string* put) { +inline void HttpRule::set_allocated_put(std::string* put) { if (has_pattern()) { clear_pattern(); } @@ -1125,119 +1282,126 @@ inline void HttpRule::set_allocated_put(::std::string* put) { } // @@protoc_insertion_point(field_set_allocated:google.api.HttpRule.put) } -inline ::std::string* HttpRule::unsafe_arena_release_put() { +inline std::string* HttpRule::unsafe_arena_release_put() { // @@protoc_insertion_point(field_unsafe_arena_release:google.api.HttpRule.put) GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); - if (has_put()) { + if (_internal_has_put()) { clear_has_pattern(); return pattern_.put_.UnsafeArenaRelease( - &::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } else { return nullptr; } } -inline void HttpRule::unsafe_arena_set_allocated_put(::std::string* put) { +inline void HttpRule::unsafe_arena_set_allocated_put(std::string* put) { GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); - if (!has_put()) { - pattern_.put_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (!_internal_has_put()) { + pattern_.put_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } clear_pattern(); if (put) { set_has_put(); - pattern_.put_.UnsafeArenaSetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), put, GetArenaNoVirtual()); + pattern_.put_.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), put, GetArenaNoVirtual()); } // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.api.HttpRule.put) } // string post = 4; -inline bool HttpRule::has_post() const { +inline bool HttpRule::_internal_has_post() const { return pattern_case() == kPost; } inline void HttpRule::set_has_post() { _oneof_case_[0] = kPost; } inline void HttpRule::clear_post() { - if (has_post()) { - pattern_.post_.Destroy(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + if (_internal_has_post()) { + pattern_.post_.Destroy(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); clear_has_pattern(); } } -inline const ::std::string& HttpRule::post() const { +inline const std::string& HttpRule::post() const { // @@protoc_insertion_point(field_get:google.api.HttpRule.post) - if (has_post()) { + return _internal_post(); +} +inline void HttpRule::set_post(const std::string& value) { + _internal_set_post(value); + // @@protoc_insertion_point(field_set:google.api.HttpRule.post) +} +inline std::string* HttpRule::mutable_post() { + // @@protoc_insertion_point(field_mutable:google.api.HttpRule.post) + return _internal_mutable_post(); +} +inline const std::string& HttpRule::_internal_post() const { + if (_internal_has_post()) { return pattern_.post_.Get(); } - return *&::google::protobuf::internal::GetEmptyStringAlreadyInited(); + return *&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(); } -inline void HttpRule::set_post(const ::std::string& value) { - if (!has_post()) { +inline void HttpRule::_internal_set_post(const std::string& value) { + if (!_internal_has_post()) { clear_pattern(); set_has_post(); - pattern_.post_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + pattern_.post_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } - pattern_.post_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value, + pattern_.post_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual()); - // @@protoc_insertion_point(field_set:google.api.HttpRule.post) } -#if LANG_CXX11 -inline void HttpRule::set_post(::std::string&& value) { +inline void HttpRule::set_post(std::string&& value) { // @@protoc_insertion_point(field_set:google.api.HttpRule.post) - if (!has_post()) { + if (!_internal_has_post()) { clear_pattern(); set_has_post(); - pattern_.post_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + pattern_.post_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } pattern_.post_.Set( - &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArenaNoVirtual()); + &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_rvalue:google.api.HttpRule.post) } -#endif inline void HttpRule::set_post(const char* value) { GOOGLE_DCHECK(value != nullptr); - if (!has_post()) { + if (!_internal_has_post()) { clear_pattern(); set_has_post(); - pattern_.post_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + pattern_.post_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } - pattern_.post_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + pattern_.post_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_char:google.api.HttpRule.post) } inline void HttpRule::set_post(const char* value, size_t size) { - if (!has_post()) { + if (!_internal_has_post()) { clear_pattern(); set_has_post(); - pattern_.post_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + pattern_.post_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } pattern_.post_.Set( - &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string( + &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string( reinterpret_cast(value), size), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_pointer:google.api.HttpRule.post) } -inline ::std::string* HttpRule::mutable_post() { - if (!has_post()) { +inline std::string* HttpRule::_internal_mutable_post() { + if (!_internal_has_post()) { clear_pattern(); set_has_post(); - pattern_.post_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + pattern_.post_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } - return pattern_.post_.Mutable(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + return pattern_.post_.Mutable(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); - // @@protoc_insertion_point(field_mutable:google.api.HttpRule.post) } -inline ::std::string* HttpRule::release_post() { +inline std::string* HttpRule::release_post() { // @@protoc_insertion_point(field_release:google.api.HttpRule.post) - if (has_post()) { + if (_internal_has_post()) { clear_has_pattern(); - return pattern_.post_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + return pattern_.post_.Release(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } else { return nullptr; } } -inline void HttpRule::set_allocated_post(::std::string* post) { +inline void HttpRule::set_allocated_post(std::string* post) { if (has_pattern()) { clear_pattern(); } @@ -1247,119 +1411,126 @@ inline void HttpRule::set_allocated_post(::std::string* post) { } // @@protoc_insertion_point(field_set_allocated:google.api.HttpRule.post) } -inline ::std::string* HttpRule::unsafe_arena_release_post() { +inline std::string* HttpRule::unsafe_arena_release_post() { // @@protoc_insertion_point(field_unsafe_arena_release:google.api.HttpRule.post) GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); - if (has_post()) { + if (_internal_has_post()) { clear_has_pattern(); return pattern_.post_.UnsafeArenaRelease( - &::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } else { return nullptr; } } -inline void HttpRule::unsafe_arena_set_allocated_post(::std::string* post) { +inline void HttpRule::unsafe_arena_set_allocated_post(std::string* post) { GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); - if (!has_post()) { - pattern_.post_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (!_internal_has_post()) { + pattern_.post_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } clear_pattern(); if (post) { set_has_post(); - pattern_.post_.UnsafeArenaSetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), post, GetArenaNoVirtual()); + pattern_.post_.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), post, GetArenaNoVirtual()); } // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.api.HttpRule.post) } // string delete = 5; -inline bool HttpRule::has_delete_() const { +inline bool HttpRule::_internal_has_delete_() const { return pattern_case() == kDelete; } inline void HttpRule::set_has_delete_() { _oneof_case_[0] = kDelete; } inline void HttpRule::clear_delete_() { - if (has_delete_()) { - pattern_.delete__.Destroy(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + if (_internal_has_delete_()) { + pattern_.delete__.Destroy(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); clear_has_pattern(); } } -inline const ::std::string& HttpRule::delete_() const { +inline const std::string& HttpRule::delete_() const { // @@protoc_insertion_point(field_get:google.api.HttpRule.delete) - if (has_delete_()) { + return _internal_delete_(); +} +inline void HttpRule::set_delete_(const std::string& value) { + _internal_set_delete_(value); + // @@protoc_insertion_point(field_set:google.api.HttpRule.delete) +} +inline std::string* HttpRule::mutable_delete_() { + // @@protoc_insertion_point(field_mutable:google.api.HttpRule.delete) + return _internal_mutable_delete_(); +} +inline const std::string& HttpRule::_internal_delete_() const { + if (_internal_has_delete_()) { return pattern_.delete__.Get(); } - return *&::google::protobuf::internal::GetEmptyStringAlreadyInited(); + return *&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(); } -inline void HttpRule::set_delete_(const ::std::string& value) { - if (!has_delete_()) { +inline void HttpRule::_internal_set_delete_(const std::string& value) { + if (!_internal_has_delete_()) { clear_pattern(); set_has_delete_(); - pattern_.delete__.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + pattern_.delete__.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } - pattern_.delete__.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value, + pattern_.delete__.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual()); - // @@protoc_insertion_point(field_set:google.api.HttpRule.delete) } -#if LANG_CXX11 -inline void HttpRule::set_delete_(::std::string&& value) { +inline void HttpRule::set_delete_(std::string&& value) { // @@protoc_insertion_point(field_set:google.api.HttpRule.delete) - if (!has_delete_()) { + if (!_internal_has_delete_()) { clear_pattern(); set_has_delete_(); - pattern_.delete__.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + pattern_.delete__.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } pattern_.delete__.Set( - &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArenaNoVirtual()); + &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_rvalue:google.api.HttpRule.delete) } -#endif inline void HttpRule::set_delete_(const char* value) { GOOGLE_DCHECK(value != nullptr); - if (!has_delete_()) { + if (!_internal_has_delete_()) { clear_pattern(); set_has_delete_(); - pattern_.delete__.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + pattern_.delete__.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } - pattern_.delete__.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + pattern_.delete__.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_char:google.api.HttpRule.delete) } inline void HttpRule::set_delete_(const char* value, size_t size) { - if (!has_delete_()) { + if (!_internal_has_delete_()) { clear_pattern(); set_has_delete_(); - pattern_.delete__.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + pattern_.delete__.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } pattern_.delete__.Set( - &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string( + &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string( reinterpret_cast(value), size), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_pointer:google.api.HttpRule.delete) } -inline ::std::string* HttpRule::mutable_delete_() { - if (!has_delete_()) { +inline std::string* HttpRule::_internal_mutable_delete_() { + if (!_internal_has_delete_()) { clear_pattern(); set_has_delete_(); - pattern_.delete__.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + pattern_.delete__.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } - return pattern_.delete__.Mutable(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + return pattern_.delete__.Mutable(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); - // @@protoc_insertion_point(field_mutable:google.api.HttpRule.delete) } -inline ::std::string* HttpRule::release_delete_() { +inline std::string* HttpRule::release_delete_() { // @@protoc_insertion_point(field_release:google.api.HttpRule.delete) - if (has_delete_()) { + if (_internal_has_delete_()) { clear_has_pattern(); - return pattern_.delete__.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + return pattern_.delete__.Release(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } else { return nullptr; } } -inline void HttpRule::set_allocated_delete_(::std::string* delete_) { +inline void HttpRule::set_allocated_delete_(std::string* delete_) { if (has_pattern()) { clear_pattern(); } @@ -1369,119 +1540,126 @@ inline void HttpRule::set_allocated_delete_(::std::string* delete_) { } // @@protoc_insertion_point(field_set_allocated:google.api.HttpRule.delete) } -inline ::std::string* HttpRule::unsafe_arena_release_delete_() { +inline std::string* HttpRule::unsafe_arena_release_delete_() { // @@protoc_insertion_point(field_unsafe_arena_release:google.api.HttpRule.delete) GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); - if (has_delete_()) { + if (_internal_has_delete_()) { clear_has_pattern(); return pattern_.delete__.UnsafeArenaRelease( - &::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } else { return nullptr; } } -inline void HttpRule::unsafe_arena_set_allocated_delete_(::std::string* delete_) { +inline void HttpRule::unsafe_arena_set_allocated_delete_(std::string* delete_) { GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); - if (!has_delete_()) { - pattern_.delete__.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (!_internal_has_delete_()) { + pattern_.delete__.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } clear_pattern(); if (delete_) { set_has_delete_(); - pattern_.delete__.UnsafeArenaSetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), delete_, GetArenaNoVirtual()); + pattern_.delete__.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), delete_, GetArenaNoVirtual()); } // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.api.HttpRule.delete) } // string patch = 6; -inline bool HttpRule::has_patch() const { +inline bool HttpRule::_internal_has_patch() const { return pattern_case() == kPatch; } inline void HttpRule::set_has_patch() { _oneof_case_[0] = kPatch; } inline void HttpRule::clear_patch() { - if (has_patch()) { - pattern_.patch_.Destroy(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + if (_internal_has_patch()) { + pattern_.patch_.Destroy(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); clear_has_pattern(); } } -inline const ::std::string& HttpRule::patch() const { +inline const std::string& HttpRule::patch() const { // @@protoc_insertion_point(field_get:google.api.HttpRule.patch) - if (has_patch()) { + return _internal_patch(); +} +inline void HttpRule::set_patch(const std::string& value) { + _internal_set_patch(value); + // @@protoc_insertion_point(field_set:google.api.HttpRule.patch) +} +inline std::string* HttpRule::mutable_patch() { + // @@protoc_insertion_point(field_mutable:google.api.HttpRule.patch) + return _internal_mutable_patch(); +} +inline const std::string& HttpRule::_internal_patch() const { + if (_internal_has_patch()) { return pattern_.patch_.Get(); } - return *&::google::protobuf::internal::GetEmptyStringAlreadyInited(); + return *&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(); } -inline void HttpRule::set_patch(const ::std::string& value) { - if (!has_patch()) { +inline void HttpRule::_internal_set_patch(const std::string& value) { + if (!_internal_has_patch()) { clear_pattern(); set_has_patch(); - pattern_.patch_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + pattern_.patch_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } - pattern_.patch_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value, + pattern_.patch_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual()); - // @@protoc_insertion_point(field_set:google.api.HttpRule.patch) } -#if LANG_CXX11 -inline void HttpRule::set_patch(::std::string&& value) { +inline void HttpRule::set_patch(std::string&& value) { // @@protoc_insertion_point(field_set:google.api.HttpRule.patch) - if (!has_patch()) { + if (!_internal_has_patch()) { clear_pattern(); set_has_patch(); - pattern_.patch_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + pattern_.patch_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } pattern_.patch_.Set( - &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArenaNoVirtual()); + &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_rvalue:google.api.HttpRule.patch) } -#endif inline void HttpRule::set_patch(const char* value) { GOOGLE_DCHECK(value != nullptr); - if (!has_patch()) { + if (!_internal_has_patch()) { clear_pattern(); set_has_patch(); - pattern_.patch_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + pattern_.patch_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } - pattern_.patch_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + pattern_.patch_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_char:google.api.HttpRule.patch) } inline void HttpRule::set_patch(const char* value, size_t size) { - if (!has_patch()) { + if (!_internal_has_patch()) { clear_pattern(); set_has_patch(); - pattern_.patch_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + pattern_.patch_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } pattern_.patch_.Set( - &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string( + &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string( reinterpret_cast(value), size), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_pointer:google.api.HttpRule.patch) } -inline ::std::string* HttpRule::mutable_patch() { - if (!has_patch()) { +inline std::string* HttpRule::_internal_mutable_patch() { + if (!_internal_has_patch()) { clear_pattern(); set_has_patch(); - pattern_.patch_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + pattern_.patch_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } - return pattern_.patch_.Mutable(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + return pattern_.patch_.Mutable(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); - // @@protoc_insertion_point(field_mutable:google.api.HttpRule.patch) } -inline ::std::string* HttpRule::release_patch() { +inline std::string* HttpRule::release_patch() { // @@protoc_insertion_point(field_release:google.api.HttpRule.patch) - if (has_patch()) { + if (_internal_has_patch()) { clear_has_pattern(); - return pattern_.patch_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + return pattern_.patch_.Release(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } else { return nullptr; } } -inline void HttpRule::set_allocated_patch(::std::string* patch) { +inline void HttpRule::set_allocated_patch(std::string* patch) { if (has_pattern()) { clear_pattern(); } @@ -1491,39 +1669,42 @@ inline void HttpRule::set_allocated_patch(::std::string* patch) { } // @@protoc_insertion_point(field_set_allocated:google.api.HttpRule.patch) } -inline ::std::string* HttpRule::unsafe_arena_release_patch() { +inline std::string* HttpRule::unsafe_arena_release_patch() { // @@protoc_insertion_point(field_unsafe_arena_release:google.api.HttpRule.patch) GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); - if (has_patch()) { + if (_internal_has_patch()) { clear_has_pattern(); return pattern_.patch_.UnsafeArenaRelease( - &::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } else { return nullptr; } } -inline void HttpRule::unsafe_arena_set_allocated_patch(::std::string* patch) { +inline void HttpRule::unsafe_arena_set_allocated_patch(std::string* patch) { GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); - if (!has_patch()) { - pattern_.patch_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (!_internal_has_patch()) { + pattern_.patch_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } clear_pattern(); if (patch) { set_has_patch(); - pattern_.patch_.UnsafeArenaSetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), patch, GetArenaNoVirtual()); + pattern_.patch_.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), patch, GetArenaNoVirtual()); } // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.api.HttpRule.patch) } // .google.api.CustomHttpPattern custom = 8; -inline bool HttpRule::has_custom() const { +inline bool HttpRule::_internal_has_custom() const { return pattern_case() == kCustom; } +inline bool HttpRule::has_custom() const { + return _internal_has_custom(); +} inline void HttpRule::set_has_custom() { _oneof_case_[0] = kCustom; } inline void HttpRule::clear_custom() { - if (has_custom()) { + if (_internal_has_custom()) { if (GetArenaNoVirtual() == nullptr) { delete pattern_.custom_; } @@ -1536,7 +1717,7 @@ inline ::google::api::CustomHttpPattern* HttpRule::release_custom() { clear_has_pattern(); ::google::api::CustomHttpPattern* temp = pattern_.custom_; if (GetArenaNoVirtual() != nullptr) { - temp = ::google::protobuf::internal::DuplicateIfNonNull(temp); + temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); } pattern_.custom_ = nullptr; return temp; @@ -1544,12 +1725,15 @@ inline ::google::api::CustomHttpPattern* HttpRule::release_custom() { return nullptr; } } -inline const ::google::api::CustomHttpPattern& HttpRule::custom() const { - // @@protoc_insertion_point(field_get:google.api.HttpRule.custom) - return has_custom() +inline const ::google::api::CustomHttpPattern& HttpRule::_internal_custom() const { + return _internal_has_custom() ? *pattern_.custom_ : *reinterpret_cast< ::google::api::CustomHttpPattern*>(&::google::api::_CustomHttpPattern_default_instance_); } +inline const ::google::api::CustomHttpPattern& HttpRule::custom() const { + // @@protoc_insertion_point(field_get:google.api.HttpRule.custom) + return _internal_custom(); +} inline ::google::api::CustomHttpPattern* HttpRule::unsafe_arena_release_custom() { // @@protoc_insertion_point(field_unsafe_arena_release:google.api.HttpRule.custom) if (has_custom()) { @@ -1569,171 +1753,191 @@ inline void HttpRule::unsafe_arena_set_allocated_custom(::google::api::CustomHtt } // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.api.HttpRule.custom) } -inline ::google::api::CustomHttpPattern* HttpRule::mutable_custom() { - if (!has_custom()) { +inline ::google::api::CustomHttpPattern* HttpRule::_internal_mutable_custom() { + if (!_internal_has_custom()) { clear_pattern(); set_has_custom(); pattern_.custom_ = CreateMaybeMessage< ::google::api::CustomHttpPattern >( GetArenaNoVirtual()); } - // @@protoc_insertion_point(field_mutable:google.api.HttpRule.custom) return pattern_.custom_; } +inline ::google::api::CustomHttpPattern* HttpRule::mutable_custom() { + // @@protoc_insertion_point(field_mutable:google.api.HttpRule.custom) + return _internal_mutable_custom(); +} // string body = 7; inline void HttpRule::clear_body() { - body_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + body_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } -inline const ::std::string& HttpRule::body() const { +inline const std::string& HttpRule::body() const { // @@protoc_insertion_point(field_get:google.api.HttpRule.body) + return _internal_body(); +} +inline void HttpRule::set_body(const std::string& value) { + _internal_set_body(value); + // @@protoc_insertion_point(field_set:google.api.HttpRule.body) +} +inline std::string* HttpRule::mutable_body() { + // @@protoc_insertion_point(field_mutable:google.api.HttpRule.body) + return _internal_mutable_body(); +} +inline const std::string& HttpRule::_internal_body() const { return body_.Get(); } -inline void HttpRule::set_body(const ::std::string& value) { +inline void HttpRule::_internal_set_body(const std::string& value) { - body_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual()); - // @@protoc_insertion_point(field_set:google.api.HttpRule.body) + body_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual()); } -#if LANG_CXX11 -inline void HttpRule::set_body(::std::string&& value) { +inline void HttpRule::set_body(std::string&& value) { body_.Set( - &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArenaNoVirtual()); + &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_rvalue:google.api.HttpRule.body) } -#endif inline void HttpRule::set_body(const char* value) { GOOGLE_DCHECK(value != nullptr); - body_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value), + body_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_char:google.api.HttpRule.body) } inline void HttpRule::set_body(const char* value, size_t size) { - body_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string( + body_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string( reinterpret_cast(value), size), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_pointer:google.api.HttpRule.body) } -inline ::std::string* HttpRule::mutable_body() { +inline std::string* HttpRule::_internal_mutable_body() { - // @@protoc_insertion_point(field_mutable:google.api.HttpRule.body) - return body_.Mutable(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + return body_.Mutable(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } -inline ::std::string* HttpRule::release_body() { +inline std::string* HttpRule::release_body() { // @@protoc_insertion_point(field_release:google.api.HttpRule.body) - return body_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + return body_.Release(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } -inline void HttpRule::set_allocated_body(::std::string* body) { +inline void HttpRule::set_allocated_body(std::string* body) { if (body != nullptr) { } else { } - body_.SetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), body, + body_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), body, GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_allocated:google.api.HttpRule.body) } -inline ::std::string* HttpRule::unsafe_arena_release_body() { +inline std::string* HttpRule::unsafe_arena_release_body() { // @@protoc_insertion_point(field_unsafe_arena_release:google.api.HttpRule.body) GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); - return body_.UnsafeArenaRelease(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + return body_.UnsafeArenaRelease(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } inline void HttpRule::unsafe_arena_set_allocated_body( - ::std::string* body) { + std::string* body) { GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); if (body != nullptr) { } else { } - body_.UnsafeArenaSetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + body_.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), body, GetArenaNoVirtual()); // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.api.HttpRule.body) } // string response_body = 12; inline void HttpRule::clear_response_body() { - response_body_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + response_body_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } -inline const ::std::string& HttpRule::response_body() const { +inline const std::string& HttpRule::response_body() const { // @@protoc_insertion_point(field_get:google.api.HttpRule.response_body) + return _internal_response_body(); +} +inline void HttpRule::set_response_body(const std::string& value) { + _internal_set_response_body(value); + // @@protoc_insertion_point(field_set:google.api.HttpRule.response_body) +} +inline std::string* HttpRule::mutable_response_body() { + // @@protoc_insertion_point(field_mutable:google.api.HttpRule.response_body) + return _internal_mutable_response_body(); +} +inline const std::string& HttpRule::_internal_response_body() const { return response_body_.Get(); } -inline void HttpRule::set_response_body(const ::std::string& value) { +inline void HttpRule::_internal_set_response_body(const std::string& value) { - response_body_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual()); - // @@protoc_insertion_point(field_set:google.api.HttpRule.response_body) + response_body_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual()); } -#if LANG_CXX11 -inline void HttpRule::set_response_body(::std::string&& value) { +inline void HttpRule::set_response_body(std::string&& value) { response_body_.Set( - &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArenaNoVirtual()); + &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_rvalue:google.api.HttpRule.response_body) } -#endif inline void HttpRule::set_response_body(const char* value) { GOOGLE_DCHECK(value != nullptr); - response_body_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value), + response_body_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_char:google.api.HttpRule.response_body) } inline void HttpRule::set_response_body(const char* value, size_t size) { - response_body_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string( + response_body_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string( reinterpret_cast(value), size), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_pointer:google.api.HttpRule.response_body) } -inline ::std::string* HttpRule::mutable_response_body() { +inline std::string* HttpRule::_internal_mutable_response_body() { - // @@protoc_insertion_point(field_mutable:google.api.HttpRule.response_body) - return response_body_.Mutable(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + return response_body_.Mutable(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } -inline ::std::string* HttpRule::release_response_body() { +inline std::string* HttpRule::release_response_body() { // @@protoc_insertion_point(field_release:google.api.HttpRule.response_body) - return response_body_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + return response_body_.Release(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } -inline void HttpRule::set_allocated_response_body(::std::string* response_body) { +inline void HttpRule::set_allocated_response_body(std::string* response_body) { if (response_body != nullptr) { } else { } - response_body_.SetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), response_body, + response_body_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), response_body, GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_allocated:google.api.HttpRule.response_body) } -inline ::std::string* HttpRule::unsafe_arena_release_response_body() { +inline std::string* HttpRule::unsafe_arena_release_response_body() { // @@protoc_insertion_point(field_unsafe_arena_release:google.api.HttpRule.response_body) GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); - return response_body_.UnsafeArenaRelease(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + return response_body_.UnsafeArenaRelease(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } inline void HttpRule::unsafe_arena_set_allocated_response_body( - ::std::string* response_body) { + std::string* response_body) { GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); if (response_body != nullptr) { } else { } - response_body_.UnsafeArenaSetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + response_body_.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), response_body, GetArenaNoVirtual()); // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.api.HttpRule.response_body) } // repeated .google.api.HttpRule additional_bindings = 11; -inline int HttpRule::additional_bindings_size() const { +inline int HttpRule::_internal_additional_bindings_size() const { return additional_bindings_.size(); } +inline int HttpRule::additional_bindings_size() const { + return _internal_additional_bindings_size(); +} inline void HttpRule::clear_additional_bindings() { additional_bindings_.Clear(); } @@ -1741,20 +1945,26 @@ inline ::google::api::HttpRule* HttpRule::mutable_additional_bindings(int index) // @@protoc_insertion_point(field_mutable:google.api.HttpRule.additional_bindings) return additional_bindings_.Mutable(index); } -inline ::google::protobuf::RepeatedPtrField< ::google::api::HttpRule >* +inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::google::api::HttpRule >* HttpRule::mutable_additional_bindings() { // @@protoc_insertion_point(field_mutable_list:google.api.HttpRule.additional_bindings) return &additional_bindings_; } +inline const ::google::api::HttpRule& HttpRule::_internal_additional_bindings(int index) const { + return additional_bindings_.Get(index); +} inline const ::google::api::HttpRule& HttpRule::additional_bindings(int index) const { // @@protoc_insertion_point(field_get:google.api.HttpRule.additional_bindings) - return additional_bindings_.Get(index); + return _internal_additional_bindings(index); +} +inline ::google::api::HttpRule* HttpRule::_internal_add_additional_bindings() { + return additional_bindings_.Add(); } inline ::google::api::HttpRule* HttpRule::add_additional_bindings() { // @@protoc_insertion_point(field_add:google.api.HttpRule.additional_bindings) - return additional_bindings_.Add(); + return _internal_add_additional_bindings(); } -inline const ::google::protobuf::RepeatedPtrField< ::google::api::HttpRule >& +inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::google::api::HttpRule >& HttpRule::additional_bindings() const { // @@protoc_insertion_point(field_list:google.api.HttpRule.additional_bindings) return additional_bindings_; @@ -1775,150 +1985,164 @@ inline HttpRule::PatternCase HttpRule::pattern_case() const { // string kind = 1; inline void CustomHttpPattern::clear_kind() { - kind_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + kind_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } -inline const ::std::string& CustomHttpPattern::kind() const { +inline const std::string& CustomHttpPattern::kind() const { // @@protoc_insertion_point(field_get:google.api.CustomHttpPattern.kind) + return _internal_kind(); +} +inline void CustomHttpPattern::set_kind(const std::string& value) { + _internal_set_kind(value); + // @@protoc_insertion_point(field_set:google.api.CustomHttpPattern.kind) +} +inline std::string* CustomHttpPattern::mutable_kind() { + // @@protoc_insertion_point(field_mutable:google.api.CustomHttpPattern.kind) + return _internal_mutable_kind(); +} +inline const std::string& CustomHttpPattern::_internal_kind() const { return kind_.Get(); } -inline void CustomHttpPattern::set_kind(const ::std::string& value) { +inline void CustomHttpPattern::_internal_set_kind(const std::string& value) { - kind_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual()); - // @@protoc_insertion_point(field_set:google.api.CustomHttpPattern.kind) + kind_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual()); } -#if LANG_CXX11 -inline void CustomHttpPattern::set_kind(::std::string&& value) { +inline void CustomHttpPattern::set_kind(std::string&& value) { kind_.Set( - &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArenaNoVirtual()); + &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_rvalue:google.api.CustomHttpPattern.kind) } -#endif inline void CustomHttpPattern::set_kind(const char* value) { GOOGLE_DCHECK(value != nullptr); - kind_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value), + kind_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_char:google.api.CustomHttpPattern.kind) } inline void CustomHttpPattern::set_kind(const char* value, size_t size) { - kind_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string( + kind_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string( reinterpret_cast(value), size), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_pointer:google.api.CustomHttpPattern.kind) } -inline ::std::string* CustomHttpPattern::mutable_kind() { +inline std::string* CustomHttpPattern::_internal_mutable_kind() { - // @@protoc_insertion_point(field_mutable:google.api.CustomHttpPattern.kind) - return kind_.Mutable(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + return kind_.Mutable(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } -inline ::std::string* CustomHttpPattern::release_kind() { +inline std::string* CustomHttpPattern::release_kind() { // @@protoc_insertion_point(field_release:google.api.CustomHttpPattern.kind) - return kind_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + return kind_.Release(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } -inline void CustomHttpPattern::set_allocated_kind(::std::string* kind) { +inline void CustomHttpPattern::set_allocated_kind(std::string* kind) { if (kind != nullptr) { } else { } - kind_.SetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), kind, + kind_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), kind, GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_allocated:google.api.CustomHttpPattern.kind) } -inline ::std::string* CustomHttpPattern::unsafe_arena_release_kind() { +inline std::string* CustomHttpPattern::unsafe_arena_release_kind() { // @@protoc_insertion_point(field_unsafe_arena_release:google.api.CustomHttpPattern.kind) GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); - return kind_.UnsafeArenaRelease(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + return kind_.UnsafeArenaRelease(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } inline void CustomHttpPattern::unsafe_arena_set_allocated_kind( - ::std::string* kind) { + std::string* kind) { GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); if (kind != nullptr) { } else { } - kind_.UnsafeArenaSetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + kind_.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), kind, GetArenaNoVirtual()); // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.api.CustomHttpPattern.kind) } // string path = 2; inline void CustomHttpPattern::clear_path() { - path_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + path_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } -inline const ::std::string& CustomHttpPattern::path() const { +inline const std::string& CustomHttpPattern::path() const { // @@protoc_insertion_point(field_get:google.api.CustomHttpPattern.path) + return _internal_path(); +} +inline void CustomHttpPattern::set_path(const std::string& value) { + _internal_set_path(value); + // @@protoc_insertion_point(field_set:google.api.CustomHttpPattern.path) +} +inline std::string* CustomHttpPattern::mutable_path() { + // @@protoc_insertion_point(field_mutable:google.api.CustomHttpPattern.path) + return _internal_mutable_path(); +} +inline const std::string& CustomHttpPattern::_internal_path() const { return path_.Get(); } -inline void CustomHttpPattern::set_path(const ::std::string& value) { +inline void CustomHttpPattern::_internal_set_path(const std::string& value) { - path_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual()); - // @@protoc_insertion_point(field_set:google.api.CustomHttpPattern.path) + path_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual()); } -#if LANG_CXX11 -inline void CustomHttpPattern::set_path(::std::string&& value) { +inline void CustomHttpPattern::set_path(std::string&& value) { path_.Set( - &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArenaNoVirtual()); + &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_rvalue:google.api.CustomHttpPattern.path) } -#endif inline void CustomHttpPattern::set_path(const char* value) { GOOGLE_DCHECK(value != nullptr); - path_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value), + path_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_char:google.api.CustomHttpPattern.path) } inline void CustomHttpPattern::set_path(const char* value, size_t size) { - path_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string( + path_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string( reinterpret_cast(value), size), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_pointer:google.api.CustomHttpPattern.path) } -inline ::std::string* CustomHttpPattern::mutable_path() { +inline std::string* CustomHttpPattern::_internal_mutable_path() { - // @@protoc_insertion_point(field_mutable:google.api.CustomHttpPattern.path) - return path_.Mutable(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + return path_.Mutable(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } -inline ::std::string* CustomHttpPattern::release_path() { +inline std::string* CustomHttpPattern::release_path() { // @@protoc_insertion_point(field_release:google.api.CustomHttpPattern.path) - return path_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + return path_.Release(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } -inline void CustomHttpPattern::set_allocated_path(::std::string* path) { +inline void CustomHttpPattern::set_allocated_path(std::string* path) { if (path != nullptr) { } else { } - path_.SetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), path, + path_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), path, GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_allocated:google.api.CustomHttpPattern.path) } -inline ::std::string* CustomHttpPattern::unsafe_arena_release_path() { +inline std::string* CustomHttpPattern::unsafe_arena_release_path() { // @@protoc_insertion_point(field_unsafe_arena_release:google.api.CustomHttpPattern.path) GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); - return path_.UnsafeArenaRelease(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + return path_.UnsafeArenaRelease(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } inline void CustomHttpPattern::unsafe_arena_set_allocated_path( - ::std::string* path) { + std::string* path) { GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); if (path != nullptr) { } else { } - path_.UnsafeArenaSetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + path_.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), path, GetArenaNoVirtual()); // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.api.CustomHttpPattern.path) } @@ -1939,4 +2163,4 @@ inline void CustomHttpPattern::unsafe_arena_set_allocated_path( // @@protoc_insertion_point(global_scope) #include -#endif // PROTOBUF_INCLUDED_google_2fapi_2fhttp_2eproto +#endif // GOOGLE_PROTOBUF_INCLUDED_GOOGLE_PROTOBUF_INCLUDED_google_2fapi_2fhttp_2eproto diff --git a/sdks/cpp/src/agones/sdk.pb.cc b/sdks/cpp/src/agones/sdk.pb.cc index f4dff61be6..9f441bd5b6 100644 --- a/sdks/cpp/src/agones/sdk.pb.cc +++ b/sdks/cpp/src/agones/sdk.pb.cc @@ -20,117 +20,134 @@ #include -#include #include #include -#include +#include #include #include #include #include // @@protoc_insertion_point(includes) #include - -extern PROTOBUF_INTERNAL_EXPORT_sdk_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_GameServer_ObjectMeta_AnnotationsEntry_DoNotUse_sdk_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_sdk_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_GameServer_ObjectMeta_LabelsEntry_DoNotUse_sdk_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_sdk_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_GameServer_Spec_Health_sdk_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_sdk_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_GameServer_Status_Port_sdk_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_sdk_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_GameServer_Spec_sdk_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_sdk_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_GameServer_Status_sdk_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_sdk_2eproto ::google::protobuf::internal::SCCInfo<2> scc_info_GameServer_ObjectMeta_sdk_2eproto; +extern PROTOBUF_INTERNAL_EXPORT_sdk_2eproto ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<2> scc_info_GameServer_ObjectMeta_sdk_2eproto; +extern PROTOBUF_INTERNAL_EXPORT_sdk_2eproto ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<0> scc_info_GameServer_ObjectMeta_AnnotationsEntry_DoNotUse_sdk_2eproto; +extern PROTOBUF_INTERNAL_EXPORT_sdk_2eproto ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<0> scc_info_GameServer_ObjectMeta_LabelsEntry_DoNotUse_sdk_2eproto; +extern PROTOBUF_INTERNAL_EXPORT_sdk_2eproto ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<1> scc_info_GameServer_Spec_sdk_2eproto; +extern PROTOBUF_INTERNAL_EXPORT_sdk_2eproto ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<0> scc_info_GameServer_Spec_Health_sdk_2eproto; +extern PROTOBUF_INTERNAL_EXPORT_sdk_2eproto ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<1> scc_info_GameServer_Status_sdk_2eproto; +extern PROTOBUF_INTERNAL_EXPORT_sdk_2eproto ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<0> scc_info_GameServer_Status_Port_sdk_2eproto; namespace agones { namespace dev { namespace sdk { class EmptyDefaultTypeInternal { public: - ::google::protobuf::internal::ExplicitlyConstructed _instance; + ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed _instance; } _Empty_default_instance_; class KeyValueDefaultTypeInternal { public: - ::google::protobuf::internal::ExplicitlyConstructed _instance; + ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed _instance; } _KeyValue_default_instance_; class DurationDefaultTypeInternal { public: - ::google::protobuf::internal::ExplicitlyConstructed _instance; + ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed _instance; } _Duration_default_instance_; class GameServer_ObjectMeta_AnnotationsEntry_DoNotUseDefaultTypeInternal { public: - ::google::protobuf::internal::ExplicitlyConstructed _instance; + ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed _instance; } _GameServer_ObjectMeta_AnnotationsEntry_DoNotUse_default_instance_; class GameServer_ObjectMeta_LabelsEntry_DoNotUseDefaultTypeInternal { public: - ::google::protobuf::internal::ExplicitlyConstructed _instance; + ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed _instance; } _GameServer_ObjectMeta_LabelsEntry_DoNotUse_default_instance_; class GameServer_ObjectMetaDefaultTypeInternal { public: - ::google::protobuf::internal::ExplicitlyConstructed _instance; + ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed _instance; } _GameServer_ObjectMeta_default_instance_; class GameServer_Spec_HealthDefaultTypeInternal { public: - ::google::protobuf::internal::ExplicitlyConstructed _instance; + ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed _instance; } _GameServer_Spec_Health_default_instance_; class GameServer_SpecDefaultTypeInternal { public: - ::google::protobuf::internal::ExplicitlyConstructed _instance; + ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed _instance; } _GameServer_Spec_default_instance_; class GameServer_Status_PortDefaultTypeInternal { public: - ::google::protobuf::internal::ExplicitlyConstructed _instance; + ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed _instance; } _GameServer_Status_Port_default_instance_; class GameServer_StatusDefaultTypeInternal { public: - ::google::protobuf::internal::ExplicitlyConstructed _instance; + ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed _instance; } _GameServer_Status_default_instance_; class GameServerDefaultTypeInternal { public: - ::google::protobuf::internal::ExplicitlyConstructed _instance; + ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed _instance; } _GameServer_default_instance_; } // namespace sdk } // namespace dev } // namespace agones -static void InitDefaultsEmpty_sdk_2eproto() { +static void InitDefaultsscc_info_Duration_sdk_2eproto() { + GOOGLE_PROTOBUF_VERIFY_VERSION; + + { + void* ptr = &::agones::dev::sdk::_Duration_default_instance_; + new (ptr) ::agones::dev::sdk::Duration(); + ::PROTOBUF_NAMESPACE_ID::internal::OnShutdownDestroyMessage(ptr); + } + ::agones::dev::sdk::Duration::InitAsDefaultInstance(); +} + +AGONES_EXPORT ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<0> scc_info_Duration_sdk_2eproto = + {{ATOMIC_VAR_INIT(::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase::kUninitialized), 0, 0, InitDefaultsscc_info_Duration_sdk_2eproto}, {}}; + +static void InitDefaultsscc_info_Empty_sdk_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; { void* ptr = &::agones::dev::sdk::_Empty_default_instance_; new (ptr) ::agones::dev::sdk::Empty(); - ::google::protobuf::internal::OnShutdownDestroyMessage(ptr); + ::PROTOBUF_NAMESPACE_ID::internal::OnShutdownDestroyMessage(ptr); } ::agones::dev::sdk::Empty::InitAsDefaultInstance(); } -AGONES_EXPORT ::google::protobuf::internal::SCCInfo<0> scc_info_Empty_sdk_2eproto = - {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsEmpty_sdk_2eproto}, {}}; +AGONES_EXPORT ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<0> scc_info_Empty_sdk_2eproto = + {{ATOMIC_VAR_INIT(::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase::kUninitialized), 0, 0, InitDefaultsscc_info_Empty_sdk_2eproto}, {}}; -static void InitDefaultsKeyValue_sdk_2eproto() { +static void InitDefaultsscc_info_GameServer_sdk_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; { - void* ptr = &::agones::dev::sdk::_KeyValue_default_instance_; - new (ptr) ::agones::dev::sdk::KeyValue(); - ::google::protobuf::internal::OnShutdownDestroyMessage(ptr); + void* ptr = &::agones::dev::sdk::_GameServer_default_instance_; + new (ptr) ::agones::dev::sdk::GameServer(); + ::PROTOBUF_NAMESPACE_ID::internal::OnShutdownDestroyMessage(ptr); } - ::agones::dev::sdk::KeyValue::InitAsDefaultInstance(); + ::agones::dev::sdk::GameServer::InitAsDefaultInstance(); } -AGONES_EXPORT ::google::protobuf::internal::SCCInfo<0> scc_info_KeyValue_sdk_2eproto = - {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsKeyValue_sdk_2eproto}, {}}; +AGONES_EXPORT ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<3> scc_info_GameServer_sdk_2eproto = + {{ATOMIC_VAR_INIT(::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase::kUninitialized), 3, 0, InitDefaultsscc_info_GameServer_sdk_2eproto}, { + &scc_info_GameServer_ObjectMeta_sdk_2eproto.base, + &scc_info_GameServer_Spec_sdk_2eproto.base, + &scc_info_GameServer_Status_sdk_2eproto.base,}}; -static void InitDefaultsDuration_sdk_2eproto() { +static void InitDefaultsscc_info_GameServer_ObjectMeta_sdk_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; { - void* ptr = &::agones::dev::sdk::_Duration_default_instance_; - new (ptr) ::agones::dev::sdk::Duration(); - ::google::protobuf::internal::OnShutdownDestroyMessage(ptr); + void* ptr = &::agones::dev::sdk::_GameServer_ObjectMeta_default_instance_; + new (ptr) ::agones::dev::sdk::GameServer_ObjectMeta(); + ::PROTOBUF_NAMESPACE_ID::internal::OnShutdownDestroyMessage(ptr); } - ::agones::dev::sdk::Duration::InitAsDefaultInstance(); + ::agones::dev::sdk::GameServer_ObjectMeta::InitAsDefaultInstance(); } -AGONES_EXPORT ::google::protobuf::internal::SCCInfo<0> scc_info_Duration_sdk_2eproto = - {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsDuration_sdk_2eproto}, {}}; +AGONES_EXPORT ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<2> scc_info_GameServer_ObjectMeta_sdk_2eproto = + {{ATOMIC_VAR_INIT(::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase::kUninitialized), 2, 0, InitDefaultsscc_info_GameServer_ObjectMeta_sdk_2eproto}, { + &scc_info_GameServer_ObjectMeta_AnnotationsEntry_DoNotUse_sdk_2eproto.base, + &scc_info_GameServer_ObjectMeta_LabelsEntry_DoNotUse_sdk_2eproto.base,}}; -static void InitDefaultsGameServer_ObjectMeta_AnnotationsEntry_DoNotUse_sdk_2eproto() { +static void InitDefaultsscc_info_GameServer_ObjectMeta_AnnotationsEntry_DoNotUse_sdk_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; { @@ -140,10 +157,10 @@ static void InitDefaultsGameServer_ObjectMeta_AnnotationsEntry_DoNotUse_sdk_2epr ::agones::dev::sdk::GameServer_ObjectMeta_AnnotationsEntry_DoNotUse::InitAsDefaultInstance(); } -AGONES_EXPORT ::google::protobuf::internal::SCCInfo<0> scc_info_GameServer_ObjectMeta_AnnotationsEntry_DoNotUse_sdk_2eproto = - {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsGameServer_ObjectMeta_AnnotationsEntry_DoNotUse_sdk_2eproto}, {}}; +AGONES_EXPORT ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<0> scc_info_GameServer_ObjectMeta_AnnotationsEntry_DoNotUse_sdk_2eproto = + {{ATOMIC_VAR_INIT(::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase::kUninitialized), 0, 0, InitDefaultsscc_info_GameServer_ObjectMeta_AnnotationsEntry_DoNotUse_sdk_2eproto}, {}}; -static void InitDefaultsGameServer_ObjectMeta_LabelsEntry_DoNotUse_sdk_2eproto() { +static void InitDefaultsscc_info_GameServer_ObjectMeta_LabelsEntry_DoNotUse_sdk_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; { @@ -153,119 +170,86 @@ static void InitDefaultsGameServer_ObjectMeta_LabelsEntry_DoNotUse_sdk_2eproto() ::agones::dev::sdk::GameServer_ObjectMeta_LabelsEntry_DoNotUse::InitAsDefaultInstance(); } -AGONES_EXPORT ::google::protobuf::internal::SCCInfo<0> scc_info_GameServer_ObjectMeta_LabelsEntry_DoNotUse_sdk_2eproto = - {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsGameServer_ObjectMeta_LabelsEntry_DoNotUse_sdk_2eproto}, {}}; +AGONES_EXPORT ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<0> scc_info_GameServer_ObjectMeta_LabelsEntry_DoNotUse_sdk_2eproto = + {{ATOMIC_VAR_INIT(::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase::kUninitialized), 0, 0, InitDefaultsscc_info_GameServer_ObjectMeta_LabelsEntry_DoNotUse_sdk_2eproto}, {}}; -static void InitDefaultsGameServer_ObjectMeta_sdk_2eproto() { +static void InitDefaultsscc_info_GameServer_Spec_sdk_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; { - void* ptr = &::agones::dev::sdk::_GameServer_ObjectMeta_default_instance_; - new (ptr) ::agones::dev::sdk::GameServer_ObjectMeta(); - ::google::protobuf::internal::OnShutdownDestroyMessage(ptr); + void* ptr = &::agones::dev::sdk::_GameServer_Spec_default_instance_; + new (ptr) ::agones::dev::sdk::GameServer_Spec(); + ::PROTOBUF_NAMESPACE_ID::internal::OnShutdownDestroyMessage(ptr); } - ::agones::dev::sdk::GameServer_ObjectMeta::InitAsDefaultInstance(); + ::agones::dev::sdk::GameServer_Spec::InitAsDefaultInstance(); } -AGONES_EXPORT ::google::protobuf::internal::SCCInfo<2> scc_info_GameServer_ObjectMeta_sdk_2eproto = - {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 2, InitDefaultsGameServer_ObjectMeta_sdk_2eproto}, { - &scc_info_GameServer_ObjectMeta_AnnotationsEntry_DoNotUse_sdk_2eproto.base, - &scc_info_GameServer_ObjectMeta_LabelsEntry_DoNotUse_sdk_2eproto.base,}}; +AGONES_EXPORT ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<1> scc_info_GameServer_Spec_sdk_2eproto = + {{ATOMIC_VAR_INIT(::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase::kUninitialized), 1, 0, InitDefaultsscc_info_GameServer_Spec_sdk_2eproto}, { + &scc_info_GameServer_Spec_Health_sdk_2eproto.base,}}; -static void InitDefaultsGameServer_Spec_Health_sdk_2eproto() { +static void InitDefaultsscc_info_GameServer_Spec_Health_sdk_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; { void* ptr = &::agones::dev::sdk::_GameServer_Spec_Health_default_instance_; new (ptr) ::agones::dev::sdk::GameServer_Spec_Health(); - ::google::protobuf::internal::OnShutdownDestroyMessage(ptr); + ::PROTOBUF_NAMESPACE_ID::internal::OnShutdownDestroyMessage(ptr); } ::agones::dev::sdk::GameServer_Spec_Health::InitAsDefaultInstance(); } -AGONES_EXPORT ::google::protobuf::internal::SCCInfo<0> scc_info_GameServer_Spec_Health_sdk_2eproto = - {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsGameServer_Spec_Health_sdk_2eproto}, {}}; +AGONES_EXPORT ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<0> scc_info_GameServer_Spec_Health_sdk_2eproto = + {{ATOMIC_VAR_INIT(::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase::kUninitialized), 0, 0, InitDefaultsscc_info_GameServer_Spec_Health_sdk_2eproto}, {}}; -static void InitDefaultsGameServer_Spec_sdk_2eproto() { +static void InitDefaultsscc_info_GameServer_Status_sdk_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; { - void* ptr = &::agones::dev::sdk::_GameServer_Spec_default_instance_; - new (ptr) ::agones::dev::sdk::GameServer_Spec(); - ::google::protobuf::internal::OnShutdownDestroyMessage(ptr); + void* ptr = &::agones::dev::sdk::_GameServer_Status_default_instance_; + new (ptr) ::agones::dev::sdk::GameServer_Status(); + ::PROTOBUF_NAMESPACE_ID::internal::OnShutdownDestroyMessage(ptr); } - ::agones::dev::sdk::GameServer_Spec::InitAsDefaultInstance(); + ::agones::dev::sdk::GameServer_Status::InitAsDefaultInstance(); } -AGONES_EXPORT ::google::protobuf::internal::SCCInfo<1> scc_info_GameServer_Spec_sdk_2eproto = - {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsGameServer_Spec_sdk_2eproto}, { - &scc_info_GameServer_Spec_Health_sdk_2eproto.base,}}; +AGONES_EXPORT ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<1> scc_info_GameServer_Status_sdk_2eproto = + {{ATOMIC_VAR_INIT(::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase::kUninitialized), 1, 0, InitDefaultsscc_info_GameServer_Status_sdk_2eproto}, { + &scc_info_GameServer_Status_Port_sdk_2eproto.base,}}; -static void InitDefaultsGameServer_Status_Port_sdk_2eproto() { +static void InitDefaultsscc_info_GameServer_Status_Port_sdk_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; { void* ptr = &::agones::dev::sdk::_GameServer_Status_Port_default_instance_; new (ptr) ::agones::dev::sdk::GameServer_Status_Port(); - ::google::protobuf::internal::OnShutdownDestroyMessage(ptr); + ::PROTOBUF_NAMESPACE_ID::internal::OnShutdownDestroyMessage(ptr); } ::agones::dev::sdk::GameServer_Status_Port::InitAsDefaultInstance(); } -AGONES_EXPORT ::google::protobuf::internal::SCCInfo<0> scc_info_GameServer_Status_Port_sdk_2eproto = - {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsGameServer_Status_Port_sdk_2eproto}, {}}; +AGONES_EXPORT ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<0> scc_info_GameServer_Status_Port_sdk_2eproto = + {{ATOMIC_VAR_INIT(::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase::kUninitialized), 0, 0, InitDefaultsscc_info_GameServer_Status_Port_sdk_2eproto}, {}}; -static void InitDefaultsGameServer_Status_sdk_2eproto() { +static void InitDefaultsscc_info_KeyValue_sdk_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; { - void* ptr = &::agones::dev::sdk::_GameServer_Status_default_instance_; - new (ptr) ::agones::dev::sdk::GameServer_Status(); - ::google::protobuf::internal::OnShutdownDestroyMessage(ptr); + void* ptr = &::agones::dev::sdk::_KeyValue_default_instance_; + new (ptr) ::agones::dev::sdk::KeyValue(); + ::PROTOBUF_NAMESPACE_ID::internal::OnShutdownDestroyMessage(ptr); } - ::agones::dev::sdk::GameServer_Status::InitAsDefaultInstance(); + ::agones::dev::sdk::KeyValue::InitAsDefaultInstance(); } -AGONES_EXPORT ::google::protobuf::internal::SCCInfo<1> scc_info_GameServer_Status_sdk_2eproto = - {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsGameServer_Status_sdk_2eproto}, { - &scc_info_GameServer_Status_Port_sdk_2eproto.base,}}; +AGONES_EXPORT ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<0> scc_info_KeyValue_sdk_2eproto = + {{ATOMIC_VAR_INIT(::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase::kUninitialized), 0, 0, InitDefaultsscc_info_KeyValue_sdk_2eproto}, {}}; -static void InitDefaultsGameServer_sdk_2eproto() { - GOOGLE_PROTOBUF_VERIFY_VERSION; - - { - void* ptr = &::agones::dev::sdk::_GameServer_default_instance_; - new (ptr) ::agones::dev::sdk::GameServer(); - ::google::protobuf::internal::OnShutdownDestroyMessage(ptr); - } - ::agones::dev::sdk::GameServer::InitAsDefaultInstance(); -} +static ::PROTOBUF_NAMESPACE_ID::Metadata file_level_metadata_sdk_2eproto[11]; +static constexpr ::PROTOBUF_NAMESPACE_ID::EnumDescriptor const** file_level_enum_descriptors_sdk_2eproto = nullptr; +static constexpr ::PROTOBUF_NAMESPACE_ID::ServiceDescriptor const** file_level_service_descriptors_sdk_2eproto = nullptr; -AGONES_EXPORT ::google::protobuf::internal::SCCInfo<3> scc_info_GameServer_sdk_2eproto = - {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 3, InitDefaultsGameServer_sdk_2eproto}, { - &scc_info_GameServer_ObjectMeta_sdk_2eproto.base, - &scc_info_GameServer_Spec_sdk_2eproto.base, - &scc_info_GameServer_Status_sdk_2eproto.base,}}; - -void InitDefaults_sdk_2eproto() { - ::google::protobuf::internal::InitSCC(&scc_info_Empty_sdk_2eproto.base); - ::google::protobuf::internal::InitSCC(&scc_info_KeyValue_sdk_2eproto.base); - ::google::protobuf::internal::InitSCC(&scc_info_Duration_sdk_2eproto.base); - ::google::protobuf::internal::InitSCC(&scc_info_GameServer_ObjectMeta_AnnotationsEntry_DoNotUse_sdk_2eproto.base); - ::google::protobuf::internal::InitSCC(&scc_info_GameServer_ObjectMeta_LabelsEntry_DoNotUse_sdk_2eproto.base); - ::google::protobuf::internal::InitSCC(&scc_info_GameServer_ObjectMeta_sdk_2eproto.base); - ::google::protobuf::internal::InitSCC(&scc_info_GameServer_Spec_Health_sdk_2eproto.base); - ::google::protobuf::internal::InitSCC(&scc_info_GameServer_Spec_sdk_2eproto.base); - ::google::protobuf::internal::InitSCC(&scc_info_GameServer_Status_Port_sdk_2eproto.base); - ::google::protobuf::internal::InitSCC(&scc_info_GameServer_Status_sdk_2eproto.base); - ::google::protobuf::internal::InitSCC(&scc_info_GameServer_sdk_2eproto.base); -} - -::google::protobuf::Metadata file_level_metadata_sdk_2eproto[11]; -constexpr ::google::protobuf::EnumDescriptor const** file_level_enum_descriptors_sdk_2eproto = nullptr; -constexpr ::google::protobuf::ServiceDescriptor const** file_level_service_descriptors_sdk_2eproto = nullptr; - -const ::google::protobuf::uint32 TableStruct_sdk_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { +const ::PROTOBUF_NAMESPACE_ID::uint32 TableStruct_sdk_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::agones::dev::sdk::Empty, _internal_metadata_), ~0u, // no _extensions_ @@ -355,7 +339,7 @@ const ::google::protobuf::uint32 TableStruct_sdk_2eproto::offsets[] PROTOBUF_SEC PROTOBUF_FIELD_OFFSET(::agones::dev::sdk::GameServer, spec_), PROTOBUF_FIELD_OFFSET(::agones::dev::sdk::GameServer, status_), }; -static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { +static const ::PROTOBUF_NAMESPACE_ID::internal::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { { 0, -1, sizeof(::agones::dev::sdk::Empty)}, { 5, -1, sizeof(::agones::dev::sdk::KeyValue)}, { 12, -1, sizeof(::agones::dev::sdk::Duration)}, @@ -369,27 +353,21 @@ static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_SE { 80, -1, sizeof(::agones::dev::sdk::GameServer)}, }; -static ::google::protobuf::Message const * const file_default_instances[] = { - reinterpret_cast(&::agones::dev::sdk::_Empty_default_instance_), - reinterpret_cast(&::agones::dev::sdk::_KeyValue_default_instance_), - reinterpret_cast(&::agones::dev::sdk::_Duration_default_instance_), - reinterpret_cast(&::agones::dev::sdk::_GameServer_ObjectMeta_AnnotationsEntry_DoNotUse_default_instance_), - reinterpret_cast(&::agones::dev::sdk::_GameServer_ObjectMeta_LabelsEntry_DoNotUse_default_instance_), - reinterpret_cast(&::agones::dev::sdk::_GameServer_ObjectMeta_default_instance_), - reinterpret_cast(&::agones::dev::sdk::_GameServer_Spec_Health_default_instance_), - reinterpret_cast(&::agones::dev::sdk::_GameServer_Spec_default_instance_), - reinterpret_cast(&::agones::dev::sdk::_GameServer_Status_Port_default_instance_), - reinterpret_cast(&::agones::dev::sdk::_GameServer_Status_default_instance_), - reinterpret_cast(&::agones::dev::sdk::_GameServer_default_instance_), -}; - -::google::protobuf::internal::AssignDescriptorsTable assign_descriptors_table_sdk_2eproto = { - {}, AddDescriptors_sdk_2eproto, "sdk.proto", schemas, - file_default_instances, TableStruct_sdk_2eproto::offsets, - file_level_metadata_sdk_2eproto, 11, file_level_enum_descriptors_sdk_2eproto, file_level_service_descriptors_sdk_2eproto, +static ::PROTOBUF_NAMESPACE_ID::Message const * const file_default_instances[] = { + reinterpret_cast(&::agones::dev::sdk::_Empty_default_instance_), + reinterpret_cast(&::agones::dev::sdk::_KeyValue_default_instance_), + reinterpret_cast(&::agones::dev::sdk::_Duration_default_instance_), + reinterpret_cast(&::agones::dev::sdk::_GameServer_ObjectMeta_AnnotationsEntry_DoNotUse_default_instance_), + reinterpret_cast(&::agones::dev::sdk::_GameServer_ObjectMeta_LabelsEntry_DoNotUse_default_instance_), + reinterpret_cast(&::agones::dev::sdk::_GameServer_ObjectMeta_default_instance_), + reinterpret_cast(&::agones::dev::sdk::_GameServer_Spec_Health_default_instance_), + reinterpret_cast(&::agones::dev::sdk::_GameServer_Spec_default_instance_), + reinterpret_cast(&::agones::dev::sdk::_GameServer_Status_Port_default_instance_), + reinterpret_cast(&::agones::dev::sdk::_GameServer_Status_default_instance_), + reinterpret_cast(&::agones::dev::sdk::_GameServer_default_instance_), }; -const char descriptor_table_protodef_sdk_2eproto[] = +const char descriptor_table_protodef_sdk_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = "\n\tsdk.proto\022\016agones.dev.sdk\032\034google/api/" "annotations.proto\"\007\n\005Empty\"&\n\010KeyValue\022\013" "\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t\"\033\n\010Duration\022\017" @@ -437,22 +415,33 @@ const char descriptor_table_protodef_sdk_2eproto[] = "gones.dev.sdk.Empty\"\023\202\323\344\223\002\r\"\010/reserve:\001*" "B\005Z\003sdkb\006proto3" ; -::google::protobuf::internal::DescriptorTable descriptor_table_sdk_2eproto = { - false, InitDefaults_sdk_2eproto, - descriptor_table_protodef_sdk_2eproto, - "sdk.proto", &assign_descriptors_table_sdk_2eproto, 1815, +static const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable*const descriptor_table_sdk_2eproto_deps[1] = { + &::descriptor_table_google_2fapi_2fannotations_2eproto, +}; +static ::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase*const descriptor_table_sdk_2eproto_sccs[11] = { + &scc_info_Duration_sdk_2eproto.base, + &scc_info_Empty_sdk_2eproto.base, + &scc_info_GameServer_sdk_2eproto.base, + &scc_info_GameServer_ObjectMeta_sdk_2eproto.base, + &scc_info_GameServer_ObjectMeta_AnnotationsEntry_DoNotUse_sdk_2eproto.base, + &scc_info_GameServer_ObjectMeta_LabelsEntry_DoNotUse_sdk_2eproto.base, + &scc_info_GameServer_Spec_sdk_2eproto.base, + &scc_info_GameServer_Spec_Health_sdk_2eproto.base, + &scc_info_GameServer_Status_sdk_2eproto.base, + &scc_info_GameServer_Status_Port_sdk_2eproto.base, + &scc_info_KeyValue_sdk_2eproto.base, +}; +static ::PROTOBUF_NAMESPACE_ID::internal::once_flag descriptor_table_sdk_2eproto_once; +static bool descriptor_table_sdk_2eproto_initialized = false; +const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_sdk_2eproto = { + &descriptor_table_sdk_2eproto_initialized, descriptor_table_protodef_sdk_2eproto, "sdk.proto", 1815, + &descriptor_table_sdk_2eproto_once, descriptor_table_sdk_2eproto_sccs, descriptor_table_sdk_2eproto_deps, 11, 1, + schemas, file_default_instances, TableStruct_sdk_2eproto::offsets, + file_level_metadata_sdk_2eproto, 11, file_level_enum_descriptors_sdk_2eproto, file_level_service_descriptors_sdk_2eproto, }; - -void AddDescriptors_sdk_2eproto() { - static constexpr ::google::protobuf::internal::InitFunc deps[1] = - { - ::AddDescriptors_google_2fapi_2fannotations_2eproto, - }; - ::google::protobuf::internal::AddDescriptors(&descriptor_table_sdk_2eproto, deps, 1); -} // Force running AddDescriptors() at dynamic initialization time. -static bool dynamic_init_dummy_sdk_2eproto = []() { AddDescriptors_sdk_2eproto(); return true; }(); +static bool dynamic_init_dummy_sdk_2eproto = ( ::PROTOBUF_NAMESPACE_ID::internal::AddDescriptors(&descriptor_table_sdk_2eproto), true); namespace agones { namespace dev { namespace sdk { @@ -461,20 +450,17 @@ namespace sdk { void Empty::InitAsDefaultInstance() { } -class Empty::HasBitSetters { +class Empty::_Internal { public: }; -#if !defined(_MSC_VER) || _MSC_VER >= 1900 -#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 - Empty::Empty() - : ::google::protobuf::Message(), _internal_metadata_(nullptr) { + : ::PROTOBUF_NAMESPACE_ID::Message(), _internal_metadata_(nullptr) { SharedCtor(); // @@protoc_insertion_point(constructor:agones.dev.sdk.Empty) } Empty::Empty(const Empty& from) - : ::google::protobuf::Message(), + : ::PROTOBUF_NAMESPACE_ID::Message(), _internal_metadata_(nullptr) { _internal_metadata_.MergeFrom(from._internal_metadata_); // @@protoc_insertion_point(copy_constructor:agones.dev.sdk.Empty) @@ -495,97 +481,55 @@ void Empty::SetCachedSize(int size) const { _cached_size_.Set(size); } const Empty& Empty::default_instance() { - ::google::protobuf::internal::InitSCC(&::scc_info_Empty_sdk_2eproto.base); + ::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&::scc_info_Empty_sdk_2eproto.base); return *internal_default_instance(); } void Empty::Clear() { // @@protoc_insertion_point(message_clear_start:agones.dev.sdk.Empty) - ::google::protobuf::uint32 cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; _internal_metadata_.Clear(); } -#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -const char* Empty::_InternalParse(const char* begin, const char* end, void* object, - ::google::protobuf::internal::ParseContext* ctx) { - auto msg = static_cast(object); - ::google::protobuf::int32 size; (void)size; - int depth; (void)depth; - ::google::protobuf::uint32 tag; - ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; - auto ptr = begin; - while (ptr < end) { - ptr = ::google::protobuf::io::Parse32(ptr, &tag); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); +const char* Empty::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) { +#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure + while (!ctx->Done(&ptr)) { + ::PROTOBUF_NAMESPACE_ID::uint32 tag; + ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); + CHK_(ptr); switch (tag >> 3) { default: { if ((tag & 7) == 4 || tag == 0) { - ctx->EndGroup(tag); - return ptr; + ctx->SetLastTag(tag); + goto success; } - auto res = UnknownFieldParse(tag, {_InternalParse, msg}, - ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); - ptr = res.first; - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); - if (res.second) return ptr; + ptr = UnknownFieldParse(tag, &_internal_metadata_, ptr, ctx); + CHK_(ptr != nullptr); + continue; } } // switch } // while - return ptr; -} -#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -bool Empty::MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) { -#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure - ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:agones.dev.sdk.Empty) - for (;;) { - ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); - tag = p.first; - if (!p.second) goto handle_unusual; - handle_unusual: - if (tag == 0) { - goto success; - } - DO_(::google::protobuf::internal::WireFormat::SkipField( - input, tag, _internal_metadata_.mutable_unknown_fields())); - } success: - // @@protoc_insertion_point(parse_success:agones.dev.sdk.Empty) - return true; + return ptr; failure: - // @@protoc_insertion_point(parse_failure:agones.dev.sdk.Empty) - return false; -#undef DO_ + ptr = nullptr; + goto success; +#undef CHK_ } -#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -void Empty::SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:agones.dev.sdk.Empty) - ::google::protobuf::uint32 cached_has_bits = 0; - (void) cached_has_bits; - - if (_internal_metadata_.have_unknown_fields()) { - ::google::protobuf::internal::WireFormat::SerializeUnknownFields( - _internal_metadata_.unknown_fields(), output); - } - // @@protoc_insertion_point(serialize_end:agones.dev.sdk.Empty) -} - -::google::protobuf::uint8* Empty::InternalSerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { +::PROTOBUF_NAMESPACE_ID::uint8* Empty::InternalSerializeWithCachedSizesToArray( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:agones.dev.sdk.Empty) - ::google::protobuf::uint32 cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; - if (_internal_metadata_.have_unknown_fields()) { - target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( - _internal_metadata_.unknown_fields(), target); + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::InternalSerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields(), target, stream); } // @@protoc_insertion_point(serialize_to_array_end:agones.dev.sdk.Empty) return target; @@ -595,29 +539,28 @@ size_t Empty::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:agones.dev.sdk.Empty) size_t total_size = 0; - if (_internal_metadata_.have_unknown_fields()) { - total_size += - ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - _internal_metadata_.unknown_fields()); - } - ::google::protobuf::uint32 cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + return ::PROTOBUF_NAMESPACE_ID::internal::ComputeUnknownFieldsSize( + _internal_metadata_, total_size, &_cached_size_); + } + int cached_size = ::PROTOBUF_NAMESPACE_ID::internal::ToCachedSize(total_size); SetCachedSize(cached_size); return total_size; } -void Empty::MergeFrom(const ::google::protobuf::Message& from) { +void Empty::MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:agones.dev.sdk.Empty) GOOGLE_DCHECK_NE(&from, this); const Empty* source = - ::google::protobuf::DynamicCastToGenerated( + ::PROTOBUF_NAMESPACE_ID::DynamicCastToGenerated( &from); if (source == nullptr) { // @@protoc_insertion_point(generalized_merge_from_cast_fail:agones.dev.sdk.Empty) - ::google::protobuf::internal::ReflectionOps::Merge(from, this); + ::PROTOBUF_NAMESPACE_ID::internal::ReflectionOps::Merge(from, this); } else { // @@protoc_insertion_point(generalized_merge_from_cast_success:agones.dev.sdk.Empty) MergeFrom(*source); @@ -628,12 +571,12 @@ void Empty::MergeFrom(const Empty& from) { // @@protoc_insertion_point(class_specific_merge_from_start:agones.dev.sdk.Empty) GOOGLE_DCHECK_NE(&from, this); _internal_metadata_.MergeFrom(from._internal_metadata_); - ::google::protobuf::uint32 cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; } -void Empty::CopyFrom(const ::google::protobuf::Message& from) { +void Empty::CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) { // @@protoc_insertion_point(generalized_copy_from_start:agones.dev.sdk.Empty) if (&from == this) return; Clear(); @@ -651,18 +594,13 @@ bool Empty::IsInitialized() const { return true; } -void Empty::Swap(Empty* other) { - if (other == this) return; - InternalSwap(other); -} void Empty::InternalSwap(Empty* other) { using std::swap; _internal_metadata_.Swap(&other->_internal_metadata_); } -::google::protobuf::Metadata Empty::GetMetadata() const { - ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_sdk_2eproto); - return ::file_level_metadata_sdk_2eproto[kIndexInFileMessages]; +::PROTOBUF_NAMESPACE_ID::Metadata Empty::GetMetadata() const { + return GetMetadataStatic(); } @@ -670,40 +608,34 @@ ::google::protobuf::Metadata Empty::GetMetadata() const { void KeyValue::InitAsDefaultInstance() { } -class KeyValue::HasBitSetters { +class KeyValue::_Internal { public: }; -#if !defined(_MSC_VER) || _MSC_VER >= 1900 -const int KeyValue::kKeyFieldNumber; -const int KeyValue::kValueFieldNumber; -#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 - KeyValue::KeyValue() - : ::google::protobuf::Message(), _internal_metadata_(nullptr) { + : ::PROTOBUF_NAMESPACE_ID::Message(), _internal_metadata_(nullptr) { SharedCtor(); // @@protoc_insertion_point(constructor:agones.dev.sdk.KeyValue) } KeyValue::KeyValue(const KeyValue& from) - : ::google::protobuf::Message(), + : ::PROTOBUF_NAMESPACE_ID::Message(), _internal_metadata_(nullptr) { _internal_metadata_.MergeFrom(from._internal_metadata_); - key_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - if (from.key().size() > 0) { - key_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.key_); + key_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + if (!from._internal_key().empty()) { + key_.AssignWithDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from.key_); } - value_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - if (from.value().size() > 0) { - value_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.value_); + value_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + if (!from._internal_value().empty()) { + value_.AssignWithDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from.value_); } // @@protoc_insertion_point(copy_constructor:agones.dev.sdk.KeyValue) } void KeyValue::SharedCtor() { - ::google::protobuf::internal::InitSCC( - &scc_info_KeyValue_sdk_2eproto.base); - key_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - value_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + ::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&scc_info_KeyValue_sdk_2eproto.base); + key_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + value_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } KeyValue::~KeyValue() { @@ -712,224 +644,100 @@ KeyValue::~KeyValue() { } void KeyValue::SharedDtor() { - key_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - value_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + key_.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + value_.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } void KeyValue::SetCachedSize(int size) const { _cached_size_.Set(size); } const KeyValue& KeyValue::default_instance() { - ::google::protobuf::internal::InitSCC(&::scc_info_KeyValue_sdk_2eproto.base); + ::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&::scc_info_KeyValue_sdk_2eproto.base); return *internal_default_instance(); } void KeyValue::Clear() { // @@protoc_insertion_point(message_clear_start:agones.dev.sdk.KeyValue) - ::google::protobuf::uint32 cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - key_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - value_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + key_.ClearToEmptyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + value_.ClearToEmptyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); _internal_metadata_.Clear(); } -#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -const char* KeyValue::_InternalParse(const char* begin, const char* end, void* object, - ::google::protobuf::internal::ParseContext* ctx) { - auto msg = static_cast(object); - ::google::protobuf::int32 size; (void)size; - int depth; (void)depth; - ::google::protobuf::uint32 tag; - ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; - auto ptr = begin; - while (ptr < end) { - ptr = ::google::protobuf::io::Parse32(ptr, &tag); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); +const char* KeyValue::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) { +#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure + while (!ctx->Done(&ptr)) { + ::PROTOBUF_NAMESPACE_ID::uint32 tag; + ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); + CHK_(ptr); switch (tag >> 3) { // string key = 1; - case 1: { - if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual; - ptr = ::google::protobuf::io::ReadSize(ptr, &size); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - ctx->extra_parse_data().SetFieldName("agones.dev.sdk.KeyValue.key"); - object = msg->mutable_key(); - if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { - parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; - goto string_till_end; - } - GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); - ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); - ptr += size; - break; - } + case 1: + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 10)) { + ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParserUTF8(_internal_mutable_key(), ptr, ctx, "agones.dev.sdk.KeyValue.key"); + CHK_(ptr); + } else goto handle_unusual; + continue; // string value = 2; - case 2: { - if (static_cast<::google::protobuf::uint8>(tag) != 18) goto handle_unusual; - ptr = ::google::protobuf::io::ReadSize(ptr, &size); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - ctx->extra_parse_data().SetFieldName("agones.dev.sdk.KeyValue.value"); - object = msg->mutable_value(); - if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { - parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; - goto string_till_end; - } - GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); - ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); - ptr += size; - break; - } + case 2: + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 18)) { + ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParserUTF8(_internal_mutable_value(), ptr, ctx, "agones.dev.sdk.KeyValue.value"); + CHK_(ptr); + } else goto handle_unusual; + continue; default: { handle_unusual: if ((tag & 7) == 4 || tag == 0) { - ctx->EndGroup(tag); - return ptr; + ctx->SetLastTag(tag); + goto success; } - auto res = UnknownFieldParse(tag, {_InternalParse, msg}, - ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); - ptr = res.first; - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); - if (res.second) return ptr; + ptr = UnknownFieldParse(tag, &_internal_metadata_, ptr, ctx); + CHK_(ptr != nullptr); + continue; } } // switch } // while - return ptr; -string_till_end: - static_cast<::std::string*>(object)->clear(); - static_cast<::std::string*>(object)->reserve(size); - goto len_delim_till_end; -len_delim_till_end: - return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg}, - {parser_till_end, object}, size); -} -#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -bool KeyValue::MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) { -#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure - ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:agones.dev.sdk.KeyValue) - for (;;) { - ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); - tag = p.first; - if (!p.second) goto handle_unusual; - switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // string key = 1; - case 1: { - if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadString( - input, this->mutable_key())); - DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->key().data(), static_cast(this->key().length()), - ::google::protobuf::internal::WireFormatLite::PARSE, - "agones.dev.sdk.KeyValue.key")); - } else { - goto handle_unusual; - } - break; - } - - // string value = 2; - case 2: { - if (static_cast< ::google::protobuf::uint8>(tag) == (18 & 0xFF)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadString( - input, this->mutable_value())); - DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->value().data(), static_cast(this->value().length()), - ::google::protobuf::internal::WireFormatLite::PARSE, - "agones.dev.sdk.KeyValue.value")); - } else { - goto handle_unusual; - } - break; - } - - default: { - handle_unusual: - if (tag == 0) { - goto success; - } - DO_(::google::protobuf::internal::WireFormat::SkipField( - input, tag, _internal_metadata_.mutable_unknown_fields())); - break; - } - } - } success: - // @@protoc_insertion_point(parse_success:agones.dev.sdk.KeyValue) - return true; + return ptr; failure: - // @@protoc_insertion_point(parse_failure:agones.dev.sdk.KeyValue) - return false; -#undef DO_ + ptr = nullptr; + goto success; +#undef CHK_ } -#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER - -void KeyValue::SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:agones.dev.sdk.KeyValue) - ::google::protobuf::uint32 cached_has_bits = 0; - (void) cached_has_bits; - - // string key = 1; - if (this->key().size() > 0) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->key().data(), static_cast(this->key().length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, - "agones.dev.sdk.KeyValue.key"); - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( - 1, this->key(), output); - } - // string value = 2; - if (this->value().size() > 0) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->value().data(), static_cast(this->value().length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, - "agones.dev.sdk.KeyValue.value"); - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( - 2, this->value(), output); - } - - if (_internal_metadata_.have_unknown_fields()) { - ::google::protobuf::internal::WireFormat::SerializeUnknownFields( - _internal_metadata_.unknown_fields(), output); - } - // @@protoc_insertion_point(serialize_end:agones.dev.sdk.KeyValue) -} - -::google::protobuf::uint8* KeyValue::InternalSerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { +::PROTOBUF_NAMESPACE_ID::uint8* KeyValue::InternalSerializeWithCachedSizesToArray( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:agones.dev.sdk.KeyValue) - ::google::protobuf::uint32 cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; // string key = 1; if (this->key().size() > 0) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->key().data(), static_cast(this->key().length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( + this->_internal_key().data(), static_cast(this->_internal_key().length()), + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "agones.dev.sdk.KeyValue.key"); - target = - ::google::protobuf::internal::WireFormatLite::WriteStringToArray( - 1, this->key(), target); + target = stream->WriteStringMaybeAliased( + 1, this->_internal_key(), target); } // string value = 2; if (this->value().size() > 0) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->value().data(), static_cast(this->value().length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( + this->_internal_value().data(), static_cast(this->_internal_value().length()), + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "agones.dev.sdk.KeyValue.value"); - target = - ::google::protobuf::internal::WireFormatLite::WriteStringToArray( - 2, this->value(), target); + target = stream->WriteStringMaybeAliased( + 2, this->_internal_value(), target); } - if (_internal_metadata_.have_unknown_fields()) { - target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( - _internal_metadata_.unknown_fields(), target); + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::InternalSerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields(), target, stream); } // @@protoc_insertion_point(serialize_to_array_end:agones.dev.sdk.KeyValue) return target; @@ -939,43 +747,42 @@ size_t KeyValue::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:agones.dev.sdk.KeyValue) size_t total_size = 0; - if (_internal_metadata_.have_unknown_fields()) { - total_size += - ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - _internal_metadata_.unknown_fields()); - } - ::google::protobuf::uint32 cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; // string key = 1; if (this->key().size() > 0) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::StringSize( - this->key()); + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( + this->_internal_key()); } // string value = 2; if (this->value().size() > 0) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::StringSize( - this->value()); + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( + this->_internal_value()); } - int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + return ::PROTOBUF_NAMESPACE_ID::internal::ComputeUnknownFieldsSize( + _internal_metadata_, total_size, &_cached_size_); + } + int cached_size = ::PROTOBUF_NAMESPACE_ID::internal::ToCachedSize(total_size); SetCachedSize(cached_size); return total_size; } -void KeyValue::MergeFrom(const ::google::protobuf::Message& from) { +void KeyValue::MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:agones.dev.sdk.KeyValue) GOOGLE_DCHECK_NE(&from, this); const KeyValue* source = - ::google::protobuf::DynamicCastToGenerated( + ::PROTOBUF_NAMESPACE_ID::DynamicCastToGenerated( &from); if (source == nullptr) { // @@protoc_insertion_point(generalized_merge_from_cast_fail:agones.dev.sdk.KeyValue) - ::google::protobuf::internal::ReflectionOps::Merge(from, this); + ::PROTOBUF_NAMESPACE_ID::internal::ReflectionOps::Merge(from, this); } else { // @@protoc_insertion_point(generalized_merge_from_cast_success:agones.dev.sdk.KeyValue) MergeFrom(*source); @@ -986,20 +793,20 @@ void KeyValue::MergeFrom(const KeyValue& from) { // @@protoc_insertion_point(class_specific_merge_from_start:agones.dev.sdk.KeyValue) GOOGLE_DCHECK_NE(&from, this); _internal_metadata_.MergeFrom(from._internal_metadata_); - ::google::protobuf::uint32 cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; if (from.key().size() > 0) { - key_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.key_); + key_.AssignWithDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from.key_); } if (from.value().size() > 0) { - value_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.value_); + value_.AssignWithDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from.value_); } } -void KeyValue::CopyFrom(const ::google::protobuf::Message& from) { +void KeyValue::CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) { // @@protoc_insertion_point(generalized_copy_from_start:agones.dev.sdk.KeyValue) if (&from == this) return; Clear(); @@ -1017,22 +824,17 @@ bool KeyValue::IsInitialized() const { return true; } -void KeyValue::Swap(KeyValue* other) { - if (other == this) return; - InternalSwap(other); -} void KeyValue::InternalSwap(KeyValue* other) { using std::swap; _internal_metadata_.Swap(&other->_internal_metadata_); - key_.Swap(&other->key_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), + key_.Swap(&other->key_, &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); - value_.Swap(&other->value_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), + value_.Swap(&other->value_, &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } -::google::protobuf::Metadata KeyValue::GetMetadata() const { - ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_sdk_2eproto); - return ::file_level_metadata_sdk_2eproto[kIndexInFileMessages]; +::PROTOBUF_NAMESPACE_ID::Metadata KeyValue::GetMetadata() const { + return GetMetadataStatic(); } @@ -1040,21 +842,17 @@ ::google::protobuf::Metadata KeyValue::GetMetadata() const { void Duration::InitAsDefaultInstance() { } -class Duration::HasBitSetters { +class Duration::_Internal { public: }; -#if !defined(_MSC_VER) || _MSC_VER >= 1900 -const int Duration::kSecondsFieldNumber; -#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 - Duration::Duration() - : ::google::protobuf::Message(), _internal_metadata_(nullptr) { + : ::PROTOBUF_NAMESPACE_ID::Message(), _internal_metadata_(nullptr) { SharedCtor(); // @@protoc_insertion_point(constructor:agones.dev.sdk.Duration) } Duration::Duration(const Duration& from) - : ::google::protobuf::Message(), + : ::PROTOBUF_NAMESPACE_ID::Message(), _internal_metadata_(nullptr) { _internal_metadata_.MergeFrom(from._internal_metadata_); seconds_ = from.seconds_; @@ -1077,14 +875,14 @@ void Duration::SetCachedSize(int size) const { _cached_size_.Set(size); } const Duration& Duration::default_instance() { - ::google::protobuf::internal::InitSCC(&::scc_info_Duration_sdk_2eproto.base); + ::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&::scc_info_Duration_sdk_2eproto.base); return *internal_default_instance(); } void Duration::Clear() { // @@protoc_insertion_point(message_clear_start:agones.dev.sdk.Duration) - ::google::protobuf::uint32 cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -1092,119 +890,55 @@ void Duration::Clear() { _internal_metadata_.Clear(); } -#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -const char* Duration::_InternalParse(const char* begin, const char* end, void* object, - ::google::protobuf::internal::ParseContext* ctx) { - auto msg = static_cast(object); - ::google::protobuf::int32 size; (void)size; - int depth; (void)depth; - ::google::protobuf::uint32 tag; - ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; - auto ptr = begin; - while (ptr < end) { - ptr = ::google::protobuf::io::Parse32(ptr, &tag); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); +const char* Duration::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) { +#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure + while (!ctx->Done(&ptr)) { + ::PROTOBUF_NAMESPACE_ID::uint32 tag; + ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); + CHK_(ptr); switch (tag >> 3) { // int64 seconds = 1; - case 1: { - if (static_cast<::google::protobuf::uint8>(tag) != 8) goto handle_unusual; - msg->set_seconds(::google::protobuf::internal::ReadVarint(&ptr)); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - break; - } + case 1: + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) { + seconds_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint(&ptr); + CHK_(ptr); + } else goto handle_unusual; + continue; default: { handle_unusual: if ((tag & 7) == 4 || tag == 0) { - ctx->EndGroup(tag); - return ptr; + ctx->SetLastTag(tag); + goto success; } - auto res = UnknownFieldParse(tag, {_InternalParse, msg}, - ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); - ptr = res.first; - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); - if (res.second) return ptr; + ptr = UnknownFieldParse(tag, &_internal_metadata_, ptr, ctx); + CHK_(ptr != nullptr); + continue; } } // switch } // while - return ptr; -} -#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -bool Duration::MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) { -#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure - ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:agones.dev.sdk.Duration) - for (;;) { - ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); - tag = p.first; - if (!p.second) goto handle_unusual; - switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // int64 seconds = 1; - case 1: { - if (static_cast< ::google::protobuf::uint8>(tag) == (8 & 0xFF)) { - - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::int64, ::google::protobuf::internal::WireFormatLite::TYPE_INT64>( - input, &seconds_))); - } else { - goto handle_unusual; - } - break; - } - - default: { - handle_unusual: - if (tag == 0) { - goto success; - } - DO_(::google::protobuf::internal::WireFormat::SkipField( - input, tag, _internal_metadata_.mutable_unknown_fields())); - break; - } - } - } success: - // @@protoc_insertion_point(parse_success:agones.dev.sdk.Duration) - return true; + return ptr; failure: - // @@protoc_insertion_point(parse_failure:agones.dev.sdk.Duration) - return false; -#undef DO_ + ptr = nullptr; + goto success; +#undef CHK_ } -#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -void Duration::SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:agones.dev.sdk.Duration) - ::google::protobuf::uint32 cached_has_bits = 0; - (void) cached_has_bits; - - // int64 seconds = 1; - if (this->seconds() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteInt64(1, this->seconds(), output); - } - - if (_internal_metadata_.have_unknown_fields()) { - ::google::protobuf::internal::WireFormat::SerializeUnknownFields( - _internal_metadata_.unknown_fields(), output); - } - // @@protoc_insertion_point(serialize_end:agones.dev.sdk.Duration) -} - -::google::protobuf::uint8* Duration::InternalSerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { +::PROTOBUF_NAMESPACE_ID::uint8* Duration::InternalSerializeWithCachedSizesToArray( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:agones.dev.sdk.Duration) - ::google::protobuf::uint32 cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; // int64 seconds = 1; if (this->seconds() != 0) { - target = ::google::protobuf::internal::WireFormatLite::WriteInt64ToArray(1, this->seconds(), target); + stream->EnsureSpace(&target); + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64ToArray(1, this->_internal_seconds(), target); } - if (_internal_metadata_.have_unknown_fields()) { - target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( - _internal_metadata_.unknown_fields(), target); + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::InternalSerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields(), target, stream); } // @@protoc_insertion_point(serialize_to_array_end:agones.dev.sdk.Duration) return target; @@ -1214,36 +948,35 @@ size_t Duration::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:agones.dev.sdk.Duration) size_t total_size = 0; - if (_internal_metadata_.have_unknown_fields()) { - total_size += - ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - _internal_metadata_.unknown_fields()); - } - ::google::protobuf::uint32 cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; // int64 seconds = 1; if (this->seconds() != 0) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::Int64Size( - this->seconds()); + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int64Size( + this->_internal_seconds()); } - int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + return ::PROTOBUF_NAMESPACE_ID::internal::ComputeUnknownFieldsSize( + _internal_metadata_, total_size, &_cached_size_); + } + int cached_size = ::PROTOBUF_NAMESPACE_ID::internal::ToCachedSize(total_size); SetCachedSize(cached_size); return total_size; } -void Duration::MergeFrom(const ::google::protobuf::Message& from) { +void Duration::MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:agones.dev.sdk.Duration) GOOGLE_DCHECK_NE(&from, this); const Duration* source = - ::google::protobuf::DynamicCastToGenerated( + ::PROTOBUF_NAMESPACE_ID::DynamicCastToGenerated( &from); if (source == nullptr) { // @@protoc_insertion_point(generalized_merge_from_cast_fail:agones.dev.sdk.Duration) - ::google::protobuf::internal::ReflectionOps::Merge(from, this); + ::PROTOBUF_NAMESPACE_ID::internal::ReflectionOps::Merge(from, this); } else { // @@protoc_insertion_point(generalized_merge_from_cast_success:agones.dev.sdk.Duration) MergeFrom(*source); @@ -1254,15 +987,15 @@ void Duration::MergeFrom(const Duration& from) { // @@protoc_insertion_point(class_specific_merge_from_start:agones.dev.sdk.Duration) GOOGLE_DCHECK_NE(&from, this); _internal_metadata_.MergeFrom(from._internal_metadata_); - ::google::protobuf::uint32 cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; if (from.seconds() != 0) { - set_seconds(from.seconds()); + _internal_set_seconds(from._internal_seconds()); } } -void Duration::CopyFrom(const ::google::protobuf::Message& from) { +void Duration::CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) { // @@protoc_insertion_point(generalized_copy_from_start:agones.dev.sdk.Duration) if (&from == this) return; Clear(); @@ -1280,150 +1013,85 @@ bool Duration::IsInitialized() const { return true; } -void Duration::Swap(Duration* other) { - if (other == this) return; - InternalSwap(other); -} void Duration::InternalSwap(Duration* other) { using std::swap; _internal_metadata_.Swap(&other->_internal_metadata_); swap(seconds_, other->seconds_); } -::google::protobuf::Metadata Duration::GetMetadata() const { - ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_sdk_2eproto); - return ::file_level_metadata_sdk_2eproto[kIndexInFileMessages]; +::PROTOBUF_NAMESPACE_ID::Metadata Duration::GetMetadata() const { + return GetMetadataStatic(); } // =================================================================== GameServer_ObjectMeta_AnnotationsEntry_DoNotUse::GameServer_ObjectMeta_AnnotationsEntry_DoNotUse() {} -GameServer_ObjectMeta_AnnotationsEntry_DoNotUse::GameServer_ObjectMeta_AnnotationsEntry_DoNotUse(::google::protobuf::Arena* arena) +GameServer_ObjectMeta_AnnotationsEntry_DoNotUse::GameServer_ObjectMeta_AnnotationsEntry_DoNotUse(::PROTOBUF_NAMESPACE_ID::Arena* arena) : SuperType(arena) {} void GameServer_ObjectMeta_AnnotationsEntry_DoNotUse::MergeFrom(const GameServer_ObjectMeta_AnnotationsEntry_DoNotUse& other) { MergeFromInternal(other); } -::google::protobuf::Metadata GameServer_ObjectMeta_AnnotationsEntry_DoNotUse::GetMetadata() const { - ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_sdk_2eproto); - return ::file_level_metadata_sdk_2eproto[3]; +::PROTOBUF_NAMESPACE_ID::Metadata GameServer_ObjectMeta_AnnotationsEntry_DoNotUse::GetMetadata() const { + return GetMetadataStatic(); } void GameServer_ObjectMeta_AnnotationsEntry_DoNotUse::MergeFrom( - const ::google::protobuf::Message& other) { - ::google::protobuf::Message::MergeFrom(other); -} - -#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -bool GameServer_ObjectMeta_AnnotationsEntry_DoNotUse::_ParseMap(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx) { - using MF = ::google::protobuf::internal::MapField< - GameServer_ObjectMeta_AnnotationsEntry_DoNotUse, EntryKeyType, EntryValueType, - kEntryKeyFieldType, kEntryValueFieldType, - kEntryDefaultEnumValue>; - auto mf = static_cast(object); - Parser> parser(mf); -#define DO_(x) if (!(x)) return false - DO_(parser.ParseMap(begin, end)); - DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - parser.key().data(), static_cast(parser.key().length()), - ::google::protobuf::internal::WireFormatLite::PARSE, - "agones.dev.sdk.GameServer.ObjectMeta.AnnotationsEntry.key")); - DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - parser.value().data(), static_cast(parser.value().length()), - ::google::protobuf::internal::WireFormatLite::PARSE, - "agones.dev.sdk.GameServer.ObjectMeta.AnnotationsEntry.value")); -#undef DO_ - return true; + const ::PROTOBUF_NAMESPACE_ID::Message& other) { + ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom(other); } -#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER // =================================================================== GameServer_ObjectMeta_LabelsEntry_DoNotUse::GameServer_ObjectMeta_LabelsEntry_DoNotUse() {} -GameServer_ObjectMeta_LabelsEntry_DoNotUse::GameServer_ObjectMeta_LabelsEntry_DoNotUse(::google::protobuf::Arena* arena) +GameServer_ObjectMeta_LabelsEntry_DoNotUse::GameServer_ObjectMeta_LabelsEntry_DoNotUse(::PROTOBUF_NAMESPACE_ID::Arena* arena) : SuperType(arena) {} void GameServer_ObjectMeta_LabelsEntry_DoNotUse::MergeFrom(const GameServer_ObjectMeta_LabelsEntry_DoNotUse& other) { MergeFromInternal(other); } -::google::protobuf::Metadata GameServer_ObjectMeta_LabelsEntry_DoNotUse::GetMetadata() const { - ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_sdk_2eproto); - return ::file_level_metadata_sdk_2eproto[4]; +::PROTOBUF_NAMESPACE_ID::Metadata GameServer_ObjectMeta_LabelsEntry_DoNotUse::GetMetadata() const { + return GetMetadataStatic(); } void GameServer_ObjectMeta_LabelsEntry_DoNotUse::MergeFrom( - const ::google::protobuf::Message& other) { - ::google::protobuf::Message::MergeFrom(other); -} - -#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -bool GameServer_ObjectMeta_LabelsEntry_DoNotUse::_ParseMap(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx) { - using MF = ::google::protobuf::internal::MapField< - GameServer_ObjectMeta_LabelsEntry_DoNotUse, EntryKeyType, EntryValueType, - kEntryKeyFieldType, kEntryValueFieldType, - kEntryDefaultEnumValue>; - auto mf = static_cast(object); - Parser> parser(mf); -#define DO_(x) if (!(x)) return false - DO_(parser.ParseMap(begin, end)); - DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - parser.key().data(), static_cast(parser.key().length()), - ::google::protobuf::internal::WireFormatLite::PARSE, - "agones.dev.sdk.GameServer.ObjectMeta.LabelsEntry.key")); - DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - parser.value().data(), static_cast(parser.value().length()), - ::google::protobuf::internal::WireFormatLite::PARSE, - "agones.dev.sdk.GameServer.ObjectMeta.LabelsEntry.value")); -#undef DO_ - return true; + const ::PROTOBUF_NAMESPACE_ID::Message& other) { + ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom(other); } -#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER // =================================================================== void GameServer_ObjectMeta::InitAsDefaultInstance() { } -class GameServer_ObjectMeta::HasBitSetters { +class GameServer_ObjectMeta::_Internal { public: }; -#if !defined(_MSC_VER) || _MSC_VER >= 1900 -const int GameServer_ObjectMeta::kNameFieldNumber; -const int GameServer_ObjectMeta::kNamespaceFieldNumber; -const int GameServer_ObjectMeta::kUidFieldNumber; -const int GameServer_ObjectMeta::kResourceVersionFieldNumber; -const int GameServer_ObjectMeta::kGenerationFieldNumber; -const int GameServer_ObjectMeta::kCreationTimestampFieldNumber; -const int GameServer_ObjectMeta::kDeletionTimestampFieldNumber; -const int GameServer_ObjectMeta::kAnnotationsFieldNumber; -const int GameServer_ObjectMeta::kLabelsFieldNumber; -#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 - GameServer_ObjectMeta::GameServer_ObjectMeta() - : ::google::protobuf::Message(), _internal_metadata_(nullptr) { + : ::PROTOBUF_NAMESPACE_ID::Message(), _internal_metadata_(nullptr) { SharedCtor(); // @@protoc_insertion_point(constructor:agones.dev.sdk.GameServer.ObjectMeta) } GameServer_ObjectMeta::GameServer_ObjectMeta(const GameServer_ObjectMeta& from) - : ::google::protobuf::Message(), + : ::PROTOBUF_NAMESPACE_ID::Message(), _internal_metadata_(nullptr) { _internal_metadata_.MergeFrom(from._internal_metadata_); annotations_.MergeFrom(from.annotations_); labels_.MergeFrom(from.labels_); - name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - if (from.name().size() > 0) { - name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); + name_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + if (!from._internal_name().empty()) { + name_.AssignWithDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from.name_); } - namespace__.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - if (from.namespace_().size() > 0) { - namespace__.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.namespace__); + namespace__.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + if (!from._internal_namespace_().empty()) { + namespace__.AssignWithDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from.namespace__); } - uid_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - if (from.uid().size() > 0) { - uid_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.uid_); + uid_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + if (!from._internal_uid().empty()) { + uid_.AssignWithDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from.uid_); } - resource_version_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - if (from.resource_version().size() > 0) { - resource_version_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.resource_version_); + resource_version_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + if (!from._internal_resource_version().empty()) { + resource_version_.AssignWithDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from.resource_version_); } ::memcpy(&generation_, &from.generation_, static_cast(reinterpret_cast(&deletion_timestamp_) - @@ -1432,12 +1100,11 @@ GameServer_ObjectMeta::GameServer_ObjectMeta(const GameServer_ObjectMeta& from) } void GameServer_ObjectMeta::SharedCtor() { - ::google::protobuf::internal::InitSCC( - &scc_info_GameServer_ObjectMeta_sdk_2eproto.base); - name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - namespace__.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - uid_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - resource_version_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + ::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&scc_info_GameServer_ObjectMeta_sdk_2eproto.base); + name_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + namespace__.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + uid_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + resource_version_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); ::memset(&generation_, 0, static_cast( reinterpret_cast(&deletion_timestamp_) - reinterpret_cast(&generation_)) + sizeof(deletion_timestamp_)); @@ -1449,713 +1116,296 @@ GameServer_ObjectMeta::~GameServer_ObjectMeta() { } void GameServer_ObjectMeta::SharedDtor() { - name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - namespace__.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - uid_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - resource_version_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + name_.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + namespace__.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + uid_.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + resource_version_.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } void GameServer_ObjectMeta::SetCachedSize(int size) const { _cached_size_.Set(size); } const GameServer_ObjectMeta& GameServer_ObjectMeta::default_instance() { - ::google::protobuf::internal::InitSCC(&::scc_info_GameServer_ObjectMeta_sdk_2eproto.base); + ::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&::scc_info_GameServer_ObjectMeta_sdk_2eproto.base); return *internal_default_instance(); } void GameServer_ObjectMeta::Clear() { // @@protoc_insertion_point(message_clear_start:agones.dev.sdk.GameServer.ObjectMeta) - ::google::protobuf::uint32 cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; annotations_.Clear(); labels_.Clear(); - name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - namespace__.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - uid_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - resource_version_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + name_.ClearToEmptyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + namespace__.ClearToEmptyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + uid_.ClearToEmptyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + resource_version_.ClearToEmptyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); ::memset(&generation_, 0, static_cast( reinterpret_cast(&deletion_timestamp_) - reinterpret_cast(&generation_)) + sizeof(deletion_timestamp_)); _internal_metadata_.Clear(); } -#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -const char* GameServer_ObjectMeta::_InternalParse(const char* begin, const char* end, void* object, - ::google::protobuf::internal::ParseContext* ctx) { - auto msg = static_cast(object); - ::google::protobuf::int32 size; (void)size; - int depth; (void)depth; - ::google::protobuf::uint32 tag; - ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; - auto ptr = begin; - while (ptr < end) { - ptr = ::google::protobuf::io::Parse32(ptr, &tag); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); +const char* GameServer_ObjectMeta::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) { +#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure + while (!ctx->Done(&ptr)) { + ::PROTOBUF_NAMESPACE_ID::uint32 tag; + ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); + CHK_(ptr); switch (tag >> 3) { // string name = 1; - case 1: { - if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual; - ptr = ::google::protobuf::io::ReadSize(ptr, &size); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - ctx->extra_parse_data().SetFieldName("agones.dev.sdk.GameServer.ObjectMeta.name"); - object = msg->mutable_name(); - if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { - parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; - goto string_till_end; - } - GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); - ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); - ptr += size; - break; - } + case 1: + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 10)) { + ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParserUTF8(_internal_mutable_name(), ptr, ctx, "agones.dev.sdk.GameServer.ObjectMeta.name"); + CHK_(ptr); + } else goto handle_unusual; + continue; // string namespace = 2; - case 2: { - if (static_cast<::google::protobuf::uint8>(tag) != 18) goto handle_unusual; - ptr = ::google::protobuf::io::ReadSize(ptr, &size); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - ctx->extra_parse_data().SetFieldName("agones.dev.sdk.GameServer.ObjectMeta.namespace"); - object = msg->mutable_namespace_(); - if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { - parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; - goto string_till_end; - } - GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); - ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); - ptr += size; - break; - } + case 2: + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 18)) { + ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParserUTF8(_internal_mutable_namespace_(), ptr, ctx, "agones.dev.sdk.GameServer.ObjectMeta.namespace"); + CHK_(ptr); + } else goto handle_unusual; + continue; // string uid = 3; - case 3: { - if (static_cast<::google::protobuf::uint8>(tag) != 26) goto handle_unusual; - ptr = ::google::protobuf::io::ReadSize(ptr, &size); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - ctx->extra_parse_data().SetFieldName("agones.dev.sdk.GameServer.ObjectMeta.uid"); - object = msg->mutable_uid(); - if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { - parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; - goto string_till_end; - } - GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); - ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); - ptr += size; - break; - } + case 3: + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 26)) { + ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParserUTF8(_internal_mutable_uid(), ptr, ctx, "agones.dev.sdk.GameServer.ObjectMeta.uid"); + CHK_(ptr); + } else goto handle_unusual; + continue; // string resource_version = 4; - case 4: { - if (static_cast<::google::protobuf::uint8>(tag) != 34) goto handle_unusual; - ptr = ::google::protobuf::io::ReadSize(ptr, &size); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - ctx->extra_parse_data().SetFieldName("agones.dev.sdk.GameServer.ObjectMeta.resource_version"); - object = msg->mutable_resource_version(); - if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { - parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; - goto string_till_end; - } - GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); - ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); - ptr += size; - break; - } + case 4: + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 34)) { + ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParserUTF8(_internal_mutable_resource_version(), ptr, ctx, "agones.dev.sdk.GameServer.ObjectMeta.resource_version"); + CHK_(ptr); + } else goto handle_unusual; + continue; // int64 generation = 5; - case 5: { - if (static_cast<::google::protobuf::uint8>(tag) != 40) goto handle_unusual; - msg->set_generation(::google::protobuf::internal::ReadVarint(&ptr)); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - break; - } + case 5: + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 40)) { + generation_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint(&ptr); + CHK_(ptr); + } else goto handle_unusual; + continue; // int64 creation_timestamp = 6; - case 6: { - if (static_cast<::google::protobuf::uint8>(tag) != 48) goto handle_unusual; - msg->set_creation_timestamp(::google::protobuf::internal::ReadVarint(&ptr)); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - break; - } + case 6: + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 48)) { + creation_timestamp_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint(&ptr); + CHK_(ptr); + } else goto handle_unusual; + continue; // int64 deletion_timestamp = 7; - case 7: { - if (static_cast<::google::protobuf::uint8>(tag) != 56) goto handle_unusual; - msg->set_deletion_timestamp(::google::protobuf::internal::ReadVarint(&ptr)); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - break; - } + case 7: + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 56)) { + deletion_timestamp_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint(&ptr); + CHK_(ptr); + } else goto handle_unusual; + continue; // map annotations = 8; - case 8: { - if (static_cast<::google::protobuf::uint8>(tag) != 66) goto handle_unusual; - do { - ptr = ::google::protobuf::io::ReadSize(ptr, &size); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - parser_till_end = ::google::protobuf::internal::SlowMapEntryParser; - auto parse_map = ::agones::dev::sdk::GameServer_ObjectMeta_AnnotationsEntry_DoNotUse::_ParseMap; - ctx->extra_parse_data().payload.clear(); - ctx->extra_parse_data().parse_map = parse_map; - object = &msg->annotations_; - if (size > end - ptr) goto len_delim_till_end; - auto newend = ptr + size; - GOOGLE_PROTOBUF_PARSER_ASSERT(parse_map(ptr, newend, object, ctx)); - ptr = newend; - if (ptr >= end) break; - } while ((::google::protobuf::io::UnalignedLoad<::google::protobuf::uint64>(ptr) & 255) == 66 && (ptr += 1)); - break; - } + case 8: + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 66)) { + ptr -= 1; + do { + ptr += 1; + ptr = ctx->ParseMessage(&annotations_, ptr); + CHK_(ptr); + if (!ctx->DataAvailable(ptr)) break; + } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<66>(ptr)); + } else goto handle_unusual; + continue; // map labels = 9; - case 9: { - if (static_cast<::google::protobuf::uint8>(tag) != 74) goto handle_unusual; - do { - ptr = ::google::protobuf::io::ReadSize(ptr, &size); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - parser_till_end = ::google::protobuf::internal::SlowMapEntryParser; - auto parse_map = ::agones::dev::sdk::GameServer_ObjectMeta_LabelsEntry_DoNotUse::_ParseMap; - ctx->extra_parse_data().payload.clear(); - ctx->extra_parse_data().parse_map = parse_map; - object = &msg->labels_; - if (size > end - ptr) goto len_delim_till_end; - auto newend = ptr + size; - GOOGLE_PROTOBUF_PARSER_ASSERT(parse_map(ptr, newend, object, ctx)); - ptr = newend; - if (ptr >= end) break; - } while ((::google::protobuf::io::UnalignedLoad<::google::protobuf::uint64>(ptr) & 255) == 74 && (ptr += 1)); - break; - } + case 9: + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 74)) { + ptr -= 1; + do { + ptr += 1; + ptr = ctx->ParseMessage(&labels_, ptr); + CHK_(ptr); + if (!ctx->DataAvailable(ptr)) break; + } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<74>(ptr)); + } else goto handle_unusual; + continue; default: { handle_unusual: if ((tag & 7) == 4 || tag == 0) { - ctx->EndGroup(tag); - return ptr; - } - auto res = UnknownFieldParse(tag, {_InternalParse, msg}, - ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); - ptr = res.first; - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); - if (res.second) return ptr; - } - } // switch - } // while - return ptr; -string_till_end: - static_cast<::std::string*>(object)->clear(); - static_cast<::std::string*>(object)->reserve(size); - goto len_delim_till_end; -len_delim_till_end: - return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg}, - {parser_till_end, object}, size); -} -#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -bool GameServer_ObjectMeta::MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) { -#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure - ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:agones.dev.sdk.GameServer.ObjectMeta) - for (;;) { - ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); - tag = p.first; - if (!p.second) goto handle_unusual; - switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // string name = 1; - case 1: { - if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadString( - input, this->mutable_name())); - DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->name().data(), static_cast(this->name().length()), - ::google::protobuf::internal::WireFormatLite::PARSE, - "agones.dev.sdk.GameServer.ObjectMeta.name")); - } else { - goto handle_unusual; - } - break; - } - - // string namespace = 2; - case 2: { - if (static_cast< ::google::protobuf::uint8>(tag) == (18 & 0xFF)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadString( - input, this->mutable_namespace_())); - DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->namespace_().data(), static_cast(this->namespace_().length()), - ::google::protobuf::internal::WireFormatLite::PARSE, - "agones.dev.sdk.GameServer.ObjectMeta.namespace")); - } else { - goto handle_unusual; - } - break; - } - - // string uid = 3; - case 3: { - if (static_cast< ::google::protobuf::uint8>(tag) == (26 & 0xFF)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadString( - input, this->mutable_uid())); - DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->uid().data(), static_cast(this->uid().length()), - ::google::protobuf::internal::WireFormatLite::PARSE, - "agones.dev.sdk.GameServer.ObjectMeta.uid")); - } else { - goto handle_unusual; - } - break; - } - - // string resource_version = 4; - case 4: { - if (static_cast< ::google::protobuf::uint8>(tag) == (34 & 0xFF)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadString( - input, this->mutable_resource_version())); - DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->resource_version().data(), static_cast(this->resource_version().length()), - ::google::protobuf::internal::WireFormatLite::PARSE, - "agones.dev.sdk.GameServer.ObjectMeta.resource_version")); - } else { - goto handle_unusual; - } - break; - } - - // int64 generation = 5; - case 5: { - if (static_cast< ::google::protobuf::uint8>(tag) == (40 & 0xFF)) { - - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::int64, ::google::protobuf::internal::WireFormatLite::TYPE_INT64>( - input, &generation_))); - } else { - goto handle_unusual; - } - break; - } - - // int64 creation_timestamp = 6; - case 6: { - if (static_cast< ::google::protobuf::uint8>(tag) == (48 & 0xFF)) { - - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::int64, ::google::protobuf::internal::WireFormatLite::TYPE_INT64>( - input, &creation_timestamp_))); - } else { - goto handle_unusual; - } - break; - } - - // int64 deletion_timestamp = 7; - case 7: { - if (static_cast< ::google::protobuf::uint8>(tag) == (56 & 0xFF)) { - - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::int64, ::google::protobuf::internal::WireFormatLite::TYPE_INT64>( - input, &deletion_timestamp_))); - } else { - goto handle_unusual; - } - break; - } - - // map annotations = 8; - case 8: { - if (static_cast< ::google::protobuf::uint8>(tag) == (66 & 0xFF)) { - GameServer_ObjectMeta_AnnotationsEntry_DoNotUse::Parser< ::google::protobuf::internal::MapField< - GameServer_ObjectMeta_AnnotationsEntry_DoNotUse, - ::std::string, ::std::string, - ::google::protobuf::internal::WireFormatLite::TYPE_STRING, - ::google::protobuf::internal::WireFormatLite::TYPE_STRING, - 0 >, - ::google::protobuf::Map< ::std::string, ::std::string > > parser(&annotations_); - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, &parser)); - DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - parser.key().data(), static_cast(parser.key().length()), - ::google::protobuf::internal::WireFormatLite::PARSE, - "agones.dev.sdk.GameServer.ObjectMeta.AnnotationsEntry.key")); - DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - parser.value().data(), static_cast(parser.value().length()), - ::google::protobuf::internal::WireFormatLite::PARSE, - "agones.dev.sdk.GameServer.ObjectMeta.AnnotationsEntry.value")); - } else { - goto handle_unusual; - } - break; - } - - // map labels = 9; - case 9: { - if (static_cast< ::google::protobuf::uint8>(tag) == (74 & 0xFF)) { - GameServer_ObjectMeta_LabelsEntry_DoNotUse::Parser< ::google::protobuf::internal::MapField< - GameServer_ObjectMeta_LabelsEntry_DoNotUse, - ::std::string, ::std::string, - ::google::protobuf::internal::WireFormatLite::TYPE_STRING, - ::google::protobuf::internal::WireFormatLite::TYPE_STRING, - 0 >, - ::google::protobuf::Map< ::std::string, ::std::string > > parser(&labels_); - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, &parser)); - DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - parser.key().data(), static_cast(parser.key().length()), - ::google::protobuf::internal::WireFormatLite::PARSE, - "agones.dev.sdk.GameServer.ObjectMeta.LabelsEntry.key")); - DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - parser.value().data(), static_cast(parser.value().length()), - ::google::protobuf::internal::WireFormatLite::PARSE, - "agones.dev.sdk.GameServer.ObjectMeta.LabelsEntry.value")); - } else { - goto handle_unusual; - } - break; - } - - default: { - handle_unusual: - if (tag == 0) { - goto success; - } - DO_(::google::protobuf::internal::WireFormat::SkipField( - input, tag, _internal_metadata_.mutable_unknown_fields())); - break; - } - } - } -success: - // @@protoc_insertion_point(parse_success:agones.dev.sdk.GameServer.ObjectMeta) - return true; -failure: - // @@protoc_insertion_point(parse_failure:agones.dev.sdk.GameServer.ObjectMeta) - return false; -#undef DO_ -} -#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER - -void GameServer_ObjectMeta::SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:agones.dev.sdk.GameServer.ObjectMeta) - ::google::protobuf::uint32 cached_has_bits = 0; - (void) cached_has_bits; - - // string name = 1; - if (this->name().size() > 0) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->name().data(), static_cast(this->name().length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, - "agones.dev.sdk.GameServer.ObjectMeta.name"); - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( - 1, this->name(), output); - } - - // string namespace = 2; - if (this->namespace_().size() > 0) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->namespace_().data(), static_cast(this->namespace_().length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, - "agones.dev.sdk.GameServer.ObjectMeta.namespace"); - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( - 2, this->namespace_(), output); - } - - // string uid = 3; - if (this->uid().size() > 0) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->uid().data(), static_cast(this->uid().length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, - "agones.dev.sdk.GameServer.ObjectMeta.uid"); - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( - 3, this->uid(), output); - } - - // string resource_version = 4; - if (this->resource_version().size() > 0) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->resource_version().data(), static_cast(this->resource_version().length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, - "agones.dev.sdk.GameServer.ObjectMeta.resource_version"); - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( - 4, this->resource_version(), output); - } - - // int64 generation = 5; - if (this->generation() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteInt64(5, this->generation(), output); - } - - // int64 creation_timestamp = 6; - if (this->creation_timestamp() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteInt64(6, this->creation_timestamp(), output); - } - - // int64 deletion_timestamp = 7; - if (this->deletion_timestamp() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteInt64(7, this->deletion_timestamp(), output); - } - - // map annotations = 8; - if (!this->annotations().empty()) { - typedef ::google::protobuf::Map< ::std::string, ::std::string >::const_pointer - ConstPtr; - typedef ConstPtr SortItem; - typedef ::google::protobuf::internal::CompareByDerefFirst Less; - struct Utf8Check { - static void Check(ConstPtr p) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - p->first.data(), static_cast(p->first.length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, - "agones.dev.sdk.GameServer.ObjectMeta.AnnotationsEntry.key"); - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - p->second.data(), static_cast(p->second.length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, - "agones.dev.sdk.GameServer.ObjectMeta.AnnotationsEntry.value"); - } - }; - - if (output->IsSerializationDeterministic() && - this->annotations().size() > 1) { - ::std::unique_ptr items( - new SortItem[this->annotations().size()]); - typedef ::google::protobuf::Map< ::std::string, ::std::string >::size_type size_type; - size_type n = 0; - for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator - it = this->annotations().begin(); - it != this->annotations().end(); ++it, ++n) { - items[static_cast(n)] = SortItem(&*it); - } - ::std::sort(&items[0], &items[static_cast(n)], Less()); - ::std::unique_ptr entry; - for (size_type i = 0; i < n; i++) { - entry.reset(annotations_.NewEntryWrapper(items[static_cast(i)]->first, items[static_cast(i)]->second)); - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(8, *entry, output); - Utf8Check::Check(&(*items[static_cast(i)])); - } - } else { - ::std::unique_ptr entry; - for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator - it = this->annotations().begin(); - it != this->annotations().end(); ++it) { - entry.reset(annotations_.NewEntryWrapper(it->first, it->second)); - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(8, *entry, output); - Utf8Check::Check(&(*it)); - } - } - } - - // map labels = 9; - if (!this->labels().empty()) { - typedef ::google::protobuf::Map< ::std::string, ::std::string >::const_pointer - ConstPtr; - typedef ConstPtr SortItem; - typedef ::google::protobuf::internal::CompareByDerefFirst Less; - struct Utf8Check { - static void Check(ConstPtr p) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - p->first.data(), static_cast(p->first.length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, - "agones.dev.sdk.GameServer.ObjectMeta.LabelsEntry.key"); - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - p->second.data(), static_cast(p->second.length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, - "agones.dev.sdk.GameServer.ObjectMeta.LabelsEntry.value"); - } - }; - - if (output->IsSerializationDeterministic() && - this->labels().size() > 1) { - ::std::unique_ptr items( - new SortItem[this->labels().size()]); - typedef ::google::protobuf::Map< ::std::string, ::std::string >::size_type size_type; - size_type n = 0; - for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator - it = this->labels().begin(); - it != this->labels().end(); ++it, ++n) { - items[static_cast(n)] = SortItem(&*it); - } - ::std::sort(&items[0], &items[static_cast(n)], Less()); - ::std::unique_ptr entry; - for (size_type i = 0; i < n; i++) { - entry.reset(labels_.NewEntryWrapper(items[static_cast(i)]->first, items[static_cast(i)]->second)); - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(9, *entry, output); - Utf8Check::Check(&(*items[static_cast(i)])); - } - } else { - ::std::unique_ptr entry; - for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator - it = this->labels().begin(); - it != this->labels().end(); ++it) { - entry.reset(labels_.NewEntryWrapper(it->first, it->second)); - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(9, *entry, output); - Utf8Check::Check(&(*it)); - } - } - } - - if (_internal_metadata_.have_unknown_fields()) { - ::google::protobuf::internal::WireFormat::SerializeUnknownFields( - _internal_metadata_.unknown_fields(), output); - } - // @@protoc_insertion_point(serialize_end:agones.dev.sdk.GameServer.ObjectMeta) + ctx->SetLastTag(tag); + goto success; + } + ptr = UnknownFieldParse(tag, &_internal_metadata_, ptr, ctx); + CHK_(ptr != nullptr); + continue; + } + } // switch + } // while +success: + return ptr; +failure: + ptr = nullptr; + goto success; +#undef CHK_ } -::google::protobuf::uint8* GameServer_ObjectMeta::InternalSerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { +::PROTOBUF_NAMESPACE_ID::uint8* GameServer_ObjectMeta::InternalSerializeWithCachedSizesToArray( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:agones.dev.sdk.GameServer.ObjectMeta) - ::google::protobuf::uint32 cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; // string name = 1; if (this->name().size() > 0) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->name().data(), static_cast(this->name().length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( + this->_internal_name().data(), static_cast(this->_internal_name().length()), + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "agones.dev.sdk.GameServer.ObjectMeta.name"); - target = - ::google::protobuf::internal::WireFormatLite::WriteStringToArray( - 1, this->name(), target); + target = stream->WriteStringMaybeAliased( + 1, this->_internal_name(), target); } // string namespace = 2; if (this->namespace_().size() > 0) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->namespace_().data(), static_cast(this->namespace_().length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( + this->_internal_namespace_().data(), static_cast(this->_internal_namespace_().length()), + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "agones.dev.sdk.GameServer.ObjectMeta.namespace"); - target = - ::google::protobuf::internal::WireFormatLite::WriteStringToArray( - 2, this->namespace_(), target); + target = stream->WriteStringMaybeAliased( + 2, this->_internal_namespace_(), target); } // string uid = 3; if (this->uid().size() > 0) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->uid().data(), static_cast(this->uid().length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( + this->_internal_uid().data(), static_cast(this->_internal_uid().length()), + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "agones.dev.sdk.GameServer.ObjectMeta.uid"); - target = - ::google::protobuf::internal::WireFormatLite::WriteStringToArray( - 3, this->uid(), target); + target = stream->WriteStringMaybeAliased( + 3, this->_internal_uid(), target); } // string resource_version = 4; if (this->resource_version().size() > 0) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->resource_version().data(), static_cast(this->resource_version().length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( + this->_internal_resource_version().data(), static_cast(this->_internal_resource_version().length()), + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "agones.dev.sdk.GameServer.ObjectMeta.resource_version"); - target = - ::google::protobuf::internal::WireFormatLite::WriteStringToArray( - 4, this->resource_version(), target); + target = stream->WriteStringMaybeAliased( + 4, this->_internal_resource_version(), target); } // int64 generation = 5; if (this->generation() != 0) { - target = ::google::protobuf::internal::WireFormatLite::WriteInt64ToArray(5, this->generation(), target); + stream->EnsureSpace(&target); + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64ToArray(5, this->_internal_generation(), target); } // int64 creation_timestamp = 6; if (this->creation_timestamp() != 0) { - target = ::google::protobuf::internal::WireFormatLite::WriteInt64ToArray(6, this->creation_timestamp(), target); + stream->EnsureSpace(&target); + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64ToArray(6, this->_internal_creation_timestamp(), target); } // int64 deletion_timestamp = 7; if (this->deletion_timestamp() != 0) { - target = ::google::protobuf::internal::WireFormatLite::WriteInt64ToArray(7, this->deletion_timestamp(), target); + stream->EnsureSpace(&target); + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64ToArray(7, this->_internal_deletion_timestamp(), target); } // map annotations = 8; - if (!this->annotations().empty()) { - typedef ::google::protobuf::Map< ::std::string, ::std::string >::const_pointer + if (!this->_internal_annotations().empty()) { + typedef ::PROTOBUF_NAMESPACE_ID::Map< std::string, std::string >::const_pointer ConstPtr; typedef ConstPtr SortItem; - typedef ::google::protobuf::internal::CompareByDerefFirst Less; + typedef ::PROTOBUF_NAMESPACE_ID::internal::CompareByDerefFirst Less; struct Utf8Check { static void Check(ConstPtr p) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( p->first.data(), static_cast(p->first.length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "agones.dev.sdk.GameServer.ObjectMeta.AnnotationsEntry.key"); - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( p->second.data(), static_cast(p->second.length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "agones.dev.sdk.GameServer.ObjectMeta.AnnotationsEntry.value"); } }; - if (false && - this->annotations().size() > 1) { + if (stream->IsSerializationDeterministic() && + this->_internal_annotations().size() > 1) { ::std::unique_ptr items( - new SortItem[this->annotations().size()]); - typedef ::google::protobuf::Map< ::std::string, ::std::string >::size_type size_type; + new SortItem[this->_internal_annotations().size()]); + typedef ::PROTOBUF_NAMESPACE_ID::Map< std::string, std::string >::size_type size_type; size_type n = 0; - for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator - it = this->annotations().begin(); - it != this->annotations().end(); ++it, ++n) { + for (::PROTOBUF_NAMESPACE_ID::Map< std::string, std::string >::const_iterator + it = this->_internal_annotations().begin(); + it != this->_internal_annotations().end(); ++it, ++n) { items[static_cast(n)] = SortItem(&*it); } ::std::sort(&items[0], &items[static_cast(n)], Less()); - ::std::unique_ptr entry; for (size_type i = 0; i < n; i++) { - entry.reset(annotations_.NewEntryWrapper(items[static_cast(i)]->first, items[static_cast(i)]->second)); - target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessageNoVirtualToArray(8, *entry, target); + target = GameServer_ObjectMeta_AnnotationsEntry_DoNotUse::Funcs::InternalSerialize(8, items[static_cast(i)]->first, items[static_cast(i)]->second, target, stream); Utf8Check::Check(&(*items[static_cast(i)])); } } else { - ::std::unique_ptr entry; - for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator - it = this->annotations().begin(); - it != this->annotations().end(); ++it) { - entry.reset(annotations_.NewEntryWrapper(it->first, it->second)); - target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessageNoVirtualToArray(8, *entry, target); + for (::PROTOBUF_NAMESPACE_ID::Map< std::string, std::string >::const_iterator + it = this->_internal_annotations().begin(); + it != this->_internal_annotations().end(); ++it) { + target = GameServer_ObjectMeta_AnnotationsEntry_DoNotUse::Funcs::InternalSerialize(8, it->first, it->second, target, stream); Utf8Check::Check(&(*it)); } } } // map labels = 9; - if (!this->labels().empty()) { - typedef ::google::protobuf::Map< ::std::string, ::std::string >::const_pointer + if (!this->_internal_labels().empty()) { + typedef ::PROTOBUF_NAMESPACE_ID::Map< std::string, std::string >::const_pointer ConstPtr; typedef ConstPtr SortItem; - typedef ::google::protobuf::internal::CompareByDerefFirst Less; + typedef ::PROTOBUF_NAMESPACE_ID::internal::CompareByDerefFirst Less; struct Utf8Check { static void Check(ConstPtr p) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( p->first.data(), static_cast(p->first.length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "agones.dev.sdk.GameServer.ObjectMeta.LabelsEntry.key"); - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( p->second.data(), static_cast(p->second.length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "agones.dev.sdk.GameServer.ObjectMeta.LabelsEntry.value"); } }; - if (false && - this->labels().size() > 1) { + if (stream->IsSerializationDeterministic() && + this->_internal_labels().size() > 1) { ::std::unique_ptr items( - new SortItem[this->labels().size()]); - typedef ::google::protobuf::Map< ::std::string, ::std::string >::size_type size_type; + new SortItem[this->_internal_labels().size()]); + typedef ::PROTOBUF_NAMESPACE_ID::Map< std::string, std::string >::size_type size_type; size_type n = 0; - for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator - it = this->labels().begin(); - it != this->labels().end(); ++it, ++n) { + for (::PROTOBUF_NAMESPACE_ID::Map< std::string, std::string >::const_iterator + it = this->_internal_labels().begin(); + it != this->_internal_labels().end(); ++it, ++n) { items[static_cast(n)] = SortItem(&*it); } ::std::sort(&items[0], &items[static_cast(n)], Less()); - ::std::unique_ptr entry; for (size_type i = 0; i < n; i++) { - entry.reset(labels_.NewEntryWrapper(items[static_cast(i)]->first, items[static_cast(i)]->second)); - target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessageNoVirtualToArray(9, *entry, target); + target = GameServer_ObjectMeta_LabelsEntry_DoNotUse::Funcs::InternalSerialize(9, items[static_cast(i)]->first, items[static_cast(i)]->second, target, stream); Utf8Check::Check(&(*items[static_cast(i)])); } } else { - ::std::unique_ptr entry; - for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator - it = this->labels().begin(); - it != this->labels().end(); ++it) { - entry.reset(labels_.NewEntryWrapper(it->first, it->second)); - target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessageNoVirtualToArray(9, *entry, target); + for (::PROTOBUF_NAMESPACE_ID::Map< std::string, std::string >::const_iterator + it = this->_internal_labels().begin(); + it != this->_internal_labels().end(); ++it) { + target = GameServer_ObjectMeta_LabelsEntry_DoNotUse::Funcs::InternalSerialize(9, it->first, it->second, target, stream); Utf8Check::Check(&(*it)); } } } - if (_internal_metadata_.have_unknown_fields()) { - target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( - _internal_metadata_.unknown_fields(), target); + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::InternalSerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields(), target, stream); } // @@protoc_insertion_point(serialize_to_array_end:agones.dev.sdk.GameServer.ObjectMeta) return target; @@ -2165,106 +1415,95 @@ size_t GameServer_ObjectMeta::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:agones.dev.sdk.GameServer.ObjectMeta) size_t total_size = 0; - if (_internal_metadata_.have_unknown_fields()) { - total_size += - ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - _internal_metadata_.unknown_fields()); - } - ::google::protobuf::uint32 cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; // map annotations = 8; total_size += 1 * - ::google::protobuf::internal::FromIntSize(this->annotations_size()); - { - ::std::unique_ptr entry; - for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator - it = this->annotations().begin(); - it != this->annotations().end(); ++it) { - entry.reset(annotations_.NewEntryWrapper(it->first, it->second)); - total_size += ::google::protobuf::internal::WireFormatLite:: - MessageSizeNoVirtual(*entry); - } + ::PROTOBUF_NAMESPACE_ID::internal::FromIntSize(this->_internal_annotations_size()); + for (::PROTOBUF_NAMESPACE_ID::Map< std::string, std::string >::const_iterator + it = this->_internal_annotations().begin(); + it != this->_internal_annotations().end(); ++it) { + total_size += GameServer_ObjectMeta_AnnotationsEntry_DoNotUse::Funcs::ByteSizeLong(it->first, it->second); } // map labels = 9; total_size += 1 * - ::google::protobuf::internal::FromIntSize(this->labels_size()); - { - ::std::unique_ptr entry; - for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator - it = this->labels().begin(); - it != this->labels().end(); ++it) { - entry.reset(labels_.NewEntryWrapper(it->first, it->second)); - total_size += ::google::protobuf::internal::WireFormatLite:: - MessageSizeNoVirtual(*entry); - } + ::PROTOBUF_NAMESPACE_ID::internal::FromIntSize(this->_internal_labels_size()); + for (::PROTOBUF_NAMESPACE_ID::Map< std::string, std::string >::const_iterator + it = this->_internal_labels().begin(); + it != this->_internal_labels().end(); ++it) { + total_size += GameServer_ObjectMeta_LabelsEntry_DoNotUse::Funcs::ByteSizeLong(it->first, it->second); } // string name = 1; if (this->name().size() > 0) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::StringSize( - this->name()); + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( + this->_internal_name()); } // string namespace = 2; if (this->namespace_().size() > 0) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::StringSize( - this->namespace_()); + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( + this->_internal_namespace_()); } // string uid = 3; if (this->uid().size() > 0) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::StringSize( - this->uid()); + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( + this->_internal_uid()); } // string resource_version = 4; if (this->resource_version().size() > 0) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::StringSize( - this->resource_version()); + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( + this->_internal_resource_version()); } // int64 generation = 5; if (this->generation() != 0) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::Int64Size( - this->generation()); + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int64Size( + this->_internal_generation()); } // int64 creation_timestamp = 6; if (this->creation_timestamp() != 0) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::Int64Size( - this->creation_timestamp()); + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int64Size( + this->_internal_creation_timestamp()); } // int64 deletion_timestamp = 7; if (this->deletion_timestamp() != 0) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::Int64Size( - this->deletion_timestamp()); + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int64Size( + this->_internal_deletion_timestamp()); } - int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + return ::PROTOBUF_NAMESPACE_ID::internal::ComputeUnknownFieldsSize( + _internal_metadata_, total_size, &_cached_size_); + } + int cached_size = ::PROTOBUF_NAMESPACE_ID::internal::ToCachedSize(total_size); SetCachedSize(cached_size); return total_size; } -void GameServer_ObjectMeta::MergeFrom(const ::google::protobuf::Message& from) { +void GameServer_ObjectMeta::MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:agones.dev.sdk.GameServer.ObjectMeta) GOOGLE_DCHECK_NE(&from, this); const GameServer_ObjectMeta* source = - ::google::protobuf::DynamicCastToGenerated( + ::PROTOBUF_NAMESPACE_ID::DynamicCastToGenerated( &from); if (source == nullptr) { // @@protoc_insertion_point(generalized_merge_from_cast_fail:agones.dev.sdk.GameServer.ObjectMeta) - ::google::protobuf::internal::ReflectionOps::Merge(from, this); + ::PROTOBUF_NAMESPACE_ID::internal::ReflectionOps::Merge(from, this); } else { // @@protoc_insertion_point(generalized_merge_from_cast_success:agones.dev.sdk.GameServer.ObjectMeta) MergeFrom(*source); @@ -2275,39 +1514,39 @@ void GameServer_ObjectMeta::MergeFrom(const GameServer_ObjectMeta& from) { // @@protoc_insertion_point(class_specific_merge_from_start:agones.dev.sdk.GameServer.ObjectMeta) GOOGLE_DCHECK_NE(&from, this); _internal_metadata_.MergeFrom(from._internal_metadata_); - ::google::protobuf::uint32 cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; annotations_.MergeFrom(from.annotations_); labels_.MergeFrom(from.labels_); if (from.name().size() > 0) { - name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); + name_.AssignWithDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from.name_); } if (from.namespace_().size() > 0) { - namespace__.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.namespace__); + namespace__.AssignWithDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from.namespace__); } if (from.uid().size() > 0) { - uid_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.uid_); + uid_.AssignWithDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from.uid_); } if (from.resource_version().size() > 0) { - resource_version_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.resource_version_); + resource_version_.AssignWithDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from.resource_version_); } if (from.generation() != 0) { - set_generation(from.generation()); + _internal_set_generation(from._internal_generation()); } if (from.creation_timestamp() != 0) { - set_creation_timestamp(from.creation_timestamp()); + _internal_set_creation_timestamp(from._internal_creation_timestamp()); } if (from.deletion_timestamp() != 0) { - set_deletion_timestamp(from.deletion_timestamp()); + _internal_set_deletion_timestamp(from._internal_deletion_timestamp()); } } -void GameServer_ObjectMeta::CopyFrom(const ::google::protobuf::Message& from) { +void GameServer_ObjectMeta::CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) { // @@protoc_insertion_point(generalized_copy_from_start:agones.dev.sdk.GameServer.ObjectMeta) if (&from == this) return; Clear(); @@ -2325,31 +1564,26 @@ bool GameServer_ObjectMeta::IsInitialized() const { return true; } -void GameServer_ObjectMeta::Swap(GameServer_ObjectMeta* other) { - if (other == this) return; - InternalSwap(other); -} void GameServer_ObjectMeta::InternalSwap(GameServer_ObjectMeta* other) { using std::swap; _internal_metadata_.Swap(&other->_internal_metadata_); annotations_.Swap(&other->annotations_); labels_.Swap(&other->labels_); - name_.Swap(&other->name_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), + name_.Swap(&other->name_, &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); - namespace__.Swap(&other->namespace__, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), + namespace__.Swap(&other->namespace__, &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); - uid_.Swap(&other->uid_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), + uid_.Swap(&other->uid_, &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); - resource_version_.Swap(&other->resource_version_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), + resource_version_.Swap(&other->resource_version_, &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); swap(generation_, other->generation_); swap(creation_timestamp_, other->creation_timestamp_); swap(deletion_timestamp_, other->deletion_timestamp_); } -::google::protobuf::Metadata GameServer_ObjectMeta::GetMetadata() const { - ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_sdk_2eproto); - return ::file_level_metadata_sdk_2eproto[kIndexInFileMessages]; +::PROTOBUF_NAMESPACE_ID::Metadata GameServer_ObjectMeta::GetMetadata() const { + return GetMetadataStatic(); } @@ -2357,24 +1591,17 @@ ::google::protobuf::Metadata GameServer_ObjectMeta::GetMetadata() const { void GameServer_Spec_Health::InitAsDefaultInstance() { } -class GameServer_Spec_Health::HasBitSetters { +class GameServer_Spec_Health::_Internal { public: }; -#if !defined(_MSC_VER) || _MSC_VER >= 1900 -const int GameServer_Spec_Health::kDisabledFieldNumber; -const int GameServer_Spec_Health::kPeriodSecondsFieldNumber; -const int GameServer_Spec_Health::kFailureThresholdFieldNumber; -const int GameServer_Spec_Health::kInitialDelaySecondsFieldNumber; -#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 - GameServer_Spec_Health::GameServer_Spec_Health() - : ::google::protobuf::Message(), _internal_metadata_(nullptr) { + : ::PROTOBUF_NAMESPACE_ID::Message(), _internal_metadata_(nullptr) { SharedCtor(); // @@protoc_insertion_point(constructor:agones.dev.sdk.GameServer.Spec.Health) } GameServer_Spec_Health::GameServer_Spec_Health(const GameServer_Spec_Health& from) - : ::google::protobuf::Message(), + : ::PROTOBUF_NAMESPACE_ID::Message(), _internal_metadata_(nullptr) { _internal_metadata_.MergeFrom(from._internal_metadata_); ::memcpy(&disabled_, &from.disabled_, @@ -2401,14 +1628,14 @@ void GameServer_Spec_Health::SetCachedSize(int size) const { _cached_size_.Set(size); } const GameServer_Spec_Health& GameServer_Spec_Health::default_instance() { - ::google::protobuf::internal::InitSCC(&::scc_info_GameServer_Spec_Health_sdk_2eproto.base); + ::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&::scc_info_GameServer_Spec_Health_sdk_2eproto.base); return *internal_default_instance(); } void GameServer_Spec_Health::Clear() { // @@protoc_insertion_point(message_clear_start:agones.dev.sdk.GameServer.Spec.Health) - ::google::protobuf::uint32 cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -2418,209 +1645,94 @@ void GameServer_Spec_Health::Clear() { _internal_metadata_.Clear(); } -#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -const char* GameServer_Spec_Health::_InternalParse(const char* begin, const char* end, void* object, - ::google::protobuf::internal::ParseContext* ctx) { - auto msg = static_cast(object); - ::google::protobuf::int32 size; (void)size; - int depth; (void)depth; - ::google::protobuf::uint32 tag; - ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; - auto ptr = begin; - while (ptr < end) { - ptr = ::google::protobuf::io::Parse32(ptr, &tag); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); +const char* GameServer_Spec_Health::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) { +#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure + while (!ctx->Done(&ptr)) { + ::PROTOBUF_NAMESPACE_ID::uint32 tag; + ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); + CHK_(ptr); switch (tag >> 3) { // bool disabled = 1; - case 1: { - if (static_cast<::google::protobuf::uint8>(tag) != 8) goto handle_unusual; - msg->set_disabled(::google::protobuf::internal::ReadVarint(&ptr)); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - break; - } + case 1: + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) { + disabled_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint(&ptr); + CHK_(ptr); + } else goto handle_unusual; + continue; // int32 period_seconds = 2; - case 2: { - if (static_cast<::google::protobuf::uint8>(tag) != 16) goto handle_unusual; - msg->set_period_seconds(::google::protobuf::internal::ReadVarint(&ptr)); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - break; - } + case 2: + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 16)) { + period_seconds_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint(&ptr); + CHK_(ptr); + } else goto handle_unusual; + continue; // int32 failure_threshold = 3; - case 3: { - if (static_cast<::google::protobuf::uint8>(tag) != 24) goto handle_unusual; - msg->set_failure_threshold(::google::protobuf::internal::ReadVarint(&ptr)); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - break; - } + case 3: + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 24)) { + failure_threshold_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint(&ptr); + CHK_(ptr); + } else goto handle_unusual; + continue; // int32 initial_delay_seconds = 4; - case 4: { - if (static_cast<::google::protobuf::uint8>(tag) != 32) goto handle_unusual; - msg->set_initial_delay_seconds(::google::protobuf::internal::ReadVarint(&ptr)); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - break; - } + case 4: + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 32)) { + initial_delay_seconds_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint(&ptr); + CHK_(ptr); + } else goto handle_unusual; + continue; default: { handle_unusual: if ((tag & 7) == 4 || tag == 0) { - ctx->EndGroup(tag); - return ptr; + ctx->SetLastTag(tag); + goto success; } - auto res = UnknownFieldParse(tag, {_InternalParse, msg}, - ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); - ptr = res.first; - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); - if (res.second) return ptr; + ptr = UnknownFieldParse(tag, &_internal_metadata_, ptr, ctx); + CHK_(ptr != nullptr); + continue; } } // switch } // while - return ptr; -} -#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -bool GameServer_Spec_Health::MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) { -#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure - ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:agones.dev.sdk.GameServer.Spec.Health) - for (;;) { - ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); - tag = p.first; - if (!p.second) goto handle_unusual; - switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // bool disabled = 1; - case 1: { - if (static_cast< ::google::protobuf::uint8>(tag) == (8 & 0xFF)) { - - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( - input, &disabled_))); - } else { - goto handle_unusual; - } - break; - } - - // int32 period_seconds = 2; - case 2: { - if (static_cast< ::google::protobuf::uint8>(tag) == (16 & 0xFF)) { - - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( - input, &period_seconds_))); - } else { - goto handle_unusual; - } - break; - } - - // int32 failure_threshold = 3; - case 3: { - if (static_cast< ::google::protobuf::uint8>(tag) == (24 & 0xFF)) { - - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( - input, &failure_threshold_))); - } else { - goto handle_unusual; - } - break; - } - - // int32 initial_delay_seconds = 4; - case 4: { - if (static_cast< ::google::protobuf::uint8>(tag) == (32 & 0xFF)) { - - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( - input, &initial_delay_seconds_))); - } else { - goto handle_unusual; - } - break; - } - - default: { - handle_unusual: - if (tag == 0) { - goto success; - } - DO_(::google::protobuf::internal::WireFormat::SkipField( - input, tag, _internal_metadata_.mutable_unknown_fields())); - break; - } - } - } success: - // @@protoc_insertion_point(parse_success:agones.dev.sdk.GameServer.Spec.Health) - return true; + return ptr; failure: - // @@protoc_insertion_point(parse_failure:agones.dev.sdk.GameServer.Spec.Health) - return false; -#undef DO_ -} -#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER - -void GameServer_Spec_Health::SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:agones.dev.sdk.GameServer.Spec.Health) - ::google::protobuf::uint32 cached_has_bits = 0; - (void) cached_has_bits; - - // bool disabled = 1; - if (this->disabled() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteBool(1, this->disabled(), output); - } - - // int32 period_seconds = 2; - if (this->period_seconds() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteInt32(2, this->period_seconds(), output); - } - - // int32 failure_threshold = 3; - if (this->failure_threshold() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteInt32(3, this->failure_threshold(), output); - } - - // int32 initial_delay_seconds = 4; - if (this->initial_delay_seconds() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteInt32(4, this->initial_delay_seconds(), output); - } - - if (_internal_metadata_.have_unknown_fields()) { - ::google::protobuf::internal::WireFormat::SerializeUnknownFields( - _internal_metadata_.unknown_fields(), output); - } - // @@protoc_insertion_point(serialize_end:agones.dev.sdk.GameServer.Spec.Health) + ptr = nullptr; + goto success; +#undef CHK_ } -::google::protobuf::uint8* GameServer_Spec_Health::InternalSerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { +::PROTOBUF_NAMESPACE_ID::uint8* GameServer_Spec_Health::InternalSerializeWithCachedSizesToArray( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:agones.dev.sdk.GameServer.Spec.Health) - ::google::protobuf::uint32 cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; // bool disabled = 1; if (this->disabled() != 0) { - target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(1, this->disabled(), target); + stream->EnsureSpace(&target); + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteBoolToArray(1, this->_internal_disabled(), target); } // int32 period_seconds = 2; if (this->period_seconds() != 0) { - target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(2, this->period_seconds(), target); + stream->EnsureSpace(&target); + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt32ToArray(2, this->_internal_period_seconds(), target); } // int32 failure_threshold = 3; if (this->failure_threshold() != 0) { - target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(3, this->failure_threshold(), target); + stream->EnsureSpace(&target); + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt32ToArray(3, this->_internal_failure_threshold(), target); } // int32 initial_delay_seconds = 4; if (this->initial_delay_seconds() != 0) { - target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(4, this->initial_delay_seconds(), target); + stream->EnsureSpace(&target); + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt32ToArray(4, this->_internal_initial_delay_seconds(), target); } - if (_internal_metadata_.have_unknown_fields()) { - target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( - _internal_metadata_.unknown_fields(), target); + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::InternalSerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields(), target, stream); } // @@protoc_insertion_point(serialize_to_array_end:agones.dev.sdk.GameServer.Spec.Health) return target; @@ -2630,12 +1742,7 @@ size_t GameServer_Spec_Health::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:agones.dev.sdk.GameServer.Spec.Health) size_t total_size = 0; - if (_internal_metadata_.have_unknown_fields()) { - total_size += - ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - _internal_metadata_.unknown_fields()); - } - ::google::protobuf::uint32 cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -2647,38 +1754,42 @@ size_t GameServer_Spec_Health::ByteSizeLong() const { // int32 period_seconds = 2; if (this->period_seconds() != 0) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::Int32Size( - this->period_seconds()); + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int32Size( + this->_internal_period_seconds()); } // int32 failure_threshold = 3; if (this->failure_threshold() != 0) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::Int32Size( - this->failure_threshold()); + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int32Size( + this->_internal_failure_threshold()); } // int32 initial_delay_seconds = 4; if (this->initial_delay_seconds() != 0) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::Int32Size( - this->initial_delay_seconds()); + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int32Size( + this->_internal_initial_delay_seconds()); } - int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + return ::PROTOBUF_NAMESPACE_ID::internal::ComputeUnknownFieldsSize( + _internal_metadata_, total_size, &_cached_size_); + } + int cached_size = ::PROTOBUF_NAMESPACE_ID::internal::ToCachedSize(total_size); SetCachedSize(cached_size); return total_size; } -void GameServer_Spec_Health::MergeFrom(const ::google::protobuf::Message& from) { +void GameServer_Spec_Health::MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:agones.dev.sdk.GameServer.Spec.Health) GOOGLE_DCHECK_NE(&from, this); const GameServer_Spec_Health* source = - ::google::protobuf::DynamicCastToGenerated( + ::PROTOBUF_NAMESPACE_ID::DynamicCastToGenerated( &from); if (source == nullptr) { // @@protoc_insertion_point(generalized_merge_from_cast_fail:agones.dev.sdk.GameServer.Spec.Health) - ::google::protobuf::internal::ReflectionOps::Merge(from, this); + ::PROTOBUF_NAMESPACE_ID::internal::ReflectionOps::Merge(from, this); } else { // @@protoc_insertion_point(generalized_merge_from_cast_success:agones.dev.sdk.GameServer.Spec.Health) MergeFrom(*source); @@ -2689,24 +1800,24 @@ void GameServer_Spec_Health::MergeFrom(const GameServer_Spec_Health& from) { // @@protoc_insertion_point(class_specific_merge_from_start:agones.dev.sdk.GameServer.Spec.Health) GOOGLE_DCHECK_NE(&from, this); _internal_metadata_.MergeFrom(from._internal_metadata_); - ::google::protobuf::uint32 cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; if (from.disabled() != 0) { - set_disabled(from.disabled()); + _internal_set_disabled(from._internal_disabled()); } if (from.period_seconds() != 0) { - set_period_seconds(from.period_seconds()); + _internal_set_period_seconds(from._internal_period_seconds()); } if (from.failure_threshold() != 0) { - set_failure_threshold(from.failure_threshold()); + _internal_set_failure_threshold(from._internal_failure_threshold()); } if (from.initial_delay_seconds() != 0) { - set_initial_delay_seconds(from.initial_delay_seconds()); + _internal_set_initial_delay_seconds(from._internal_initial_delay_seconds()); } } -void GameServer_Spec_Health::CopyFrom(const ::google::protobuf::Message& from) { +void GameServer_Spec_Health::CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) { // @@protoc_insertion_point(generalized_copy_from_start:agones.dev.sdk.GameServer.Spec.Health) if (&from == this) return; Clear(); @@ -2724,10 +1835,6 @@ bool GameServer_Spec_Health::IsInitialized() const { return true; } -void GameServer_Spec_Health::Swap(GameServer_Spec_Health* other) { - if (other == this) return; - InternalSwap(other); -} void GameServer_Spec_Health::InternalSwap(GameServer_Spec_Health* other) { using std::swap; _internal_metadata_.Swap(&other->_internal_metadata_); @@ -2737,9 +1844,8 @@ void GameServer_Spec_Health::InternalSwap(GameServer_Spec_Health* other) { swap(initial_delay_seconds_, other->initial_delay_seconds_); } -::google::protobuf::Metadata GameServer_Spec_Health::GetMetadata() const { - ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_sdk_2eproto); - return ::file_level_metadata_sdk_2eproto[kIndexInFileMessages]; +::PROTOBUF_NAMESPACE_ID::Metadata GameServer_Spec_Health::GetMetadata() const { + return GetMetadataStatic(); } @@ -2749,29 +1855,25 @@ void GameServer_Spec::InitAsDefaultInstance() { ::agones::dev::sdk::_GameServer_Spec_default_instance_._instance.get_mutable()->health_ = const_cast< ::agones::dev::sdk::GameServer_Spec_Health*>( ::agones::dev::sdk::GameServer_Spec_Health::internal_default_instance()); } -class GameServer_Spec::HasBitSetters { +class GameServer_Spec::_Internal { public: static const ::agones::dev::sdk::GameServer_Spec_Health& health(const GameServer_Spec* msg); }; const ::agones::dev::sdk::GameServer_Spec_Health& -GameServer_Spec::HasBitSetters::health(const GameServer_Spec* msg) { +GameServer_Spec::_Internal::health(const GameServer_Spec* msg) { return *msg->health_; } -#if !defined(_MSC_VER) || _MSC_VER >= 1900 -const int GameServer_Spec::kHealthFieldNumber; -#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 - GameServer_Spec::GameServer_Spec() - : ::google::protobuf::Message(), _internal_metadata_(nullptr) { + : ::PROTOBUF_NAMESPACE_ID::Message(), _internal_metadata_(nullptr) { SharedCtor(); // @@protoc_insertion_point(constructor:agones.dev.sdk.GameServer.Spec) } GameServer_Spec::GameServer_Spec(const GameServer_Spec& from) - : ::google::protobuf::Message(), + : ::PROTOBUF_NAMESPACE_ID::Message(), _internal_metadata_(nullptr) { _internal_metadata_.MergeFrom(from._internal_metadata_); - if (from.has_health()) { + if (from._internal_has_health()) { health_ = new ::agones::dev::sdk::GameServer_Spec_Health(*from.health_); } else { health_ = nullptr; @@ -2780,8 +1882,7 @@ GameServer_Spec::GameServer_Spec(const GameServer_Spec& from) } void GameServer_Spec::SharedCtor() { - ::google::protobuf::internal::InitSCC( - &scc_info_GameServer_Spec_sdk_2eproto.base); + ::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&scc_info_GameServer_Spec_sdk_2eproto.base); health_ = nullptr; } @@ -2798,14 +1899,14 @@ void GameServer_Spec::SetCachedSize(int size) const { _cached_size_.Set(size); } const GameServer_Spec& GameServer_Spec::default_instance() { - ::google::protobuf::internal::InitSCC(&::scc_info_GameServer_Spec_sdk_2eproto.base); + ::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&::scc_info_GameServer_Spec_sdk_2eproto.base); return *internal_default_instance(); } void GameServer_Spec::Clear() { // @@protoc_insertion_point(message_clear_start:agones.dev.sdk.GameServer.Spec) - ::google::protobuf::uint32 cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -2816,129 +1917,57 @@ void GameServer_Spec::Clear() { _internal_metadata_.Clear(); } -#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -const char* GameServer_Spec::_InternalParse(const char* begin, const char* end, void* object, - ::google::protobuf::internal::ParseContext* ctx) { - auto msg = static_cast(object); - ::google::protobuf::int32 size; (void)size; - int depth; (void)depth; - ::google::protobuf::uint32 tag; - ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; - auto ptr = begin; - while (ptr < end) { - ptr = ::google::protobuf::io::Parse32(ptr, &tag); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); +const char* GameServer_Spec::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) { +#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure + while (!ctx->Done(&ptr)) { + ::PROTOBUF_NAMESPACE_ID::uint32 tag; + ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); + CHK_(ptr); switch (tag >> 3) { // .agones.dev.sdk.GameServer.Spec.Health health = 1; - case 1: { - if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual; - ptr = ::google::protobuf::io::ReadSize(ptr, &size); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - parser_till_end = ::agones::dev::sdk::GameServer_Spec_Health::_InternalParse; - object = msg->mutable_health(); - if (size > end - ptr) goto len_delim_till_end; - ptr += size; - GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange( - {parser_till_end, object}, ptr - size, ptr)); - break; - } + case 1: + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 10)) { + ptr = ctx->ParseMessage(_internal_mutable_health(), ptr); + CHK_(ptr); + } else goto handle_unusual; + continue; default: { handle_unusual: if ((tag & 7) == 4 || tag == 0) { - ctx->EndGroup(tag); - return ptr; + ctx->SetLastTag(tag); + goto success; } - auto res = UnknownFieldParse(tag, {_InternalParse, msg}, - ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); - ptr = res.first; - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); - if (res.second) return ptr; + ptr = UnknownFieldParse(tag, &_internal_metadata_, ptr, ctx); + CHK_(ptr != nullptr); + continue; } } // switch } // while - return ptr; -len_delim_till_end: - return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg}, - {parser_till_end, object}, size); -} -#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -bool GameServer_Spec::MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) { -#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure - ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:agones.dev.sdk.GameServer.Spec) - for (;;) { - ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); - tag = p.first; - if (!p.second) goto handle_unusual; - switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // .agones.dev.sdk.GameServer.Spec.Health health = 1; - case 1: { - if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( - input, mutable_health())); - } else { - goto handle_unusual; - } - break; - } - - default: { - handle_unusual: - if (tag == 0) { - goto success; - } - DO_(::google::protobuf::internal::WireFormat::SkipField( - input, tag, _internal_metadata_.mutable_unknown_fields())); - break; - } - } - } success: - // @@protoc_insertion_point(parse_success:agones.dev.sdk.GameServer.Spec) - return true; + return ptr; failure: - // @@protoc_insertion_point(parse_failure:agones.dev.sdk.GameServer.Spec) - return false; -#undef DO_ -} -#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER - -void GameServer_Spec::SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:agones.dev.sdk.GameServer.Spec) - ::google::protobuf::uint32 cached_has_bits = 0; - (void) cached_has_bits; - - // .agones.dev.sdk.GameServer.Spec.Health health = 1; - if (this->has_health()) { - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 1, HasBitSetters::health(this), output); - } - - if (_internal_metadata_.have_unknown_fields()) { - ::google::protobuf::internal::WireFormat::SerializeUnknownFields( - _internal_metadata_.unknown_fields(), output); - } - // @@protoc_insertion_point(serialize_end:agones.dev.sdk.GameServer.Spec) + ptr = nullptr; + goto success; +#undef CHK_ } -::google::protobuf::uint8* GameServer_Spec::InternalSerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { +::PROTOBUF_NAMESPACE_ID::uint8* GameServer_Spec::InternalSerializeWithCachedSizesToArray( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:agones.dev.sdk.GameServer.Spec) - ::google::protobuf::uint32 cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; // .agones.dev.sdk.GameServer.Spec.Health health = 1; if (this->has_health()) { - target = ::google::protobuf::internal::WireFormatLite:: + stream->EnsureSpace(&target); + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: InternalWriteMessageToArray( - 1, HasBitSetters::health(this), target); + 1, _Internal::health(this), target, stream); } - if (_internal_metadata_.have_unknown_fields()) { - target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( - _internal_metadata_.unknown_fields(), target); + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::InternalSerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields(), target, stream); } // @@protoc_insertion_point(serialize_to_array_end:agones.dev.sdk.GameServer.Spec) return target; @@ -2948,36 +1977,35 @@ size_t GameServer_Spec::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:agones.dev.sdk.GameServer.Spec) size_t total_size = 0; - if (_internal_metadata_.have_unknown_fields()) { - total_size += - ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - _internal_metadata_.unknown_fields()); - } - ::google::protobuf::uint32 cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; // .agones.dev.sdk.GameServer.Spec.Health health = 1; if (this->has_health()) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSize( + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize( *health_); } - int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + return ::PROTOBUF_NAMESPACE_ID::internal::ComputeUnknownFieldsSize( + _internal_metadata_, total_size, &_cached_size_); + } + int cached_size = ::PROTOBUF_NAMESPACE_ID::internal::ToCachedSize(total_size); SetCachedSize(cached_size); return total_size; } -void GameServer_Spec::MergeFrom(const ::google::protobuf::Message& from) { +void GameServer_Spec::MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:agones.dev.sdk.GameServer.Spec) GOOGLE_DCHECK_NE(&from, this); const GameServer_Spec* source = - ::google::protobuf::DynamicCastToGenerated( + ::PROTOBUF_NAMESPACE_ID::DynamicCastToGenerated( &from); if (source == nullptr) { // @@protoc_insertion_point(generalized_merge_from_cast_fail:agones.dev.sdk.GameServer.Spec) - ::google::protobuf::internal::ReflectionOps::Merge(from, this); + ::PROTOBUF_NAMESPACE_ID::internal::ReflectionOps::Merge(from, this); } else { // @@protoc_insertion_point(generalized_merge_from_cast_success:agones.dev.sdk.GameServer.Spec) MergeFrom(*source); @@ -2988,15 +2016,15 @@ void GameServer_Spec::MergeFrom(const GameServer_Spec& from) { // @@protoc_insertion_point(class_specific_merge_from_start:agones.dev.sdk.GameServer.Spec) GOOGLE_DCHECK_NE(&from, this); _internal_metadata_.MergeFrom(from._internal_metadata_); - ::google::protobuf::uint32 cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; if (from.has_health()) { - mutable_health()->::agones::dev::sdk::GameServer_Spec_Health::MergeFrom(from.health()); + _internal_mutable_health()->::agones::dev::sdk::GameServer_Spec_Health::MergeFrom(from._internal_health()); } } -void GameServer_Spec::CopyFrom(const ::google::protobuf::Message& from) { +void GameServer_Spec::CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) { // @@protoc_insertion_point(generalized_copy_from_start:agones.dev.sdk.GameServer.Spec) if (&from == this) return; Clear(); @@ -3014,19 +2042,14 @@ bool GameServer_Spec::IsInitialized() const { return true; } -void GameServer_Spec::Swap(GameServer_Spec* other) { - if (other == this) return; - InternalSwap(other); -} void GameServer_Spec::InternalSwap(GameServer_Spec* other) { using std::swap; _internal_metadata_.Swap(&other->_internal_metadata_); swap(health_, other->health_); } -::google::protobuf::Metadata GameServer_Spec::GetMetadata() const { - ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_sdk_2eproto); - return ::file_level_metadata_sdk_2eproto[kIndexInFileMessages]; +::PROTOBUF_NAMESPACE_ID::Metadata GameServer_Spec::GetMetadata() const { + return GetMetadataStatic(); } @@ -3034,36 +2057,30 @@ ::google::protobuf::Metadata GameServer_Spec::GetMetadata() const { void GameServer_Status_Port::InitAsDefaultInstance() { } -class GameServer_Status_Port::HasBitSetters { +class GameServer_Status_Port::_Internal { public: }; -#if !defined(_MSC_VER) || _MSC_VER >= 1900 -const int GameServer_Status_Port::kNameFieldNumber; -const int GameServer_Status_Port::kPortFieldNumber; -#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 - GameServer_Status_Port::GameServer_Status_Port() - : ::google::protobuf::Message(), _internal_metadata_(nullptr) { + : ::PROTOBUF_NAMESPACE_ID::Message(), _internal_metadata_(nullptr) { SharedCtor(); // @@protoc_insertion_point(constructor:agones.dev.sdk.GameServer.Status.Port) } GameServer_Status_Port::GameServer_Status_Port(const GameServer_Status_Port& from) - : ::google::protobuf::Message(), + : ::PROTOBUF_NAMESPACE_ID::Message(), _internal_metadata_(nullptr) { _internal_metadata_.MergeFrom(from._internal_metadata_); - name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - if (from.name().size() > 0) { - name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); + name_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + if (!from._internal_name().empty()) { + name_.AssignWithDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from.name_); } port_ = from.port_; // @@protoc_insertion_point(copy_constructor:agones.dev.sdk.GameServer.Status.Port) } void GameServer_Status_Port::SharedCtor() { - ::google::protobuf::internal::InitSCC( - &scc_info_GameServer_Status_Port_sdk_2eproto.base); - name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + ::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&scc_info_GameServer_Status_Port_sdk_2eproto.base); + name_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); port_ = 0; } @@ -3073,201 +2090,95 @@ GameServer_Status_Port::~GameServer_Status_Port() { } void GameServer_Status_Port::SharedDtor() { - name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + name_.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } void GameServer_Status_Port::SetCachedSize(int size) const { _cached_size_.Set(size); } const GameServer_Status_Port& GameServer_Status_Port::default_instance() { - ::google::protobuf::internal::InitSCC(&::scc_info_GameServer_Status_Port_sdk_2eproto.base); + ::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&::scc_info_GameServer_Status_Port_sdk_2eproto.base); return *internal_default_instance(); } void GameServer_Status_Port::Clear() { // @@protoc_insertion_point(message_clear_start:agones.dev.sdk.GameServer.Status.Port) - ::google::protobuf::uint32 cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + name_.ClearToEmptyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); port_ = 0; _internal_metadata_.Clear(); } -#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -const char* GameServer_Status_Port::_InternalParse(const char* begin, const char* end, void* object, - ::google::protobuf::internal::ParseContext* ctx) { - auto msg = static_cast(object); - ::google::protobuf::int32 size; (void)size; - int depth; (void)depth; - ::google::protobuf::uint32 tag; - ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; - auto ptr = begin; - while (ptr < end) { - ptr = ::google::protobuf::io::Parse32(ptr, &tag); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); +const char* GameServer_Status_Port::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) { +#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure + while (!ctx->Done(&ptr)) { + ::PROTOBUF_NAMESPACE_ID::uint32 tag; + ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); + CHK_(ptr); switch (tag >> 3) { // string name = 1; - case 1: { - if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual; - ptr = ::google::protobuf::io::ReadSize(ptr, &size); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - ctx->extra_parse_data().SetFieldName("agones.dev.sdk.GameServer.Status.Port.name"); - object = msg->mutable_name(); - if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { - parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; - goto string_till_end; - } - GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); - ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); - ptr += size; - break; - } + case 1: + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 10)) { + ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParserUTF8(_internal_mutable_name(), ptr, ctx, "agones.dev.sdk.GameServer.Status.Port.name"); + CHK_(ptr); + } else goto handle_unusual; + continue; // int32 port = 2; - case 2: { - if (static_cast<::google::protobuf::uint8>(tag) != 16) goto handle_unusual; - msg->set_port(::google::protobuf::internal::ReadVarint(&ptr)); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - break; - } + case 2: + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 16)) { + port_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint(&ptr); + CHK_(ptr); + } else goto handle_unusual; + continue; default: { handle_unusual: if ((tag & 7) == 4 || tag == 0) { - ctx->EndGroup(tag); - return ptr; + ctx->SetLastTag(tag); + goto success; } - auto res = UnknownFieldParse(tag, {_InternalParse, msg}, - ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); - ptr = res.first; - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); - if (res.second) return ptr; + ptr = UnknownFieldParse(tag, &_internal_metadata_, ptr, ctx); + CHK_(ptr != nullptr); + continue; } } // switch } // while - return ptr; -string_till_end: - static_cast<::std::string*>(object)->clear(); - static_cast<::std::string*>(object)->reserve(size); - goto len_delim_till_end; -len_delim_till_end: - return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg}, - {parser_till_end, object}, size); -} -#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -bool GameServer_Status_Port::MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) { -#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure - ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:agones.dev.sdk.GameServer.Status.Port) - for (;;) { - ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); - tag = p.first; - if (!p.second) goto handle_unusual; - switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // string name = 1; - case 1: { - if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadString( - input, this->mutable_name())); - DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->name().data(), static_cast(this->name().length()), - ::google::protobuf::internal::WireFormatLite::PARSE, - "agones.dev.sdk.GameServer.Status.Port.name")); - } else { - goto handle_unusual; - } - break; - } - - // int32 port = 2; - case 2: { - if (static_cast< ::google::protobuf::uint8>(tag) == (16 & 0xFF)) { - - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( - input, &port_))); - } else { - goto handle_unusual; - } - break; - } - - default: { - handle_unusual: - if (tag == 0) { - goto success; - } - DO_(::google::protobuf::internal::WireFormat::SkipField( - input, tag, _internal_metadata_.mutable_unknown_fields())); - break; - } - } - } success: - // @@protoc_insertion_point(parse_success:agones.dev.sdk.GameServer.Status.Port) - return true; + return ptr; failure: - // @@protoc_insertion_point(parse_failure:agones.dev.sdk.GameServer.Status.Port) - return false; -#undef DO_ -} -#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER - -void GameServer_Status_Port::SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:agones.dev.sdk.GameServer.Status.Port) - ::google::protobuf::uint32 cached_has_bits = 0; - (void) cached_has_bits; - - // string name = 1; - if (this->name().size() > 0) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->name().data(), static_cast(this->name().length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, - "agones.dev.sdk.GameServer.Status.Port.name"); - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( - 1, this->name(), output); - } - - // int32 port = 2; - if (this->port() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteInt32(2, this->port(), output); - } - - if (_internal_metadata_.have_unknown_fields()) { - ::google::protobuf::internal::WireFormat::SerializeUnknownFields( - _internal_metadata_.unknown_fields(), output); - } - // @@protoc_insertion_point(serialize_end:agones.dev.sdk.GameServer.Status.Port) + ptr = nullptr; + goto success; +#undef CHK_ } -::google::protobuf::uint8* GameServer_Status_Port::InternalSerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { +::PROTOBUF_NAMESPACE_ID::uint8* GameServer_Status_Port::InternalSerializeWithCachedSizesToArray( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:agones.dev.sdk.GameServer.Status.Port) - ::google::protobuf::uint32 cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; // string name = 1; if (this->name().size() > 0) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->name().data(), static_cast(this->name().length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( + this->_internal_name().data(), static_cast(this->_internal_name().length()), + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "agones.dev.sdk.GameServer.Status.Port.name"); - target = - ::google::protobuf::internal::WireFormatLite::WriteStringToArray( - 1, this->name(), target); + target = stream->WriteStringMaybeAliased( + 1, this->_internal_name(), target); } // int32 port = 2; if (this->port() != 0) { - target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(2, this->port(), target); + stream->EnsureSpace(&target); + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt32ToArray(2, this->_internal_port(), target); } - if (_internal_metadata_.have_unknown_fields()) { - target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( - _internal_metadata_.unknown_fields(), target); + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::InternalSerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields(), target, stream); } // @@protoc_insertion_point(serialize_to_array_end:agones.dev.sdk.GameServer.Status.Port) return target; @@ -3277,43 +2188,42 @@ size_t GameServer_Status_Port::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:agones.dev.sdk.GameServer.Status.Port) size_t total_size = 0; - if (_internal_metadata_.have_unknown_fields()) { - total_size += - ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - _internal_metadata_.unknown_fields()); - } - ::google::protobuf::uint32 cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; // string name = 1; if (this->name().size() > 0) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::StringSize( - this->name()); + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( + this->_internal_name()); } // int32 port = 2; if (this->port() != 0) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::Int32Size( - this->port()); + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int32Size( + this->_internal_port()); } - int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + return ::PROTOBUF_NAMESPACE_ID::internal::ComputeUnknownFieldsSize( + _internal_metadata_, total_size, &_cached_size_); + } + int cached_size = ::PROTOBUF_NAMESPACE_ID::internal::ToCachedSize(total_size); SetCachedSize(cached_size); return total_size; } -void GameServer_Status_Port::MergeFrom(const ::google::protobuf::Message& from) { +void GameServer_Status_Port::MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:agones.dev.sdk.GameServer.Status.Port) GOOGLE_DCHECK_NE(&from, this); const GameServer_Status_Port* source = - ::google::protobuf::DynamicCastToGenerated( + ::PROTOBUF_NAMESPACE_ID::DynamicCastToGenerated( &from); if (source == nullptr) { // @@protoc_insertion_point(generalized_merge_from_cast_fail:agones.dev.sdk.GameServer.Status.Port) - ::google::protobuf::internal::ReflectionOps::Merge(from, this); + ::PROTOBUF_NAMESPACE_ID::internal::ReflectionOps::Merge(from, this); } else { // @@protoc_insertion_point(generalized_merge_from_cast_success:agones.dev.sdk.GameServer.Status.Port) MergeFrom(*source); @@ -3324,19 +2234,19 @@ void GameServer_Status_Port::MergeFrom(const GameServer_Status_Port& from) { // @@protoc_insertion_point(class_specific_merge_from_start:agones.dev.sdk.GameServer.Status.Port) GOOGLE_DCHECK_NE(&from, this); _internal_metadata_.MergeFrom(from._internal_metadata_); - ::google::protobuf::uint32 cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; if (from.name().size() > 0) { - name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); + name_.AssignWithDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from.name_); } if (from.port() != 0) { - set_port(from.port()); + _internal_set_port(from._internal_port()); } } -void GameServer_Status_Port::CopyFrom(const ::google::protobuf::Message& from) { +void GameServer_Status_Port::CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) { // @@protoc_insertion_point(generalized_copy_from_start:agones.dev.sdk.GameServer.Status.Port) if (&from == this) return; Clear(); @@ -3354,21 +2264,16 @@ bool GameServer_Status_Port::IsInitialized() const { return true; } -void GameServer_Status_Port::Swap(GameServer_Status_Port* other) { - if (other == this) return; - InternalSwap(other); -} void GameServer_Status_Port::InternalSwap(GameServer_Status_Port* other) { using std::swap; _internal_metadata_.Swap(&other->_internal_metadata_); - name_.Swap(&other->name_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), + name_.Swap(&other->name_, &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); swap(port_, other->port_); } -::google::protobuf::Metadata GameServer_Status_Port::GetMetadata() const { - ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_sdk_2eproto); - return ::file_level_metadata_sdk_2eproto[kIndexInFileMessages]; +::PROTOBUF_NAMESPACE_ID::Metadata GameServer_Status_Port::GetMetadata() const { + return GetMetadataStatic(); } @@ -3376,42 +2281,35 @@ ::google::protobuf::Metadata GameServer_Status_Port::GetMetadata() const { void GameServer_Status::InitAsDefaultInstance() { } -class GameServer_Status::HasBitSetters { +class GameServer_Status::_Internal { public: }; -#if !defined(_MSC_VER) || _MSC_VER >= 1900 -const int GameServer_Status::kStateFieldNumber; -const int GameServer_Status::kAddressFieldNumber; -const int GameServer_Status::kPortsFieldNumber; -#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 - GameServer_Status::GameServer_Status() - : ::google::protobuf::Message(), _internal_metadata_(nullptr) { + : ::PROTOBUF_NAMESPACE_ID::Message(), _internal_metadata_(nullptr) { SharedCtor(); // @@protoc_insertion_point(constructor:agones.dev.sdk.GameServer.Status) } GameServer_Status::GameServer_Status(const GameServer_Status& from) - : ::google::protobuf::Message(), + : ::PROTOBUF_NAMESPACE_ID::Message(), _internal_metadata_(nullptr), ports_(from.ports_) { _internal_metadata_.MergeFrom(from._internal_metadata_); - state_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - if (from.state().size() > 0) { - state_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.state_); + state_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + if (!from._internal_state().empty()) { + state_.AssignWithDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from.state_); } - address_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - if (from.address().size() > 0) { - address_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.address_); + address_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + if (!from._internal_address().empty()) { + address_.AssignWithDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from.address_); } // @@protoc_insertion_point(copy_constructor:agones.dev.sdk.GameServer.Status) } void GameServer_Status::SharedCtor() { - ::google::protobuf::internal::InitSCC( - &scc_info_GameServer_Status_sdk_2eproto.base); - state_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - address_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + ::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&scc_info_GameServer_Status_sdk_2eproto.base); + state_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + address_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } GameServer_Status::~GameServer_Status() { @@ -3420,269 +2318,121 @@ GameServer_Status::~GameServer_Status() { } void GameServer_Status::SharedDtor() { - state_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - address_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + state_.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + address_.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } void GameServer_Status::SetCachedSize(int size) const { _cached_size_.Set(size); } const GameServer_Status& GameServer_Status::default_instance() { - ::google::protobuf::internal::InitSCC(&::scc_info_GameServer_Status_sdk_2eproto.base); + ::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&::scc_info_GameServer_Status_sdk_2eproto.base); return *internal_default_instance(); } void GameServer_Status::Clear() { // @@protoc_insertion_point(message_clear_start:agones.dev.sdk.GameServer.Status) - ::google::protobuf::uint32 cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; ports_.Clear(); - state_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - address_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + state_.ClearToEmptyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + address_.ClearToEmptyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); _internal_metadata_.Clear(); } -#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -const char* GameServer_Status::_InternalParse(const char* begin, const char* end, void* object, - ::google::protobuf::internal::ParseContext* ctx) { - auto msg = static_cast(object); - ::google::protobuf::int32 size; (void)size; - int depth; (void)depth; - ::google::protobuf::uint32 tag; - ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; - auto ptr = begin; - while (ptr < end) { - ptr = ::google::protobuf::io::Parse32(ptr, &tag); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); +const char* GameServer_Status::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) { +#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure + while (!ctx->Done(&ptr)) { + ::PROTOBUF_NAMESPACE_ID::uint32 tag; + ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); + CHK_(ptr); switch (tag >> 3) { // string state = 1; - case 1: { - if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual; - ptr = ::google::protobuf::io::ReadSize(ptr, &size); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - ctx->extra_parse_data().SetFieldName("agones.dev.sdk.GameServer.Status.state"); - object = msg->mutable_state(); - if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { - parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; - goto string_till_end; - } - GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); - ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); - ptr += size; - break; - } + case 1: + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 10)) { + ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParserUTF8(_internal_mutable_state(), ptr, ctx, "agones.dev.sdk.GameServer.Status.state"); + CHK_(ptr); + } else goto handle_unusual; + continue; // string address = 2; - case 2: { - if (static_cast<::google::protobuf::uint8>(tag) != 18) goto handle_unusual; - ptr = ::google::protobuf::io::ReadSize(ptr, &size); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - ctx->extra_parse_data().SetFieldName("agones.dev.sdk.GameServer.Status.address"); - object = msg->mutable_address(); - if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { - parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; - goto string_till_end; - } - GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); - ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); - ptr += size; - break; - } + case 2: + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 18)) { + ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParserUTF8(_internal_mutable_address(), ptr, ctx, "agones.dev.sdk.GameServer.Status.address"); + CHK_(ptr); + } else goto handle_unusual; + continue; // repeated .agones.dev.sdk.GameServer.Status.Port ports = 3; - case 3: { - if (static_cast<::google::protobuf::uint8>(tag) != 26) goto handle_unusual; - do { - ptr = ::google::protobuf::io::ReadSize(ptr, &size); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - parser_till_end = ::agones::dev::sdk::GameServer_Status_Port::_InternalParse; - object = msg->add_ports(); - if (size > end - ptr) goto len_delim_till_end; - ptr += size; - GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange( - {parser_till_end, object}, ptr - size, ptr)); - if (ptr >= end) break; - } while ((::google::protobuf::io::UnalignedLoad<::google::protobuf::uint64>(ptr) & 255) == 26 && (ptr += 1)); - break; - } + case 3: + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 26)) { + ptr -= 1; + do { + ptr += 1; + ptr = ctx->ParseMessage(_internal_add_ports(), ptr); + CHK_(ptr); + if (!ctx->DataAvailable(ptr)) break; + } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<26>(ptr)); + } else goto handle_unusual; + continue; default: { handle_unusual: if ((tag & 7) == 4 || tag == 0) { - ctx->EndGroup(tag); - return ptr; + ctx->SetLastTag(tag); + goto success; } - auto res = UnknownFieldParse(tag, {_InternalParse, msg}, - ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); - ptr = res.first; - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); - if (res.second) return ptr; + ptr = UnknownFieldParse(tag, &_internal_metadata_, ptr, ctx); + CHK_(ptr != nullptr); + continue; } } // switch } // while - return ptr; -string_till_end: - static_cast<::std::string*>(object)->clear(); - static_cast<::std::string*>(object)->reserve(size); - goto len_delim_till_end; -len_delim_till_end: - return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg}, - {parser_till_end, object}, size); -} -#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -bool GameServer_Status::MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) { -#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure - ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:agones.dev.sdk.GameServer.Status) - for (;;) { - ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); - tag = p.first; - if (!p.second) goto handle_unusual; - switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // string state = 1; - case 1: { - if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadString( - input, this->mutable_state())); - DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->state().data(), static_cast(this->state().length()), - ::google::protobuf::internal::WireFormatLite::PARSE, - "agones.dev.sdk.GameServer.Status.state")); - } else { - goto handle_unusual; - } - break; - } - - // string address = 2; - case 2: { - if (static_cast< ::google::protobuf::uint8>(tag) == (18 & 0xFF)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadString( - input, this->mutable_address())); - DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->address().data(), static_cast(this->address().length()), - ::google::protobuf::internal::WireFormatLite::PARSE, - "agones.dev.sdk.GameServer.Status.address")); - } else { - goto handle_unusual; - } - break; - } - - // repeated .agones.dev.sdk.GameServer.Status.Port ports = 3; - case 3: { - if (static_cast< ::google::protobuf::uint8>(tag) == (26 & 0xFF)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( - input, add_ports())); - } else { - goto handle_unusual; - } - break; - } - - default: { - handle_unusual: - if (tag == 0) { - goto success; - } - DO_(::google::protobuf::internal::WireFormat::SkipField( - input, tag, _internal_metadata_.mutable_unknown_fields())); - break; - } - } - } success: - // @@protoc_insertion_point(parse_success:agones.dev.sdk.GameServer.Status) - return true; + return ptr; failure: - // @@protoc_insertion_point(parse_failure:agones.dev.sdk.GameServer.Status) - return false; -#undef DO_ -} -#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER - -void GameServer_Status::SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:agones.dev.sdk.GameServer.Status) - ::google::protobuf::uint32 cached_has_bits = 0; - (void) cached_has_bits; - - // string state = 1; - if (this->state().size() > 0) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->state().data(), static_cast(this->state().length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, - "agones.dev.sdk.GameServer.Status.state"); - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( - 1, this->state(), output); - } - - // string address = 2; - if (this->address().size() > 0) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->address().data(), static_cast(this->address().length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, - "agones.dev.sdk.GameServer.Status.address"); - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( - 2, this->address(), output); - } - - // repeated .agones.dev.sdk.GameServer.Status.Port ports = 3; - for (unsigned int i = 0, - n = static_cast(this->ports_size()); i < n; i++) { - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 3, - this->ports(static_cast(i)), - output); - } - - if (_internal_metadata_.have_unknown_fields()) { - ::google::protobuf::internal::WireFormat::SerializeUnknownFields( - _internal_metadata_.unknown_fields(), output); - } - // @@protoc_insertion_point(serialize_end:agones.dev.sdk.GameServer.Status) + ptr = nullptr; + goto success; +#undef CHK_ } -::google::protobuf::uint8* GameServer_Status::InternalSerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { +::PROTOBUF_NAMESPACE_ID::uint8* GameServer_Status::InternalSerializeWithCachedSizesToArray( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:agones.dev.sdk.GameServer.Status) - ::google::protobuf::uint32 cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; // string state = 1; if (this->state().size() > 0) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->state().data(), static_cast(this->state().length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( + this->_internal_state().data(), static_cast(this->_internal_state().length()), + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "agones.dev.sdk.GameServer.Status.state"); - target = - ::google::protobuf::internal::WireFormatLite::WriteStringToArray( - 1, this->state(), target); + target = stream->WriteStringMaybeAliased( + 1, this->_internal_state(), target); } // string address = 2; if (this->address().size() > 0) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->address().data(), static_cast(this->address().length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( + this->_internal_address().data(), static_cast(this->_internal_address().length()), + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "agones.dev.sdk.GameServer.Status.address"); - target = - ::google::protobuf::internal::WireFormatLite::WriteStringToArray( - 2, this->address(), target); + target = stream->WriteStringMaybeAliased( + 2, this->_internal_address(), target); } // repeated .agones.dev.sdk.GameServer.Status.Port ports = 3; for (unsigned int i = 0, - n = static_cast(this->ports_size()); i < n; i++) { - target = ::google::protobuf::internal::WireFormatLite:: - InternalWriteMessageToArray( - 3, this->ports(static_cast(i)), target); + n = static_cast(this->_internal_ports_size()); i < n; i++) { + stream->EnsureSpace(&target); + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: + InternalWriteMessageToArray(3, this->_internal_ports(i), target, stream); } - if (_internal_metadata_.have_unknown_fields()) { - target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( - _internal_metadata_.unknown_fields(), target); + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::InternalSerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields(), target, stream); } // @@protoc_insertion_point(serialize_to_array_end:agones.dev.sdk.GameServer.Status) return target; @@ -3692,54 +2442,49 @@ size_t GameServer_Status::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:agones.dev.sdk.GameServer.Status) size_t total_size = 0; - if (_internal_metadata_.have_unknown_fields()) { - total_size += - ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - _internal_metadata_.unknown_fields()); - } - ::google::protobuf::uint32 cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; // repeated .agones.dev.sdk.GameServer.Status.Port ports = 3; - { - unsigned int count = static_cast(this->ports_size()); - total_size += 1UL * count; - for (unsigned int i = 0; i < count; i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSize( - this->ports(static_cast(i))); - } + total_size += 1UL * this->_internal_ports_size(); + for (const auto& msg : this->ports_) { + total_size += + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg); } // string state = 1; if (this->state().size() > 0) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::StringSize( - this->state()); + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( + this->_internal_state()); } // string address = 2; if (this->address().size() > 0) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::StringSize( - this->address()); + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( + this->_internal_address()); } - int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + return ::PROTOBUF_NAMESPACE_ID::internal::ComputeUnknownFieldsSize( + _internal_metadata_, total_size, &_cached_size_); + } + int cached_size = ::PROTOBUF_NAMESPACE_ID::internal::ToCachedSize(total_size); SetCachedSize(cached_size); return total_size; } -void GameServer_Status::MergeFrom(const ::google::protobuf::Message& from) { +void GameServer_Status::MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:agones.dev.sdk.GameServer.Status) GOOGLE_DCHECK_NE(&from, this); const GameServer_Status* source = - ::google::protobuf::DynamicCastToGenerated( + ::PROTOBUF_NAMESPACE_ID::DynamicCastToGenerated( &from); if (source == nullptr) { // @@protoc_insertion_point(generalized_merge_from_cast_fail:agones.dev.sdk.GameServer.Status) - ::google::protobuf::internal::ReflectionOps::Merge(from, this); + ::PROTOBUF_NAMESPACE_ID::internal::ReflectionOps::Merge(from, this); } else { // @@protoc_insertion_point(generalized_merge_from_cast_success:agones.dev.sdk.GameServer.Status) MergeFrom(*source); @@ -3750,21 +2495,21 @@ void GameServer_Status::MergeFrom(const GameServer_Status& from) { // @@protoc_insertion_point(class_specific_merge_from_start:agones.dev.sdk.GameServer.Status) GOOGLE_DCHECK_NE(&from, this); _internal_metadata_.MergeFrom(from._internal_metadata_); - ::google::protobuf::uint32 cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; ports_.MergeFrom(from.ports_); if (from.state().size() > 0) { - state_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.state_); + state_.AssignWithDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from.state_); } if (from.address().size() > 0) { - address_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.address_); + address_.AssignWithDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from.address_); } } -void GameServer_Status::CopyFrom(const ::google::protobuf::Message& from) { +void GameServer_Status::CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) { // @@protoc_insertion_point(generalized_copy_from_start:agones.dev.sdk.GameServer.Status) if (&from == this) return; Clear(); @@ -3782,23 +2527,18 @@ bool GameServer_Status::IsInitialized() const { return true; } -void GameServer_Status::Swap(GameServer_Status* other) { - if (other == this) return; - InternalSwap(other); -} void GameServer_Status::InternalSwap(GameServer_Status* other) { using std::swap; _internal_metadata_.Swap(&other->_internal_metadata_); - CastToBase(&ports_)->InternalSwap(CastToBase(&other->ports_)); - state_.Swap(&other->state_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), + ports_.InternalSwap(&other->ports_); + state_.Swap(&other->state_, &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); - address_.Swap(&other->address_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), + address_.Swap(&other->address_, &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } -::google::protobuf::Metadata GameServer_Status::GetMetadata() const { - ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_sdk_2eproto); - return ::file_level_metadata_sdk_2eproto[kIndexInFileMessages]; +::PROTOBUF_NAMESPACE_ID::Metadata GameServer_Status::GetMetadata() const { + return GetMetadataStatic(); } @@ -3812,7 +2552,7 @@ void GameServer::InitAsDefaultInstance() { ::agones::dev::sdk::_GameServer_default_instance_._instance.get_mutable()->status_ = const_cast< ::agones::dev::sdk::GameServer_Status*>( ::agones::dev::sdk::GameServer_Status::internal_default_instance()); } -class GameServer::HasBitSetters { +class GameServer::_Internal { public: static const ::agones::dev::sdk::GameServer_ObjectMeta& object_meta(const GameServer* msg); static const ::agones::dev::sdk::GameServer_Spec& spec(const GameServer* msg); @@ -3820,43 +2560,37 @@ class GameServer::HasBitSetters { }; const ::agones::dev::sdk::GameServer_ObjectMeta& -GameServer::HasBitSetters::object_meta(const GameServer* msg) { +GameServer::_Internal::object_meta(const GameServer* msg) { return *msg->object_meta_; } const ::agones::dev::sdk::GameServer_Spec& -GameServer::HasBitSetters::spec(const GameServer* msg) { +GameServer::_Internal::spec(const GameServer* msg) { return *msg->spec_; } const ::agones::dev::sdk::GameServer_Status& -GameServer::HasBitSetters::status(const GameServer* msg) { +GameServer::_Internal::status(const GameServer* msg) { return *msg->status_; } -#if !defined(_MSC_VER) || _MSC_VER >= 1900 -const int GameServer::kObjectMetaFieldNumber; -const int GameServer::kSpecFieldNumber; -const int GameServer::kStatusFieldNumber; -#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 - GameServer::GameServer() - : ::google::protobuf::Message(), _internal_metadata_(nullptr) { + : ::PROTOBUF_NAMESPACE_ID::Message(), _internal_metadata_(nullptr) { SharedCtor(); // @@protoc_insertion_point(constructor:agones.dev.sdk.GameServer) } GameServer::GameServer(const GameServer& from) - : ::google::protobuf::Message(), + : ::PROTOBUF_NAMESPACE_ID::Message(), _internal_metadata_(nullptr) { _internal_metadata_.MergeFrom(from._internal_metadata_); - if (from.has_object_meta()) { + if (from._internal_has_object_meta()) { object_meta_ = new ::agones::dev::sdk::GameServer_ObjectMeta(*from.object_meta_); } else { object_meta_ = nullptr; } - if (from.has_spec()) { + if (from._internal_has_spec()) { spec_ = new ::agones::dev::sdk::GameServer_Spec(*from.spec_); } else { spec_ = nullptr; } - if (from.has_status()) { + if (from._internal_has_status()) { status_ = new ::agones::dev::sdk::GameServer_Status(*from.status_); } else { status_ = nullptr; @@ -3865,8 +2599,7 @@ GameServer::GameServer(const GameServer& from) } void GameServer::SharedCtor() { - ::google::protobuf::internal::InitSCC( - &scc_info_GameServer_sdk_2eproto.base); + ::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&scc_info_GameServer_sdk_2eproto.base); ::memset(&object_meta_, 0, static_cast( reinterpret_cast(&status_) - reinterpret_cast(&object_meta_)) + sizeof(status_)); @@ -3887,14 +2620,14 @@ void GameServer::SetCachedSize(int size) const { _cached_size_.Set(size); } const GameServer& GameServer::default_instance() { - ::google::protobuf::internal::InitSCC(&::scc_info_GameServer_sdk_2eproto.base); + ::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&::scc_info_GameServer_sdk_2eproto.base); return *internal_default_instance(); } void GameServer::Clear() { // @@protoc_insertion_point(message_clear_start:agones.dev.sdk.GameServer) - ::google::protobuf::uint32 cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -3913,203 +2646,87 @@ void GameServer::Clear() { _internal_metadata_.Clear(); } -#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -const char* GameServer::_InternalParse(const char* begin, const char* end, void* object, - ::google::protobuf::internal::ParseContext* ctx) { - auto msg = static_cast(object); - ::google::protobuf::int32 size; (void)size; - int depth; (void)depth; - ::google::protobuf::uint32 tag; - ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; - auto ptr = begin; - while (ptr < end) { - ptr = ::google::protobuf::io::Parse32(ptr, &tag); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); +const char* GameServer::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) { +#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure + while (!ctx->Done(&ptr)) { + ::PROTOBUF_NAMESPACE_ID::uint32 tag; + ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); + CHK_(ptr); switch (tag >> 3) { // .agones.dev.sdk.GameServer.ObjectMeta object_meta = 1; - case 1: { - if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual; - ptr = ::google::protobuf::io::ReadSize(ptr, &size); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - parser_till_end = ::agones::dev::sdk::GameServer_ObjectMeta::_InternalParse; - object = msg->mutable_object_meta(); - if (size > end - ptr) goto len_delim_till_end; - ptr += size; - GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange( - {parser_till_end, object}, ptr - size, ptr)); - break; - } + case 1: + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 10)) { + ptr = ctx->ParseMessage(_internal_mutable_object_meta(), ptr); + CHK_(ptr); + } else goto handle_unusual; + continue; // .agones.dev.sdk.GameServer.Spec spec = 2; - case 2: { - if (static_cast<::google::protobuf::uint8>(tag) != 18) goto handle_unusual; - ptr = ::google::protobuf::io::ReadSize(ptr, &size); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - parser_till_end = ::agones::dev::sdk::GameServer_Spec::_InternalParse; - object = msg->mutable_spec(); - if (size > end - ptr) goto len_delim_till_end; - ptr += size; - GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange( - {parser_till_end, object}, ptr - size, ptr)); - break; - } + case 2: + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 18)) { + ptr = ctx->ParseMessage(_internal_mutable_spec(), ptr); + CHK_(ptr); + } else goto handle_unusual; + continue; // .agones.dev.sdk.GameServer.Status status = 3; - case 3: { - if (static_cast<::google::protobuf::uint8>(tag) != 26) goto handle_unusual; - ptr = ::google::protobuf::io::ReadSize(ptr, &size); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - parser_till_end = ::agones::dev::sdk::GameServer_Status::_InternalParse; - object = msg->mutable_status(); - if (size > end - ptr) goto len_delim_till_end; - ptr += size; - GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange( - {parser_till_end, object}, ptr - size, ptr)); - break; - } + case 3: + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 26)) { + ptr = ctx->ParseMessage(_internal_mutable_status(), ptr); + CHK_(ptr); + } else goto handle_unusual; + continue; default: { handle_unusual: if ((tag & 7) == 4 || tag == 0) { - ctx->EndGroup(tag); - return ptr; + ctx->SetLastTag(tag); + goto success; } - auto res = UnknownFieldParse(tag, {_InternalParse, msg}, - ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); - ptr = res.first; - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); - if (res.second) return ptr; + ptr = UnknownFieldParse(tag, &_internal_metadata_, ptr, ctx); + CHK_(ptr != nullptr); + continue; } } // switch } // while - return ptr; -len_delim_till_end: - return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg}, - {parser_till_end, object}, size); -} -#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -bool GameServer::MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) { -#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure - ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:agones.dev.sdk.GameServer) - for (;;) { - ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); - tag = p.first; - if (!p.second) goto handle_unusual; - switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // .agones.dev.sdk.GameServer.ObjectMeta object_meta = 1; - case 1: { - if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( - input, mutable_object_meta())); - } else { - goto handle_unusual; - } - break; - } - - // .agones.dev.sdk.GameServer.Spec spec = 2; - case 2: { - if (static_cast< ::google::protobuf::uint8>(tag) == (18 & 0xFF)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( - input, mutable_spec())); - } else { - goto handle_unusual; - } - break; - } - - // .agones.dev.sdk.GameServer.Status status = 3; - case 3: { - if (static_cast< ::google::protobuf::uint8>(tag) == (26 & 0xFF)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( - input, mutable_status())); - } else { - goto handle_unusual; - } - break; - } - - default: { - handle_unusual: - if (tag == 0) { - goto success; - } - DO_(::google::protobuf::internal::WireFormat::SkipField( - input, tag, _internal_metadata_.mutable_unknown_fields())); - break; - } - } - } success: - // @@protoc_insertion_point(parse_success:agones.dev.sdk.GameServer) - return true; + return ptr; failure: - // @@protoc_insertion_point(parse_failure:agones.dev.sdk.GameServer) - return false; -#undef DO_ -} -#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER - -void GameServer::SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:agones.dev.sdk.GameServer) - ::google::protobuf::uint32 cached_has_bits = 0; - (void) cached_has_bits; - - // .agones.dev.sdk.GameServer.ObjectMeta object_meta = 1; - if (this->has_object_meta()) { - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 1, HasBitSetters::object_meta(this), output); - } - - // .agones.dev.sdk.GameServer.Spec spec = 2; - if (this->has_spec()) { - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 2, HasBitSetters::spec(this), output); - } - - // .agones.dev.sdk.GameServer.Status status = 3; - if (this->has_status()) { - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 3, HasBitSetters::status(this), output); - } - - if (_internal_metadata_.have_unknown_fields()) { - ::google::protobuf::internal::WireFormat::SerializeUnknownFields( - _internal_metadata_.unknown_fields(), output); - } - // @@protoc_insertion_point(serialize_end:agones.dev.sdk.GameServer) + ptr = nullptr; + goto success; +#undef CHK_ } -::google::protobuf::uint8* GameServer::InternalSerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { +::PROTOBUF_NAMESPACE_ID::uint8* GameServer::InternalSerializeWithCachedSizesToArray( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:agones.dev.sdk.GameServer) - ::google::protobuf::uint32 cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; // .agones.dev.sdk.GameServer.ObjectMeta object_meta = 1; if (this->has_object_meta()) { - target = ::google::protobuf::internal::WireFormatLite:: + stream->EnsureSpace(&target); + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: InternalWriteMessageToArray( - 1, HasBitSetters::object_meta(this), target); + 1, _Internal::object_meta(this), target, stream); } // .agones.dev.sdk.GameServer.Spec spec = 2; if (this->has_spec()) { - target = ::google::protobuf::internal::WireFormatLite:: + stream->EnsureSpace(&target); + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: InternalWriteMessageToArray( - 2, HasBitSetters::spec(this), target); + 2, _Internal::spec(this), target, stream); } // .agones.dev.sdk.GameServer.Status status = 3; if (this->has_status()) { - target = ::google::protobuf::internal::WireFormatLite:: + stream->EnsureSpace(&target); + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: InternalWriteMessageToArray( - 3, HasBitSetters::status(this), target); + 3, _Internal::status(this), target, stream); } - if (_internal_metadata_.have_unknown_fields()) { - target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( - _internal_metadata_.unknown_fields(), target); + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::InternalSerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields(), target, stream); } // @@protoc_insertion_point(serialize_to_array_end:agones.dev.sdk.GameServer) return target; @@ -4119,50 +2736,49 @@ size_t GameServer::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:agones.dev.sdk.GameServer) size_t total_size = 0; - if (_internal_metadata_.have_unknown_fields()) { - total_size += - ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - _internal_metadata_.unknown_fields()); - } - ::google::protobuf::uint32 cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; // .agones.dev.sdk.GameServer.ObjectMeta object_meta = 1; if (this->has_object_meta()) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSize( + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize( *object_meta_); } // .agones.dev.sdk.GameServer.Spec spec = 2; if (this->has_spec()) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSize( + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize( *spec_); } // .agones.dev.sdk.GameServer.Status status = 3; if (this->has_status()) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSize( + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize( *status_); } - int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + return ::PROTOBUF_NAMESPACE_ID::internal::ComputeUnknownFieldsSize( + _internal_metadata_, total_size, &_cached_size_); + } + int cached_size = ::PROTOBUF_NAMESPACE_ID::internal::ToCachedSize(total_size); SetCachedSize(cached_size); return total_size; } -void GameServer::MergeFrom(const ::google::protobuf::Message& from) { +void GameServer::MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:agones.dev.sdk.GameServer) GOOGLE_DCHECK_NE(&from, this); const GameServer* source = - ::google::protobuf::DynamicCastToGenerated( + ::PROTOBUF_NAMESPACE_ID::DynamicCastToGenerated( &from); if (source == nullptr) { // @@protoc_insertion_point(generalized_merge_from_cast_fail:agones.dev.sdk.GameServer) - ::google::protobuf::internal::ReflectionOps::Merge(from, this); + ::PROTOBUF_NAMESPACE_ID::internal::ReflectionOps::Merge(from, this); } else { // @@protoc_insertion_point(generalized_merge_from_cast_success:agones.dev.sdk.GameServer) MergeFrom(*source); @@ -4173,21 +2789,21 @@ void GameServer::MergeFrom(const GameServer& from) { // @@protoc_insertion_point(class_specific_merge_from_start:agones.dev.sdk.GameServer) GOOGLE_DCHECK_NE(&from, this); _internal_metadata_.MergeFrom(from._internal_metadata_); - ::google::protobuf::uint32 cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; if (from.has_object_meta()) { - mutable_object_meta()->::agones::dev::sdk::GameServer_ObjectMeta::MergeFrom(from.object_meta()); + _internal_mutable_object_meta()->::agones::dev::sdk::GameServer_ObjectMeta::MergeFrom(from._internal_object_meta()); } if (from.has_spec()) { - mutable_spec()->::agones::dev::sdk::GameServer_Spec::MergeFrom(from.spec()); + _internal_mutable_spec()->::agones::dev::sdk::GameServer_Spec::MergeFrom(from._internal_spec()); } if (from.has_status()) { - mutable_status()->::agones::dev::sdk::GameServer_Status::MergeFrom(from.status()); + _internal_mutable_status()->::agones::dev::sdk::GameServer_Status::MergeFrom(from._internal_status()); } } -void GameServer::CopyFrom(const ::google::protobuf::Message& from) { +void GameServer::CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) { // @@protoc_insertion_point(generalized_copy_from_start:agones.dev.sdk.GameServer) if (&from == this) return; Clear(); @@ -4205,10 +2821,6 @@ bool GameServer::IsInitialized() const { return true; } -void GameServer::Swap(GameServer* other) { - if (other == this) return; - InternalSwap(other); -} void GameServer::InternalSwap(GameServer* other) { using std::swap; _internal_metadata_.Swap(&other->_internal_metadata_); @@ -4217,9 +2829,8 @@ void GameServer::InternalSwap(GameServer* other) { swap(status_, other->status_); } -::google::protobuf::Metadata GameServer::GetMetadata() const { - ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_sdk_2eproto); - return ::file_level_metadata_sdk_2eproto[kIndexInFileMessages]; +::PROTOBUF_NAMESPACE_ID::Metadata GameServer::GetMetadata() const { + return GetMetadataStatic(); } @@ -4227,8 +2838,7 @@ ::google::protobuf::Metadata GameServer::GetMetadata() const { } // namespace sdk } // namespace dev } // namespace agones -namespace google { -namespace protobuf { +PROTOBUF_NAMESPACE_OPEN template<> PROTOBUF_NOINLINE ::agones::dev::sdk::Empty* Arena::CreateMaybeMessage< ::agones::dev::sdk::Empty >(Arena* arena) { return Arena::CreateInternal< ::agones::dev::sdk::Empty >(arena); } @@ -4262,8 +2872,7 @@ template<> PROTOBUF_NOINLINE ::agones::dev::sdk::GameServer_Status* Arena::Creat template<> PROTOBUF_NOINLINE ::agones::dev::sdk::GameServer* Arena::CreateMaybeMessage< ::agones::dev::sdk::GameServer >(Arena* arena) { return Arena::CreateInternal< ::agones::dev::sdk::GameServer >(arena); } -} // namespace protobuf -} // namespace google +PROTOBUF_NAMESPACE_CLOSE // @@protoc_insertion_point(global_scope) #include diff --git a/sdks/cpp/src/google/annotations.pb.cc b/sdks/cpp/src/google/annotations.pb.cc index fbd5deced2..9f06fd0f76 100644 --- a/sdks/cpp/src/google/annotations.pb.cc +++ b/sdks/cpp/src/google/annotations.pb.cc @@ -20,39 +20,28 @@ #include -#include #include #include -#include +#include #include #include #include #include // @@protoc_insertion_point(includes) #include - -extern PROTOBUF_INTERNAL_EXPORT_google_2fapi_2fhttp_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_HttpRule_google_2fapi_2fhttp_2eproto; +extern PROTOBUF_INTERNAL_EXPORT_google_2fapi_2fhttp_2eproto ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<1> scc_info_HttpRule_google_2fapi_2fhttp_2eproto; namespace google { namespace api { } // namespace api } // namespace google -void InitDefaults_google_2fapi_2fannotations_2eproto() { -} - -constexpr ::google::protobuf::Metadata* file_level_metadata_google_2fapi_2fannotations_2eproto = nullptr; -constexpr ::google::protobuf::EnumDescriptor const** file_level_enum_descriptors_google_2fapi_2fannotations_2eproto = nullptr; -constexpr ::google::protobuf::ServiceDescriptor const** file_level_service_descriptors_google_2fapi_2fannotations_2eproto = nullptr; -const ::google::protobuf::uint32 TableStruct_google_2fapi_2fannotations_2eproto::offsets[1] = {}; -static constexpr ::google::protobuf::internal::MigrationSchema* schemas = nullptr; -static constexpr ::google::protobuf::Message* const* file_default_instances = nullptr; - -::google::protobuf::internal::AssignDescriptorsTable assign_descriptors_table_google_2fapi_2fannotations_2eproto = { - {}, AddDescriptors_google_2fapi_2fannotations_2eproto, "google/api/annotations.proto", schemas, - file_default_instances, TableStruct_google_2fapi_2fannotations_2eproto::offsets, - file_level_metadata_google_2fapi_2fannotations_2eproto, 0, file_level_enum_descriptors_google_2fapi_2fannotations_2eproto, file_level_service_descriptors_google_2fapi_2fannotations_2eproto, -}; +static constexpr ::PROTOBUF_NAMESPACE_ID::Metadata* file_level_metadata_google_2fapi_2fannotations_2eproto = nullptr; +static constexpr ::PROTOBUF_NAMESPACE_ID::EnumDescriptor const** file_level_enum_descriptors_google_2fapi_2fannotations_2eproto = nullptr; +static constexpr ::PROTOBUF_NAMESPACE_ID::ServiceDescriptor const** file_level_service_descriptors_google_2fapi_2fannotations_2eproto = nullptr; +const ::PROTOBUF_NAMESPACE_ID::uint32 TableStruct_google_2fapi_2fannotations_2eproto::offsets[1] = {}; +static constexpr ::PROTOBUF_NAMESPACE_ID::internal::MigrationSchema* schemas = nullptr; +static constexpr ::PROTOBUF_NAMESPACE_ID::Message* const* file_default_instances = nullptr; -const char descriptor_table_protodef_google_2fapi_2fannotations_2eproto[] = +const char descriptor_table_protodef_google_2fapi_2fannotations_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = "\n\034google/api/annotations.proto\022\ngoogle.a" "pi\032\025google/api/http.proto\032 google/protob" "uf/descriptor.proto:E\n\004http\022\036.google.pro" @@ -62,36 +51,34 @@ const char descriptor_table_protodef_google_2fapi_2fannotations_2eproto[] = "gleapis/api/annotations;annotations\242\002\004GA" "PIb\006proto3" ; -::google::protobuf::internal::DescriptorTable descriptor_table_google_2fapi_2fannotations_2eproto = { - false, InitDefaults_google_2fapi_2fannotations_2eproto, - descriptor_table_protodef_google_2fapi_2fannotations_2eproto, - "google/api/annotations.proto", &assign_descriptors_table_google_2fapi_2fannotations_2eproto, 290, +static const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable*const descriptor_table_google_2fapi_2fannotations_2eproto_deps[2] = { + &::descriptor_table_google_2fapi_2fhttp_2eproto, + &::descriptor_table_google_2fprotobuf_2fdescriptor_2eproto, +}; +static ::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase*const descriptor_table_google_2fapi_2fannotations_2eproto_sccs[1] = { +}; +static ::PROTOBUF_NAMESPACE_ID::internal::once_flag descriptor_table_google_2fapi_2fannotations_2eproto_once; +static bool descriptor_table_google_2fapi_2fannotations_2eproto_initialized = false; +const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_google_2fapi_2fannotations_2eproto = { + &descriptor_table_google_2fapi_2fannotations_2eproto_initialized, descriptor_table_protodef_google_2fapi_2fannotations_2eproto, "google/api/annotations.proto", 290, + &descriptor_table_google_2fapi_2fannotations_2eproto_once, descriptor_table_google_2fapi_2fannotations_2eproto_sccs, descriptor_table_google_2fapi_2fannotations_2eproto_deps, 0, 2, + schemas, file_default_instances, TableStruct_google_2fapi_2fannotations_2eproto::offsets, + file_level_metadata_google_2fapi_2fannotations_2eproto, 0, file_level_enum_descriptors_google_2fapi_2fannotations_2eproto, file_level_service_descriptors_google_2fapi_2fannotations_2eproto, }; - -void AddDescriptors_google_2fapi_2fannotations_2eproto() { - static constexpr ::google::protobuf::internal::InitFunc deps[2] = - { - ::AddDescriptors_google_2fapi_2fhttp_2eproto, - ::AddDescriptors_google_2fprotobuf_2fdescriptor_2eproto, - }; - ::google::protobuf::internal::AddDescriptors(&descriptor_table_google_2fapi_2fannotations_2eproto, deps, 2); -} // Force running AddDescriptors() at dynamic initialization time. -static bool dynamic_init_dummy_google_2fapi_2fannotations_2eproto = []() { AddDescriptors_google_2fapi_2fannotations_2eproto(); return true; }(); +static bool dynamic_init_dummy_google_2fapi_2fannotations_2eproto = ( ::PROTOBUF_NAMESPACE_ID::internal::AddDescriptors(&descriptor_table_google_2fapi_2fannotations_2eproto), true); namespace google { namespace api { -::google::protobuf::internal::ExtensionIdentifier< ::google::protobuf::MethodOptions, - ::google::protobuf::internal::MessageTypeTraits< ::google::api::HttpRule >, 11, false > +::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier< ::google::protobuf::MethodOptions, + ::PROTOBUF_NAMESPACE_ID::internal::MessageTypeTraits< ::google::api::HttpRule >, 11, false > http(kHttpFieldNumber, *::google::api::HttpRule::internal_default_instance()); // @@protoc_insertion_point(namespace_scope) } // namespace api } // namespace google -namespace google { -namespace protobuf { -} // namespace protobuf -} // namespace google +PROTOBUF_NAMESPACE_OPEN +PROTOBUF_NAMESPACE_CLOSE // @@protoc_insertion_point(global_scope) #include diff --git a/sdks/cpp/src/google/http.pb.cc b/sdks/cpp/src/google/http.pb.cc index d34aa7252a..1e398e2c01 100644 --- a/sdks/cpp/src/google/http.pb.cc +++ b/sdks/cpp/src/google/http.pb.cc @@ -20,96 +20,88 @@ #include -#include #include #include -#include +#include #include #include #include #include // @@protoc_insertion_point(includes) #include - -extern PROTOBUF_INTERNAL_EXPORT_google_2fapi_2fhttp_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_CustomHttpPattern_google_2fapi_2fhttp_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_google_2fapi_2fhttp_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_HttpRule_google_2fapi_2fhttp_2eproto; +extern PROTOBUF_INTERNAL_EXPORT_google_2fapi_2fhttp_2eproto ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<0> scc_info_CustomHttpPattern_google_2fapi_2fhttp_2eproto; +extern PROTOBUF_INTERNAL_EXPORT_google_2fapi_2fhttp_2eproto ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<1> scc_info_HttpRule_google_2fapi_2fhttp_2eproto; namespace google { namespace api { class HttpDefaultTypeInternal { public: - ::google::protobuf::internal::ExplicitlyConstructed _instance; + ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed _instance; } _Http_default_instance_; class HttpRuleDefaultTypeInternal { public: - ::google::protobuf::internal::ExplicitlyConstructed _instance; - ::google::protobuf::internal::ArenaStringPtr get_; - ::google::protobuf::internal::ArenaStringPtr put_; - ::google::protobuf::internal::ArenaStringPtr post_; - ::google::protobuf::internal::ArenaStringPtr delete__; - ::google::protobuf::internal::ArenaStringPtr patch_; + ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed _instance; + ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr get_; + ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr put_; + ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr post_; + ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr delete__; + ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr patch_; const ::google::api::CustomHttpPattern* custom_; } _HttpRule_default_instance_; class CustomHttpPatternDefaultTypeInternal { public: - ::google::protobuf::internal::ExplicitlyConstructed _instance; + ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed _instance; } _CustomHttpPattern_default_instance_; } // namespace api } // namespace google -static void InitDefaultsHttp_google_2fapi_2fhttp_2eproto() { +static void InitDefaultsscc_info_CustomHttpPattern_google_2fapi_2fhttp_2eproto() { + GOOGLE_PROTOBUF_VERIFY_VERSION; + + { + void* ptr = &::google::api::_CustomHttpPattern_default_instance_; + new (ptr) ::google::api::CustomHttpPattern(); + ::PROTOBUF_NAMESPACE_ID::internal::OnShutdownDestroyMessage(ptr); + } + ::google::api::CustomHttpPattern::InitAsDefaultInstance(); +} + +AGONES_EXPORT ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<0> scc_info_CustomHttpPattern_google_2fapi_2fhttp_2eproto = + {{ATOMIC_VAR_INIT(::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase::kUninitialized), 0, 0, InitDefaultsscc_info_CustomHttpPattern_google_2fapi_2fhttp_2eproto}, {}}; + +static void InitDefaultsscc_info_Http_google_2fapi_2fhttp_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; { void* ptr = &::google::api::_Http_default_instance_; new (ptr) ::google::api::Http(); - ::google::protobuf::internal::OnShutdownDestroyMessage(ptr); + ::PROTOBUF_NAMESPACE_ID::internal::OnShutdownDestroyMessage(ptr); } ::google::api::Http::InitAsDefaultInstance(); } -AGONES_EXPORT ::google::protobuf::internal::SCCInfo<1> scc_info_Http_google_2fapi_2fhttp_2eproto = - {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsHttp_google_2fapi_2fhttp_2eproto}, { +AGONES_EXPORT ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<1> scc_info_Http_google_2fapi_2fhttp_2eproto = + {{ATOMIC_VAR_INIT(::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase::kUninitialized), 1, 0, InitDefaultsscc_info_Http_google_2fapi_2fhttp_2eproto}, { &scc_info_HttpRule_google_2fapi_2fhttp_2eproto.base,}}; -static void InitDefaultsHttpRule_google_2fapi_2fhttp_2eproto() { +static void InitDefaultsscc_info_HttpRule_google_2fapi_2fhttp_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; { void* ptr = &::google::api::_HttpRule_default_instance_; new (ptr) ::google::api::HttpRule(); - ::google::protobuf::internal::OnShutdownDestroyMessage(ptr); + ::PROTOBUF_NAMESPACE_ID::internal::OnShutdownDestroyMessage(ptr); } ::google::api::HttpRule::InitAsDefaultInstance(); } -AGONES_EXPORT ::google::protobuf::internal::SCCInfo<1> scc_info_HttpRule_google_2fapi_2fhttp_2eproto = - {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsHttpRule_google_2fapi_2fhttp_2eproto}, { +AGONES_EXPORT ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<1> scc_info_HttpRule_google_2fapi_2fhttp_2eproto = + {{ATOMIC_VAR_INIT(::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase::kUninitialized), 1, 0, InitDefaultsscc_info_HttpRule_google_2fapi_2fhttp_2eproto}, { &scc_info_CustomHttpPattern_google_2fapi_2fhttp_2eproto.base,}}; -static void InitDefaultsCustomHttpPattern_google_2fapi_2fhttp_2eproto() { - GOOGLE_PROTOBUF_VERIFY_VERSION; +static ::PROTOBUF_NAMESPACE_ID::Metadata file_level_metadata_google_2fapi_2fhttp_2eproto[3]; +static constexpr ::PROTOBUF_NAMESPACE_ID::EnumDescriptor const** file_level_enum_descriptors_google_2fapi_2fhttp_2eproto = nullptr; +static constexpr ::PROTOBUF_NAMESPACE_ID::ServiceDescriptor const** file_level_service_descriptors_google_2fapi_2fhttp_2eproto = nullptr; - { - void* ptr = &::google::api::_CustomHttpPattern_default_instance_; - new (ptr) ::google::api::CustomHttpPattern(); - ::google::protobuf::internal::OnShutdownDestroyMessage(ptr); - } - ::google::api::CustomHttpPattern::InitAsDefaultInstance(); -} - -AGONES_EXPORT ::google::protobuf::internal::SCCInfo<0> scc_info_CustomHttpPattern_google_2fapi_2fhttp_2eproto = - {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsCustomHttpPattern_google_2fapi_2fhttp_2eproto}, {}}; - -void InitDefaults_google_2fapi_2fhttp_2eproto() { - ::google::protobuf::internal::InitSCC(&scc_info_Http_google_2fapi_2fhttp_2eproto.base); - ::google::protobuf::internal::InitSCC(&scc_info_HttpRule_google_2fapi_2fhttp_2eproto.base); - ::google::protobuf::internal::InitSCC(&scc_info_CustomHttpPattern_google_2fapi_2fhttp_2eproto.base); -} - -::google::protobuf::Metadata file_level_metadata_google_2fapi_2fhttp_2eproto[3]; -constexpr ::google::protobuf::EnumDescriptor const** file_level_enum_descriptors_google_2fapi_2fhttp_2eproto = nullptr; -constexpr ::google::protobuf::ServiceDescriptor const** file_level_service_descriptors_google_2fapi_2fhttp_2eproto = nullptr; - -const ::google::protobuf::uint32 TableStruct_google_2fapi_2fhttp_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { +const ::PROTOBUF_NAMESPACE_ID::uint32 TableStruct_google_2fapi_2fhttp_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::google::api::Http, _internal_metadata_), ~0u, // no _extensions_ @@ -141,25 +133,19 @@ const ::google::protobuf::uint32 TableStruct_google_2fapi_2fhttp_2eproto::offset PROTOBUF_FIELD_OFFSET(::google::api::CustomHttpPattern, kind_), PROTOBUF_FIELD_OFFSET(::google::api::CustomHttpPattern, path_), }; -static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { +static const ::PROTOBUF_NAMESPACE_ID::internal::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { { 0, -1, sizeof(::google::api::Http)}, { 7, -1, sizeof(::google::api::HttpRule)}, { 23, -1, sizeof(::google::api::CustomHttpPattern)}, }; -static ::google::protobuf::Message const * const file_default_instances[] = { - reinterpret_cast(&::google::api::_Http_default_instance_), - reinterpret_cast(&::google::api::_HttpRule_default_instance_), - reinterpret_cast(&::google::api::_CustomHttpPattern_default_instance_), -}; - -::google::protobuf::internal::AssignDescriptorsTable assign_descriptors_table_google_2fapi_2fhttp_2eproto = { - {}, AddDescriptors_google_2fapi_2fhttp_2eproto, "google/api/http.proto", schemas, - file_default_instances, TableStruct_google_2fapi_2fhttp_2eproto::offsets, - file_level_metadata_google_2fapi_2fhttp_2eproto, 3, file_level_enum_descriptors_google_2fapi_2fhttp_2eproto, file_level_service_descriptors_google_2fapi_2fhttp_2eproto, +static ::PROTOBUF_NAMESPACE_ID::Message const * const file_default_instances[] = { + reinterpret_cast(&::google::api::_Http_default_instance_), + reinterpret_cast(&::google::api::_HttpRule_default_instance_), + reinterpret_cast(&::google::api::_CustomHttpPattern_default_instance_), }; -const char descriptor_table_protodef_google_2fapi_2fhttp_2eproto[] = +const char descriptor_table_protodef_google_2fapi_2fhttp_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = "\n\025google/api/http.proto\022\ngoogle.api\"T\n\004H" "ttp\022#\n\005rules\030\001 \003(\0132\024.google.api.HttpRule" "\022\'\n\037fully_decode_reserved_expansion\030\002 \001(" @@ -175,21 +161,24 @@ const char descriptor_table_protodef_google_2fapi_2fhttp_2eproto[] = "/genproto/googleapis/api/annotations;ann" "otations\370\001\001\242\002\004GAPIb\006proto3" ; -::google::protobuf::internal::DescriptorTable descriptor_table_google_2fapi_2fhttp_2eproto = { - false, InitDefaults_google_2fapi_2fhttp_2eproto, - descriptor_table_protodef_google_2fapi_2fhttp_2eproto, - "google/api/http.proto", &assign_descriptors_table_google_2fapi_2fhttp_2eproto, 546, +static const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable*const descriptor_table_google_2fapi_2fhttp_2eproto_deps[1] = { +}; +static ::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase*const descriptor_table_google_2fapi_2fhttp_2eproto_sccs[3] = { + &scc_info_CustomHttpPattern_google_2fapi_2fhttp_2eproto.base, + &scc_info_Http_google_2fapi_2fhttp_2eproto.base, + &scc_info_HttpRule_google_2fapi_2fhttp_2eproto.base, +}; +static ::PROTOBUF_NAMESPACE_ID::internal::once_flag descriptor_table_google_2fapi_2fhttp_2eproto_once; +static bool descriptor_table_google_2fapi_2fhttp_2eproto_initialized = false; +const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_google_2fapi_2fhttp_2eproto = { + &descriptor_table_google_2fapi_2fhttp_2eproto_initialized, descriptor_table_protodef_google_2fapi_2fhttp_2eproto, "google/api/http.proto", 546, + &descriptor_table_google_2fapi_2fhttp_2eproto_once, descriptor_table_google_2fapi_2fhttp_2eproto_sccs, descriptor_table_google_2fapi_2fhttp_2eproto_deps, 3, 0, + schemas, file_default_instances, TableStruct_google_2fapi_2fhttp_2eproto::offsets, + file_level_metadata_google_2fapi_2fhttp_2eproto, 3, file_level_enum_descriptors_google_2fapi_2fhttp_2eproto, file_level_service_descriptors_google_2fapi_2fhttp_2eproto, }; - -void AddDescriptors_google_2fapi_2fhttp_2eproto() { - static constexpr ::google::protobuf::internal::InitFunc deps[1] = - { - }; - ::google::protobuf::internal::AddDescriptors(&descriptor_table_google_2fapi_2fhttp_2eproto, deps, 0); -} // Force running AddDescriptors() at dynamic initialization time. -static bool dynamic_init_dummy_google_2fapi_2fhttp_2eproto = []() { AddDescriptors_google_2fapi_2fhttp_2eproto(); return true; }(); +static bool dynamic_init_dummy_google_2fapi_2fhttp_2eproto = ( ::PROTOBUF_NAMESPACE_ID::internal::AddDescriptors(&descriptor_table_google_2fapi_2fhttp_2eproto), true); namespace google { namespace api { @@ -197,22 +186,17 @@ namespace api { void Http::InitAsDefaultInstance() { } -class Http::HasBitSetters { +class Http::_Internal { public: }; -#if !defined(_MSC_VER) || _MSC_VER >= 1900 -const int Http::kRulesFieldNumber; -const int Http::kFullyDecodeReservedExpansionFieldNumber; -#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 - Http::Http() - : ::google::protobuf::Message(), _internal_metadata_(nullptr) { + : ::PROTOBUF_NAMESPACE_ID::Message(), _internal_metadata_(nullptr) { SharedCtor(); // @@protoc_insertion_point(constructor:google.api.Http) } -Http::Http(::google::protobuf::Arena* arena) - : ::google::protobuf::Message(), +Http::Http(::PROTOBUF_NAMESPACE_ID::Arena* arena) + : ::PROTOBUF_NAMESPACE_ID::Message(), _internal_metadata_(arena), rules_(arena) { SharedCtor(); @@ -220,7 +204,7 @@ Http::Http(::google::protobuf::Arena* arena) // @@protoc_insertion_point(arena_constructor:google.api.Http) } Http::Http(const Http& from) - : ::google::protobuf::Message(), + : ::PROTOBUF_NAMESPACE_ID::Message(), _internal_metadata_(nullptr), rules_(from.rules_) { _internal_metadata_.MergeFrom(from._internal_metadata_); @@ -229,8 +213,7 @@ Http::Http(const Http& from) } void Http::SharedCtor() { - ::google::protobuf::internal::InitSCC( - &scc_info_Http_google_2fapi_2fhttp_2eproto.base); + ::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&scc_info_Http_google_2fapi_2fhttp_2eproto.base); fully_decode_reserved_expansion_ = false; } @@ -247,20 +230,20 @@ void Http::ArenaDtor(void* object) { Http* _this = reinterpret_cast< Http* >(object); (void)_this; } -void Http::RegisterArenaDtor(::google::protobuf::Arena*) { +void Http::RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena*) { } void Http::SetCachedSize(int size) const { _cached_size_.Set(size); } const Http& Http::default_instance() { - ::google::protobuf::internal::InitSCC(&::scc_info_Http_google_2fapi_2fhttp_2eproto.base); + ::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&::scc_info_Http_google_2fapi_2fhttp_2eproto.base); return *internal_default_instance(); } void Http::Clear() { // @@protoc_insertion_point(message_clear_start:google.api.Http) - ::google::protobuf::uint32 cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -269,166 +252,76 @@ void Http::Clear() { _internal_metadata_.Clear(); } -#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -const char* Http::_InternalParse(const char* begin, const char* end, void* object, - ::google::protobuf::internal::ParseContext* ctx) { - auto msg = static_cast(object); - ::google::protobuf::int32 size; (void)size; - int depth; (void)depth; - ::google::protobuf::uint32 tag; - ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; - auto ptr = begin; - while (ptr < end) { - ptr = ::google::protobuf::io::Parse32(ptr, &tag); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); +const char* Http::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) { +#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure + ::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArenaNoVirtual(); (void)arena; + while (!ctx->Done(&ptr)) { + ::PROTOBUF_NAMESPACE_ID::uint32 tag; + ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); + CHK_(ptr); switch (tag >> 3) { // repeated .google.api.HttpRule rules = 1; - case 1: { - if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual; - do { - ptr = ::google::protobuf::io::ReadSize(ptr, &size); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - parser_till_end = ::google::api::HttpRule::_InternalParse; - object = msg->add_rules(); - if (size > end - ptr) goto len_delim_till_end; - ptr += size; - GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange( - {parser_till_end, object}, ptr - size, ptr)); - if (ptr >= end) break; - } while ((::google::protobuf::io::UnalignedLoad<::google::protobuf::uint64>(ptr) & 255) == 10 && (ptr += 1)); - break; - } + case 1: + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 10)) { + ptr -= 1; + do { + ptr += 1; + ptr = ctx->ParseMessage(_internal_add_rules(), ptr); + CHK_(ptr); + if (!ctx->DataAvailable(ptr)) break; + } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<10>(ptr)); + } else goto handle_unusual; + continue; // bool fully_decode_reserved_expansion = 2; - case 2: { - if (static_cast<::google::protobuf::uint8>(tag) != 16) goto handle_unusual; - msg->set_fully_decode_reserved_expansion(::google::protobuf::internal::ReadVarint(&ptr)); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - break; - } + case 2: + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 16)) { + fully_decode_reserved_expansion_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint(&ptr); + CHK_(ptr); + } else goto handle_unusual; + continue; default: { handle_unusual: if ((tag & 7) == 4 || tag == 0) { - ctx->EndGroup(tag); - return ptr; + ctx->SetLastTag(tag); + goto success; } - auto res = UnknownFieldParse(tag, {_InternalParse, msg}, - ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); - ptr = res.first; - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); - if (res.second) return ptr; + ptr = UnknownFieldParse(tag, &_internal_metadata_, ptr, ctx); + CHK_(ptr != nullptr); + continue; } } // switch } // while - return ptr; -len_delim_till_end: - return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg}, - {parser_till_end, object}, size); -} -#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -bool Http::MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) { -#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure - ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:google.api.Http) - for (;;) { - ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); - tag = p.first; - if (!p.second) goto handle_unusual; - switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // repeated .google.api.HttpRule rules = 1; - case 1: { - if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( - input, add_rules())); - } else { - goto handle_unusual; - } - break; - } - - // bool fully_decode_reserved_expansion = 2; - case 2: { - if (static_cast< ::google::protobuf::uint8>(tag) == (16 & 0xFF)) { - - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( - input, &fully_decode_reserved_expansion_))); - } else { - goto handle_unusual; - } - break; - } - - default: { - handle_unusual: - if (tag == 0) { - goto success; - } - DO_(::google::protobuf::internal::WireFormat::SkipField( - input, tag, _internal_metadata_.mutable_unknown_fields())); - break; - } - } - } success: - // @@protoc_insertion_point(parse_success:google.api.Http) - return true; + return ptr; failure: - // @@protoc_insertion_point(parse_failure:google.api.Http) - return false; -#undef DO_ + ptr = nullptr; + goto success; +#undef CHK_ } -#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER - -void Http::SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:google.api.Http) - ::google::protobuf::uint32 cached_has_bits = 0; - (void) cached_has_bits; - - // repeated .google.api.HttpRule rules = 1; - for (unsigned int i = 0, - n = static_cast(this->rules_size()); i < n; i++) { - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 1, - this->rules(static_cast(i)), - output); - } - - // bool fully_decode_reserved_expansion = 2; - if (this->fully_decode_reserved_expansion() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteBool(2, this->fully_decode_reserved_expansion(), output); - } - if (_internal_metadata_.have_unknown_fields()) { - ::google::protobuf::internal::WireFormat::SerializeUnknownFields( - _internal_metadata_.unknown_fields(), output); - } - // @@protoc_insertion_point(serialize_end:google.api.Http) -} - -::google::protobuf::uint8* Http::InternalSerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { +::PROTOBUF_NAMESPACE_ID::uint8* Http::InternalSerializeWithCachedSizesToArray( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:google.api.Http) - ::google::protobuf::uint32 cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; // repeated .google.api.HttpRule rules = 1; for (unsigned int i = 0, - n = static_cast(this->rules_size()); i < n; i++) { - target = ::google::protobuf::internal::WireFormatLite:: - InternalWriteMessageToArray( - 1, this->rules(static_cast(i)), target); + n = static_cast(this->_internal_rules_size()); i < n; i++) { + stream->EnsureSpace(&target); + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: + InternalWriteMessageToArray(1, this->_internal_rules(i), target, stream); } // bool fully_decode_reserved_expansion = 2; if (this->fully_decode_reserved_expansion() != 0) { - target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(2, this->fully_decode_reserved_expansion(), target); + stream->EnsureSpace(&target); + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteBoolToArray(2, this->_internal_fully_decode_reserved_expansion(), target); } - if (_internal_metadata_.have_unknown_fields()) { - target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( - _internal_metadata_.unknown_fields(), target); + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::InternalSerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields(), target, stream); } // @@protoc_insertion_point(serialize_to_array_end:google.api.Http) return target; @@ -438,24 +331,15 @@ size_t Http::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:google.api.Http) size_t total_size = 0; - if (_internal_metadata_.have_unknown_fields()) { - total_size += - ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - _internal_metadata_.unknown_fields()); - } - ::google::protobuf::uint32 cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; // repeated .google.api.HttpRule rules = 1; - { - unsigned int count = static_cast(this->rules_size()); - total_size += 1UL * count; - for (unsigned int i = 0; i < count; i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSize( - this->rules(static_cast(i))); - } + total_size += 1UL * this->_internal_rules_size(); + for (const auto& msg : this->rules_) { + total_size += + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg); } // bool fully_decode_reserved_expansion = 2; @@ -463,20 +347,24 @@ size_t Http::ByteSizeLong() const { total_size += 1 + 1; } - int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + return ::PROTOBUF_NAMESPACE_ID::internal::ComputeUnknownFieldsSize( + _internal_metadata_, total_size, &_cached_size_); + } + int cached_size = ::PROTOBUF_NAMESPACE_ID::internal::ToCachedSize(total_size); SetCachedSize(cached_size); return total_size; } -void Http::MergeFrom(const ::google::protobuf::Message& from) { +void Http::MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:google.api.Http) GOOGLE_DCHECK_NE(&from, this); const Http* source = - ::google::protobuf::DynamicCastToGenerated( + ::PROTOBUF_NAMESPACE_ID::DynamicCastToGenerated( &from); if (source == nullptr) { // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.api.Http) - ::google::protobuf::internal::ReflectionOps::Merge(from, this); + ::PROTOBUF_NAMESPACE_ID::internal::ReflectionOps::Merge(from, this); } else { // @@protoc_insertion_point(generalized_merge_from_cast_success:google.api.Http) MergeFrom(*source); @@ -487,16 +375,16 @@ void Http::MergeFrom(const Http& from) { // @@protoc_insertion_point(class_specific_merge_from_start:google.api.Http) GOOGLE_DCHECK_NE(&from, this); _internal_metadata_.MergeFrom(from._internal_metadata_); - ::google::protobuf::uint32 cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; rules_.MergeFrom(from.rules_); if (from.fully_decode_reserved_expansion() != 0) { - set_fully_decode_reserved_expansion(from.fully_decode_reserved_expansion()); + _internal_set_fully_decode_reserved_expansion(from._internal_fully_decode_reserved_expansion()); } } -void Http::CopyFrom(const ::google::protobuf::Message& from) { +void Http::CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) { // @@protoc_insertion_point(generalized_copy_from_start:google.api.Http) if (&from == this) return; Clear(); @@ -514,35 +402,15 @@ bool Http::IsInitialized() const { return true; } -void Http::Swap(Http* other) { - if (other == this) return; - if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) { - InternalSwap(other); - } else { - Http* temp = New(GetArenaNoVirtual()); - temp->MergeFrom(*other); - other->CopyFrom(*this); - InternalSwap(temp); - if (GetArenaNoVirtual() == nullptr) { - delete temp; - } - } -} -void Http::UnsafeArenaSwap(Http* other) { - if (other == this) return; - GOOGLE_DCHECK(GetArenaNoVirtual() == other->GetArenaNoVirtual()); - InternalSwap(other); -} void Http::InternalSwap(Http* other) { using std::swap; _internal_metadata_.Swap(&other->_internal_metadata_); - CastToBase(&rules_)->InternalSwap(CastToBase(&other->rules_)); + rules_.InternalSwap(&other->rules_); swap(fully_decode_reserved_expansion_, other->fully_decode_reserved_expansion_); } -::google::protobuf::Metadata Http::GetMetadata() const { - ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_google_2fapi_2fhttp_2eproto); - return ::file_level_metadata_google_2fapi_2fhttp_2eproto[kIndexInFileMessages]; +::PROTOBUF_NAMESPACE_ID::Metadata Http::GetMetadata() const { + return GetMetadataStatic(); } @@ -550,35 +418,35 @@ ::google::protobuf::Metadata Http::GetMetadata() const { void HttpRule::InitAsDefaultInstance() { ::google::api::_HttpRule_default_instance_.get_.UnsafeSetDefault( - &::google::protobuf::internal::GetEmptyStringAlreadyInited()); + &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); ::google::api::_HttpRule_default_instance_.put_.UnsafeSetDefault( - &::google::protobuf::internal::GetEmptyStringAlreadyInited()); + &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); ::google::api::_HttpRule_default_instance_.post_.UnsafeSetDefault( - &::google::protobuf::internal::GetEmptyStringAlreadyInited()); + &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); ::google::api::_HttpRule_default_instance_.delete__.UnsafeSetDefault( - &::google::protobuf::internal::GetEmptyStringAlreadyInited()); + &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); ::google::api::_HttpRule_default_instance_.patch_.UnsafeSetDefault( - &::google::protobuf::internal::GetEmptyStringAlreadyInited()); + &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); ::google::api::_HttpRule_default_instance_.custom_ = const_cast< ::google::api::CustomHttpPattern*>( ::google::api::CustomHttpPattern::internal_default_instance()); } -class HttpRule::HasBitSetters { +class HttpRule::_Internal { public: static const ::google::api::CustomHttpPattern& custom(const HttpRule* msg); }; const ::google::api::CustomHttpPattern& -HttpRule::HasBitSetters::custom(const HttpRule* msg) { +HttpRule::_Internal::custom(const HttpRule* msg) { return *msg->pattern_.custom_; } void HttpRule::set_allocated_custom(::google::api::CustomHttpPattern* custom) { - ::google::protobuf::Arena* message_arena = GetArenaNoVirtual(); + ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaNoVirtual(); clear_pattern(); if (custom) { - ::google::protobuf::Arena* submessage_arena = - ::google::protobuf::Arena::GetArena(custom); + ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena = + ::PROTOBUF_NAMESPACE_ID::Arena::GetArena(custom); if (message_arena != submessage_arena) { - custom = ::google::protobuf::internal::GetOwnedMessage( + custom = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage( message_arena, custom, submessage_arena); } set_has_custom(); @@ -586,26 +454,13 @@ void HttpRule::set_allocated_custom(::google::api::CustomHttpPattern* custom) { } // @@protoc_insertion_point(field_set_allocated:google.api.HttpRule.custom) } -#if !defined(_MSC_VER) || _MSC_VER >= 1900 -const int HttpRule::kSelectorFieldNumber; -const int HttpRule::kGetFieldNumber; -const int HttpRule::kPutFieldNumber; -const int HttpRule::kPostFieldNumber; -const int HttpRule::kDeleteFieldNumber; -const int HttpRule::kPatchFieldNumber; -const int HttpRule::kCustomFieldNumber; -const int HttpRule::kBodyFieldNumber; -const int HttpRule::kResponseBodyFieldNumber; -const int HttpRule::kAdditionalBindingsFieldNumber; -#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 - HttpRule::HttpRule() - : ::google::protobuf::Message(), _internal_metadata_(nullptr) { + : ::PROTOBUF_NAMESPACE_ID::Message(), _internal_metadata_(nullptr) { SharedCtor(); // @@protoc_insertion_point(constructor:google.api.HttpRule) } -HttpRule::HttpRule(::google::protobuf::Arena* arena) - : ::google::protobuf::Message(), +HttpRule::HttpRule(::PROTOBUF_NAMESPACE_ID::Arena* arena) + : ::PROTOBUF_NAMESPACE_ID::Message(), _internal_metadata_(arena), additional_bindings_(arena) { SharedCtor(); @@ -613,49 +468,49 @@ HttpRule::HttpRule(::google::protobuf::Arena* arena) // @@protoc_insertion_point(arena_constructor:google.api.HttpRule) } HttpRule::HttpRule(const HttpRule& from) - : ::google::protobuf::Message(), + : ::PROTOBUF_NAMESPACE_ID::Message(), _internal_metadata_(nullptr), additional_bindings_(from.additional_bindings_) { _internal_metadata_.MergeFrom(from._internal_metadata_); - selector_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - if (from.selector().size() > 0) { - selector_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.selector(), + selector_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + if (!from._internal_selector().empty()) { + selector_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from._internal_selector(), GetArenaNoVirtual()); } - body_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - if (from.body().size() > 0) { - body_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.body(), + body_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + if (!from._internal_body().empty()) { + body_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from._internal_body(), GetArenaNoVirtual()); } - response_body_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - if (from.response_body().size() > 0) { - response_body_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.response_body(), + response_body_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + if (!from._internal_response_body().empty()) { + response_body_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from._internal_response_body(), GetArenaNoVirtual()); } clear_has_pattern(); switch (from.pattern_case()) { case kGet: { - set_get(from.get()); + _internal_set_get(from._internal_get()); break; } case kPut: { - set_put(from.put()); + _internal_set_put(from._internal_put()); break; } case kPost: { - set_post(from.post()); + _internal_set_post(from._internal_post()); break; } case kDelete: { - set_delete_(from.delete_()); + _internal_set_delete_(from._internal_delete_()); break; } case kPatch: { - set_patch(from.patch()); + _internal_set_patch(from._internal_patch()); break; } case kCustom: { - mutable_custom()->::google::api::CustomHttpPattern::MergeFrom(from.custom()); + _internal_mutable_custom()->::google::api::CustomHttpPattern::MergeFrom(from._internal_custom()); break; } case PATTERN_NOT_SET: { @@ -666,11 +521,10 @@ HttpRule::HttpRule(const HttpRule& from) } void HttpRule::SharedCtor() { - ::google::protobuf::internal::InitSCC( - &scc_info_HttpRule_google_2fapi_2fhttp_2eproto.base); - selector_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - body_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - response_body_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + ::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&scc_info_HttpRule_google_2fapi_2fhttp_2eproto.base); + selector_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + body_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + response_body_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); clear_has_pattern(); } @@ -681,9 +535,9 @@ HttpRule::~HttpRule() { void HttpRule::SharedDtor() { GOOGLE_DCHECK(GetArenaNoVirtual() == nullptr); - selector_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - body_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - response_body_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + selector_.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + body_.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + response_body_.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); if (has_pattern()) { clear_pattern(); } @@ -693,13 +547,13 @@ void HttpRule::ArenaDtor(void* object) { HttpRule* _this = reinterpret_cast< HttpRule* >(object); (void)_this; } -void HttpRule::RegisterArenaDtor(::google::protobuf::Arena*) { +void HttpRule::RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena*) { } void HttpRule::SetCachedSize(int size) const { _cached_size_.Set(size); } const HttpRule& HttpRule::default_instance() { - ::google::protobuf::internal::InitSCC(&::scc_info_HttpRule_google_2fapi_2fhttp_2eproto.base); + ::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&::scc_info_HttpRule_google_2fapi_2fhttp_2eproto.base); return *internal_default_instance(); } @@ -708,27 +562,27 @@ void HttpRule::clear_pattern() { // @@protoc_insertion_point(one_of_clear_start:google.api.HttpRule) switch (pattern_case()) { case kGet: { - pattern_.get_.Destroy(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + pattern_.get_.Destroy(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); break; } case kPut: { - pattern_.put_.Destroy(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + pattern_.put_.Destroy(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); break; } case kPost: { - pattern_.post_.Destroy(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + pattern_.post_.Destroy(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); break; } case kDelete: { - pattern_.delete__.Destroy(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + pattern_.delete__.Destroy(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); break; } case kPatch: { - pattern_.patch_.Destroy(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + pattern_.patch_.Destroy(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); break; } @@ -748,605 +602,226 @@ void HttpRule::clear_pattern() { void HttpRule::Clear() { // @@protoc_insertion_point(message_clear_start:google.api.HttpRule) - ::google::protobuf::uint32 cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; additional_bindings_.Clear(); - selector_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); - body_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); - response_body_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + selector_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + body_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + response_body_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); clear_pattern(); _internal_metadata_.Clear(); } -#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -const char* HttpRule::_InternalParse(const char* begin, const char* end, void* object, - ::google::protobuf::internal::ParseContext* ctx) { - auto msg = static_cast(object); - ::google::protobuf::int32 size; (void)size; - int depth; (void)depth; - ::google::protobuf::uint32 tag; - ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; - auto ptr = begin; - while (ptr < end) { - ptr = ::google::protobuf::io::Parse32(ptr, &tag); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); +const char* HttpRule::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) { +#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure + ::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArenaNoVirtual(); (void)arena; + while (!ctx->Done(&ptr)) { + ::PROTOBUF_NAMESPACE_ID::uint32 tag; + ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); + CHK_(ptr); switch (tag >> 3) { // string selector = 1; - case 1: { - if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual; - ptr = ::google::protobuf::io::ReadSize(ptr, &size); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - ctx->extra_parse_data().SetFieldName("google.api.HttpRule.selector"); - object = msg->mutable_selector(); - if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { - parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; - goto string_till_end; - } - GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); - ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); - ptr += size; - break; - } + case 1: + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 10)) { + ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParserUTF8(_internal_mutable_selector(), ptr, ctx, "google.api.HttpRule.selector"); + CHK_(ptr); + } else goto handle_unusual; + continue; // string get = 2; - case 2: { - if (static_cast<::google::protobuf::uint8>(tag) != 18) goto handle_unusual; - ptr = ::google::protobuf::io::ReadSize(ptr, &size); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - ctx->extra_parse_data().SetFieldName("google.api.HttpRule.get"); - object = msg->mutable_get(); - if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { - parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; - goto string_till_end; - } - GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); - ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); - ptr += size; - break; - } + case 2: + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 18)) { + ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParserUTF8(_internal_mutable_get(), ptr, ctx, "google.api.HttpRule.get"); + CHK_(ptr); + } else goto handle_unusual; + continue; // string put = 3; - case 3: { - if (static_cast<::google::protobuf::uint8>(tag) != 26) goto handle_unusual; - ptr = ::google::protobuf::io::ReadSize(ptr, &size); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - ctx->extra_parse_data().SetFieldName("google.api.HttpRule.put"); - object = msg->mutable_put(); - if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { - parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; - goto string_till_end; - } - GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); - ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); - ptr += size; - break; - } + case 3: + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 26)) { + ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParserUTF8(_internal_mutable_put(), ptr, ctx, "google.api.HttpRule.put"); + CHK_(ptr); + } else goto handle_unusual; + continue; // string post = 4; - case 4: { - if (static_cast<::google::protobuf::uint8>(tag) != 34) goto handle_unusual; - ptr = ::google::protobuf::io::ReadSize(ptr, &size); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - ctx->extra_parse_data().SetFieldName("google.api.HttpRule.post"); - object = msg->mutable_post(); - if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { - parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; - goto string_till_end; - } - GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); - ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); - ptr += size; - break; - } + case 4: + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 34)) { + ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParserUTF8(_internal_mutable_post(), ptr, ctx, "google.api.HttpRule.post"); + CHK_(ptr); + } else goto handle_unusual; + continue; // string delete = 5; - case 5: { - if (static_cast<::google::protobuf::uint8>(tag) != 42) goto handle_unusual; - ptr = ::google::protobuf::io::ReadSize(ptr, &size); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - ctx->extra_parse_data().SetFieldName("google.api.HttpRule.delete"); - object = msg->mutable_delete_(); - if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { - parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; - goto string_till_end; - } - GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); - ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); - ptr += size; - break; - } + case 5: + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 42)) { + ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParserUTF8(_internal_mutable_delete_(), ptr, ctx, "google.api.HttpRule.delete"); + CHK_(ptr); + } else goto handle_unusual; + continue; // string patch = 6; - case 6: { - if (static_cast<::google::protobuf::uint8>(tag) != 50) goto handle_unusual; - ptr = ::google::protobuf::io::ReadSize(ptr, &size); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - ctx->extra_parse_data().SetFieldName("google.api.HttpRule.patch"); - object = msg->mutable_patch(); - if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { - parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; - goto string_till_end; - } - GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); - ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); - ptr += size; - break; - } + case 6: + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 50)) { + ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParserUTF8(_internal_mutable_patch(), ptr, ctx, "google.api.HttpRule.patch"); + CHK_(ptr); + } else goto handle_unusual; + continue; // string body = 7; - case 7: { - if (static_cast<::google::protobuf::uint8>(tag) != 58) goto handle_unusual; - ptr = ::google::protobuf::io::ReadSize(ptr, &size); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - ctx->extra_parse_data().SetFieldName("google.api.HttpRule.body"); - object = msg->mutable_body(); - if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { - parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; - goto string_till_end; - } - GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); - ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); - ptr += size; - break; - } + case 7: + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 58)) { + ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParserUTF8(_internal_mutable_body(), ptr, ctx, "google.api.HttpRule.body"); + CHK_(ptr); + } else goto handle_unusual; + continue; // .google.api.CustomHttpPattern custom = 8; - case 8: { - if (static_cast<::google::protobuf::uint8>(tag) != 66) goto handle_unusual; - ptr = ::google::protobuf::io::ReadSize(ptr, &size); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - parser_till_end = ::google::api::CustomHttpPattern::_InternalParse; - object = msg->mutable_custom(); - if (size > end - ptr) goto len_delim_till_end; - ptr += size; - GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange( - {parser_till_end, object}, ptr - size, ptr)); - break; - } + case 8: + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 66)) { + ptr = ctx->ParseMessage(_internal_mutable_custom(), ptr); + CHK_(ptr); + } else goto handle_unusual; + continue; // repeated .google.api.HttpRule additional_bindings = 11; - case 11: { - if (static_cast<::google::protobuf::uint8>(tag) != 90) goto handle_unusual; - do { - ptr = ::google::protobuf::io::ReadSize(ptr, &size); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - parser_till_end = ::google::api::HttpRule::_InternalParse; - object = msg->add_additional_bindings(); - if (size > end - ptr) goto len_delim_till_end; - ptr += size; - GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange( - {parser_till_end, object}, ptr - size, ptr)); - if (ptr >= end) break; - } while ((::google::protobuf::io::UnalignedLoad<::google::protobuf::uint64>(ptr) & 255) == 90 && (ptr += 1)); - break; - } + case 11: + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 90)) { + ptr -= 1; + do { + ptr += 1; + ptr = ctx->ParseMessage(_internal_add_additional_bindings(), ptr); + CHK_(ptr); + if (!ctx->DataAvailable(ptr)) break; + } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<90>(ptr)); + } else goto handle_unusual; + continue; // string response_body = 12; - case 12: { - if (static_cast<::google::protobuf::uint8>(tag) != 98) goto handle_unusual; - ptr = ::google::protobuf::io::ReadSize(ptr, &size); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - ctx->extra_parse_data().SetFieldName("google.api.HttpRule.response_body"); - object = msg->mutable_response_body(); - if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { - parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; - goto string_till_end; - } - GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); - ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); - ptr += size; - break; - } + case 12: + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 98)) { + ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParserUTF8(_internal_mutable_response_body(), ptr, ctx, "google.api.HttpRule.response_body"); + CHK_(ptr); + } else goto handle_unusual; + continue; default: { handle_unusual: if ((tag & 7) == 4 || tag == 0) { - ctx->EndGroup(tag); - return ptr; + ctx->SetLastTag(tag); + goto success; } - auto res = UnknownFieldParse(tag, {_InternalParse, msg}, - ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); - ptr = res.first; - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); - if (res.second) return ptr; + ptr = UnknownFieldParse(tag, &_internal_metadata_, ptr, ctx); + CHK_(ptr != nullptr); + continue; } } // switch } // while - return ptr; -string_till_end: - static_cast<::std::string*>(object)->clear(); - static_cast<::std::string*>(object)->reserve(size); - goto len_delim_till_end; -len_delim_till_end: - return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg}, - {parser_till_end, object}, size); -} -#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -bool HttpRule::MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) { -#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure - ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:google.api.HttpRule) - for (;;) { - ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); - tag = p.first; - if (!p.second) goto handle_unusual; - switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // string selector = 1; - case 1: { - if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadString( - input, this->mutable_selector())); - DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->selector().data(), static_cast(this->selector().length()), - ::google::protobuf::internal::WireFormatLite::PARSE, - "google.api.HttpRule.selector")); - } else { - goto handle_unusual; - } - break; - } - - // string get = 2; - case 2: { - if (static_cast< ::google::protobuf::uint8>(tag) == (18 & 0xFF)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadString( - input, this->mutable_get())); - DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->get().data(), static_cast(this->get().length()), - ::google::protobuf::internal::WireFormatLite::PARSE, - "google.api.HttpRule.get")); - } else { - goto handle_unusual; - } - break; - } - - // string put = 3; - case 3: { - if (static_cast< ::google::protobuf::uint8>(tag) == (26 & 0xFF)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadString( - input, this->mutable_put())); - DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->put().data(), static_cast(this->put().length()), - ::google::protobuf::internal::WireFormatLite::PARSE, - "google.api.HttpRule.put")); - } else { - goto handle_unusual; - } - break; - } - - // string post = 4; - case 4: { - if (static_cast< ::google::protobuf::uint8>(tag) == (34 & 0xFF)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadString( - input, this->mutable_post())); - DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->post().data(), static_cast(this->post().length()), - ::google::protobuf::internal::WireFormatLite::PARSE, - "google.api.HttpRule.post")); - } else { - goto handle_unusual; - } - break; - } - - // string delete = 5; - case 5: { - if (static_cast< ::google::protobuf::uint8>(tag) == (42 & 0xFF)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadString( - input, this->mutable_delete_())); - DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->delete_().data(), static_cast(this->delete_().length()), - ::google::protobuf::internal::WireFormatLite::PARSE, - "google.api.HttpRule.delete")); - } else { - goto handle_unusual; - } - break; - } - - // string patch = 6; - case 6: { - if (static_cast< ::google::protobuf::uint8>(tag) == (50 & 0xFF)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadString( - input, this->mutable_patch())); - DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->patch().data(), static_cast(this->patch().length()), - ::google::protobuf::internal::WireFormatLite::PARSE, - "google.api.HttpRule.patch")); - } else { - goto handle_unusual; - } - break; - } - - // string body = 7; - case 7: { - if (static_cast< ::google::protobuf::uint8>(tag) == (58 & 0xFF)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadString( - input, this->mutable_body())); - DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->body().data(), static_cast(this->body().length()), - ::google::protobuf::internal::WireFormatLite::PARSE, - "google.api.HttpRule.body")); - } else { - goto handle_unusual; - } - break; - } - - // .google.api.CustomHttpPattern custom = 8; - case 8: { - if (static_cast< ::google::protobuf::uint8>(tag) == (66 & 0xFF)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( - input, mutable_custom())); - } else { - goto handle_unusual; - } - break; - } - - // repeated .google.api.HttpRule additional_bindings = 11; - case 11: { - if (static_cast< ::google::protobuf::uint8>(tag) == (90 & 0xFF)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( - input, add_additional_bindings())); - } else { - goto handle_unusual; - } - break; - } - - // string response_body = 12; - case 12: { - if (static_cast< ::google::protobuf::uint8>(tag) == (98 & 0xFF)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadString( - input, this->mutable_response_body())); - DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->response_body().data(), static_cast(this->response_body().length()), - ::google::protobuf::internal::WireFormatLite::PARSE, - "google.api.HttpRule.response_body")); - } else { - goto handle_unusual; - } - break; - } - - default: { - handle_unusual: - if (tag == 0) { - goto success; - } - DO_(::google::protobuf::internal::WireFormat::SkipField( - input, tag, _internal_metadata_.mutable_unknown_fields())); - break; - } - } - } success: - // @@protoc_insertion_point(parse_success:google.api.HttpRule) - return true; + return ptr; failure: - // @@protoc_insertion_point(parse_failure:google.api.HttpRule) - return false; -#undef DO_ + ptr = nullptr; + goto success; +#undef CHK_ } -#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER - -void HttpRule::SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:google.api.HttpRule) - ::google::protobuf::uint32 cached_has_bits = 0; - (void) cached_has_bits; - - // string selector = 1; - if (this->selector().size() > 0) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->selector().data(), static_cast(this->selector().length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, - "google.api.HttpRule.selector"); - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( - 1, this->selector(), output); - } - - // string get = 2; - if (has_get()) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->get().data(), static_cast(this->get().length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, - "google.api.HttpRule.get"); - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( - 2, this->get(), output); - } - - // string put = 3; - if (has_put()) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->put().data(), static_cast(this->put().length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, - "google.api.HttpRule.put"); - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( - 3, this->put(), output); - } - // string post = 4; - if (has_post()) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->post().data(), static_cast(this->post().length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, - "google.api.HttpRule.post"); - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( - 4, this->post(), output); - } - - // string delete = 5; - if (has_delete_()) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->delete_().data(), static_cast(this->delete_().length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, - "google.api.HttpRule.delete"); - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( - 5, this->delete_(), output); - } - - // string patch = 6; - if (has_patch()) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->patch().data(), static_cast(this->patch().length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, - "google.api.HttpRule.patch"); - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( - 6, this->patch(), output); - } - - // string body = 7; - if (this->body().size() > 0) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->body().data(), static_cast(this->body().length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, - "google.api.HttpRule.body"); - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( - 7, this->body(), output); - } - - // .google.api.CustomHttpPattern custom = 8; - if (has_custom()) { - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 8, HasBitSetters::custom(this), output); - } - - // repeated .google.api.HttpRule additional_bindings = 11; - for (unsigned int i = 0, - n = static_cast(this->additional_bindings_size()); i < n; i++) { - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 11, - this->additional_bindings(static_cast(i)), - output); - } - - // string response_body = 12; - if (this->response_body().size() > 0) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->response_body().data(), static_cast(this->response_body().length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, - "google.api.HttpRule.response_body"); - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( - 12, this->response_body(), output); - } - - if (_internal_metadata_.have_unknown_fields()) { - ::google::protobuf::internal::WireFormat::SerializeUnknownFields( - _internal_metadata_.unknown_fields(), output); - } - // @@protoc_insertion_point(serialize_end:google.api.HttpRule) -} - -::google::protobuf::uint8* HttpRule::InternalSerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { +::PROTOBUF_NAMESPACE_ID::uint8* HttpRule::InternalSerializeWithCachedSizesToArray( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:google.api.HttpRule) - ::google::protobuf::uint32 cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; // string selector = 1; if (this->selector().size() > 0) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->selector().data(), static_cast(this->selector().length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( + this->_internal_selector().data(), static_cast(this->_internal_selector().length()), + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "google.api.HttpRule.selector"); - target = - ::google::protobuf::internal::WireFormatLite::WriteStringToArray( - 1, this->selector(), target); + target = stream->WriteStringMaybeAliased( + 1, this->_internal_selector(), target); } // string get = 2; - if (has_get()) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->get().data(), static_cast(this->get().length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, + if (_internal_has_get()) { + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( + this->_internal_get().data(), static_cast(this->_internal_get().length()), + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "google.api.HttpRule.get"); - target = - ::google::protobuf::internal::WireFormatLite::WriteStringToArray( - 2, this->get(), target); + target = stream->WriteStringMaybeAliased( + 2, this->_internal_get(), target); } // string put = 3; - if (has_put()) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->put().data(), static_cast(this->put().length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, + if (_internal_has_put()) { + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( + this->_internal_put().data(), static_cast(this->_internal_put().length()), + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "google.api.HttpRule.put"); - target = - ::google::protobuf::internal::WireFormatLite::WriteStringToArray( - 3, this->put(), target); + target = stream->WriteStringMaybeAliased( + 3, this->_internal_put(), target); } // string post = 4; - if (has_post()) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->post().data(), static_cast(this->post().length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, + if (_internal_has_post()) { + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( + this->_internal_post().data(), static_cast(this->_internal_post().length()), + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "google.api.HttpRule.post"); - target = - ::google::protobuf::internal::WireFormatLite::WriteStringToArray( - 4, this->post(), target); + target = stream->WriteStringMaybeAliased( + 4, this->_internal_post(), target); } // string delete = 5; - if (has_delete_()) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->delete_().data(), static_cast(this->delete_().length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, + if (_internal_has_delete_()) { + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( + this->_internal_delete_().data(), static_cast(this->_internal_delete_().length()), + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "google.api.HttpRule.delete"); - target = - ::google::protobuf::internal::WireFormatLite::WriteStringToArray( - 5, this->delete_(), target); + target = stream->WriteStringMaybeAliased( + 5, this->_internal_delete_(), target); } // string patch = 6; - if (has_patch()) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->patch().data(), static_cast(this->patch().length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, + if (_internal_has_patch()) { + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( + this->_internal_patch().data(), static_cast(this->_internal_patch().length()), + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "google.api.HttpRule.patch"); - target = - ::google::protobuf::internal::WireFormatLite::WriteStringToArray( - 6, this->patch(), target); + target = stream->WriteStringMaybeAliased( + 6, this->_internal_patch(), target); } // string body = 7; if (this->body().size() > 0) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->body().data(), static_cast(this->body().length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( + this->_internal_body().data(), static_cast(this->_internal_body().length()), + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "google.api.HttpRule.body"); - target = - ::google::protobuf::internal::WireFormatLite::WriteStringToArray( - 7, this->body(), target); + target = stream->WriteStringMaybeAliased( + 7, this->_internal_body(), target); } // .google.api.CustomHttpPattern custom = 8; - if (has_custom()) { - target = ::google::protobuf::internal::WireFormatLite:: + if (_internal_has_custom()) { + stream->EnsureSpace(&target); + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: InternalWriteMessageToArray( - 8, HasBitSetters::custom(this), target); + 8, _Internal::custom(this), target, stream); } // repeated .google.api.HttpRule additional_bindings = 11; for (unsigned int i = 0, - n = static_cast(this->additional_bindings_size()); i < n; i++) { - target = ::google::protobuf::internal::WireFormatLite:: - InternalWriteMessageToArray( - 11, this->additional_bindings(static_cast(i)), target); + n = static_cast(this->_internal_additional_bindings_size()); i < n; i++) { + stream->EnsureSpace(&target); + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: + InternalWriteMessageToArray(11, this->_internal_additional_bindings(i), target, stream); } // string response_body = 12; if (this->response_body().size() > 0) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->response_body().data(), static_cast(this->response_body().length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( + this->_internal_response_body().data(), static_cast(this->_internal_response_body().length()), + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "google.api.HttpRule.response_body"); - target = - ::google::protobuf::internal::WireFormatLite::WriteStringToArray( - 12, this->response_body(), target); + target = stream->WriteStringMaybeAliased( + 12, this->_internal_response_body(), target); } - if (_internal_metadata_.have_unknown_fields()) { - target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( - _internal_metadata_.unknown_fields(), target); + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::InternalSerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields(), target, stream); } // @@protoc_insertion_point(serialize_to_array_end:google.api.HttpRule) return target; @@ -1356,87 +831,78 @@ size_t HttpRule::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:google.api.HttpRule) size_t total_size = 0; - if (_internal_metadata_.have_unknown_fields()) { - total_size += - ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - _internal_metadata_.unknown_fields()); - } - ::google::protobuf::uint32 cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; // repeated .google.api.HttpRule additional_bindings = 11; - { - unsigned int count = static_cast(this->additional_bindings_size()); - total_size += 1UL * count; - for (unsigned int i = 0; i < count; i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSize( - this->additional_bindings(static_cast(i))); - } + total_size += 1UL * this->_internal_additional_bindings_size(); + for (const auto& msg : this->additional_bindings_) { + total_size += + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg); } // string selector = 1; if (this->selector().size() > 0) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::StringSize( - this->selector()); + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( + this->_internal_selector()); } // string body = 7; if (this->body().size() > 0) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::StringSize( - this->body()); + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( + this->_internal_body()); } // string response_body = 12; if (this->response_body().size() > 0) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::StringSize( - this->response_body()); + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( + this->_internal_response_body()); } switch (pattern_case()) { // string get = 2; case kGet: { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::StringSize( - this->get()); + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( + this->_internal_get()); break; } // string put = 3; case kPut: { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::StringSize( - this->put()); + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( + this->_internal_put()); break; } // string post = 4; case kPost: { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::StringSize( - this->post()); + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( + this->_internal_post()); break; } // string delete = 5; case kDelete: { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::StringSize( - this->delete_()); + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( + this->_internal_delete_()); break; } // string patch = 6; case kPatch: { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::StringSize( - this->patch()); + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( + this->_internal_patch()); break; } // .google.api.CustomHttpPattern custom = 8; case kCustom: { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSize( + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize( *pattern_.custom_); break; } @@ -1444,20 +910,24 @@ size_t HttpRule::ByteSizeLong() const { break; } } - int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + return ::PROTOBUF_NAMESPACE_ID::internal::ComputeUnknownFieldsSize( + _internal_metadata_, total_size, &_cached_size_); + } + int cached_size = ::PROTOBUF_NAMESPACE_ID::internal::ToCachedSize(total_size); SetCachedSize(cached_size); return total_size; } -void HttpRule::MergeFrom(const ::google::protobuf::Message& from) { +void HttpRule::MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:google.api.HttpRule) GOOGLE_DCHECK_NE(&from, this); const HttpRule* source = - ::google::protobuf::DynamicCastToGenerated( + ::PROTOBUF_NAMESPACE_ID::DynamicCastToGenerated( &from); if (source == nullptr) { // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.api.HttpRule) - ::google::protobuf::internal::ReflectionOps::Merge(from, this); + ::PROTOBUF_NAMESPACE_ID::internal::ReflectionOps::Merge(from, this); } else { // @@protoc_insertion_point(generalized_merge_from_cast_success:google.api.HttpRule) MergeFrom(*source); @@ -1468,42 +938,42 @@ void HttpRule::MergeFrom(const HttpRule& from) { // @@protoc_insertion_point(class_specific_merge_from_start:google.api.HttpRule) GOOGLE_DCHECK_NE(&from, this); _internal_metadata_.MergeFrom(from._internal_metadata_); - ::google::protobuf::uint32 cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; additional_bindings_.MergeFrom(from.additional_bindings_); if (from.selector().size() > 0) { - set_selector(from.selector()); + _internal_set_selector(from._internal_selector()); } if (from.body().size() > 0) { - set_body(from.body()); + _internal_set_body(from._internal_body()); } if (from.response_body().size() > 0) { - set_response_body(from.response_body()); + _internal_set_response_body(from._internal_response_body()); } switch (from.pattern_case()) { case kGet: { - set_get(from.get()); + _internal_set_get(from._internal_get()); break; } case kPut: { - set_put(from.put()); + _internal_set_put(from._internal_put()); break; } case kPost: { - set_post(from.post()); + _internal_set_post(from._internal_post()); break; } case kDelete: { - set_delete_(from.delete_()); + _internal_set_delete_(from._internal_delete_()); break; } case kPatch: { - set_patch(from.patch()); + _internal_set_patch(from._internal_patch()); break; } case kCustom: { - mutable_custom()->::google::api::CustomHttpPattern::MergeFrom(from.custom()); + _internal_mutable_custom()->::google::api::CustomHttpPattern::MergeFrom(from._internal_custom()); break; } case PATTERN_NOT_SET: { @@ -1512,7 +982,7 @@ void HttpRule::MergeFrom(const HttpRule& from) { } } -void HttpRule::CopyFrom(const ::google::protobuf::Message& from) { +void HttpRule::CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) { // @@protoc_insertion_point(generalized_copy_from_start:google.api.HttpRule) if (&from == this) return; Clear(); @@ -1530,42 +1000,22 @@ bool HttpRule::IsInitialized() const { return true; } -void HttpRule::Swap(HttpRule* other) { - if (other == this) return; - if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) { - InternalSwap(other); - } else { - HttpRule* temp = New(GetArenaNoVirtual()); - temp->MergeFrom(*other); - other->CopyFrom(*this); - InternalSwap(temp); - if (GetArenaNoVirtual() == nullptr) { - delete temp; - } - } -} -void HttpRule::UnsafeArenaSwap(HttpRule* other) { - if (other == this) return; - GOOGLE_DCHECK(GetArenaNoVirtual() == other->GetArenaNoVirtual()); - InternalSwap(other); -} void HttpRule::InternalSwap(HttpRule* other) { using std::swap; _internal_metadata_.Swap(&other->_internal_metadata_); - CastToBase(&additional_bindings_)->InternalSwap(CastToBase(&other->additional_bindings_)); - selector_.Swap(&other->selector_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), + additional_bindings_.InternalSwap(&other->additional_bindings_); + selector_.Swap(&other->selector_, &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); - body_.Swap(&other->body_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), + body_.Swap(&other->body_, &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); - response_body_.Swap(&other->response_body_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), + response_body_.Swap(&other->response_body_, &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); swap(pattern_, other->pattern_); swap(_oneof_case_[0], other->_oneof_case_[0]); } -::google::protobuf::Metadata HttpRule::GetMetadata() const { - ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_google_2fapi_2fhttp_2eproto); - return ::file_level_metadata_google_2fapi_2fhttp_2eproto[kIndexInFileMessages]; +::PROTOBUF_NAMESPACE_ID::Metadata HttpRule::GetMetadata() const { + return GetMetadataStatic(); } @@ -1573,49 +1023,43 @@ ::google::protobuf::Metadata HttpRule::GetMetadata() const { void CustomHttpPattern::InitAsDefaultInstance() { } -class CustomHttpPattern::HasBitSetters { +class CustomHttpPattern::_Internal { public: }; -#if !defined(_MSC_VER) || _MSC_VER >= 1900 -const int CustomHttpPattern::kKindFieldNumber; -const int CustomHttpPattern::kPathFieldNumber; -#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 - CustomHttpPattern::CustomHttpPattern() - : ::google::protobuf::Message(), _internal_metadata_(nullptr) { + : ::PROTOBUF_NAMESPACE_ID::Message(), _internal_metadata_(nullptr) { SharedCtor(); // @@protoc_insertion_point(constructor:google.api.CustomHttpPattern) } -CustomHttpPattern::CustomHttpPattern(::google::protobuf::Arena* arena) - : ::google::protobuf::Message(), +CustomHttpPattern::CustomHttpPattern(::PROTOBUF_NAMESPACE_ID::Arena* arena) + : ::PROTOBUF_NAMESPACE_ID::Message(), _internal_metadata_(arena) { SharedCtor(); RegisterArenaDtor(arena); // @@protoc_insertion_point(arena_constructor:google.api.CustomHttpPattern) } CustomHttpPattern::CustomHttpPattern(const CustomHttpPattern& from) - : ::google::protobuf::Message(), + : ::PROTOBUF_NAMESPACE_ID::Message(), _internal_metadata_(nullptr) { _internal_metadata_.MergeFrom(from._internal_metadata_); - kind_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - if (from.kind().size() > 0) { - kind_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.kind(), + kind_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + if (!from._internal_kind().empty()) { + kind_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from._internal_kind(), GetArenaNoVirtual()); } - path_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - if (from.path().size() > 0) { - path_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.path(), + path_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + if (!from._internal_path().empty()) { + path_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from._internal_path(), GetArenaNoVirtual()); } // @@protoc_insertion_point(copy_constructor:google.api.CustomHttpPattern) } void CustomHttpPattern::SharedCtor() { - ::google::protobuf::internal::InitSCC( - &scc_info_CustomHttpPattern_google_2fapi_2fhttp_2eproto.base); - kind_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - path_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + ::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&scc_info_CustomHttpPattern_google_2fapi_2fhttp_2eproto.base); + kind_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + path_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } CustomHttpPattern::~CustomHttpPattern() { @@ -1625,230 +1069,107 @@ CustomHttpPattern::~CustomHttpPattern() { void CustomHttpPattern::SharedDtor() { GOOGLE_DCHECK(GetArenaNoVirtual() == nullptr); - kind_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - path_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + kind_.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + path_.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); } void CustomHttpPattern::ArenaDtor(void* object) { CustomHttpPattern* _this = reinterpret_cast< CustomHttpPattern* >(object); (void)_this; } -void CustomHttpPattern::RegisterArenaDtor(::google::protobuf::Arena*) { +void CustomHttpPattern::RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena*) { } void CustomHttpPattern::SetCachedSize(int size) const { _cached_size_.Set(size); } const CustomHttpPattern& CustomHttpPattern::default_instance() { - ::google::protobuf::internal::InitSCC(&::scc_info_CustomHttpPattern_google_2fapi_2fhttp_2eproto.base); + ::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&::scc_info_CustomHttpPattern_google_2fapi_2fhttp_2eproto.base); return *internal_default_instance(); } void CustomHttpPattern::Clear() { // @@protoc_insertion_point(message_clear_start:google.api.CustomHttpPattern) - ::google::protobuf::uint32 cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - kind_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); - path_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + kind_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + path_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); _internal_metadata_.Clear(); } -#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -const char* CustomHttpPattern::_InternalParse(const char* begin, const char* end, void* object, - ::google::protobuf::internal::ParseContext* ctx) { - auto msg = static_cast(object); - ::google::protobuf::int32 size; (void)size; - int depth; (void)depth; - ::google::protobuf::uint32 tag; - ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; - auto ptr = begin; - while (ptr < end) { - ptr = ::google::protobuf::io::Parse32(ptr, &tag); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); +const char* CustomHttpPattern::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) { +#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure + ::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArenaNoVirtual(); (void)arena; + while (!ctx->Done(&ptr)) { + ::PROTOBUF_NAMESPACE_ID::uint32 tag; + ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); + CHK_(ptr); switch (tag >> 3) { // string kind = 1; - case 1: { - if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual; - ptr = ::google::protobuf::io::ReadSize(ptr, &size); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - ctx->extra_parse_data().SetFieldName("google.api.CustomHttpPattern.kind"); - object = msg->mutable_kind(); - if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { - parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; - goto string_till_end; - } - GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); - ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); - ptr += size; - break; - } + case 1: + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 10)) { + ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParserUTF8(_internal_mutable_kind(), ptr, ctx, "google.api.CustomHttpPattern.kind"); + CHK_(ptr); + } else goto handle_unusual; + continue; // string path = 2; - case 2: { - if (static_cast<::google::protobuf::uint8>(tag) != 18) goto handle_unusual; - ptr = ::google::protobuf::io::ReadSize(ptr, &size); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - ctx->extra_parse_data().SetFieldName("google.api.CustomHttpPattern.path"); - object = msg->mutable_path(); - if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { - parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; - goto string_till_end; - } - GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); - ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); - ptr += size; - break; - } + case 2: + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 18)) { + ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParserUTF8(_internal_mutable_path(), ptr, ctx, "google.api.CustomHttpPattern.path"); + CHK_(ptr); + } else goto handle_unusual; + continue; default: { handle_unusual: if ((tag & 7) == 4 || tag == 0) { - ctx->EndGroup(tag); - return ptr; + ctx->SetLastTag(tag); + goto success; } - auto res = UnknownFieldParse(tag, {_InternalParse, msg}, - ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); - ptr = res.first; - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); - if (res.second) return ptr; + ptr = UnknownFieldParse(tag, &_internal_metadata_, ptr, ctx); + CHK_(ptr != nullptr); + continue; } } // switch } // while - return ptr; -string_till_end: - static_cast<::std::string*>(object)->clear(); - static_cast<::std::string*>(object)->reserve(size); - goto len_delim_till_end; -len_delim_till_end: - return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg}, - {parser_till_end, object}, size); -} -#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -bool CustomHttpPattern::MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) { -#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure - ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:google.api.CustomHttpPattern) - for (;;) { - ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); - tag = p.first; - if (!p.second) goto handle_unusual; - switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // string kind = 1; - case 1: { - if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadString( - input, this->mutable_kind())); - DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->kind().data(), static_cast(this->kind().length()), - ::google::protobuf::internal::WireFormatLite::PARSE, - "google.api.CustomHttpPattern.kind")); - } else { - goto handle_unusual; - } - break; - } - - // string path = 2; - case 2: { - if (static_cast< ::google::protobuf::uint8>(tag) == (18 & 0xFF)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadString( - input, this->mutable_path())); - DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->path().data(), static_cast(this->path().length()), - ::google::protobuf::internal::WireFormatLite::PARSE, - "google.api.CustomHttpPattern.path")); - } else { - goto handle_unusual; - } - break; - } - - default: { - handle_unusual: - if (tag == 0) { - goto success; - } - DO_(::google::protobuf::internal::WireFormat::SkipField( - input, tag, _internal_metadata_.mutable_unknown_fields())); - break; - } - } - } success: - // @@protoc_insertion_point(parse_success:google.api.CustomHttpPattern) - return true; + return ptr; failure: - // @@protoc_insertion_point(parse_failure:google.api.CustomHttpPattern) - return false; -#undef DO_ -} -#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER - -void CustomHttpPattern::SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:google.api.CustomHttpPattern) - ::google::protobuf::uint32 cached_has_bits = 0; - (void) cached_has_bits; - - // string kind = 1; - if (this->kind().size() > 0) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->kind().data(), static_cast(this->kind().length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, - "google.api.CustomHttpPattern.kind"); - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( - 1, this->kind(), output); - } - - // string path = 2; - if (this->path().size() > 0) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->path().data(), static_cast(this->path().length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, - "google.api.CustomHttpPattern.path"); - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( - 2, this->path(), output); - } - - if (_internal_metadata_.have_unknown_fields()) { - ::google::protobuf::internal::WireFormat::SerializeUnknownFields( - _internal_metadata_.unknown_fields(), output); - } - // @@protoc_insertion_point(serialize_end:google.api.CustomHttpPattern) + ptr = nullptr; + goto success; +#undef CHK_ } -::google::protobuf::uint8* CustomHttpPattern::InternalSerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { +::PROTOBUF_NAMESPACE_ID::uint8* CustomHttpPattern::InternalSerializeWithCachedSizesToArray( + ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:google.api.CustomHttpPattern) - ::google::protobuf::uint32 cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; // string kind = 1; if (this->kind().size() > 0) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->kind().data(), static_cast(this->kind().length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( + this->_internal_kind().data(), static_cast(this->_internal_kind().length()), + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "google.api.CustomHttpPattern.kind"); - target = - ::google::protobuf::internal::WireFormatLite::WriteStringToArray( - 1, this->kind(), target); + target = stream->WriteStringMaybeAliased( + 1, this->_internal_kind(), target); } // string path = 2; if (this->path().size() > 0) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->path().data(), static_cast(this->path().length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( + this->_internal_path().data(), static_cast(this->_internal_path().length()), + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "google.api.CustomHttpPattern.path"); - target = - ::google::protobuf::internal::WireFormatLite::WriteStringToArray( - 2, this->path(), target); + target = stream->WriteStringMaybeAliased( + 2, this->_internal_path(), target); } - if (_internal_metadata_.have_unknown_fields()) { - target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( - _internal_metadata_.unknown_fields(), target); + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::InternalSerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields(), target, stream); } // @@protoc_insertion_point(serialize_to_array_end:google.api.CustomHttpPattern) return target; @@ -1858,43 +1179,42 @@ size_t CustomHttpPattern::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:google.api.CustomHttpPattern) size_t total_size = 0; - if (_internal_metadata_.have_unknown_fields()) { - total_size += - ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - _internal_metadata_.unknown_fields()); - } - ::google::protobuf::uint32 cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; // string kind = 1; if (this->kind().size() > 0) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::StringSize( - this->kind()); + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( + this->_internal_kind()); } // string path = 2; if (this->path().size() > 0) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::StringSize( - this->path()); + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( + this->_internal_path()); } - int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + return ::PROTOBUF_NAMESPACE_ID::internal::ComputeUnknownFieldsSize( + _internal_metadata_, total_size, &_cached_size_); + } + int cached_size = ::PROTOBUF_NAMESPACE_ID::internal::ToCachedSize(total_size); SetCachedSize(cached_size); return total_size; } -void CustomHttpPattern::MergeFrom(const ::google::protobuf::Message& from) { +void CustomHttpPattern::MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:google.api.CustomHttpPattern) GOOGLE_DCHECK_NE(&from, this); const CustomHttpPattern* source = - ::google::protobuf::DynamicCastToGenerated( + ::PROTOBUF_NAMESPACE_ID::DynamicCastToGenerated( &from); if (source == nullptr) { // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.api.CustomHttpPattern) - ::google::protobuf::internal::ReflectionOps::Merge(from, this); + ::PROTOBUF_NAMESPACE_ID::internal::ReflectionOps::Merge(from, this); } else { // @@protoc_insertion_point(generalized_merge_from_cast_success:google.api.CustomHttpPattern) MergeFrom(*source); @@ -1905,18 +1225,18 @@ void CustomHttpPattern::MergeFrom(const CustomHttpPattern& from) { // @@protoc_insertion_point(class_specific_merge_from_start:google.api.CustomHttpPattern) GOOGLE_DCHECK_NE(&from, this); _internal_metadata_.MergeFrom(from._internal_metadata_); - ::google::protobuf::uint32 cached_has_bits = 0; + ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; (void) cached_has_bits; if (from.kind().size() > 0) { - set_kind(from.kind()); + _internal_set_kind(from._internal_kind()); } if (from.path().size() > 0) { - set_path(from.path()); + _internal_set_path(from._internal_path()); } } -void CustomHttpPattern::CopyFrom(const ::google::protobuf::Message& from) { +void CustomHttpPattern::CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) { // @@protoc_insertion_point(generalized_copy_from_start:google.api.CustomHttpPattern) if (&from == this) return; Clear(); @@ -1934,45 +1254,24 @@ bool CustomHttpPattern::IsInitialized() const { return true; } -void CustomHttpPattern::Swap(CustomHttpPattern* other) { - if (other == this) return; - if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) { - InternalSwap(other); - } else { - CustomHttpPattern* temp = New(GetArenaNoVirtual()); - temp->MergeFrom(*other); - other->CopyFrom(*this); - InternalSwap(temp); - if (GetArenaNoVirtual() == nullptr) { - delete temp; - } - } -} -void CustomHttpPattern::UnsafeArenaSwap(CustomHttpPattern* other) { - if (other == this) return; - GOOGLE_DCHECK(GetArenaNoVirtual() == other->GetArenaNoVirtual()); - InternalSwap(other); -} void CustomHttpPattern::InternalSwap(CustomHttpPattern* other) { using std::swap; _internal_metadata_.Swap(&other->_internal_metadata_); - kind_.Swap(&other->kind_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), + kind_.Swap(&other->kind_, &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); - path_.Swap(&other->path_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), + path_.Swap(&other->path_, &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } -::google::protobuf::Metadata CustomHttpPattern::GetMetadata() const { - ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_google_2fapi_2fhttp_2eproto); - return ::file_level_metadata_google_2fapi_2fhttp_2eproto[kIndexInFileMessages]; +::PROTOBUF_NAMESPACE_ID::Metadata CustomHttpPattern::GetMetadata() const { + return GetMetadataStatic(); } // @@protoc_insertion_point(namespace_scope) } // namespace api } // namespace google -namespace google { -namespace protobuf { +PROTOBUF_NAMESPACE_OPEN template<> PROTOBUF_NOINLINE ::google::api::Http* Arena::CreateMaybeMessage< ::google::api::Http >(Arena* arena) { return Arena::CreateMessageInternal< ::google::api::Http >(arena); } @@ -1982,8 +1281,7 @@ template<> PROTOBUF_NOINLINE ::google::api::HttpRule* Arena::CreateMaybeMessage< template<> PROTOBUF_NOINLINE ::google::api::CustomHttpPattern* Arena::CreateMaybeMessage< ::google::api::CustomHttpPattern >(Arena* arena) { return Arena::CreateMessageInternal< ::google::api::CustomHttpPattern >(arena); } -} // namespace protobuf -} // namespace google +PROTOBUF_NAMESPACE_CLOSE // @@protoc_insertion_point(global_scope) #include diff --git a/sdks/nodejs/lib/google/api/annotations_pb.js b/sdks/nodejs/lib/google/api/annotations_pb.js index c61ca0bc86..d27ae4840e 100644 --- a/sdks/nodejs/lib/google/api/annotations_pb.js +++ b/sdks/nodejs/lib/google/api/annotations_pb.js @@ -13,6 +13,7 @@ // limitations under the License. // This code was autogenerated. Do not edit directly. +// source: google/api/annotations.proto /** * @fileoverview * @enhanceable diff --git a/sdks/nodejs/lib/google/api/http_pb.js b/sdks/nodejs/lib/google/api/http_pb.js index f678c5b5c4..acc6be5c6f 100644 --- a/sdks/nodejs/lib/google/api/http_pb.js +++ b/sdks/nodejs/lib/google/api/http_pb.js @@ -13,6 +13,7 @@ // limitations under the License. // This code was autogenerated. Do not edit directly. +// source: google/api/http.proto /** * @fileoverview * @enhanceable @@ -29,6 +30,7 @@ var global = Function('return this')(); goog.exportSymbol('proto.google.api.CustomHttpPattern', null, global); goog.exportSymbol('proto.google.api.Http', null, global); goog.exportSymbol('proto.google.api.HttpRule', null, global); +goog.exportSymbol('proto.google.api.HttpRule.PatternCase', null, global); /** * Generated by JsPbCodeGenerator. * @param {Array=} opt_data Optional initial data array, typically from a @@ -104,13 +106,15 @@ proto.google.api.Http.repeatedFields_ = [1]; if (jspb.Message.GENERATE_TO_OBJECT) { /** - * Creates an object representation of this proto suitable for use in Soy templates. + * Creates an object representation of this proto. * Field names that are reserved in JavaScript and will be renamed to pb_name. + * Optional fields that are not set will be set to undefined. * To access a reserved field use, foo.pb_, eg, foo.pb_default. * For the list of reserved names please see: - * com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS. - * @param {boolean=} opt_includeInstance Whether to include the JSPB instance - * for transitional soy proto support: http://goto/soy-param-migration + * net/proto2/compiler/js/internal/generator.cc#kKeyword. + * @param {boolean=} opt_includeInstance Deprecated. whether to include the + * JSPB instance for transitional soy proto support: + * http://goto/soy-param-migration * @return {!Object} */ proto.google.api.Http.prototype.toObject = function(opt_includeInstance) { @@ -120,18 +124,18 @@ proto.google.api.Http.prototype.toObject = function(opt_includeInstance) { /** * Static version of the {@see toObject} method. - * @param {boolean|undefined} includeInstance Whether to include the JSPB - * instance for transitional soy proto support: + * @param {boolean|undefined} includeInstance Deprecated. Whether to include + * the JSPB instance for transitional soy proto support: * http://goto/soy-param-migration * @param {!proto.google.api.Http} msg The msg instance to transform. * @return {!Object} * @suppress {unusedLocalVariables} f is only used for nested messages */ proto.google.api.Http.toObject = function(includeInstance, msg) { - var obj = { + var f, obj = { rulesList: jspb.Message.toObjectList(msg.getRulesList(), proto.google.api.HttpRule.toObject, includeInstance), - fullyDecodeReservedExpansion: jspb.Message.getFieldWithDefault(msg, 2, false) + fullyDecodeReservedExpansion: jspb.Message.getBooleanFieldWithDefault(msg, 2, false) }; if (includeInstance) { @@ -234,9 +238,12 @@ proto.google.api.Http.prototype.getRulesList = function() { }; -/** @param {!Array} value */ +/** + * @param {!Array} value + * @return {!proto.google.api.Http} returns this +*/ proto.google.api.Http.prototype.setRulesList = function(value) { - jspb.Message.setRepeatedWrapperField(this, 1, value); + return jspb.Message.setRepeatedWrapperField(this, 1, value); }; @@ -252,26 +259,28 @@ proto.google.api.Http.prototype.addRules = function(opt_value, opt_index) { /** * Clears the list making it empty but non-null. + * @return {!proto.google.api.Http} returns this */ proto.google.api.Http.prototype.clearRulesList = function() { - this.setRulesList([]); + return this.setRulesList([]); }; /** * optional bool fully_decode_reserved_expansion = 2; - * Note that Boolean fields may be set to 0/1 when serialized from a Java server. - * You should avoid comparisons like {@code val === true/false} in those cases. * @return {boolean} */ proto.google.api.Http.prototype.getFullyDecodeReservedExpansion = function() { - return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 2, false)); + return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 2, false)); }; -/** @param {boolean} value */ +/** + * @param {boolean} value + * @return {!proto.google.api.Http} returns this + */ proto.google.api.Http.prototype.setFullyDecodeReservedExpansion = function(value) { - jspb.Message.setProto3BooleanField(this, 2, value); + return jspb.Message.setProto3BooleanField(this, 2, value); }; @@ -317,13 +326,15 @@ proto.google.api.HttpRule.prototype.getPatternCase = function() { if (jspb.Message.GENERATE_TO_OBJECT) { /** - * Creates an object representation of this proto suitable for use in Soy templates. + * Creates an object representation of this proto. * Field names that are reserved in JavaScript and will be renamed to pb_name. + * Optional fields that are not set will be set to undefined. * To access a reserved field use, foo.pb_, eg, foo.pb_default. * For the list of reserved names please see: - * com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS. - * @param {boolean=} opt_includeInstance Whether to include the JSPB instance - * for transitional soy proto support: http://goto/soy-param-migration + * net/proto2/compiler/js/internal/generator.cc#kKeyword. + * @param {boolean=} opt_includeInstance Deprecated. whether to include the + * JSPB instance for transitional soy proto support: + * http://goto/soy-param-migration * @return {!Object} */ proto.google.api.HttpRule.prototype.toObject = function(opt_includeInstance) { @@ -333,15 +344,15 @@ proto.google.api.HttpRule.prototype.toObject = function(opt_includeInstance) { /** * Static version of the {@see toObject} method. - * @param {boolean|undefined} includeInstance Whether to include the JSPB - * instance for transitional soy proto support: + * @param {boolean|undefined} includeInstance Deprecated. Whether to include + * the JSPB instance for transitional soy proto support: * http://goto/soy-param-migration * @param {!proto.google.api.HttpRule} msg The msg instance to transform. * @return {!Object} * @suppress {unusedLocalVariables} f is only used for nested messages */ proto.google.api.HttpRule.toObject = function(includeInstance, msg) { - var obj = { + var f, obj = { selector: jspb.Message.getFieldWithDefault(msg, 1, ""), get: jspb.Message.getFieldWithDefault(msg, 2, ""), put: jspb.Message.getFieldWithDefault(msg, 3, ""), @@ -544,9 +555,12 @@ proto.google.api.HttpRule.prototype.getSelector = function() { }; -/** @param {string} value */ +/** + * @param {string} value + * @return {!proto.google.api.HttpRule} returns this + */ proto.google.api.HttpRule.prototype.setSelector = function(value) { - jspb.Message.setProto3StringField(this, 1, value); + return jspb.Message.setProto3StringField(this, 1, value); }; @@ -559,17 +573,21 @@ proto.google.api.HttpRule.prototype.getGet = function() { }; -/** @param {string} value */ +/** + * @param {string} value + * @return {!proto.google.api.HttpRule} returns this + */ proto.google.api.HttpRule.prototype.setGet = function(value) { - jspb.Message.setOneofField(this, 2, proto.google.api.HttpRule.oneofGroups_[0], value); + return jspb.Message.setOneofField(this, 2, proto.google.api.HttpRule.oneofGroups_[0], value); }; /** * Clears the field making it undefined. + * @return {!proto.google.api.HttpRule} returns this */ proto.google.api.HttpRule.prototype.clearGet = function() { - jspb.Message.setOneofField(this, 2, proto.google.api.HttpRule.oneofGroups_[0], undefined); + return jspb.Message.setOneofField(this, 2, proto.google.api.HttpRule.oneofGroups_[0], undefined); }; @@ -591,17 +609,21 @@ proto.google.api.HttpRule.prototype.getPut = function() { }; -/** @param {string} value */ +/** + * @param {string} value + * @return {!proto.google.api.HttpRule} returns this + */ proto.google.api.HttpRule.prototype.setPut = function(value) { - jspb.Message.setOneofField(this, 3, proto.google.api.HttpRule.oneofGroups_[0], value); + return jspb.Message.setOneofField(this, 3, proto.google.api.HttpRule.oneofGroups_[0], value); }; /** * Clears the field making it undefined. + * @return {!proto.google.api.HttpRule} returns this */ proto.google.api.HttpRule.prototype.clearPut = function() { - jspb.Message.setOneofField(this, 3, proto.google.api.HttpRule.oneofGroups_[0], undefined); + return jspb.Message.setOneofField(this, 3, proto.google.api.HttpRule.oneofGroups_[0], undefined); }; @@ -623,17 +645,21 @@ proto.google.api.HttpRule.prototype.getPost = function() { }; -/** @param {string} value */ +/** + * @param {string} value + * @return {!proto.google.api.HttpRule} returns this + */ proto.google.api.HttpRule.prototype.setPost = function(value) { - jspb.Message.setOneofField(this, 4, proto.google.api.HttpRule.oneofGroups_[0], value); + return jspb.Message.setOneofField(this, 4, proto.google.api.HttpRule.oneofGroups_[0], value); }; /** * Clears the field making it undefined. + * @return {!proto.google.api.HttpRule} returns this */ proto.google.api.HttpRule.prototype.clearPost = function() { - jspb.Message.setOneofField(this, 4, proto.google.api.HttpRule.oneofGroups_[0], undefined); + return jspb.Message.setOneofField(this, 4, proto.google.api.HttpRule.oneofGroups_[0], undefined); }; @@ -655,17 +681,21 @@ proto.google.api.HttpRule.prototype.getDelete = function() { }; -/** @param {string} value */ +/** + * @param {string} value + * @return {!proto.google.api.HttpRule} returns this + */ proto.google.api.HttpRule.prototype.setDelete = function(value) { - jspb.Message.setOneofField(this, 5, proto.google.api.HttpRule.oneofGroups_[0], value); + return jspb.Message.setOneofField(this, 5, proto.google.api.HttpRule.oneofGroups_[0], value); }; /** * Clears the field making it undefined. + * @return {!proto.google.api.HttpRule} returns this */ proto.google.api.HttpRule.prototype.clearDelete = function() { - jspb.Message.setOneofField(this, 5, proto.google.api.HttpRule.oneofGroups_[0], undefined); + return jspb.Message.setOneofField(this, 5, proto.google.api.HttpRule.oneofGroups_[0], undefined); }; @@ -687,17 +717,21 @@ proto.google.api.HttpRule.prototype.getPatch = function() { }; -/** @param {string} value */ +/** + * @param {string} value + * @return {!proto.google.api.HttpRule} returns this + */ proto.google.api.HttpRule.prototype.setPatch = function(value) { - jspb.Message.setOneofField(this, 6, proto.google.api.HttpRule.oneofGroups_[0], value); + return jspb.Message.setOneofField(this, 6, proto.google.api.HttpRule.oneofGroups_[0], value); }; /** * Clears the field making it undefined. + * @return {!proto.google.api.HttpRule} returns this */ proto.google.api.HttpRule.prototype.clearPatch = function() { - jspb.Message.setOneofField(this, 6, proto.google.api.HttpRule.oneofGroups_[0], undefined); + return jspb.Message.setOneofField(this, 6, proto.google.api.HttpRule.oneofGroups_[0], undefined); }; @@ -720,17 +754,21 @@ proto.google.api.HttpRule.prototype.getCustom = function() { }; -/** @param {?proto.google.api.CustomHttpPattern|undefined} value */ +/** + * @param {?proto.google.api.CustomHttpPattern|undefined} value + * @return {!proto.google.api.HttpRule} returns this +*/ proto.google.api.HttpRule.prototype.setCustom = function(value) { - jspb.Message.setOneofWrapperField(this, 8, proto.google.api.HttpRule.oneofGroups_[0], value); + return jspb.Message.setOneofWrapperField(this, 8, proto.google.api.HttpRule.oneofGroups_[0], value); }; /** * Clears the message field making it undefined. + * @return {!proto.google.api.HttpRule} returns this */ proto.google.api.HttpRule.prototype.clearCustom = function() { - this.setCustom(undefined); + return this.setCustom(undefined); }; @@ -752,9 +790,12 @@ proto.google.api.HttpRule.prototype.getBody = function() { }; -/** @param {string} value */ +/** + * @param {string} value + * @return {!proto.google.api.HttpRule} returns this + */ proto.google.api.HttpRule.prototype.setBody = function(value) { - jspb.Message.setProto3StringField(this, 7, value); + return jspb.Message.setProto3StringField(this, 7, value); }; @@ -767,9 +808,12 @@ proto.google.api.HttpRule.prototype.getResponseBody = function() { }; -/** @param {string} value */ +/** + * @param {string} value + * @return {!proto.google.api.HttpRule} returns this + */ proto.google.api.HttpRule.prototype.setResponseBody = function(value) { - jspb.Message.setProto3StringField(this, 12, value); + return jspb.Message.setProto3StringField(this, 12, value); }; @@ -783,9 +827,12 @@ proto.google.api.HttpRule.prototype.getAdditionalBindingsList = function() { }; -/** @param {!Array} value */ +/** + * @param {!Array} value + * @return {!proto.google.api.HttpRule} returns this +*/ proto.google.api.HttpRule.prototype.setAdditionalBindingsList = function(value) { - jspb.Message.setRepeatedWrapperField(this, 11, value); + return jspb.Message.setRepeatedWrapperField(this, 11, value); }; @@ -801,9 +848,10 @@ proto.google.api.HttpRule.prototype.addAdditionalBindings = function(opt_value, /** * Clears the list making it empty but non-null. + * @return {!proto.google.api.HttpRule} returns this */ proto.google.api.HttpRule.prototype.clearAdditionalBindingsList = function() { - this.setAdditionalBindingsList([]); + return this.setAdditionalBindingsList([]); }; @@ -812,13 +860,15 @@ proto.google.api.HttpRule.prototype.clearAdditionalBindingsList = function() { if (jspb.Message.GENERATE_TO_OBJECT) { /** - * Creates an object representation of this proto suitable for use in Soy templates. + * Creates an object representation of this proto. * Field names that are reserved in JavaScript and will be renamed to pb_name. + * Optional fields that are not set will be set to undefined. * To access a reserved field use, foo.pb_, eg, foo.pb_default. * For the list of reserved names please see: - * com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS. - * @param {boolean=} opt_includeInstance Whether to include the JSPB instance - * for transitional soy proto support: http://goto/soy-param-migration + * net/proto2/compiler/js/internal/generator.cc#kKeyword. + * @param {boolean=} opt_includeInstance Deprecated. whether to include the + * JSPB instance for transitional soy proto support: + * http://goto/soy-param-migration * @return {!Object} */ proto.google.api.CustomHttpPattern.prototype.toObject = function(opt_includeInstance) { @@ -828,15 +878,15 @@ proto.google.api.CustomHttpPattern.prototype.toObject = function(opt_includeInst /** * Static version of the {@see toObject} method. - * @param {boolean|undefined} includeInstance Whether to include the JSPB - * instance for transitional soy proto support: + * @param {boolean|undefined} includeInstance Deprecated. Whether to include + * the JSPB instance for transitional soy proto support: * http://goto/soy-param-migration * @param {!proto.google.api.CustomHttpPattern} msg The msg instance to transform. * @return {!Object} * @suppress {unusedLocalVariables} f is only used for nested messages */ proto.google.api.CustomHttpPattern.toObject = function(includeInstance, msg) { - var obj = { + var f, obj = { kind: jspb.Message.getFieldWithDefault(msg, 1, ""), path: jspb.Message.getFieldWithDefault(msg, 2, "") }; @@ -938,9 +988,12 @@ proto.google.api.CustomHttpPattern.prototype.getKind = function() { }; -/** @param {string} value */ +/** + * @param {string} value + * @return {!proto.google.api.CustomHttpPattern} returns this + */ proto.google.api.CustomHttpPattern.prototype.setKind = function(value) { - jspb.Message.setProto3StringField(this, 1, value); + return jspb.Message.setProto3StringField(this, 1, value); }; @@ -953,9 +1006,12 @@ proto.google.api.CustomHttpPattern.prototype.getPath = function() { }; -/** @param {string} value */ +/** + * @param {string} value + * @return {!proto.google.api.CustomHttpPattern} returns this + */ proto.google.api.CustomHttpPattern.prototype.setPath = function(value) { - jspb.Message.setProto3StringField(this, 2, value); + return jspb.Message.setProto3StringField(this, 2, value); }; diff --git a/sdks/nodejs/lib/sdk_pb.js b/sdks/nodejs/lib/sdk_pb.js index f221e0e577..4e3c9bb70d 100644 --- a/sdks/nodejs/lib/sdk_pb.js +++ b/sdks/nodejs/lib/sdk_pb.js @@ -13,6 +13,7 @@ // limitations under the License. // This code was autogenerated. Do not edit directly. +// source: sdk.proto /** * @fileoverview * @enhanceable @@ -231,13 +232,15 @@ if (goog.DEBUG && !COMPILED) { if (jspb.Message.GENERATE_TO_OBJECT) { /** - * Creates an object representation of this proto suitable for use in Soy templates. + * Creates an object representation of this proto. * Field names that are reserved in JavaScript and will be renamed to pb_name. + * Optional fields that are not set will be set to undefined. * To access a reserved field use, foo.pb_, eg, foo.pb_default. * For the list of reserved names please see: - * com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS. - * @param {boolean=} opt_includeInstance Whether to include the JSPB instance - * for transitional soy proto support: http://goto/soy-param-migration + * net/proto2/compiler/js/internal/generator.cc#kKeyword. + * @param {boolean=} opt_includeInstance Deprecated. whether to include the + * JSPB instance for transitional soy proto support: + * http://goto/soy-param-migration * @return {!Object} */ proto.agones.dev.sdk.Empty.prototype.toObject = function(opt_includeInstance) { @@ -247,15 +250,15 @@ proto.agones.dev.sdk.Empty.prototype.toObject = function(opt_includeInstance) { /** * Static version of the {@see toObject} method. - * @param {boolean|undefined} includeInstance Whether to include the JSPB - * instance for transitional soy proto support: + * @param {boolean|undefined} includeInstance Deprecated. Whether to include + * the JSPB instance for transitional soy proto support: * http://goto/soy-param-migration * @param {!proto.agones.dev.sdk.Empty} msg The msg instance to transform. * @return {!Object} * @suppress {unusedLocalVariables} f is only used for nested messages */ proto.agones.dev.sdk.Empty.toObject = function(includeInstance, msg) { - var obj = { + var f, obj = { }; @@ -330,13 +333,15 @@ proto.agones.dev.sdk.Empty.serializeBinaryToWriter = function(message, writer) { if (jspb.Message.GENERATE_TO_OBJECT) { /** - * Creates an object representation of this proto suitable for use in Soy templates. + * Creates an object representation of this proto. * Field names that are reserved in JavaScript and will be renamed to pb_name. + * Optional fields that are not set will be set to undefined. * To access a reserved field use, foo.pb_, eg, foo.pb_default. * For the list of reserved names please see: - * com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS. - * @param {boolean=} opt_includeInstance Whether to include the JSPB instance - * for transitional soy proto support: http://goto/soy-param-migration + * net/proto2/compiler/js/internal/generator.cc#kKeyword. + * @param {boolean=} opt_includeInstance Deprecated. whether to include the + * JSPB instance for transitional soy proto support: + * http://goto/soy-param-migration * @return {!Object} */ proto.agones.dev.sdk.KeyValue.prototype.toObject = function(opt_includeInstance) { @@ -346,15 +351,15 @@ proto.agones.dev.sdk.KeyValue.prototype.toObject = function(opt_includeInstance) /** * Static version of the {@see toObject} method. - * @param {boolean|undefined} includeInstance Whether to include the JSPB - * instance for transitional soy proto support: + * @param {boolean|undefined} includeInstance Deprecated. Whether to include + * the JSPB instance for transitional soy proto support: * http://goto/soy-param-migration * @param {!proto.agones.dev.sdk.KeyValue} msg The msg instance to transform. * @return {!Object} * @suppress {unusedLocalVariables} f is only used for nested messages */ proto.agones.dev.sdk.KeyValue.toObject = function(includeInstance, msg) { - var obj = { + var f, obj = { key: jspb.Message.getFieldWithDefault(msg, 1, ""), value: jspb.Message.getFieldWithDefault(msg, 2, "") }; @@ -456,9 +461,12 @@ proto.agones.dev.sdk.KeyValue.prototype.getKey = function() { }; -/** @param {string} value */ +/** + * @param {string} value + * @return {!proto.agones.dev.sdk.KeyValue} returns this + */ proto.agones.dev.sdk.KeyValue.prototype.setKey = function(value) { - jspb.Message.setProto3StringField(this, 1, value); + return jspb.Message.setProto3StringField(this, 1, value); }; @@ -471,9 +479,12 @@ proto.agones.dev.sdk.KeyValue.prototype.getValue = function() { }; -/** @param {string} value */ +/** + * @param {string} value + * @return {!proto.agones.dev.sdk.KeyValue} returns this + */ proto.agones.dev.sdk.KeyValue.prototype.setValue = function(value) { - jspb.Message.setProto3StringField(this, 2, value); + return jspb.Message.setProto3StringField(this, 2, value); }; @@ -482,13 +493,15 @@ proto.agones.dev.sdk.KeyValue.prototype.setValue = function(value) { if (jspb.Message.GENERATE_TO_OBJECT) { /** - * Creates an object representation of this proto suitable for use in Soy templates. + * Creates an object representation of this proto. * Field names that are reserved in JavaScript and will be renamed to pb_name. + * Optional fields that are not set will be set to undefined. * To access a reserved field use, foo.pb_, eg, foo.pb_default. * For the list of reserved names please see: - * com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS. - * @param {boolean=} opt_includeInstance Whether to include the JSPB instance - * for transitional soy proto support: http://goto/soy-param-migration + * net/proto2/compiler/js/internal/generator.cc#kKeyword. + * @param {boolean=} opt_includeInstance Deprecated. whether to include the + * JSPB instance for transitional soy proto support: + * http://goto/soy-param-migration * @return {!Object} */ proto.agones.dev.sdk.Duration.prototype.toObject = function(opt_includeInstance) { @@ -498,15 +511,15 @@ proto.agones.dev.sdk.Duration.prototype.toObject = function(opt_includeInstance) /** * Static version of the {@see toObject} method. - * @param {boolean|undefined} includeInstance Whether to include the JSPB - * instance for transitional soy proto support: + * @param {boolean|undefined} includeInstance Deprecated. Whether to include + * the JSPB instance for transitional soy proto support: * http://goto/soy-param-migration * @param {!proto.agones.dev.sdk.Duration} msg The msg instance to transform. * @return {!Object} * @suppress {unusedLocalVariables} f is only used for nested messages */ proto.agones.dev.sdk.Duration.toObject = function(includeInstance, msg) { - var obj = { + var f, obj = { seconds: jspb.Message.getFieldWithDefault(msg, 1, 0) }; @@ -596,9 +609,12 @@ proto.agones.dev.sdk.Duration.prototype.getSeconds = function() { }; -/** @param {number} value */ +/** + * @param {number} value + * @return {!proto.agones.dev.sdk.Duration} returns this + */ proto.agones.dev.sdk.Duration.prototype.setSeconds = function(value) { - jspb.Message.setProto3IntField(this, 1, value); + return jspb.Message.setProto3IntField(this, 1, value); }; @@ -607,13 +623,15 @@ proto.agones.dev.sdk.Duration.prototype.setSeconds = function(value) { if (jspb.Message.GENERATE_TO_OBJECT) { /** - * Creates an object representation of this proto suitable for use in Soy templates. + * Creates an object representation of this proto. * Field names that are reserved in JavaScript and will be renamed to pb_name. + * Optional fields that are not set will be set to undefined. * To access a reserved field use, foo.pb_, eg, foo.pb_default. * For the list of reserved names please see: - * com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS. - * @param {boolean=} opt_includeInstance Whether to include the JSPB instance - * for transitional soy proto support: http://goto/soy-param-migration + * net/proto2/compiler/js/internal/generator.cc#kKeyword. + * @param {boolean=} opt_includeInstance Deprecated. whether to include the + * JSPB instance for transitional soy proto support: + * http://goto/soy-param-migration * @return {!Object} */ proto.agones.dev.sdk.GameServer.prototype.toObject = function(opt_includeInstance) { @@ -623,15 +641,15 @@ proto.agones.dev.sdk.GameServer.prototype.toObject = function(opt_includeInstanc /** * Static version of the {@see toObject} method. - * @param {boolean|undefined} includeInstance Whether to include the JSPB - * instance for transitional soy proto support: + * @param {boolean|undefined} includeInstance Deprecated. Whether to include + * the JSPB instance for transitional soy proto support: * http://goto/soy-param-migration * @param {!proto.agones.dev.sdk.GameServer} msg The msg instance to transform. * @return {!Object} * @suppress {unusedLocalVariables} f is only used for nested messages */ proto.agones.dev.sdk.GameServer.toObject = function(includeInstance, msg) { - var obj = { + var f, obj = { objectMeta: (f = msg.getObjectMeta()) && proto.agones.dev.sdk.GameServer.ObjectMeta.toObject(includeInstance, f), spec: (f = msg.getSpec()) && proto.agones.dev.sdk.GameServer.Spec.toObject(includeInstance, f), status: (f = msg.getStatus()) && proto.agones.dev.sdk.GameServer.Status.toObject(includeInstance, f) @@ -747,13 +765,15 @@ proto.agones.dev.sdk.GameServer.serializeBinaryToWriter = function(message, writ if (jspb.Message.GENERATE_TO_OBJECT) { /** - * Creates an object representation of this proto suitable for use in Soy templates. + * Creates an object representation of this proto. * Field names that are reserved in JavaScript and will be renamed to pb_name. + * Optional fields that are not set will be set to undefined. * To access a reserved field use, foo.pb_, eg, foo.pb_default. * For the list of reserved names please see: - * com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS. - * @param {boolean=} opt_includeInstance Whether to include the JSPB instance - * for transitional soy proto support: http://goto/soy-param-migration + * net/proto2/compiler/js/internal/generator.cc#kKeyword. + * @param {boolean=} opt_includeInstance Deprecated. whether to include the + * JSPB instance for transitional soy proto support: + * http://goto/soy-param-migration * @return {!Object} */ proto.agones.dev.sdk.GameServer.ObjectMeta.prototype.toObject = function(opt_includeInstance) { @@ -763,15 +783,15 @@ proto.agones.dev.sdk.GameServer.ObjectMeta.prototype.toObject = function(opt_inc /** * Static version of the {@see toObject} method. - * @param {boolean|undefined} includeInstance Whether to include the JSPB - * instance for transitional soy proto support: + * @param {boolean|undefined} includeInstance Deprecated. Whether to include + * the JSPB instance for transitional soy proto support: * http://goto/soy-param-migration * @param {!proto.agones.dev.sdk.GameServer.ObjectMeta} msg The msg instance to transform. * @return {!Object} * @suppress {unusedLocalVariables} f is only used for nested messages */ proto.agones.dev.sdk.GameServer.ObjectMeta.toObject = function(includeInstance, msg) { - var obj = { + var f, obj = { name: jspb.Message.getFieldWithDefault(msg, 1, ""), namespace: jspb.Message.getFieldWithDefault(msg, 2, ""), uid: jspb.Message.getFieldWithDefault(msg, 3, ""), @@ -848,13 +868,13 @@ proto.agones.dev.sdk.GameServer.ObjectMeta.deserializeBinaryFromReader = functio case 8: var value = msg.getAnnotationsMap(); reader.readMessage(value, function(message, reader) { - jspb.Map.deserializeBinary(message, reader, jspb.BinaryReader.prototype.readString, jspb.BinaryReader.prototype.readString, null, ""); + jspb.Map.deserializeBinary(message, reader, jspb.BinaryReader.prototype.readString, jspb.BinaryReader.prototype.readString, null, "", ""); }); break; case 9: var value = msg.getLabelsMap(); reader.readMessage(value, function(message, reader) { - jspb.Map.deserializeBinary(message, reader, jspb.BinaryReader.prototype.readString, jspb.BinaryReader.prototype.readString, null, ""); + jspb.Map.deserializeBinary(message, reader, jspb.BinaryReader.prototype.readString, jspb.BinaryReader.prototype.readString, null, "", ""); }); break; default: @@ -955,9 +975,12 @@ proto.agones.dev.sdk.GameServer.ObjectMeta.prototype.getName = function() { }; -/** @param {string} value */ +/** + * @param {string} value + * @return {!proto.agones.dev.sdk.GameServer.ObjectMeta} returns this + */ proto.agones.dev.sdk.GameServer.ObjectMeta.prototype.setName = function(value) { - jspb.Message.setProto3StringField(this, 1, value); + return jspb.Message.setProto3StringField(this, 1, value); }; @@ -970,9 +993,12 @@ proto.agones.dev.sdk.GameServer.ObjectMeta.prototype.getNamespace = function() { }; -/** @param {string} value */ +/** + * @param {string} value + * @return {!proto.agones.dev.sdk.GameServer.ObjectMeta} returns this + */ proto.agones.dev.sdk.GameServer.ObjectMeta.prototype.setNamespace = function(value) { - jspb.Message.setProto3StringField(this, 2, value); + return jspb.Message.setProto3StringField(this, 2, value); }; @@ -985,9 +1011,12 @@ proto.agones.dev.sdk.GameServer.ObjectMeta.prototype.getUid = function() { }; -/** @param {string} value */ +/** + * @param {string} value + * @return {!proto.agones.dev.sdk.GameServer.ObjectMeta} returns this + */ proto.agones.dev.sdk.GameServer.ObjectMeta.prototype.setUid = function(value) { - jspb.Message.setProto3StringField(this, 3, value); + return jspb.Message.setProto3StringField(this, 3, value); }; @@ -1000,9 +1029,12 @@ proto.agones.dev.sdk.GameServer.ObjectMeta.prototype.getResourceVersion = functi }; -/** @param {string} value */ +/** + * @param {string} value + * @return {!proto.agones.dev.sdk.GameServer.ObjectMeta} returns this + */ proto.agones.dev.sdk.GameServer.ObjectMeta.prototype.setResourceVersion = function(value) { - jspb.Message.setProto3StringField(this, 4, value); + return jspb.Message.setProto3StringField(this, 4, value); }; @@ -1015,9 +1047,12 @@ proto.agones.dev.sdk.GameServer.ObjectMeta.prototype.getGeneration = function() }; -/** @param {number} value */ +/** + * @param {number} value + * @return {!proto.agones.dev.sdk.GameServer.ObjectMeta} returns this + */ proto.agones.dev.sdk.GameServer.ObjectMeta.prototype.setGeneration = function(value) { - jspb.Message.setProto3IntField(this, 5, value); + return jspb.Message.setProto3IntField(this, 5, value); }; @@ -1030,9 +1065,12 @@ proto.agones.dev.sdk.GameServer.ObjectMeta.prototype.getCreationTimestamp = func }; -/** @param {number} value */ +/** + * @param {number} value + * @return {!proto.agones.dev.sdk.GameServer.ObjectMeta} returns this + */ proto.agones.dev.sdk.GameServer.ObjectMeta.prototype.setCreationTimestamp = function(value) { - jspb.Message.setProto3IntField(this, 6, value); + return jspb.Message.setProto3IntField(this, 6, value); }; @@ -1045,9 +1083,12 @@ proto.agones.dev.sdk.GameServer.ObjectMeta.prototype.getDeletionTimestamp = func }; -/** @param {number} value */ +/** + * @param {number} value + * @return {!proto.agones.dev.sdk.GameServer.ObjectMeta} returns this + */ proto.agones.dev.sdk.GameServer.ObjectMeta.prototype.setDeletionTimestamp = function(value) { - jspb.Message.setProto3IntField(this, 7, value); + return jspb.Message.setProto3IntField(this, 7, value); }; @@ -1066,10 +1107,11 @@ proto.agones.dev.sdk.GameServer.ObjectMeta.prototype.getAnnotationsMap = functio /** * Clears values from the map. The map will be non-null. + * @return {!proto.agones.dev.sdk.GameServer.ObjectMeta} returns this */ proto.agones.dev.sdk.GameServer.ObjectMeta.prototype.clearAnnotationsMap = function() { this.getAnnotationsMap().clear(); -}; + return this;}; /** @@ -1087,10 +1129,11 @@ proto.agones.dev.sdk.GameServer.ObjectMeta.prototype.getLabelsMap = function(opt /** * Clears values from the map. The map will be non-null. + * @return {!proto.agones.dev.sdk.GameServer.ObjectMeta} returns this */ proto.agones.dev.sdk.GameServer.ObjectMeta.prototype.clearLabelsMap = function() { this.getLabelsMap().clear(); -}; + return this;}; @@ -1098,13 +1141,15 @@ proto.agones.dev.sdk.GameServer.ObjectMeta.prototype.clearLabelsMap = function() if (jspb.Message.GENERATE_TO_OBJECT) { /** - * Creates an object representation of this proto suitable for use in Soy templates. + * Creates an object representation of this proto. * Field names that are reserved in JavaScript and will be renamed to pb_name. + * Optional fields that are not set will be set to undefined. * To access a reserved field use, foo.pb_, eg, foo.pb_default. * For the list of reserved names please see: - * com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS. - * @param {boolean=} opt_includeInstance Whether to include the JSPB instance - * for transitional soy proto support: http://goto/soy-param-migration + * net/proto2/compiler/js/internal/generator.cc#kKeyword. + * @param {boolean=} opt_includeInstance Deprecated. whether to include the + * JSPB instance for transitional soy proto support: + * http://goto/soy-param-migration * @return {!Object} */ proto.agones.dev.sdk.GameServer.Spec.prototype.toObject = function(opt_includeInstance) { @@ -1114,15 +1159,15 @@ proto.agones.dev.sdk.GameServer.Spec.prototype.toObject = function(opt_includeIn /** * Static version of the {@see toObject} method. - * @param {boolean|undefined} includeInstance Whether to include the JSPB - * instance for transitional soy proto support: + * @param {boolean|undefined} includeInstance Deprecated. Whether to include + * the JSPB instance for transitional soy proto support: * http://goto/soy-param-migration * @param {!proto.agones.dev.sdk.GameServer.Spec} msg The msg instance to transform. * @return {!Object} * @suppress {unusedLocalVariables} f is only used for nested messages */ proto.agones.dev.sdk.GameServer.Spec.toObject = function(includeInstance, msg) { - var obj = { + var f, obj = { health: (f = msg.getHealth()) && proto.agones.dev.sdk.GameServer.Spec.Health.toObject(includeInstance, f) }; @@ -1210,13 +1255,15 @@ proto.agones.dev.sdk.GameServer.Spec.serializeBinaryToWriter = function(message, if (jspb.Message.GENERATE_TO_OBJECT) { /** - * Creates an object representation of this proto suitable for use in Soy templates. + * Creates an object representation of this proto. * Field names that are reserved in JavaScript and will be renamed to pb_name. + * Optional fields that are not set will be set to undefined. * To access a reserved field use, foo.pb_, eg, foo.pb_default. * For the list of reserved names please see: - * com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS. - * @param {boolean=} opt_includeInstance Whether to include the JSPB instance - * for transitional soy proto support: http://goto/soy-param-migration + * net/proto2/compiler/js/internal/generator.cc#kKeyword. + * @param {boolean=} opt_includeInstance Deprecated. whether to include the + * JSPB instance for transitional soy proto support: + * http://goto/soy-param-migration * @return {!Object} */ proto.agones.dev.sdk.GameServer.Spec.Health.prototype.toObject = function(opt_includeInstance) { @@ -1226,16 +1273,16 @@ proto.agones.dev.sdk.GameServer.Spec.Health.prototype.toObject = function(opt_in /** * Static version of the {@see toObject} method. - * @param {boolean|undefined} includeInstance Whether to include the JSPB - * instance for transitional soy proto support: + * @param {boolean|undefined} includeInstance Deprecated. Whether to include + * the JSPB instance for transitional soy proto support: * http://goto/soy-param-migration * @param {!proto.agones.dev.sdk.GameServer.Spec.Health} msg The msg instance to transform. * @return {!Object} * @suppress {unusedLocalVariables} f is only used for nested messages */ proto.agones.dev.sdk.GameServer.Spec.Health.toObject = function(includeInstance, msg) { - var obj = { - disabled: jspb.Message.getFieldWithDefault(msg, 1, false), + var f, obj = { + disabled: jspb.Message.getBooleanFieldWithDefault(msg, 1, false), periodSeconds: jspb.Message.getFieldWithDefault(msg, 2, 0), failureThreshold: jspb.Message.getFieldWithDefault(msg, 3, 0), initialDelaySeconds: jspb.Message.getFieldWithDefault(msg, 4, 0) @@ -1353,18 +1400,19 @@ proto.agones.dev.sdk.GameServer.Spec.Health.serializeBinaryToWriter = function(m /** * optional bool disabled = 1; - * Note that Boolean fields may be set to 0/1 when serialized from a Java server. - * You should avoid comparisons like {@code val === true/false} in those cases. * @return {boolean} */ proto.agones.dev.sdk.GameServer.Spec.Health.prototype.getDisabled = function() { - return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 1, false)); + return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 1, false)); }; -/** @param {boolean} value */ +/** + * @param {boolean} value + * @return {!proto.agones.dev.sdk.GameServer.Spec.Health} returns this + */ proto.agones.dev.sdk.GameServer.Spec.Health.prototype.setDisabled = function(value) { - jspb.Message.setProto3BooleanField(this, 1, value); + return jspb.Message.setProto3BooleanField(this, 1, value); }; @@ -1377,9 +1425,12 @@ proto.agones.dev.sdk.GameServer.Spec.Health.prototype.getPeriodSeconds = functio }; -/** @param {number} value */ +/** + * @param {number} value + * @return {!proto.agones.dev.sdk.GameServer.Spec.Health} returns this + */ proto.agones.dev.sdk.GameServer.Spec.Health.prototype.setPeriodSeconds = function(value) { - jspb.Message.setProto3IntField(this, 2, value); + return jspb.Message.setProto3IntField(this, 2, value); }; @@ -1392,9 +1443,12 @@ proto.agones.dev.sdk.GameServer.Spec.Health.prototype.getFailureThreshold = func }; -/** @param {number} value */ +/** + * @param {number} value + * @return {!proto.agones.dev.sdk.GameServer.Spec.Health} returns this + */ proto.agones.dev.sdk.GameServer.Spec.Health.prototype.setFailureThreshold = function(value) { - jspb.Message.setProto3IntField(this, 3, value); + return jspb.Message.setProto3IntField(this, 3, value); }; @@ -1407,9 +1461,12 @@ proto.agones.dev.sdk.GameServer.Spec.Health.prototype.getInitialDelaySeconds = f }; -/** @param {number} value */ +/** + * @param {number} value + * @return {!proto.agones.dev.sdk.GameServer.Spec.Health} returns this + */ proto.agones.dev.sdk.GameServer.Spec.Health.prototype.setInitialDelaySeconds = function(value) { - jspb.Message.setProto3IntField(this, 4, value); + return jspb.Message.setProto3IntField(this, 4, value); }; @@ -1423,17 +1480,21 @@ proto.agones.dev.sdk.GameServer.Spec.prototype.getHealth = function() { }; -/** @param {?proto.agones.dev.sdk.GameServer.Spec.Health|undefined} value */ +/** + * @param {?proto.agones.dev.sdk.GameServer.Spec.Health|undefined} value + * @return {!proto.agones.dev.sdk.GameServer.Spec} returns this +*/ proto.agones.dev.sdk.GameServer.Spec.prototype.setHealth = function(value) { - jspb.Message.setWrapperField(this, 1, value); + return jspb.Message.setWrapperField(this, 1, value); }; /** * Clears the message field making it undefined. + * @return {!proto.agones.dev.sdk.GameServer.Spec} returns this */ proto.agones.dev.sdk.GameServer.Spec.prototype.clearHealth = function() { - this.setHealth(undefined); + return this.setHealth(undefined); }; @@ -1458,13 +1519,15 @@ proto.agones.dev.sdk.GameServer.Status.repeatedFields_ = [3]; if (jspb.Message.GENERATE_TO_OBJECT) { /** - * Creates an object representation of this proto suitable for use in Soy templates. + * Creates an object representation of this proto. * Field names that are reserved in JavaScript and will be renamed to pb_name. + * Optional fields that are not set will be set to undefined. * To access a reserved field use, foo.pb_, eg, foo.pb_default. * For the list of reserved names please see: - * com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS. - * @param {boolean=} opt_includeInstance Whether to include the JSPB instance - * for transitional soy proto support: http://goto/soy-param-migration + * net/proto2/compiler/js/internal/generator.cc#kKeyword. + * @param {boolean=} opt_includeInstance Deprecated. whether to include the + * JSPB instance for transitional soy proto support: + * http://goto/soy-param-migration * @return {!Object} */ proto.agones.dev.sdk.GameServer.Status.prototype.toObject = function(opt_includeInstance) { @@ -1474,15 +1537,15 @@ proto.agones.dev.sdk.GameServer.Status.prototype.toObject = function(opt_include /** * Static version of the {@see toObject} method. - * @param {boolean|undefined} includeInstance Whether to include the JSPB - * instance for transitional soy proto support: + * @param {boolean|undefined} includeInstance Deprecated. Whether to include + * the JSPB instance for transitional soy proto support: * http://goto/soy-param-migration * @param {!proto.agones.dev.sdk.GameServer.Status} msg The msg instance to transform. * @return {!Object} * @suppress {unusedLocalVariables} f is only used for nested messages */ proto.agones.dev.sdk.GameServer.Status.toObject = function(includeInstance, msg) { - var obj = { + var f, obj = { state: jspb.Message.getFieldWithDefault(msg, 1, ""), address: jspb.Message.getFieldWithDefault(msg, 2, ""), portsList: jspb.Message.toObjectList(msg.getPortsList(), @@ -1595,13 +1658,15 @@ proto.agones.dev.sdk.GameServer.Status.serializeBinaryToWriter = function(messag if (jspb.Message.GENERATE_TO_OBJECT) { /** - * Creates an object representation of this proto suitable for use in Soy templates. + * Creates an object representation of this proto. * Field names that are reserved in JavaScript and will be renamed to pb_name. + * Optional fields that are not set will be set to undefined. * To access a reserved field use, foo.pb_, eg, foo.pb_default. * For the list of reserved names please see: - * com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS. - * @param {boolean=} opt_includeInstance Whether to include the JSPB instance - * for transitional soy proto support: http://goto/soy-param-migration + * net/proto2/compiler/js/internal/generator.cc#kKeyword. + * @param {boolean=} opt_includeInstance Deprecated. whether to include the + * JSPB instance for transitional soy proto support: + * http://goto/soy-param-migration * @return {!Object} */ proto.agones.dev.sdk.GameServer.Status.Port.prototype.toObject = function(opt_includeInstance) { @@ -1611,15 +1676,15 @@ proto.agones.dev.sdk.GameServer.Status.Port.prototype.toObject = function(opt_in /** * Static version of the {@see toObject} method. - * @param {boolean|undefined} includeInstance Whether to include the JSPB - * instance for transitional soy proto support: + * @param {boolean|undefined} includeInstance Deprecated. Whether to include + * the JSPB instance for transitional soy proto support: * http://goto/soy-param-migration * @param {!proto.agones.dev.sdk.GameServer.Status.Port} msg The msg instance to transform. * @return {!Object} * @suppress {unusedLocalVariables} f is only used for nested messages */ proto.agones.dev.sdk.GameServer.Status.Port.toObject = function(includeInstance, msg) { - var obj = { + var f, obj = { name: jspb.Message.getFieldWithDefault(msg, 1, ""), port: jspb.Message.getFieldWithDefault(msg, 2, 0) }; @@ -1721,9 +1786,12 @@ proto.agones.dev.sdk.GameServer.Status.Port.prototype.getName = function() { }; -/** @param {string} value */ +/** + * @param {string} value + * @return {!proto.agones.dev.sdk.GameServer.Status.Port} returns this + */ proto.agones.dev.sdk.GameServer.Status.Port.prototype.setName = function(value) { - jspb.Message.setProto3StringField(this, 1, value); + return jspb.Message.setProto3StringField(this, 1, value); }; @@ -1736,9 +1804,12 @@ proto.agones.dev.sdk.GameServer.Status.Port.prototype.getPort = function() { }; -/** @param {number} value */ +/** + * @param {number} value + * @return {!proto.agones.dev.sdk.GameServer.Status.Port} returns this + */ proto.agones.dev.sdk.GameServer.Status.Port.prototype.setPort = function(value) { - jspb.Message.setProto3IntField(this, 2, value); + return jspb.Message.setProto3IntField(this, 2, value); }; @@ -1751,9 +1822,12 @@ proto.agones.dev.sdk.GameServer.Status.prototype.getState = function() { }; -/** @param {string} value */ +/** + * @param {string} value + * @return {!proto.agones.dev.sdk.GameServer.Status} returns this + */ proto.agones.dev.sdk.GameServer.Status.prototype.setState = function(value) { - jspb.Message.setProto3StringField(this, 1, value); + return jspb.Message.setProto3StringField(this, 1, value); }; @@ -1766,9 +1840,12 @@ proto.agones.dev.sdk.GameServer.Status.prototype.getAddress = function() { }; -/** @param {string} value */ +/** + * @param {string} value + * @return {!proto.agones.dev.sdk.GameServer.Status} returns this + */ proto.agones.dev.sdk.GameServer.Status.prototype.setAddress = function(value) { - jspb.Message.setProto3StringField(this, 2, value); + return jspb.Message.setProto3StringField(this, 2, value); }; @@ -1782,9 +1859,12 @@ proto.agones.dev.sdk.GameServer.Status.prototype.getPortsList = function() { }; -/** @param {!Array} value */ +/** + * @param {!Array} value + * @return {!proto.agones.dev.sdk.GameServer.Status} returns this +*/ proto.agones.dev.sdk.GameServer.Status.prototype.setPortsList = function(value) { - jspb.Message.setRepeatedWrapperField(this, 3, value); + return jspb.Message.setRepeatedWrapperField(this, 3, value); }; @@ -1800,9 +1880,10 @@ proto.agones.dev.sdk.GameServer.Status.prototype.addPorts = function(opt_value, /** * Clears the list making it empty but non-null. + * @return {!proto.agones.dev.sdk.GameServer.Status} returns this */ proto.agones.dev.sdk.GameServer.Status.prototype.clearPortsList = function() { - this.setPortsList([]); + return this.setPortsList([]); }; @@ -1816,17 +1897,21 @@ proto.agones.dev.sdk.GameServer.prototype.getObjectMeta = function() { }; -/** @param {?proto.agones.dev.sdk.GameServer.ObjectMeta|undefined} value */ +/** + * @param {?proto.agones.dev.sdk.GameServer.ObjectMeta|undefined} value + * @return {!proto.agones.dev.sdk.GameServer} returns this +*/ proto.agones.dev.sdk.GameServer.prototype.setObjectMeta = function(value) { - jspb.Message.setWrapperField(this, 1, value); + return jspb.Message.setWrapperField(this, 1, value); }; /** * Clears the message field making it undefined. + * @return {!proto.agones.dev.sdk.GameServer} returns this */ proto.agones.dev.sdk.GameServer.prototype.clearObjectMeta = function() { - this.setObjectMeta(undefined); + return this.setObjectMeta(undefined); }; @@ -1849,17 +1934,21 @@ proto.agones.dev.sdk.GameServer.prototype.getSpec = function() { }; -/** @param {?proto.agones.dev.sdk.GameServer.Spec|undefined} value */ +/** + * @param {?proto.agones.dev.sdk.GameServer.Spec|undefined} value + * @return {!proto.agones.dev.sdk.GameServer} returns this +*/ proto.agones.dev.sdk.GameServer.prototype.setSpec = function(value) { - jspb.Message.setWrapperField(this, 2, value); + return jspb.Message.setWrapperField(this, 2, value); }; /** * Clears the message field making it undefined. + * @return {!proto.agones.dev.sdk.GameServer} returns this */ proto.agones.dev.sdk.GameServer.prototype.clearSpec = function() { - this.setSpec(undefined); + return this.setSpec(undefined); }; @@ -1882,17 +1971,21 @@ proto.agones.dev.sdk.GameServer.prototype.getStatus = function() { }; -/** @param {?proto.agones.dev.sdk.GameServer.Status|undefined} value */ +/** + * @param {?proto.agones.dev.sdk.GameServer.Status|undefined} value + * @return {!proto.agones.dev.sdk.GameServer} returns this +*/ proto.agones.dev.sdk.GameServer.prototype.setStatus = function(value) { - jspb.Message.setWrapperField(this, 3, value); + return jspb.Message.setWrapperField(this, 3, value); }; /** * Clears the message field making it undefined. + * @return {!proto.agones.dev.sdk.GameServer} returns this */ proto.agones.dev.sdk.GameServer.prototype.clearStatus = function() { - this.setStatus(undefined); + return this.setStatus(undefined); }; diff --git a/sdks/rust/src/grpc/sdk.rs b/sdks/rust/src/grpc/sdk.rs index 0e7f4760d9..353f43a003 100644 --- a/sdks/rust/src/grpc/sdk.rs +++ b/sdks/rust/src/grpc/sdk.rs @@ -2216,7 +2216,7 @@ static file_descriptor_proto_data: &'static [u8] = b"\ \x12\x18.agones.dev.sdk.KeyValue\x1a\x15.agones.dev.sdk.Empty\"\x1f\x82\ \xd3\xe4\x93\x02\x19\x1a\x14/metadata/annotation:\x01*\x12O\n\x07Reserve\ \x12\x18.agones.dev.sdk.Duration\x1a\x15.agones.dev.sdk.Empty\"\x13\x82\ - \xd3\xe4\x93\x02\r\"\x08/reserve:\x01*B\x05Z\x03sdkJ\xfe$\n\x07\x12\x05\ + \xd3\xe4\x93\x02\r\"\x08/reserve:\x01*B\x05Z\x03sdkJ\xd4!\n\x07\x12\x05\ \x0e\0\x96\x01\x01\n\xd1\x04\n\x01\x0c\x12\x03\x0e\0\x122\xc6\x04\x20Cop\ yright\x202017\x20Google\x20LLC\x20All\x20Rights\x20Reserved.\n\n\x20Lic\ ensed\x20under\x20the\x20Apache\x20License,\x20Version\x202.0\x20(the\ @@ -2285,124 +2285,103 @@ static file_descriptor_proto_data: &'static [u8] = b"\ \x04\0\x12\x04\\\0]\x01\x1a\x0c\x20I\x20am\x20Empty\n\n\n\n\x03\x04\0\ \x01\x12\x03\\\x08\r\n\x1e\n\x02\x04\x01\x12\x04`\0c\x01\x1a\x12\x20Key,\ \x20Value\x20entry\n\n\n\n\x03\x04\x01\x01\x12\x03`\x08\x10\n\x0b\n\x04\ - \x04\x01\x02\0\x12\x03a\x04\x13\n\r\n\x05\x04\x01\x02\0\x04\x12\x04a\x04\ - `\x12\n\x0c\n\x05\x04\x01\x02\0\x05\x12\x03a\x04\n\n\x0c\n\x05\x04\x01\ - \x02\0\x01\x12\x03a\x0b\x0e\n\x0c\n\x05\x04\x01\x02\0\x03\x12\x03a\x11\ - \x12\n\x0b\n\x04\x04\x01\x02\x01\x12\x03b\x04\x15\n\r\n\x05\x04\x01\x02\ - \x01\x04\x12\x04b\x04a\x13\n\x0c\n\x05\x04\x01\x02\x01\x05\x12\x03b\x04\ - \n\n\x0c\n\x05\x04\x01\x02\x01\x01\x12\x03b\x0b\x10\n\x0c\n\x05\x04\x01\ - \x02\x01\x03\x12\x03b\x13\x14\n'\n\x02\x04\x02\x12\x04f\0h\x01\x1a\x1b\ - \x20time\x20duration,\x20in\x20seconds\n\n\n\n\x03\x04\x02\x01\x12\x03f\ - \x08\x10\n\x0b\n\x04\x04\x02\x02\0\x12\x03g\x04\x16\n\r\n\x05\x04\x02\ - \x02\0\x04\x12\x04g\x04f\x12\n\x0c\n\x05\x04\x02\x02\0\x05\x12\x03g\x04\ - \t\n\x0c\n\x05\x04\x02\x02\0\x01\x12\x03g\n\x11\n\x0c\n\x05\x04\x02\x02\ - \0\x03\x12\x03g\x14\x15\n\xa3\x01\n\x02\x04\x03\x12\x05m\0\x96\x01\x01\ - \x1a\x95\x01\x20A\x20GameServer\x20Custom\x20Resource\x20Definition\x20o\ - bject\n\x20We\x20will\x20only\x20export\x20those\x20resources\x20that\ - \x20make\x20the\x20most\n\x20sense.\x20Can\x20always\x20expand\x20to\x20\ - more\x20as\x20needed.\n\n\n\n\x03\x04\x03\x01\x12\x03m\x08\x12\n\x0b\n\ - \x04\x04\x03\x02\0\x12\x03n\x04\x1f\n\r\n\x05\x04\x03\x02\0\x04\x12\x04n\ - \x04m\x14\n\x0c\n\x05\x04\x03\x02\0\x06\x12\x03n\x04\x0e\n\x0c\n\x05\x04\ - \x03\x02\0\x01\x12\x03n\x0f\x1a\n\x0c\n\x05\x04\x03\x02\0\x03\x12\x03n\ - \x1d\x1e\n\x0b\n\x04\x04\x03\x02\x01\x12\x03o\x04\x12\n\r\n\x05\x04\x03\ - \x02\x01\x04\x12\x04o\x04n\x1f\n\x0c\n\x05\x04\x03\x02\x01\x06\x12\x03o\ - \x04\x08\n\x0c\n\x05\x04\x03\x02\x01\x01\x12\x03o\t\r\n\x0c\n\x05\x04\ - \x03\x02\x01\x03\x12\x03o\x10\x11\n\x0b\n\x04\x04\x03\x02\x02\x12\x03p\ - \x04\x16\n\r\n\x05\x04\x03\x02\x02\x04\x12\x04p\x04o\x12\n\x0c\n\x05\x04\ - \x03\x02\x02\x06\x12\x03p\x04\n\n\x0c\n\x05\x04\x03\x02\x02\x01\x12\x03p\ - \x0b\x11\n\x0c\n\x05\x04\x03\x02\x02\x03\x12\x03p\x14\x15\n=\n\x04\x04\ - \x03\x03\0\x12\x04s\x04\x7f\x05\x1a/\x20representation\x20of\x20the\x20K\ - 8s\x20ObjectMeta\x20resource\n\n\x0c\n\x05\x04\x03\x03\0\x01\x12\x03s\ - \x0c\x16\n\r\n\x06\x04\x03\x03\0\x02\0\x12\x03t\x08\x18\n\x0f\n\x07\x04\ - \x03\x03\0\x02\0\x04\x12\x04t\x08s\x18\n\x0e\n\x07\x04\x03\x03\0\x02\0\ - \x05\x12\x03t\x08\x0e\n\x0e\n\x07\x04\x03\x03\0\x02\0\x01\x12\x03t\x0f\ - \x13\n\x0e\n\x07\x04\x03\x03\0\x02\0\x03\x12\x03t\x16\x17\n\r\n\x06\x04\ - \x03\x03\0\x02\x01\x12\x03u\x08\x1d\n\x0f\n\x07\x04\x03\x03\0\x02\x01\ - \x04\x12\x04u\x08t\x18\n\x0e\n\x07\x04\x03\x03\0\x02\x01\x05\x12\x03u\ - \x08\x0e\n\x0e\n\x07\x04\x03\x03\0\x02\x01\x01\x12\x03u\x0f\x18\n\x0e\n\ - \x07\x04\x03\x03\0\x02\x01\x03\x12\x03u\x1b\x1c\n\r\n\x06\x04\x03\x03\0\ - \x02\x02\x12\x03v\x08\x17\n\x0f\n\x07\x04\x03\x03\0\x02\x02\x04\x12\x04v\ - \x08u\x1d\n\x0e\n\x07\x04\x03\x03\0\x02\x02\x05\x12\x03v\x08\x0e\n\x0e\n\ - \x07\x04\x03\x03\0\x02\x02\x01\x12\x03v\x0f\x12\n\x0e\n\x07\x04\x03\x03\ - \0\x02\x02\x03\x12\x03v\x15\x16\n\r\n\x06\x04\x03\x03\0\x02\x03\x12\x03w\ - \x08$\n\x0f\n\x07\x04\x03\x03\0\x02\x03\x04\x12\x04w\x08v\x17\n\x0e\n\ - \x07\x04\x03\x03\0\x02\x03\x05\x12\x03w\x08\x0e\n\x0e\n\x07\x04\x03\x03\ - \0\x02\x03\x01\x12\x03w\x0f\x1f\n\x0e\n\x07\x04\x03\x03\0\x02\x03\x03\ - \x12\x03w\"#\n\r\n\x06\x04\x03\x03\0\x02\x04\x12\x03x\x08\x1d\n\x0f\n\ - \x07\x04\x03\x03\0\x02\x04\x04\x12\x04x\x08w$\n\x0e\n\x07\x04\x03\x03\0\ - \x02\x04\x05\x12\x03x\x08\r\n\x0e\n\x07\x04\x03\x03\0\x02\x04\x01\x12\ - \x03x\x0e\x18\n\x0e\n\x07\x04\x03\x03\0\x02\x04\x03\x12\x03x\x1b\x1c\n<\ - \n\x06\x04\x03\x03\0\x02\x05\x12\x03z\x08%\x1a-\x20timestamp\x20is\x20in\ - \x20Epoch\x20format,\x20unit:\x20seconds\n\n\x0f\n\x07\x04\x03\x03\0\x02\ - \x05\x04\x12\x04z\x08x\x1d\n\x0e\n\x07\x04\x03\x03\0\x02\x05\x05\x12\x03\ - z\x08\r\n\x0e\n\x07\x04\x03\x03\0\x02\x05\x01\x12\x03z\x0e\x20\n\x0e\n\ - \x07\x04\x03\x03\0\x02\x05\x03\x12\x03z#$\nK\n\x06\x04\x03\x03\0\x02\x06\ - \x12\x03|\x08%\x1a<\x20optional\x20deletion\x20timestamp\x20in\x20Epoch\ - \x20format,\x20unit:\x20seconds\n\n\x0f\n\x07\x04\x03\x03\0\x02\x06\x04\ - \x12\x04|\x08z%\n\x0e\n\x07\x04\x03\x03\0\x02\x06\x05\x12\x03|\x08\r\n\ - \x0e\n\x07\x04\x03\x03\0\x02\x06\x01\x12\x03|\x0e\x20\n\x0e\n\x07\x04\ - \x03\x03\0\x02\x06\x03\x12\x03|#$\n\r\n\x06\x04\x03\x03\0\x02\x07\x12\ - \x03}\x08,\n\x0f\n\x07\x04\x03\x03\0\x02\x07\x04\x12\x04}\x08|%\n\x0e\n\ - \x07\x04\x03\x03\0\x02\x07\x06\x12\x03}\x08\x1b\n\x0e\n\x07\x04\x03\x03\ - \0\x02\x07\x01\x12\x03}\x1c'\n\x0e\n\x07\x04\x03\x03\0\x02\x07\x03\x12\ - \x03}*+\n\r\n\x06\x04\x03\x03\0\x02\x08\x12\x03~\x08'\n\x0f\n\x07\x04\ - \x03\x03\0\x02\x08\x04\x12\x04~\x08},\n\x0e\n\x07\x04\x03\x03\0\x02\x08\ - \x06\x12\x03~\x08\x1b\n\x0e\n\x07\x04\x03\x03\0\x02\x08\x01\x12\x03~\x1c\ - \"\n\x0e\n\x07\x04\x03\x03\0\x02\x08\x03\x12\x03~%&\n\x0e\n\x04\x04\x03\ - \x03\x01\x12\x06\x81\x01\x04\x8a\x01\x05\n\r\n\x05\x04\x03\x03\x01\x01\ - \x12\x04\x81\x01\x0c\x10\n\x0e\n\x06\x04\x03\x03\x01\x02\0\x12\x04\x82\ - \x01\x08\x1a\n\x11\n\x07\x04\x03\x03\x01\x02\0\x04\x12\x06\x82\x01\x08\ - \x81\x01\x12\n\x0f\n\x07\x04\x03\x03\x01\x02\0\x06\x12\x04\x82\x01\x08\ - \x0e\n\x0f\n\x07\x04\x03\x03\x01\x02\0\x01\x12\x04\x82\x01\x0f\x15\n\x0f\ - \n\x07\x04\x03\x03\x01\x02\0\x03\x12\x04\x82\x01\x18\x19\n\x10\n\x06\x04\ - \x03\x03\x01\x03\0\x12\x06\x84\x01\x08\x89\x01\t\n\x0f\n\x07\x04\x03\x03\ - \x01\x03\0\x01\x12\x04\x84\x01\x10\x16\n\x10\n\x08\x04\x03\x03\x01\x03\0\ - \x02\0\x12\x04\x85\x01\x0c\x1e\n\x13\n\t\x04\x03\x03\x01\x03\0\x02\0\x04\ - \x12\x06\x85\x01\x0c\x84\x01\x18\n\x11\n\t\x04\x03\x03\x01\x03\0\x02\0\ - \x05\x12\x04\x85\x01\x0c\x10\n\x11\n\t\x04\x03\x03\x01\x03\0\x02\0\x01\ - \x12\x04\x85\x01\x11\x19\n\x11\n\t\x04\x03\x03\x01\x03\0\x02\0\x03\x12\ - \x04\x85\x01\x1c\x1d\n\x10\n\x08\x04\x03\x03\x01\x03\0\x02\x01\x12\x04\ - \x86\x01\x0c%\n\x13\n\t\x04\x03\x03\x01\x03\0\x02\x01\x04\x12\x06\x86\ - \x01\x0c\x85\x01\x1e\n\x11\n\t\x04\x03\x03\x01\x03\0\x02\x01\x05\x12\x04\ - \x86\x01\x0c\x11\n\x11\n\t\x04\x03\x03\x01\x03\0\x02\x01\x01\x12\x04\x86\ - \x01\x12\x20\n\x11\n\t\x04\x03\x03\x01\x03\0\x02\x01\x03\x12\x04\x86\x01\ - #$\n\x10\n\x08\x04\x03\x03\x01\x03\0\x02\x02\x12\x04\x87\x01\x0c(\n\x13\ - \n\t\x04\x03\x03\x01\x03\0\x02\x02\x04\x12\x06\x87\x01\x0c\x86\x01%\n\ + \x04\x01\x02\0\x12\x03a\x04\x13\n\x0c\n\x05\x04\x01\x02\0\x05\x12\x03a\ + \x04\n\n\x0c\n\x05\x04\x01\x02\0\x01\x12\x03a\x0b\x0e\n\x0c\n\x05\x04\ + \x01\x02\0\x03\x12\x03a\x11\x12\n\x0b\n\x04\x04\x01\x02\x01\x12\x03b\x04\ + \x15\n\x0c\n\x05\x04\x01\x02\x01\x05\x12\x03b\x04\n\n\x0c\n\x05\x04\x01\ + \x02\x01\x01\x12\x03b\x0b\x10\n\x0c\n\x05\x04\x01\x02\x01\x03\x12\x03b\ + \x13\x14\n'\n\x02\x04\x02\x12\x04f\0h\x01\x1a\x1b\x20time\x20duration,\ + \x20in\x20seconds\n\n\n\n\x03\x04\x02\x01\x12\x03f\x08\x10\n\x0b\n\x04\ + \x04\x02\x02\0\x12\x03g\x04\x16\n\x0c\n\x05\x04\x02\x02\0\x05\x12\x03g\ + \x04\t\n\x0c\n\x05\x04\x02\x02\0\x01\x12\x03g\n\x11\n\x0c\n\x05\x04\x02\ + \x02\0\x03\x12\x03g\x14\x15\n\xa3\x01\n\x02\x04\x03\x12\x05m\0\x96\x01\ + \x01\x1a\x95\x01\x20A\x20GameServer\x20Custom\x20Resource\x20Definition\ + \x20object\n\x20We\x20will\x20only\x20export\x20those\x20resources\x20th\ + at\x20make\x20the\x20most\n\x20sense.\x20Can\x20always\x20expand\x20to\ + \x20more\x20as\x20needed.\n\n\n\n\x03\x04\x03\x01\x12\x03m\x08\x12\n\x0b\ + \n\x04\x04\x03\x02\0\x12\x03n\x04\x1f\n\x0c\n\x05\x04\x03\x02\0\x06\x12\ + \x03n\x04\x0e\n\x0c\n\x05\x04\x03\x02\0\x01\x12\x03n\x0f\x1a\n\x0c\n\x05\ + \x04\x03\x02\0\x03\x12\x03n\x1d\x1e\n\x0b\n\x04\x04\x03\x02\x01\x12\x03o\ + \x04\x12\n\x0c\n\x05\x04\x03\x02\x01\x06\x12\x03o\x04\x08\n\x0c\n\x05\ + \x04\x03\x02\x01\x01\x12\x03o\t\r\n\x0c\n\x05\x04\x03\x02\x01\x03\x12\ + \x03o\x10\x11\n\x0b\n\x04\x04\x03\x02\x02\x12\x03p\x04\x16\n\x0c\n\x05\ + \x04\x03\x02\x02\x06\x12\x03p\x04\n\n\x0c\n\x05\x04\x03\x02\x02\x01\x12\ + \x03p\x0b\x11\n\x0c\n\x05\x04\x03\x02\x02\x03\x12\x03p\x14\x15\n=\n\x04\ + \x04\x03\x03\0\x12\x04s\x04\x7f\x05\x1a/\x20representation\x20of\x20the\ + \x20K8s\x20ObjectMeta\x20resource\n\n\x0c\n\x05\x04\x03\x03\0\x01\x12\ + \x03s\x0c\x16\n\r\n\x06\x04\x03\x03\0\x02\0\x12\x03t\x08\x18\n\x0e\n\x07\ + \x04\x03\x03\0\x02\0\x05\x12\x03t\x08\x0e\n\x0e\n\x07\x04\x03\x03\0\x02\ + \0\x01\x12\x03t\x0f\x13\n\x0e\n\x07\x04\x03\x03\0\x02\0\x03\x12\x03t\x16\ + \x17\n\r\n\x06\x04\x03\x03\0\x02\x01\x12\x03u\x08\x1d\n\x0e\n\x07\x04\ + \x03\x03\0\x02\x01\x05\x12\x03u\x08\x0e\n\x0e\n\x07\x04\x03\x03\0\x02\ + \x01\x01\x12\x03u\x0f\x18\n\x0e\n\x07\x04\x03\x03\0\x02\x01\x03\x12\x03u\ + \x1b\x1c\n\r\n\x06\x04\x03\x03\0\x02\x02\x12\x03v\x08\x17\n\x0e\n\x07\ + \x04\x03\x03\0\x02\x02\x05\x12\x03v\x08\x0e\n\x0e\n\x07\x04\x03\x03\0\ + \x02\x02\x01\x12\x03v\x0f\x12\n\x0e\n\x07\x04\x03\x03\0\x02\x02\x03\x12\ + \x03v\x15\x16\n\r\n\x06\x04\x03\x03\0\x02\x03\x12\x03w\x08$\n\x0e\n\x07\ + \x04\x03\x03\0\x02\x03\x05\x12\x03w\x08\x0e\n\x0e\n\x07\x04\x03\x03\0\ + \x02\x03\x01\x12\x03w\x0f\x1f\n\x0e\n\x07\x04\x03\x03\0\x02\x03\x03\x12\ + \x03w\"#\n\r\n\x06\x04\x03\x03\0\x02\x04\x12\x03x\x08\x1d\n\x0e\n\x07\ + \x04\x03\x03\0\x02\x04\x05\x12\x03x\x08\r\n\x0e\n\x07\x04\x03\x03\0\x02\ + \x04\x01\x12\x03x\x0e\x18\n\x0e\n\x07\x04\x03\x03\0\x02\x04\x03\x12\x03x\ + \x1b\x1c\n<\n\x06\x04\x03\x03\0\x02\x05\x12\x03z\x08%\x1a-\x20timestamp\ + \x20is\x20in\x20Epoch\x20format,\x20unit:\x20seconds\n\n\x0e\n\x07\x04\ + \x03\x03\0\x02\x05\x05\x12\x03z\x08\r\n\x0e\n\x07\x04\x03\x03\0\x02\x05\ + \x01\x12\x03z\x0e\x20\n\x0e\n\x07\x04\x03\x03\0\x02\x05\x03\x12\x03z#$\n\ + K\n\x06\x04\x03\x03\0\x02\x06\x12\x03|\x08%\x1a<\x20optional\x20deletion\ + \x20timestamp\x20in\x20Epoch\x20format,\x20unit:\x20seconds\n\n\x0e\n\ + \x07\x04\x03\x03\0\x02\x06\x05\x12\x03|\x08\r\n\x0e\n\x07\x04\x03\x03\0\ + \x02\x06\x01\x12\x03|\x0e\x20\n\x0e\n\x07\x04\x03\x03\0\x02\x06\x03\x12\ + \x03|#$\n\r\n\x06\x04\x03\x03\0\x02\x07\x12\x03}\x08,\n\x0e\n\x07\x04\ + \x03\x03\0\x02\x07\x06\x12\x03}\x08\x1b\n\x0e\n\x07\x04\x03\x03\0\x02\ + \x07\x01\x12\x03}\x1c'\n\x0e\n\x07\x04\x03\x03\0\x02\x07\x03\x12\x03}*+\ + \n\r\n\x06\x04\x03\x03\0\x02\x08\x12\x03~\x08'\n\x0e\n\x07\x04\x03\x03\0\ + \x02\x08\x06\x12\x03~\x08\x1b\n\x0e\n\x07\x04\x03\x03\0\x02\x08\x01\x12\ + \x03~\x1c\"\n\x0e\n\x07\x04\x03\x03\0\x02\x08\x03\x12\x03~%&\n\x0e\n\x04\ + \x04\x03\x03\x01\x12\x06\x81\x01\x04\x8a\x01\x05\n\r\n\x05\x04\x03\x03\ + \x01\x01\x12\x04\x81\x01\x0c\x10\n\x0e\n\x06\x04\x03\x03\x01\x02\0\x12\ + \x04\x82\x01\x08\x1a\n\x0f\n\x07\x04\x03\x03\x01\x02\0\x06\x12\x04\x82\ + \x01\x08\x0e\n\x0f\n\x07\x04\x03\x03\x01\x02\0\x01\x12\x04\x82\x01\x0f\ + \x15\n\x0f\n\x07\x04\x03\x03\x01\x02\0\x03\x12\x04\x82\x01\x18\x19\n\x10\ + \n\x06\x04\x03\x03\x01\x03\0\x12\x06\x84\x01\x08\x89\x01\t\n\x0f\n\x07\ + \x04\x03\x03\x01\x03\0\x01\x12\x04\x84\x01\x10\x16\n\x10\n\x08\x04\x03\ + \x03\x01\x03\0\x02\0\x12\x04\x85\x01\x0c\x1e\n\x11\n\t\x04\x03\x03\x01\ + \x03\0\x02\0\x05\x12\x04\x85\x01\x0c\x10\n\x11\n\t\x04\x03\x03\x01\x03\0\ + \x02\0\x01\x12\x04\x85\x01\x11\x19\n\x11\n\t\x04\x03\x03\x01\x03\0\x02\0\ + \x03\x12\x04\x85\x01\x1c\x1d\n\x10\n\x08\x04\x03\x03\x01\x03\0\x02\x01\ + \x12\x04\x86\x01\x0c%\n\x11\n\t\x04\x03\x03\x01\x03\0\x02\x01\x05\x12\ + \x04\x86\x01\x0c\x11\n\x11\n\t\x04\x03\x03\x01\x03\0\x02\x01\x01\x12\x04\ + \x86\x01\x12\x20\n\x11\n\t\x04\x03\x03\x01\x03\0\x02\x01\x03\x12\x04\x86\ + \x01#$\n\x10\n\x08\x04\x03\x03\x01\x03\0\x02\x02\x12\x04\x87\x01\x0c(\n\ \x11\n\t\x04\x03\x03\x01\x03\0\x02\x02\x05\x12\x04\x87\x01\x0c\x11\n\x11\ \n\t\x04\x03\x03\x01\x03\0\x02\x02\x01\x12\x04\x87\x01\x12#\n\x11\n\t\ \x04\x03\x03\x01\x03\0\x02\x02\x03\x12\x04\x87\x01&'\n\x10\n\x08\x04\x03\ - \x03\x01\x03\0\x02\x03\x12\x04\x88\x01\x0c,\n\x13\n\t\x04\x03\x03\x01\ - \x03\0\x02\x03\x04\x12\x06\x88\x01\x0c\x87\x01(\n\x11\n\t\x04\x03\x03\ - \x01\x03\0\x02\x03\x05\x12\x04\x88\x01\x0c\x11\n\x11\n\t\x04\x03\x03\x01\ - \x03\0\x02\x03\x01\x12\x04\x88\x01\x12'\n\x11\n\t\x04\x03\x03\x01\x03\0\ - \x02\x03\x03\x12\x04\x88\x01*+\n\x0e\n\x04\x04\x03\x03\x02\x12\x06\x8c\ - \x01\x04\x95\x01\x05\n\r\n\x05\x04\x03\x03\x02\x01\x12\x04\x8c\x01\x0c\ - \x12\n\x10\n\x06\x04\x03\x03\x02\x03\0\x12\x06\x8d\x01\x08\x90\x01\t\n\ - \x0f\n\x07\x04\x03\x03\x02\x03\0\x01\x12\x04\x8d\x01\x10\x14\n\x10\n\x08\ - \x04\x03\x03\x02\x03\0\x02\0\x12\x04\x8e\x01\x0c\x1c\n\x13\n\t\x04\x03\ - \x03\x02\x03\0\x02\0\x04\x12\x06\x8e\x01\x0c\x8d\x01\x16\n\x11\n\t\x04\ - \x03\x03\x02\x03\0\x02\0\x05\x12\x04\x8e\x01\x0c\x12\n\x11\n\t\x04\x03\ - \x03\x02\x03\0\x02\0\x01\x12\x04\x8e\x01\x13\x17\n\x11\n\t\x04\x03\x03\ - \x02\x03\0\x02\0\x03\x12\x04\x8e\x01\x1a\x1b\n\x10\n\x08\x04\x03\x03\x02\ - \x03\0\x02\x01\x12\x04\x8f\x01\x0c\x1b\n\x13\n\t\x04\x03\x03\x02\x03\0\ - \x02\x01\x04\x12\x06\x8f\x01\x0c\x8e\x01\x1c\n\x11\n\t\x04\x03\x03\x02\ - \x03\0\x02\x01\x05\x12\x04\x8f\x01\x0c\x11\n\x11\n\t\x04\x03\x03\x02\x03\ - \0\x02\x01\x01\x12\x04\x8f\x01\x12\x16\n\x11\n\t\x04\x03\x03\x02\x03\0\ - \x02\x01\x03\x12\x04\x8f\x01\x19\x1a\n\x0e\n\x06\x04\x03\x03\x02\x02\0\ - \x12\x04\x92\x01\x08\x19\n\x11\n\x07\x04\x03\x03\x02\x02\0\x04\x12\x06\ - \x92\x01\x08\x90\x01\t\n\x0f\n\x07\x04\x03\x03\x02\x02\0\x05\x12\x04\x92\ - \x01\x08\x0e\n\x0f\n\x07\x04\x03\x03\x02\x02\0\x01\x12\x04\x92\x01\x0f\ - \x14\n\x0f\n\x07\x04\x03\x03\x02\x02\0\x03\x12\x04\x92\x01\x17\x18\n\x0e\ - \n\x06\x04\x03\x03\x02\x02\x01\x12\x04\x93\x01\x08\x1b\n\x11\n\x07\x04\ - \x03\x03\x02\x02\x01\x04\x12\x06\x93\x01\x08\x92\x01\x19\n\x0f\n\x07\x04\ - \x03\x03\x02\x02\x01\x05\x12\x04\x93\x01\x08\x0e\n\x0f\n\x07\x04\x03\x03\ - \x02\x02\x01\x01\x12\x04\x93\x01\x0f\x16\n\x0f\n\x07\x04\x03\x03\x02\x02\ - \x01\x03\x12\x04\x93\x01\x19\x1a\n\x0e\n\x06\x04\x03\x03\x02\x02\x02\x12\ - \x04\x94\x01\x08\x20\n\x0f\n\x07\x04\x03\x03\x02\x02\x02\x04\x12\x04\x94\ - \x01\x08\x10\n\x0f\n\x07\x04\x03\x03\x02\x02\x02\x06\x12\x04\x94\x01\x11\ - \x15\n\x0f\n\x07\x04\x03\x03\x02\x02\x02\x01\x12\x04\x94\x01\x16\x1b\n\ - \x0f\n\x07\x04\x03\x03\x02\x02\x02\x03\x12\x04\x94\x01\x1e\x1fb\x06proto\ - 3\ + \x03\x01\x03\0\x02\x03\x12\x04\x88\x01\x0c,\n\x11\n\t\x04\x03\x03\x01\ + \x03\0\x02\x03\x05\x12\x04\x88\x01\x0c\x11\n\x11\n\t\x04\x03\x03\x01\x03\ + \0\x02\x03\x01\x12\x04\x88\x01\x12'\n\x11\n\t\x04\x03\x03\x01\x03\0\x02\ + \x03\x03\x12\x04\x88\x01*+\n\x0e\n\x04\x04\x03\x03\x02\x12\x06\x8c\x01\ + \x04\x95\x01\x05\n\r\n\x05\x04\x03\x03\x02\x01\x12\x04\x8c\x01\x0c\x12\n\ + \x10\n\x06\x04\x03\x03\x02\x03\0\x12\x06\x8d\x01\x08\x90\x01\t\n\x0f\n\ + \x07\x04\x03\x03\x02\x03\0\x01\x12\x04\x8d\x01\x10\x14\n\x10\n\x08\x04\ + \x03\x03\x02\x03\0\x02\0\x12\x04\x8e\x01\x0c\x1c\n\x11\n\t\x04\x03\x03\ + \x02\x03\0\x02\0\x05\x12\x04\x8e\x01\x0c\x12\n\x11\n\t\x04\x03\x03\x02\ + \x03\0\x02\0\x01\x12\x04\x8e\x01\x13\x17\n\x11\n\t\x04\x03\x03\x02\x03\0\ + \x02\0\x03\x12\x04\x8e\x01\x1a\x1b\n\x10\n\x08\x04\x03\x03\x02\x03\0\x02\ + \x01\x12\x04\x8f\x01\x0c\x1b\n\x11\n\t\x04\x03\x03\x02\x03\0\x02\x01\x05\ + \x12\x04\x8f\x01\x0c\x11\n\x11\n\t\x04\x03\x03\x02\x03\0\x02\x01\x01\x12\ + \x04\x8f\x01\x12\x16\n\x11\n\t\x04\x03\x03\x02\x03\0\x02\x01\x03\x12\x04\ + \x8f\x01\x19\x1a\n\x0e\n\x06\x04\x03\x03\x02\x02\0\x12\x04\x92\x01\x08\ + \x19\n\x0f\n\x07\x04\x03\x03\x02\x02\0\x05\x12\x04\x92\x01\x08\x0e\n\x0f\ + \n\x07\x04\x03\x03\x02\x02\0\x01\x12\x04\x92\x01\x0f\x14\n\x0f\n\x07\x04\ + \x03\x03\x02\x02\0\x03\x12\x04\x92\x01\x17\x18\n\x0e\n\x06\x04\x03\x03\ + \x02\x02\x01\x12\x04\x93\x01\x08\x1b\n\x0f\n\x07\x04\x03\x03\x02\x02\x01\ + \x05\x12\x04\x93\x01\x08\x0e\n\x0f\n\x07\x04\x03\x03\x02\x02\x01\x01\x12\ + \x04\x93\x01\x0f\x16\n\x0f\n\x07\x04\x03\x03\x02\x02\x01\x03\x12\x04\x93\ + \x01\x19\x1a\n\x0e\n\x06\x04\x03\x03\x02\x02\x02\x12\x04\x94\x01\x08\x20\ + \n\x0f\n\x07\x04\x03\x03\x02\x02\x02\x04\x12\x04\x94\x01\x08\x10\n\x0f\n\ + \x07\x04\x03\x03\x02\x02\x02\x06\x12\x04\x94\x01\x11\x15\n\x0f\n\x07\x04\ + \x03\x03\x02\x02\x02\x01\x12\x04\x94\x01\x16\x1b\n\x0f\n\x07\x04\x03\x03\ + \x02\x02\x02\x03\x12\x04\x94\x01\x1e\x1fb\x06proto3\ "; static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy { diff --git a/vendor/github.com/google/btree/btree_mem.go b/vendor/github.com/google/btree/btree_mem.go deleted file mode 100644 index cb95b7fa1b..0000000000 --- a/vendor/github.com/google/btree/btree_mem.go +++ /dev/null @@ -1,76 +0,0 @@ -// Copyright 2014 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// +build ignore - -// This binary compares memory usage between btree and gollrb. -package main - -import ( - "flag" - "fmt" - "math/rand" - "runtime" - "time" - - "github.com/google/btree" - "github.com/petar/GoLLRB/llrb" -) - -var ( - size = flag.Int("size", 1000000, "size of the tree to build") - degree = flag.Int("degree", 8, "degree of btree") - gollrb = flag.Bool("llrb", false, "use llrb instead of btree") -) - -func main() { - flag.Parse() - vals := rand.Perm(*size) - var t, v interface{} - v = vals - var stats runtime.MemStats - for i := 0; i < 10; i++ { - runtime.GC() - } - fmt.Println("-------- BEFORE ----------") - runtime.ReadMemStats(&stats) - fmt.Printf("%+v\n", stats) - start := time.Now() - if *gollrb { - tr := llrb.New() - for _, v := range vals { - tr.ReplaceOrInsert(llrb.Int(v)) - } - t = tr // keep it around - } else { - tr := btree.New(*degree) - for _, v := range vals { - tr.ReplaceOrInsert(btree.Int(v)) - } - t = tr // keep it around - } - fmt.Printf("%v inserts in %v\n", *size, time.Since(start)) - fmt.Println("-------- AFTER ----------") - runtime.ReadMemStats(&stats) - fmt.Printf("%+v\n", stats) - for i := 0; i < 10; i++ { - runtime.GC() - } - fmt.Println("-------- AFTER GC ----------") - runtime.ReadMemStats(&stats) - fmt.Printf("%+v\n", stats) - if t == v { - fmt.Println("to make sure vals and tree aren't GC'd") - } -} diff --git a/vendor/golang.org/x/sys/unix/mkasm_darwin.go b/vendor/golang.org/x/sys/unix/mkasm_darwin.go deleted file mode 100644 index 4548b993db..0000000000 --- a/vendor/golang.org/x/sys/unix/mkasm_darwin.go +++ /dev/null @@ -1,61 +0,0 @@ -// Copyright 2018 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build ignore - -// mkasm_darwin.go generates assembly trampolines to call libSystem routines from Go. -//This program must be run after mksyscall.go. -package main - -import ( - "bytes" - "fmt" - "io/ioutil" - "log" - "os" - "strings" -) - -func main() { - in1, err := ioutil.ReadFile("syscall_darwin.go") - if err != nil { - log.Fatalf("can't open syscall_darwin.go: %s", err) - } - arch := os.Args[1] - in2, err := ioutil.ReadFile(fmt.Sprintf("syscall_darwin_%s.go", arch)) - if err != nil { - log.Fatalf("can't open syscall_darwin_%s.go: %s", arch, err) - } - in3, err := ioutil.ReadFile(fmt.Sprintf("zsyscall_darwin_%s.go", arch)) - if err != nil { - log.Fatalf("can't open zsyscall_darwin_%s.go: %s", arch, err) - } - in := string(in1) + string(in2) + string(in3) - - trampolines := map[string]bool{} - - var out bytes.Buffer - - fmt.Fprintf(&out, "// go run mkasm_darwin.go %s\n", strings.Join(os.Args[1:], " ")) - fmt.Fprintf(&out, "// Code generated by the command above; DO NOT EDIT.\n") - fmt.Fprintf(&out, "\n") - fmt.Fprintf(&out, "// +build go1.12\n") - fmt.Fprintf(&out, "\n") - fmt.Fprintf(&out, "#include \"textflag.h\"\n") - for _, line := range strings.Split(in, "\n") { - if !strings.HasPrefix(line, "func ") || !strings.HasSuffix(line, "_trampoline()") { - continue - } - fn := line[5 : len(line)-13] - if !trampolines[fn] { - trampolines[fn] = true - fmt.Fprintf(&out, "TEXT ·%s_trampoline(SB),NOSPLIT,$0-0\n", fn) - fmt.Fprintf(&out, "\tJMP\t%s(SB)\n", fn) - } - } - err = ioutil.WriteFile(fmt.Sprintf("zsyscall_darwin_%s.s", arch), out.Bytes(), 0644) - if err != nil { - log.Fatalf("can't write zsyscall_darwin_%s.s: %s", arch, err) - } -} diff --git a/vendor/golang.org/x/sys/unix/mkpost.go b/vendor/golang.org/x/sys/unix/mkpost.go deleted file mode 100644 index 9feddd00c4..0000000000 --- a/vendor/golang.org/x/sys/unix/mkpost.go +++ /dev/null @@ -1,106 +0,0 @@ -// Copyright 2016 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build ignore - -// mkpost processes the output of cgo -godefs to -// modify the generated types. It is used to clean up -// the sys API in an architecture specific manner. -// -// mkpost is run after cgo -godefs; see README.md. -package main - -import ( - "bytes" - "fmt" - "go/format" - "io/ioutil" - "log" - "os" - "regexp" -) - -func main() { - // Get the OS and architecture (using GOARCH_TARGET if it exists) - goos := os.Getenv("GOOS") - goarch := os.Getenv("GOARCH_TARGET") - if goarch == "" { - goarch = os.Getenv("GOARCH") - } - // Check that we are using the Docker-based build system if we should be. - if goos == "linux" { - if os.Getenv("GOLANG_SYS_BUILD") != "docker" { - os.Stderr.WriteString("In the Docker-based build system, mkpost should not be called directly.\n") - os.Stderr.WriteString("See README.md\n") - os.Exit(1) - } - } - - b, err := ioutil.ReadAll(os.Stdin) - if err != nil { - log.Fatal(err) - } - - // Intentionally export __val fields in Fsid and Sigset_t - valRegex := regexp.MustCompile(`type (Fsid|Sigset_t) struct {(\s+)X__val(\s+\S+\s+)}`) - b = valRegex.ReplaceAll(b, []byte("type $1 struct {${2}Val$3}")) - - // Intentionally export __fds_bits field in FdSet - fdSetRegex := regexp.MustCompile(`type (FdSet) struct {(\s+)X__fds_bits(\s+\S+\s+)}`) - b = fdSetRegex.ReplaceAll(b, []byte("type $1 struct {${2}Bits$3}")) - - // If we have empty Ptrace structs, we should delete them. Only s390x emits - // nonempty Ptrace structs. - ptraceRexexp := regexp.MustCompile(`type Ptrace((Psw|Fpregs|Per) struct {\s*})`) - b = ptraceRexexp.ReplaceAll(b, nil) - - // Replace the control_regs union with a blank identifier for now. - controlRegsRegex := regexp.MustCompile(`(Control_regs)\s+\[0\]uint64`) - b = controlRegsRegex.ReplaceAll(b, []byte("_ [0]uint64")) - - // Remove fields that are added by glibc - // Note that this is unstable as the identifers are private. - removeFieldsRegex := regexp.MustCompile(`X__glibc\S*`) - b = removeFieldsRegex.ReplaceAll(b, []byte("_")) - - // Convert [65]int8 to [65]byte in Utsname members to simplify - // conversion to string; see golang.org/issue/20753 - convertUtsnameRegex := regexp.MustCompile(`((Sys|Node|Domain)name|Release|Version|Machine)(\s+)\[(\d+)\]u?int8`) - b = convertUtsnameRegex.ReplaceAll(b, []byte("$1$3[$4]byte")) - - // Convert [1024]int8 to [1024]byte in Ptmget members - convertPtmget := regexp.MustCompile(`([SC]n)(\s+)\[(\d+)\]u?int8`) - b = convertPtmget.ReplaceAll(b, []byte("$1[$3]byte")) - - // Remove spare fields (e.g. in Statx_t) - spareFieldsRegex := regexp.MustCompile(`X__spare\S*`) - b = spareFieldsRegex.ReplaceAll(b, []byte("_")) - - // Remove cgo padding fields - removePaddingFieldsRegex := regexp.MustCompile(`Pad_cgo_\d+`) - b = removePaddingFieldsRegex.ReplaceAll(b, []byte("_")) - - // Remove padding, hidden, or unused fields - removeFieldsRegex = regexp.MustCompile(`\b(X_\S+|Padding)`) - b = removeFieldsRegex.ReplaceAll(b, []byte("_")) - - // Remove the first line of warning from cgo - b = b[bytes.IndexByte(b, '\n')+1:] - // Modify the command in the header to include: - // mkpost, our own warning, and a build tag. - replacement := fmt.Sprintf(`$1 | go run mkpost.go -// Code generated by the command above; see README.md. DO NOT EDIT. - -// +build %s,%s`, goarch, goos) - cgoCommandRegex := regexp.MustCompile(`(cgo -godefs .*)`) - b = cgoCommandRegex.ReplaceAll(b, []byte(replacement)) - - // gofmt - b, err = format.Source(b) - if err != nil { - log.Fatal(err) - } - - os.Stdout.Write(b) -} diff --git a/vendor/golang.org/x/sys/unix/mksyscall_aix_ppc.go b/vendor/golang.org/x/sys/unix/mksyscall_aix_ppc.go deleted file mode 100644 index f2c58fb7cc..0000000000 --- a/vendor/golang.org/x/sys/unix/mksyscall_aix_ppc.go +++ /dev/null @@ -1,404 +0,0 @@ -// Copyright 2019 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build ignore - -/* -This program reads a file containing function prototypes -(like syscall_aix.go) and generates system call bodies. -The prototypes are marked by lines beginning with "//sys" -and read like func declarations if //sys is replaced by func, but: - * The parameter lists must give a name for each argument. - This includes return parameters. - * The parameter lists must give a type for each argument: - the (x, y, z int) shorthand is not allowed. - * If the return parameter is an error number, it must be named err. - * If go func name needs to be different than its libc name, - * or the function is not in libc, name could be specified - * at the end, after "=" sign, like - //sys getsockopt(s int, level int, name int, val uintptr, vallen *_Socklen) (err error) = libsocket.getsockopt -*/ -package main - -import ( - "bufio" - "flag" - "fmt" - "os" - "regexp" - "strings" -) - -var ( - b32 = flag.Bool("b32", false, "32bit big-endian") - l32 = flag.Bool("l32", false, "32bit little-endian") - aix = flag.Bool("aix", false, "aix") - tags = flag.String("tags", "", "build tags") -) - -// cmdLine returns this programs's commandline arguments -func cmdLine() string { - return "go run mksyscall_aix_ppc.go " + strings.Join(os.Args[1:], " ") -} - -// buildTags returns build tags -func buildTags() string { - return *tags -} - -// Param is function parameter -type Param struct { - Name string - Type string -} - -// usage prints the program usage -func usage() { - fmt.Fprintf(os.Stderr, "usage: go run mksyscall_aix_ppc.go [-b32 | -l32] [-tags x,y] [file ...]\n") - os.Exit(1) -} - -// parseParamList parses parameter list and returns a slice of parameters -func parseParamList(list string) []string { - list = strings.TrimSpace(list) - if list == "" { - return []string{} - } - return regexp.MustCompile(`\s*,\s*`).Split(list, -1) -} - -// parseParam splits a parameter into name and type -func parseParam(p string) Param { - ps := regexp.MustCompile(`^(\S*) (\S*)$`).FindStringSubmatch(p) - if ps == nil { - fmt.Fprintf(os.Stderr, "malformed parameter: %s\n", p) - os.Exit(1) - } - return Param{ps[1], ps[2]} -} - -func main() { - flag.Usage = usage - flag.Parse() - if len(flag.Args()) <= 0 { - fmt.Fprintf(os.Stderr, "no files to parse provided\n") - usage() - } - - endianness := "" - if *b32 { - endianness = "big-endian" - } else if *l32 { - endianness = "little-endian" - } - - pack := "" - text := "" - cExtern := "/*\n#include \n#include \n" - for _, path := range flag.Args() { - file, err := os.Open(path) - if err != nil { - fmt.Fprintf(os.Stderr, err.Error()) - os.Exit(1) - } - s := bufio.NewScanner(file) - for s.Scan() { - t := s.Text() - t = strings.TrimSpace(t) - t = regexp.MustCompile(`\s+`).ReplaceAllString(t, ` `) - if p := regexp.MustCompile(`^package (\S+)$`).FindStringSubmatch(t); p != nil && pack == "" { - pack = p[1] - } - nonblock := regexp.MustCompile(`^\/\/sysnb `).FindStringSubmatch(t) - if regexp.MustCompile(`^\/\/sys `).FindStringSubmatch(t) == nil && nonblock == nil { - continue - } - - // Line must be of the form - // func Open(path string, mode int, perm int) (fd int, err error) - // Split into name, in params, out params. - f := regexp.MustCompile(`^\/\/sys(nb)? (\w+)\(([^()]*)\)\s*(?:\(([^()]+)\))?\s*(?:=\s*(?:(\w*)\.)?(\w*))?$`).FindStringSubmatch(t) - if f == nil { - fmt.Fprintf(os.Stderr, "%s:%s\nmalformed //sys declaration\n", path, t) - os.Exit(1) - } - funct, inps, outps, modname, sysname := f[2], f[3], f[4], f[5], f[6] - - // Split argument lists on comma. - in := parseParamList(inps) - out := parseParamList(outps) - - inps = strings.Join(in, ", ") - outps = strings.Join(out, ", ") - - // Try in vain to keep people from editing this file. - // The theory is that they jump into the middle of the file - // without reading the header. - text += "// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT\n\n" - - // Check if value return, err return available - errvar := "" - retvar := "" - rettype := "" - for _, param := range out { - p := parseParam(param) - if p.Type == "error" { - errvar = p.Name - } else { - retvar = p.Name - rettype = p.Type - } - } - - // System call name. - if sysname == "" { - sysname = funct - } - sysname = regexp.MustCompile(`([a-z])([A-Z])`).ReplaceAllString(sysname, `${1}_$2`) - sysname = strings.ToLower(sysname) // All libc functions are lowercase. - - cRettype := "" - if rettype == "unsafe.Pointer" { - cRettype = "uintptr_t" - } else if rettype == "uintptr" { - cRettype = "uintptr_t" - } else if regexp.MustCompile(`^_`).FindStringSubmatch(rettype) != nil { - cRettype = "uintptr_t" - } else if rettype == "int" { - cRettype = "int" - } else if rettype == "int32" { - cRettype = "int" - } else if rettype == "int64" { - cRettype = "long long" - } else if rettype == "uint32" { - cRettype = "unsigned int" - } else if rettype == "uint64" { - cRettype = "unsigned long long" - } else { - cRettype = "int" - } - if sysname == "exit" { - cRettype = "void" - } - - // Change p.Types to c - var cIn []string - for _, param := range in { - p := parseParam(param) - if regexp.MustCompile(`^\*`).FindStringSubmatch(p.Type) != nil { - cIn = append(cIn, "uintptr_t") - } else if p.Type == "string" { - cIn = append(cIn, "uintptr_t") - } else if regexp.MustCompile(`^\[\](.*)`).FindStringSubmatch(p.Type) != nil { - cIn = append(cIn, "uintptr_t", "size_t") - } else if p.Type == "unsafe.Pointer" { - cIn = append(cIn, "uintptr_t") - } else if p.Type == "uintptr" { - cIn = append(cIn, "uintptr_t") - } else if regexp.MustCompile(`^_`).FindStringSubmatch(p.Type) != nil { - cIn = append(cIn, "uintptr_t") - } else if p.Type == "int" { - cIn = append(cIn, "int") - } else if p.Type == "int32" { - cIn = append(cIn, "int") - } else if p.Type == "int64" { - cIn = append(cIn, "long long") - } else if p.Type == "uint32" { - cIn = append(cIn, "unsigned int") - } else if p.Type == "uint64" { - cIn = append(cIn, "unsigned long long") - } else { - cIn = append(cIn, "int") - } - } - - if funct != "fcntl" && funct != "FcntlInt" && funct != "readlen" && funct != "writelen" { - // Imports of system calls from libc - cExtern += fmt.Sprintf("%s %s", cRettype, sysname) - cIn := strings.Join(cIn, ", ") - cExtern += fmt.Sprintf("(%s);\n", cIn) - } - - // So file name. - if *aix { - if modname == "" { - modname = "libc.a/shr_64.o" - } else { - fmt.Fprintf(os.Stderr, "%s: only syscall using libc are available\n", funct) - os.Exit(1) - } - } - - strconvfunc := "C.CString" - - // Go function header. - if outps != "" { - outps = fmt.Sprintf(" (%s)", outps) - } - if text != "" { - text += "\n" - } - - text += fmt.Sprintf("func %s(%s)%s {\n", funct, strings.Join(in, ", "), outps) - - // Prepare arguments to Syscall. - var args []string - n := 0 - argN := 0 - for _, param := range in { - p := parseParam(param) - if regexp.MustCompile(`^\*`).FindStringSubmatch(p.Type) != nil { - args = append(args, "C.uintptr_t(uintptr(unsafe.Pointer("+p.Name+")))") - } else if p.Type == "string" && errvar != "" { - text += fmt.Sprintf("\t_p%d := uintptr(unsafe.Pointer(%s(%s)))\n", n, strconvfunc, p.Name) - args = append(args, fmt.Sprintf("C.uintptr_t(_p%d)", n)) - n++ - } else if p.Type == "string" { - fmt.Fprintf(os.Stderr, path+":"+funct+" uses string arguments, but has no error return\n") - text += fmt.Sprintf("\t_p%d := uintptr(unsafe.Pointer(%s(%s)))\n", n, strconvfunc, p.Name) - args = append(args, fmt.Sprintf("C.uintptr_t(_p%d)", n)) - n++ - } else if m := regexp.MustCompile(`^\[\](.*)`).FindStringSubmatch(p.Type); m != nil { - // Convert slice into pointer, length. - // Have to be careful not to take address of &a[0] if len == 0: - // pass nil in that case. - text += fmt.Sprintf("\tvar _p%d *%s\n", n, m[1]) - text += fmt.Sprintf("\tif len(%s) > 0 {\n\t\t_p%d = &%s[0]\n\t}\n", p.Name, n, p.Name) - args = append(args, fmt.Sprintf("C.uintptr_t(uintptr(unsafe.Pointer(_p%d)))", n)) - n++ - text += fmt.Sprintf("\tvar _p%d int\n", n) - text += fmt.Sprintf("\t_p%d = len(%s)\n", n, p.Name) - args = append(args, fmt.Sprintf("C.size_t(_p%d)", n)) - n++ - } else if p.Type == "int64" && endianness != "" { - if endianness == "big-endian" { - args = append(args, fmt.Sprintf("uintptr(%s>>32)", p.Name), fmt.Sprintf("uintptr(%s)", p.Name)) - } else { - args = append(args, fmt.Sprintf("uintptr(%s)", p.Name), fmt.Sprintf("uintptr(%s>>32)", p.Name)) - } - n++ - } else if p.Type == "bool" { - text += fmt.Sprintf("\tvar _p%d uint32\n", n) - text += fmt.Sprintf("\tif %s {\n\t\t_p%d = 1\n\t} else {\n\t\t_p%d = 0\n\t}\n", p.Name, n, n) - args = append(args, fmt.Sprintf("_p%d", n)) - } else if regexp.MustCompile(`^_`).FindStringSubmatch(p.Type) != nil { - args = append(args, fmt.Sprintf("C.uintptr_t(uintptr(%s))", p.Name)) - } else if p.Type == "unsafe.Pointer" { - args = append(args, fmt.Sprintf("C.uintptr_t(uintptr(%s))", p.Name)) - } else if p.Type == "int" { - if (argN == 2) && ((funct == "readlen") || (funct == "writelen")) { - args = append(args, fmt.Sprintf("C.size_t(%s)", p.Name)) - } else if argN == 0 && funct == "fcntl" { - args = append(args, fmt.Sprintf("C.uintptr_t(%s)", p.Name)) - } else if (argN == 2) && ((funct == "fcntl") || (funct == "FcntlInt")) { - args = append(args, fmt.Sprintf("C.uintptr_t(%s)", p.Name)) - } else { - args = append(args, fmt.Sprintf("C.int(%s)", p.Name)) - } - } else if p.Type == "int32" { - args = append(args, fmt.Sprintf("C.int(%s)", p.Name)) - } else if p.Type == "int64" { - args = append(args, fmt.Sprintf("C.longlong(%s)", p.Name)) - } else if p.Type == "uint32" { - args = append(args, fmt.Sprintf("C.uint(%s)", p.Name)) - } else if p.Type == "uint64" { - args = append(args, fmt.Sprintf("C.ulonglong(%s)", p.Name)) - } else if p.Type == "uintptr" { - args = append(args, fmt.Sprintf("C.uintptr_t(%s)", p.Name)) - } else { - args = append(args, fmt.Sprintf("C.int(%s)", p.Name)) - } - argN++ - } - - // Actual call. - arglist := strings.Join(args, ", ") - call := "" - if sysname == "exit" { - if errvar != "" { - call += "er :=" - } else { - call += "" - } - } else if errvar != "" { - call += "r0,er :=" - } else if retvar != "" { - call += "r0,_ :=" - } else { - call += "" - } - call += fmt.Sprintf("C.%s(%s)", sysname, arglist) - - // Assign return values. - body := "" - for i := 0; i < len(out); i++ { - p := parseParam(out[i]) - reg := "" - if p.Name == "err" { - reg = "e1" - } else { - reg = "r0" - } - if reg != "e1" { - body += fmt.Sprintf("\t%s = %s(%s)\n", p.Name, p.Type, reg) - } - } - - // verify return - if sysname != "exit" && errvar != "" { - if regexp.MustCompile(`^uintptr`).FindStringSubmatch(cRettype) != nil { - body += "\tif (uintptr(r0) ==^uintptr(0) && er != nil) {\n" - body += fmt.Sprintf("\t\t%s = er\n", errvar) - body += "\t}\n" - } else { - body += "\tif (r0 ==-1 && er != nil) {\n" - body += fmt.Sprintf("\t\t%s = er\n", errvar) - body += "\t}\n" - } - } else if errvar != "" { - body += "\tif (er != nil) {\n" - body += fmt.Sprintf("\t\t%s = er\n", errvar) - body += "\t}\n" - } - - text += fmt.Sprintf("\t%s\n", call) - text += body - - text += "\treturn\n" - text += "}\n" - } - if err := s.Err(); err != nil { - fmt.Fprintf(os.Stderr, err.Error()) - os.Exit(1) - } - file.Close() - } - imp := "" - if pack != "unix" { - imp = "import \"golang.org/x/sys/unix\"\n" - - } - fmt.Printf(srcTemplate, cmdLine(), buildTags(), pack, cExtern, imp, text) -} - -const srcTemplate = `// %s -// Code generated by the command above; see README.md. DO NOT EDIT. - -// +build %s - -package %s - - -%s -*/ -import "C" -import ( - "unsafe" -) - - -%s - -%s -` diff --git a/vendor/golang.org/x/sys/unix/mksyscall_aix_ppc64.go b/vendor/golang.org/x/sys/unix/mksyscall_aix_ppc64.go deleted file mode 100644 index 45b4429088..0000000000 --- a/vendor/golang.org/x/sys/unix/mksyscall_aix_ppc64.go +++ /dev/null @@ -1,602 +0,0 @@ -// Copyright 2019 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build ignore - -/* -This program reads a file containing function prototypes -(like syscall_aix.go) and generates system call bodies. -The prototypes are marked by lines beginning with "//sys" -and read like func declarations if //sys is replaced by func, but: - * The parameter lists must give a name for each argument. - This includes return parameters. - * The parameter lists must give a type for each argument: - the (x, y, z int) shorthand is not allowed. - * If the return parameter is an error number, it must be named err. - * If go func name needs to be different than its libc name, - * or the function is not in libc, name could be specified - * at the end, after "=" sign, like - //sys getsockopt(s int, level int, name int, val uintptr, vallen *_Socklen) (err error) = libsocket.getsockopt - - -This program will generate three files and handle both gc and gccgo implementation: - - zsyscall_aix_ppc64.go: the common part of each implementation (error handler, pointer creation) - - zsyscall_aix_ppc64_gc.go: gc part with //go_cgo_import_dynamic and a call to syscall6 - - zsyscall_aix_ppc64_gccgo.go: gccgo part with C function and conversion to C type. - - The generated code looks like this - -zsyscall_aix_ppc64.go -func asyscall(...) (n int, err error) { - // Pointer Creation - r1, e1 := callasyscall(...) - // Type Conversion - // Error Handler - return -} - -zsyscall_aix_ppc64_gc.go -//go:cgo_import_dynamic libc_asyscall asyscall "libc.a/shr_64.o" -//go:linkname libc_asyscall libc_asyscall -var asyscall syscallFunc - -func callasyscall(...) (r1 uintptr, e1 Errno) { - r1, _, e1 = syscall6(uintptr(unsafe.Pointer(&libc_asyscall)), "nb_args", ... ) - return -} - -zsyscall_aix_ppc64_ggcgo.go - -// int asyscall(...) - -import "C" - -func callasyscall(...) (r1 uintptr, e1 Errno) { - r1 = uintptr(C.asyscall(...)) - e1 = syscall.GetErrno() - return -} -*/ - -package main - -import ( - "bufio" - "flag" - "fmt" - "io/ioutil" - "os" - "regexp" - "strings" -) - -var ( - b32 = flag.Bool("b32", false, "32bit big-endian") - l32 = flag.Bool("l32", false, "32bit little-endian") - aix = flag.Bool("aix", false, "aix") - tags = flag.String("tags", "", "build tags") -) - -// cmdLine returns this programs's commandline arguments -func cmdLine() string { - return "go run mksyscall_aix_ppc64.go " + strings.Join(os.Args[1:], " ") -} - -// buildTags returns build tags -func buildTags() string { - return *tags -} - -// Param is function parameter -type Param struct { - Name string - Type string -} - -// usage prints the program usage -func usage() { - fmt.Fprintf(os.Stderr, "usage: go run mksyscall_aix_ppc64.go [-b32 | -l32] [-tags x,y] [file ...]\n") - os.Exit(1) -} - -// parseParamList parses parameter list and returns a slice of parameters -func parseParamList(list string) []string { - list = strings.TrimSpace(list) - if list == "" { - return []string{} - } - return regexp.MustCompile(`\s*,\s*`).Split(list, -1) -} - -// parseParam splits a parameter into name and type -func parseParam(p string) Param { - ps := regexp.MustCompile(`^(\S*) (\S*)$`).FindStringSubmatch(p) - if ps == nil { - fmt.Fprintf(os.Stderr, "malformed parameter: %s\n", p) - os.Exit(1) - } - return Param{ps[1], ps[2]} -} - -func main() { - flag.Usage = usage - flag.Parse() - if len(flag.Args()) <= 0 { - fmt.Fprintf(os.Stderr, "no files to parse provided\n") - usage() - } - - endianness := "" - if *b32 { - endianness = "big-endian" - } else if *l32 { - endianness = "little-endian" - } - - pack := "" - // GCCGO - textgccgo := "" - cExtern := "/*\n#include \n" - // GC - textgc := "" - dynimports := "" - linknames := "" - var vars []string - // COMMON - textcommon := "" - for _, path := range flag.Args() { - file, err := os.Open(path) - if err != nil { - fmt.Fprintf(os.Stderr, err.Error()) - os.Exit(1) - } - s := bufio.NewScanner(file) - for s.Scan() { - t := s.Text() - t = strings.TrimSpace(t) - t = regexp.MustCompile(`\s+`).ReplaceAllString(t, ` `) - if p := regexp.MustCompile(`^package (\S+)$`).FindStringSubmatch(t); p != nil && pack == "" { - pack = p[1] - } - nonblock := regexp.MustCompile(`^\/\/sysnb `).FindStringSubmatch(t) - if regexp.MustCompile(`^\/\/sys `).FindStringSubmatch(t) == nil && nonblock == nil { - continue - } - - // Line must be of the form - // func Open(path string, mode int, perm int) (fd int, err error) - // Split into name, in params, out params. - f := regexp.MustCompile(`^\/\/sys(nb)? (\w+)\(([^()]*)\)\s*(?:\(([^()]+)\))?\s*(?:=\s*(?:(\w*)\.)?(\w*))?$`).FindStringSubmatch(t) - if f == nil { - fmt.Fprintf(os.Stderr, "%s:%s\nmalformed //sys declaration\n", path, t) - os.Exit(1) - } - funct, inps, outps, modname, sysname := f[2], f[3], f[4], f[5], f[6] - - // Split argument lists on comma. - in := parseParamList(inps) - out := parseParamList(outps) - - inps = strings.Join(in, ", ") - outps = strings.Join(out, ", ") - - if sysname == "" { - sysname = funct - } - - onlyCommon := false - if funct == "readlen" || funct == "writelen" || funct == "FcntlInt" || funct == "FcntlFlock" { - // This function call another syscall which is already implemented. - // Therefore, the gc and gccgo part must not be generated. - onlyCommon = true - } - - // Try in vain to keep people from editing this file. - // The theory is that they jump into the middle of the file - // without reading the header. - - textcommon += "// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT\n\n" - if !onlyCommon { - textgccgo += "// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT\n\n" - textgc += "// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT\n\n" - } - - // Check if value return, err return available - errvar := "" - rettype := "" - for _, param := range out { - p := parseParam(param) - if p.Type == "error" { - errvar = p.Name - } else { - rettype = p.Type - } - } - - sysname = regexp.MustCompile(`([a-z])([A-Z])`).ReplaceAllString(sysname, `${1}_$2`) - sysname = strings.ToLower(sysname) // All libc functions are lowercase. - - // GCCGO Prototype return type - cRettype := "" - if rettype == "unsafe.Pointer" { - cRettype = "uintptr_t" - } else if rettype == "uintptr" { - cRettype = "uintptr_t" - } else if regexp.MustCompile(`^_`).FindStringSubmatch(rettype) != nil { - cRettype = "uintptr_t" - } else if rettype == "int" { - cRettype = "int" - } else if rettype == "int32" { - cRettype = "int" - } else if rettype == "int64" { - cRettype = "long long" - } else if rettype == "uint32" { - cRettype = "unsigned int" - } else if rettype == "uint64" { - cRettype = "unsigned long long" - } else { - cRettype = "int" - } - if sysname == "exit" { - cRettype = "void" - } - - // GCCGO Prototype arguments type - var cIn []string - for i, param := range in { - p := parseParam(param) - if regexp.MustCompile(`^\*`).FindStringSubmatch(p.Type) != nil { - cIn = append(cIn, "uintptr_t") - } else if p.Type == "string" { - cIn = append(cIn, "uintptr_t") - } else if regexp.MustCompile(`^\[\](.*)`).FindStringSubmatch(p.Type) != nil { - cIn = append(cIn, "uintptr_t", "size_t") - } else if p.Type == "unsafe.Pointer" { - cIn = append(cIn, "uintptr_t") - } else if p.Type == "uintptr" { - cIn = append(cIn, "uintptr_t") - } else if regexp.MustCompile(`^_`).FindStringSubmatch(p.Type) != nil { - cIn = append(cIn, "uintptr_t") - } else if p.Type == "int" { - if (i == 0 || i == 2) && funct == "fcntl" { - // These fcntl arguments needs to be uintptr to be able to call FcntlInt and FcntlFlock - cIn = append(cIn, "uintptr_t") - } else { - cIn = append(cIn, "int") - } - - } else if p.Type == "int32" { - cIn = append(cIn, "int") - } else if p.Type == "int64" { - cIn = append(cIn, "long long") - } else if p.Type == "uint32" { - cIn = append(cIn, "unsigned int") - } else if p.Type == "uint64" { - cIn = append(cIn, "unsigned long long") - } else { - cIn = append(cIn, "int") - } - } - - if !onlyCommon { - // GCCGO Prototype Generation - // Imports of system calls from libc - cExtern += fmt.Sprintf("%s %s", cRettype, sysname) - cIn := strings.Join(cIn, ", ") - cExtern += fmt.Sprintf("(%s);\n", cIn) - } - // GC Library name - if modname == "" { - modname = "libc.a/shr_64.o" - } else { - fmt.Fprintf(os.Stderr, "%s: only syscall using libc are available\n", funct) - os.Exit(1) - } - sysvarname := fmt.Sprintf("libc_%s", sysname) - - if !onlyCommon { - // GC Runtime import of function to allow cross-platform builds. - dynimports += fmt.Sprintf("//go:cgo_import_dynamic %s %s \"%s\"\n", sysvarname, sysname, modname) - // GC Link symbol to proc address variable. - linknames += fmt.Sprintf("//go:linkname %s %s\n", sysvarname, sysvarname) - // GC Library proc address variable. - vars = append(vars, sysvarname) - } - - strconvfunc := "BytePtrFromString" - strconvtype := "*byte" - - // Go function header. - if outps != "" { - outps = fmt.Sprintf(" (%s)", outps) - } - if textcommon != "" { - textcommon += "\n" - } - - textcommon += fmt.Sprintf("func %s(%s)%s {\n", funct, strings.Join(in, ", "), outps) - - // Prepare arguments tocall. - var argscommon []string // Arguments in the common part - var argscall []string // Arguments for call prototype - var argsgc []string // Arguments for gc call (with syscall6) - var argsgccgo []string // Arguments for gccgo call (with C.name_of_syscall) - n := 0 - argN := 0 - for _, param := range in { - p := parseParam(param) - if regexp.MustCompile(`^\*`).FindStringSubmatch(p.Type) != nil { - argscommon = append(argscommon, fmt.Sprintf("uintptr(unsafe.Pointer(%s))", p.Name)) - argscall = append(argscall, fmt.Sprintf("%s uintptr", p.Name)) - argsgc = append(argsgc, p.Name) - argsgccgo = append(argsgccgo, fmt.Sprintf("C.uintptr_t(%s)", p.Name)) - } else if p.Type == "string" && errvar != "" { - textcommon += fmt.Sprintf("\tvar _p%d %s\n", n, strconvtype) - textcommon += fmt.Sprintf("\t_p%d, %s = %s(%s)\n", n, errvar, strconvfunc, p.Name) - textcommon += fmt.Sprintf("\tif %s != nil {\n\t\treturn\n\t}\n", errvar) - - argscommon = append(argscommon, fmt.Sprintf("uintptr(unsafe.Pointer(_p%d))", n)) - argscall = append(argscall, fmt.Sprintf("_p%d uintptr ", n)) - argsgc = append(argsgc, fmt.Sprintf("_p%d", n)) - argsgccgo = append(argsgccgo, fmt.Sprintf("C.uintptr_t(_p%d)", n)) - n++ - } else if p.Type == "string" { - fmt.Fprintf(os.Stderr, path+":"+funct+" uses string arguments, but has no error return\n") - textcommon += fmt.Sprintf("\tvar _p%d %s\n", n, strconvtype) - textcommon += fmt.Sprintf("\t_p%d, %s = %s(%s)\n", n, errvar, strconvfunc, p.Name) - textcommon += fmt.Sprintf("\tif %s != nil {\n\t\treturn\n\t}\n", errvar) - - argscommon = append(argscommon, fmt.Sprintf("uintptr(unsafe.Pointer(_p%d))", n)) - argscall = append(argscall, fmt.Sprintf("_p%d uintptr", n)) - argsgc = append(argsgc, fmt.Sprintf("_p%d", n)) - argsgccgo = append(argsgccgo, fmt.Sprintf("C.uintptr_t(_p%d)", n)) - n++ - } else if m := regexp.MustCompile(`^\[\](.*)`).FindStringSubmatch(p.Type); m != nil { - // Convert slice into pointer, length. - // Have to be careful not to take address of &a[0] if len == 0: - // pass nil in that case. - textcommon += fmt.Sprintf("\tvar _p%d *%s\n", n, m[1]) - textcommon += fmt.Sprintf("\tif len(%s) > 0 {\n\t\t_p%d = &%s[0]\n\t}\n", p.Name, n, p.Name) - argscommon = append(argscommon, fmt.Sprintf("uintptr(unsafe.Pointer(_p%d))", n), fmt.Sprintf("len(%s)", p.Name)) - argscall = append(argscall, fmt.Sprintf("_p%d uintptr", n), fmt.Sprintf("_lenp%d int", n)) - argsgc = append(argsgc, fmt.Sprintf("_p%d", n), fmt.Sprintf("uintptr(_lenp%d)", n)) - argsgccgo = append(argsgccgo, fmt.Sprintf("C.uintptr_t(_p%d)", n), fmt.Sprintf("C.size_t(_lenp%d)", n)) - n++ - } else if p.Type == "int64" && endianness != "" { - fmt.Fprintf(os.Stderr, path+":"+funct+" uses int64 with 32 bits mode. Case not yet implemented\n") - } else if p.Type == "bool" { - fmt.Fprintf(os.Stderr, path+":"+funct+" uses bool. Case not yet implemented\n") - } else if regexp.MustCompile(`^_`).FindStringSubmatch(p.Type) != nil || p.Type == "unsafe.Pointer" { - argscommon = append(argscommon, fmt.Sprintf("uintptr(%s)", p.Name)) - argscall = append(argscall, fmt.Sprintf("%s uintptr", p.Name)) - argsgc = append(argsgc, p.Name) - argsgccgo = append(argsgccgo, fmt.Sprintf("C.uintptr_t(%s)", p.Name)) - } else if p.Type == "int" { - if (argN == 0 || argN == 2) && ((funct == "fcntl") || (funct == "FcntlInt") || (funct == "FcntlFlock")) { - // These fcntl arguments need to be uintptr to be able to call FcntlInt and FcntlFlock - argscommon = append(argscommon, fmt.Sprintf("uintptr(%s)", p.Name)) - argscall = append(argscall, fmt.Sprintf("%s uintptr", p.Name)) - argsgc = append(argsgc, p.Name) - argsgccgo = append(argsgccgo, fmt.Sprintf("C.uintptr_t(%s)", p.Name)) - - } else { - argscommon = append(argscommon, p.Name) - argscall = append(argscall, fmt.Sprintf("%s int", p.Name)) - argsgc = append(argsgc, fmt.Sprintf("uintptr(%s)", p.Name)) - argsgccgo = append(argsgccgo, fmt.Sprintf("C.int(%s)", p.Name)) - } - } else if p.Type == "int32" { - argscommon = append(argscommon, p.Name) - argscall = append(argscall, fmt.Sprintf("%s int32", p.Name)) - argsgc = append(argsgc, fmt.Sprintf("uintptr(%s)", p.Name)) - argsgccgo = append(argsgccgo, fmt.Sprintf("C.int(%s)", p.Name)) - } else if p.Type == "int64" { - argscommon = append(argscommon, p.Name) - argscall = append(argscall, fmt.Sprintf("%s int64", p.Name)) - argsgc = append(argsgc, fmt.Sprintf("uintptr(%s)", p.Name)) - argsgccgo = append(argsgccgo, fmt.Sprintf("C.longlong(%s)", p.Name)) - } else if p.Type == "uint32" { - argscommon = append(argscommon, p.Name) - argscall = append(argscall, fmt.Sprintf("%s uint32", p.Name)) - argsgc = append(argsgc, fmt.Sprintf("uintptr(%s)", p.Name)) - argsgccgo = append(argsgccgo, fmt.Sprintf("C.uint(%s)", p.Name)) - } else if p.Type == "uint64" { - argscommon = append(argscommon, p.Name) - argscall = append(argscall, fmt.Sprintf("%s uint64", p.Name)) - argsgc = append(argsgc, fmt.Sprintf("uintptr(%s)", p.Name)) - argsgccgo = append(argsgccgo, fmt.Sprintf("C.ulonglong(%s)", p.Name)) - } else if p.Type == "uintptr" { - argscommon = append(argscommon, p.Name) - argscall = append(argscall, fmt.Sprintf("%s uintptr", p.Name)) - argsgc = append(argsgc, p.Name) - argsgccgo = append(argsgccgo, fmt.Sprintf("C.uintptr_t(%s)", p.Name)) - } else { - argscommon = append(argscommon, fmt.Sprintf("int(%s)", p.Name)) - argscall = append(argscall, fmt.Sprintf("%s int", p.Name)) - argsgc = append(argsgc, fmt.Sprintf("uintptr(%s)", p.Name)) - argsgccgo = append(argsgccgo, fmt.Sprintf("C.int(%s)", p.Name)) - } - argN++ - } - nargs := len(argsgc) - - // COMMON function generation - argscommonlist := strings.Join(argscommon, ", ") - callcommon := fmt.Sprintf("call%s(%s)", sysname, argscommonlist) - ret := []string{"_", "_"} - body := "" - doErrno := false - for i := 0; i < len(out); i++ { - p := parseParam(out[i]) - reg := "" - if p.Name == "err" { - reg = "e1" - ret[1] = reg - doErrno = true - } else { - reg = "r0" - ret[0] = reg - } - if p.Type == "bool" { - reg = fmt.Sprintf("%s != 0", reg) - } - if reg != "e1" { - body += fmt.Sprintf("\t%s = %s(%s)\n", p.Name, p.Type, reg) - } - } - if ret[0] == "_" && ret[1] == "_" { - textcommon += fmt.Sprintf("\t%s\n", callcommon) - } else { - textcommon += fmt.Sprintf("\t%s, %s := %s\n", ret[0], ret[1], callcommon) - } - textcommon += body - - if doErrno { - textcommon += "\tif e1 != 0 {\n" - textcommon += "\t\terr = errnoErr(e1)\n" - textcommon += "\t}\n" - } - textcommon += "\treturn\n" - textcommon += "}\n" - - if onlyCommon { - continue - } - - // CALL Prototype - callProto := fmt.Sprintf("func call%s(%s) (r1 uintptr, e1 Errno) {\n", sysname, strings.Join(argscall, ", ")) - - // GC function generation - asm := "syscall6" - if nonblock != nil { - asm = "rawSyscall6" - } - - if len(argsgc) <= 6 { - for len(argsgc) < 6 { - argsgc = append(argsgc, "0") - } - } else { - fmt.Fprintf(os.Stderr, "%s: too many arguments to system call", funct) - os.Exit(1) - } - argsgclist := strings.Join(argsgc, ", ") - callgc := fmt.Sprintf("%s(uintptr(unsafe.Pointer(&%s)), %d, %s)", asm, sysvarname, nargs, argsgclist) - - textgc += callProto - textgc += fmt.Sprintf("\tr1, _, e1 = %s\n", callgc) - textgc += "\treturn\n}\n" - - // GCCGO function generation - argsgccgolist := strings.Join(argsgccgo, ", ") - callgccgo := fmt.Sprintf("C.%s(%s)", sysname, argsgccgolist) - textgccgo += callProto - textgccgo += fmt.Sprintf("\tr1 = uintptr(%s)\n", callgccgo) - textgccgo += "\te1 = syscall.GetErrno()\n" - textgccgo += "\treturn\n}\n" - } - if err := s.Err(); err != nil { - fmt.Fprintf(os.Stderr, err.Error()) - os.Exit(1) - } - file.Close() - } - imp := "" - if pack != "unix" { - imp = "import \"golang.org/x/sys/unix\"\n" - - } - - // Print zsyscall_aix_ppc64.go - err := ioutil.WriteFile("zsyscall_aix_ppc64.go", - []byte(fmt.Sprintf(srcTemplate1, cmdLine(), buildTags(), pack, imp, textcommon)), - 0644) - if err != nil { - fmt.Fprintf(os.Stderr, err.Error()) - os.Exit(1) - } - - // Print zsyscall_aix_ppc64_gc.go - vardecls := "\t" + strings.Join(vars, ",\n\t") - vardecls += " syscallFunc" - err = ioutil.WriteFile("zsyscall_aix_ppc64_gc.go", - []byte(fmt.Sprintf(srcTemplate2, cmdLine(), buildTags(), pack, imp, dynimports, linknames, vardecls, textgc)), - 0644) - if err != nil { - fmt.Fprintf(os.Stderr, err.Error()) - os.Exit(1) - } - - // Print zsyscall_aix_ppc64_gccgo.go - err = ioutil.WriteFile("zsyscall_aix_ppc64_gccgo.go", - []byte(fmt.Sprintf(srcTemplate3, cmdLine(), buildTags(), pack, cExtern, imp, textgccgo)), - 0644) - if err != nil { - fmt.Fprintf(os.Stderr, err.Error()) - os.Exit(1) - } -} - -const srcTemplate1 = `// %s -// Code generated by the command above; see README.md. DO NOT EDIT. - -// +build %s - -package %s - -import ( - "unsafe" -) - - -%s - -%s -` -const srcTemplate2 = `// %s -// Code generated by the command above; see README.md. DO NOT EDIT. - -// +build %s -// +build !gccgo - -package %s - -import ( - "unsafe" -) -%s -%s -%s -type syscallFunc uintptr - -var ( -%s -) - -// Implemented in runtime/syscall_aix.go. -func rawSyscall6(trap, nargs, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err Errno) -func syscall6(trap, nargs, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err Errno) - -%s -` -const srcTemplate3 = `// %s -// Code generated by the command above; see README.md. DO NOT EDIT. - -// +build %s -// +build gccgo - -package %s - -%s -*/ -import "C" -import ( - "syscall" -) - - -%s - -%s -` diff --git a/vendor/golang.org/x/sys/unix/mksyscall_solaris.go b/vendor/golang.org/x/sys/unix/mksyscall_solaris.go deleted file mode 100644 index 3d864738b6..0000000000 --- a/vendor/golang.org/x/sys/unix/mksyscall_solaris.go +++ /dev/null @@ -1,335 +0,0 @@ -// Copyright 2019 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build ignore - -/* - This program reads a file containing function prototypes - (like syscall_solaris.go) and generates system call bodies. - The prototypes are marked by lines beginning with "//sys" - and read like func declarations if //sys is replaced by func, but: - * The parameter lists must give a name for each argument. - This includes return parameters. - * The parameter lists must give a type for each argument: - the (x, y, z int) shorthand is not allowed. - * If the return parameter is an error number, it must be named err. - * If go func name needs to be different than its libc name, - * or the function is not in libc, name could be specified - * at the end, after "=" sign, like - //sys getsockopt(s int, level int, name int, val uintptr, vallen *_Socklen) (err error) = libsocket.getsockopt -*/ - -package main - -import ( - "bufio" - "flag" - "fmt" - "os" - "regexp" - "strings" -) - -var ( - b32 = flag.Bool("b32", false, "32bit big-endian") - l32 = flag.Bool("l32", false, "32bit little-endian") - tags = flag.String("tags", "", "build tags") -) - -// cmdLine returns this programs's commandline arguments -func cmdLine() string { - return "go run mksyscall_solaris.go " + strings.Join(os.Args[1:], " ") -} - -// buildTags returns build tags -func buildTags() string { - return *tags -} - -// Param is function parameter -type Param struct { - Name string - Type string -} - -// usage prints the program usage -func usage() { - fmt.Fprintf(os.Stderr, "usage: go run mksyscall_solaris.go [-b32 | -l32] [-tags x,y] [file ...]\n") - os.Exit(1) -} - -// parseParamList parses parameter list and returns a slice of parameters -func parseParamList(list string) []string { - list = strings.TrimSpace(list) - if list == "" { - return []string{} - } - return regexp.MustCompile(`\s*,\s*`).Split(list, -1) -} - -// parseParam splits a parameter into name and type -func parseParam(p string) Param { - ps := regexp.MustCompile(`^(\S*) (\S*)$`).FindStringSubmatch(p) - if ps == nil { - fmt.Fprintf(os.Stderr, "malformed parameter: %s\n", p) - os.Exit(1) - } - return Param{ps[1], ps[2]} -} - -func main() { - flag.Usage = usage - flag.Parse() - if len(flag.Args()) <= 0 { - fmt.Fprintf(os.Stderr, "no files to parse provided\n") - usage() - } - - endianness := "" - if *b32 { - endianness = "big-endian" - } else if *l32 { - endianness = "little-endian" - } - - pack := "" - text := "" - dynimports := "" - linknames := "" - var vars []string - for _, path := range flag.Args() { - file, err := os.Open(path) - if err != nil { - fmt.Fprintf(os.Stderr, err.Error()) - os.Exit(1) - } - s := bufio.NewScanner(file) - for s.Scan() { - t := s.Text() - t = strings.TrimSpace(t) - t = regexp.MustCompile(`\s+`).ReplaceAllString(t, ` `) - if p := regexp.MustCompile(`^package (\S+)$`).FindStringSubmatch(t); p != nil && pack == "" { - pack = p[1] - } - nonblock := regexp.MustCompile(`^\/\/sysnb `).FindStringSubmatch(t) - if regexp.MustCompile(`^\/\/sys `).FindStringSubmatch(t) == nil && nonblock == nil { - continue - } - - // Line must be of the form - // func Open(path string, mode int, perm int) (fd int, err error) - // Split into name, in params, out params. - f := regexp.MustCompile(`^\/\/sys(nb)? (\w+)\(([^()]*)\)\s*(?:\(([^()]+)\))?\s*(?:=\s*(?:(\w*)\.)?(\w*))?$`).FindStringSubmatch(t) - if f == nil { - fmt.Fprintf(os.Stderr, "%s:%s\nmalformed //sys declaration\n", path, t) - os.Exit(1) - } - funct, inps, outps, modname, sysname := f[2], f[3], f[4], f[5], f[6] - - // Split argument lists on comma. - in := parseParamList(inps) - out := parseParamList(outps) - - inps = strings.Join(in, ", ") - outps = strings.Join(out, ", ") - - // Try in vain to keep people from editing this file. - // The theory is that they jump into the middle of the file - // without reading the header. - text += "// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT\n\n" - - // So file name. - if modname == "" { - modname = "libc" - } - - // System call name. - if sysname == "" { - sysname = funct - } - - // System call pointer variable name. - sysvarname := fmt.Sprintf("proc%s", sysname) - - strconvfunc := "BytePtrFromString" - strconvtype := "*byte" - - sysname = strings.ToLower(sysname) // All libc functions are lowercase. - - // Runtime import of function to allow cross-platform builds. - dynimports += fmt.Sprintf("//go:cgo_import_dynamic libc_%s %s \"%s.so\"\n", sysname, sysname, modname) - // Link symbol to proc address variable. - linknames += fmt.Sprintf("//go:linkname %s libc_%s\n", sysvarname, sysname) - // Library proc address variable. - vars = append(vars, sysvarname) - - // Go function header. - outlist := strings.Join(out, ", ") - if outlist != "" { - outlist = fmt.Sprintf(" (%s)", outlist) - } - if text != "" { - text += "\n" - } - text += fmt.Sprintf("func %s(%s)%s {\n", funct, strings.Join(in, ", "), outlist) - - // Check if err return available - errvar := "" - for _, param := range out { - p := parseParam(param) - if p.Type == "error" { - errvar = p.Name - continue - } - } - - // Prepare arguments to Syscall. - var args []string - n := 0 - for _, param := range in { - p := parseParam(param) - if regexp.MustCompile(`^\*`).FindStringSubmatch(p.Type) != nil { - args = append(args, "uintptr(unsafe.Pointer("+p.Name+"))") - } else if p.Type == "string" && errvar != "" { - text += fmt.Sprintf("\tvar _p%d %s\n", n, strconvtype) - text += fmt.Sprintf("\t_p%d, %s = %s(%s)\n", n, errvar, strconvfunc, p.Name) - text += fmt.Sprintf("\tif %s != nil {\n\t\treturn\n\t}\n", errvar) - args = append(args, fmt.Sprintf("uintptr(unsafe.Pointer(_p%d))", n)) - n++ - } else if p.Type == "string" { - fmt.Fprintf(os.Stderr, path+":"+funct+" uses string arguments, but has no error return\n") - text += fmt.Sprintf("\tvar _p%d %s\n", n, strconvtype) - text += fmt.Sprintf("\t_p%d, _ = %s(%s)\n", n, strconvfunc, p.Name) - args = append(args, fmt.Sprintf("uintptr(unsafe.Pointer(_p%d))", n)) - n++ - } else if s := regexp.MustCompile(`^\[\](.*)`).FindStringSubmatch(p.Type); s != nil { - // Convert slice into pointer, length. - // Have to be careful not to take address of &a[0] if len == 0: - // pass nil in that case. - text += fmt.Sprintf("\tvar _p%d *%s\n", n, s[1]) - text += fmt.Sprintf("\tif len(%s) > 0 {\n\t\t_p%d = &%s[0]\n\t}\n", p.Name, n, p.Name) - args = append(args, fmt.Sprintf("uintptr(unsafe.Pointer(_p%d))", n), fmt.Sprintf("uintptr(len(%s))", p.Name)) - n++ - } else if p.Type == "int64" && endianness != "" { - if endianness == "big-endian" { - args = append(args, fmt.Sprintf("uintptr(%s>>32)", p.Name), fmt.Sprintf("uintptr(%s)", p.Name)) - } else { - args = append(args, fmt.Sprintf("uintptr(%s)", p.Name), fmt.Sprintf("uintptr(%s>>32)", p.Name)) - } - } else if p.Type == "bool" { - text += fmt.Sprintf("\tvar _p%d uint32\n", n) - text += fmt.Sprintf("\tif %s {\n\t\t_p%d = 1\n\t} else {\n\t\t_p%d = 0\n\t}\n", p.Name, n, n) - args = append(args, fmt.Sprintf("uintptr(_p%d)", n)) - n++ - } else { - args = append(args, fmt.Sprintf("uintptr(%s)", p.Name)) - } - } - nargs := len(args) - - // Determine which form to use; pad args with zeros. - asm := "sysvicall6" - if nonblock != nil { - asm = "rawSysvicall6" - } - if len(args) <= 6 { - for len(args) < 6 { - args = append(args, "0") - } - } else { - fmt.Fprintf(os.Stderr, "%s: too many arguments to system call\n", path) - os.Exit(1) - } - - // Actual call. - arglist := strings.Join(args, ", ") - call := fmt.Sprintf("%s(uintptr(unsafe.Pointer(&%s)), %d, %s)", asm, sysvarname, nargs, arglist) - - // Assign return values. - body := "" - ret := []string{"_", "_", "_"} - doErrno := false - for i := 0; i < len(out); i++ { - p := parseParam(out[i]) - reg := "" - if p.Name == "err" { - reg = "e1" - ret[2] = reg - doErrno = true - } else { - reg = fmt.Sprintf("r%d", i) - ret[i] = reg - } - if p.Type == "bool" { - reg = fmt.Sprintf("%d != 0", reg) - } - if p.Type == "int64" && endianness != "" { - // 64-bit number in r1:r0 or r0:r1. - if i+2 > len(out) { - fmt.Fprintf(os.Stderr, "%s: not enough registers for int64 return\n", path) - os.Exit(1) - } - if endianness == "big-endian" { - reg = fmt.Sprintf("int64(r%d)<<32 | int64(r%d)", i, i+1) - } else { - reg = fmt.Sprintf("int64(r%d)<<32 | int64(r%d)", i+1, i) - } - ret[i] = fmt.Sprintf("r%d", i) - ret[i+1] = fmt.Sprintf("r%d", i+1) - } - if reg != "e1" { - body += fmt.Sprintf("\t%s = %s(%s)\n", p.Name, p.Type, reg) - } - } - if ret[0] == "_" && ret[1] == "_" && ret[2] == "_" { - text += fmt.Sprintf("\t%s\n", call) - } else { - text += fmt.Sprintf("\t%s, %s, %s := %s\n", ret[0], ret[1], ret[2], call) - } - text += body - - if doErrno { - text += "\tif e1 != 0 {\n" - text += "\t\terr = e1\n" - text += "\t}\n" - } - text += "\treturn\n" - text += "}\n" - } - if err := s.Err(); err != nil { - fmt.Fprintf(os.Stderr, err.Error()) - os.Exit(1) - } - file.Close() - } - imp := "" - if pack != "unix" { - imp = "import \"golang.org/x/sys/unix\"\n" - - } - vardecls := "\t" + strings.Join(vars, ",\n\t") - vardecls += " syscallFunc" - fmt.Printf(srcTemplate, cmdLine(), buildTags(), pack, imp, dynimports, linknames, vardecls, text) -} - -const srcTemplate = `// %s -// Code generated by the command above; see README.md. DO NOT EDIT. - -// +build %s - -package %s - -import ( - "syscall" - "unsafe" -) -%s -%s -%s -var ( -%s -) - -%s -` diff --git a/vendor/golang.org/x/sys/unix/mksysnum.go b/vendor/golang.org/x/sys/unix/mksysnum.go deleted file mode 100644 index 07f8960ff3..0000000000 --- a/vendor/golang.org/x/sys/unix/mksysnum.go +++ /dev/null @@ -1,190 +0,0 @@ -// Copyright 2018 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build ignore - -// Generate system call table for DragonFly, NetBSD, -// FreeBSD, OpenBSD or Darwin from master list -// (for example, /usr/src/sys/kern/syscalls.master or -// sys/syscall.h). -package main - -import ( - "bufio" - "fmt" - "io" - "io/ioutil" - "net/http" - "os" - "regexp" - "strings" -) - -var ( - goos, goarch string -) - -// cmdLine returns this programs's commandline arguments -func cmdLine() string { - return "go run mksysnum.go " + strings.Join(os.Args[1:], " ") -} - -// buildTags returns build tags -func buildTags() string { - return fmt.Sprintf("%s,%s", goarch, goos) -} - -func checkErr(err error) { - if err != nil { - fmt.Fprintf(os.Stderr, "%v\n", err) - os.Exit(1) - } -} - -// source string and substring slice for regexp -type re struct { - str string // source string - sub []string // matched sub-string -} - -// Match performs regular expression match -func (r *re) Match(exp string) bool { - r.sub = regexp.MustCompile(exp).FindStringSubmatch(r.str) - if r.sub != nil { - return true - } - return false -} - -// fetchFile fetches a text file from URL -func fetchFile(URL string) io.Reader { - resp, err := http.Get(URL) - checkErr(err) - defer resp.Body.Close() - body, err := ioutil.ReadAll(resp.Body) - checkErr(err) - return strings.NewReader(string(body)) -} - -// readFile reads a text file from path -func readFile(path string) io.Reader { - file, err := os.Open(os.Args[1]) - checkErr(err) - return file -} - -func format(name, num, proto string) string { - name = strings.ToUpper(name) - // There are multiple entries for enosys and nosys, so comment them out. - nm := re{str: name} - if nm.Match(`^SYS_E?NOSYS$`) { - name = fmt.Sprintf("// %s", name) - } - if name == `SYS_SYS_EXIT` { - name = `SYS_EXIT` - } - return fmt.Sprintf(" %s = %s; // %s\n", name, num, proto) -} - -func main() { - // Get the OS (using GOOS_TARGET if it exist) - goos = os.Getenv("GOOS_TARGET") - if goos == "" { - goos = os.Getenv("GOOS") - } - // Get the architecture (using GOARCH_TARGET if it exists) - goarch = os.Getenv("GOARCH_TARGET") - if goarch == "" { - goarch = os.Getenv("GOARCH") - } - // Check if GOOS and GOARCH environment variables are defined - if goarch == "" || goos == "" { - fmt.Fprintf(os.Stderr, "GOARCH or GOOS not defined in environment\n") - os.Exit(1) - } - - file := strings.TrimSpace(os.Args[1]) - var syscalls io.Reader - if strings.HasPrefix(file, "https://") || strings.HasPrefix(file, "http://") { - // Download syscalls.master file - syscalls = fetchFile(file) - } else { - syscalls = readFile(file) - } - - var text, line string - s := bufio.NewScanner(syscalls) - for s.Scan() { - t := re{str: line} - if t.Match(`^(.*)\\$`) { - // Handle continuation - line = t.sub[1] - line += strings.TrimLeft(s.Text(), " \t") - } else { - // New line - line = s.Text() - } - t = re{str: line} - if t.Match(`\\$`) { - continue - } - t = re{str: line} - - switch goos { - case "dragonfly": - if t.Match(`^([0-9]+)\s+STD\s+({ \S+\s+(\w+).*)$`) { - num, proto := t.sub[1], t.sub[2] - name := fmt.Sprintf("SYS_%s", t.sub[3]) - text += format(name, num, proto) - } - case "freebsd": - if t.Match(`^([0-9]+)\s+\S+\s+(?:NO)?STD\s+({ \S+\s+(\w+).*)$`) { - num, proto := t.sub[1], t.sub[2] - name := fmt.Sprintf("SYS_%s", t.sub[3]) - text += format(name, num, proto) - } - case "openbsd": - if t.Match(`^([0-9]+)\s+STD\s+(NOLOCK\s+)?({ \S+\s+\*?(\w+).*)$`) { - num, proto, name := t.sub[1], t.sub[3], t.sub[4] - text += format(name, num, proto) - } - case "netbsd": - if t.Match(`^([0-9]+)\s+((STD)|(NOERR))\s+(RUMP\s+)?({\s+\S+\s*\*?\s*\|(\S+)\|(\S*)\|(\w+).*\s+})(\s+(\S+))?$`) { - num, proto, compat := t.sub[1], t.sub[6], t.sub[8] - name := t.sub[7] + "_" + t.sub[9] - if t.sub[11] != "" { - name = t.sub[7] + "_" + t.sub[11] - } - name = strings.ToUpper(name) - if compat == "" || compat == "13" || compat == "30" || compat == "50" { - text += fmt.Sprintf(" %s = %s; // %s\n", name, num, proto) - } - } - case "darwin": - if t.Match(`^#define\s+SYS_(\w+)\s+([0-9]+)`) { - name, num := t.sub[1], t.sub[2] - name = strings.ToUpper(name) - text += fmt.Sprintf(" SYS_%s = %s;\n", name, num) - } - default: - fmt.Fprintf(os.Stderr, "unrecognized GOOS=%s\n", goos) - os.Exit(1) - - } - } - err := s.Err() - checkErr(err) - - fmt.Printf(template, cmdLine(), buildTags(), text) -} - -const template = `// %s -// Code generated by the command above; see README.md. DO NOT EDIT. - -// +build %s - -package unix - -const( -%s)` diff --git a/vendor/golang.org/x/sys/unix/types_aix.go b/vendor/golang.org/x/sys/unix/types_aix.go deleted file mode 100644 index 25e834940d..0000000000 --- a/vendor/golang.org/x/sys/unix/types_aix.go +++ /dev/null @@ -1,236 +0,0 @@ -// Copyright 2018 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build ignore -// +build aix - -/* -Input to cgo -godefs. See also mkerrors.sh and mkall.sh -*/ - -// +godefs map struct_in_addr [4]byte /* in_addr */ -// +godefs map struct_in6_addr [16]byte /* in6_addr */ - -package unix - -/* -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include -#include -#include -#include - - -#include -#include - -enum { - sizeofPtr = sizeof(void*), -}; - -union sockaddr_all { - struct sockaddr s1; // this one gets used for fields - struct sockaddr_in s2; // these pad it out - struct sockaddr_in6 s3; - struct sockaddr_un s4; - struct sockaddr_dl s5; -}; - -struct sockaddr_any { - struct sockaddr addr; - char pad[sizeof(union sockaddr_all) - sizeof(struct sockaddr)]; -}; - -*/ -import "C" - -// Machine characteristics - -const ( - SizeofPtr = C.sizeofPtr - SizeofShort = C.sizeof_short - SizeofInt = C.sizeof_int - SizeofLong = C.sizeof_long - SizeofLongLong = C.sizeof_longlong - PathMax = C.PATH_MAX -) - -// Basic types - -type ( - _C_short C.short - _C_int C.int - _C_long C.long - _C_long_long C.longlong -) - -type off64 C.off64_t -type off C.off_t -type Mode_t C.mode_t - -// Time - -type Timespec C.struct_timespec - -type StTimespec C.struct_st_timespec - -type Timeval C.struct_timeval - -type Timeval32 C.struct_timeval32 - -type Timex C.struct_timex - -type Time_t C.time_t - -type Tms C.struct_tms - -type Utimbuf C.struct_utimbuf - -type Timezone C.struct_timezone - -// Processes - -type Rusage C.struct_rusage - -type Rlimit C.struct_rlimit64 - -type Pid_t C.pid_t - -type _Gid_t C.gid_t - -type dev_t C.dev_t - -// Files - -type Stat_t C.struct_stat - -type StatxTimestamp C.struct_statx_timestamp - -type Statx_t C.struct_statx - -type Dirent C.struct_dirent - -// Sockets - -type RawSockaddrInet4 C.struct_sockaddr_in - -type RawSockaddrInet6 C.struct_sockaddr_in6 - -type RawSockaddrUnix C.struct_sockaddr_un - -type RawSockaddr C.struct_sockaddr - -type RawSockaddrAny C.struct_sockaddr_any - -type _Socklen C.socklen_t - -type Cmsghdr C.struct_cmsghdr - -type ICMPv6Filter C.struct_icmp6_filter - -type Iovec C.struct_iovec - -type IPMreq C.struct_ip_mreq - -type IPv6Mreq C.struct_ipv6_mreq - -type IPv6MTUInfo C.struct_ip6_mtuinfo - -type Linger C.struct_linger - -type Msghdr C.struct_msghdr - -const ( - SizeofSockaddrInet4 = C.sizeof_struct_sockaddr_in - SizeofSockaddrInet6 = C.sizeof_struct_sockaddr_in6 - SizeofSockaddrAny = C.sizeof_struct_sockaddr_any - SizeofSockaddrUnix = C.sizeof_struct_sockaddr_un - SizeofLinger = C.sizeof_struct_linger - SizeofIPMreq = C.sizeof_struct_ip_mreq - SizeofIPv6Mreq = C.sizeof_struct_ipv6_mreq - SizeofIPv6MTUInfo = C.sizeof_struct_ip6_mtuinfo - SizeofMsghdr = C.sizeof_struct_msghdr - SizeofCmsghdr = C.sizeof_struct_cmsghdr - SizeofICMPv6Filter = C.sizeof_struct_icmp6_filter -) - -// Routing and interface messages - -const ( - SizeofIfMsghdr = C.sizeof_struct_if_msghdr -) - -type IfMsgHdr C.struct_if_msghdr - -// Misc - -type FdSet C.fd_set - -type Utsname C.struct_utsname - -type Ustat_t C.struct_ustat - -type Sigset_t C.sigset_t - -const ( - AT_FDCWD = C.AT_FDCWD - AT_REMOVEDIR = C.AT_REMOVEDIR - AT_SYMLINK_NOFOLLOW = C.AT_SYMLINK_NOFOLLOW -) - -// Terminal handling - -type Termios C.struct_termios - -type Termio C.struct_termio - -type Winsize C.struct_winsize - -//poll - -type PollFd struct { - Fd int32 - Events uint16 - Revents uint16 -} - -const ( - POLLERR = C.POLLERR - POLLHUP = C.POLLHUP - POLLIN = C.POLLIN - POLLNVAL = C.POLLNVAL - POLLOUT = C.POLLOUT - POLLPRI = C.POLLPRI - POLLRDBAND = C.POLLRDBAND - POLLRDNORM = C.POLLRDNORM - POLLWRBAND = C.POLLWRBAND - POLLWRNORM = C.POLLWRNORM -) - -//flock_t - -type Flock_t C.struct_flock64 - -// Statfs - -type Fsid_t C.struct_fsid_t -type Fsid64_t C.struct_fsid64_t - -type Statfs_t C.struct_statfs - -const RNDGETENTCNT = 0x80045200 diff --git a/vendor/golang.org/x/sys/unix/types_darwin.go b/vendor/golang.org/x/sys/unix/types_darwin.go deleted file mode 100644 index 9fd2aaa6a2..0000000000 --- a/vendor/golang.org/x/sys/unix/types_darwin.go +++ /dev/null @@ -1,277 +0,0 @@ -// Copyright 2009 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build ignore - -/* -Input to cgo -godefs. See README.md -*/ - -// +godefs map struct_in_addr [4]byte /* in_addr */ -// +godefs map struct_in6_addr [16]byte /* in6_addr */ - -package unix - -/* -#define __DARWIN_UNIX03 0 -#define KERNEL -#define _DARWIN_USE_64_BIT_INODE -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -enum { - sizeofPtr = sizeof(void*), -}; - -union sockaddr_all { - struct sockaddr s1; // this one gets used for fields - struct sockaddr_in s2; // these pad it out - struct sockaddr_in6 s3; - struct sockaddr_un s4; - struct sockaddr_dl s5; -}; - -struct sockaddr_any { - struct sockaddr addr; - char pad[sizeof(union sockaddr_all) - sizeof(struct sockaddr)]; -}; - -*/ -import "C" - -// Machine characteristics - -const ( - SizeofPtr = C.sizeofPtr - SizeofShort = C.sizeof_short - SizeofInt = C.sizeof_int - SizeofLong = C.sizeof_long - SizeofLongLong = C.sizeof_longlong -) - -// Basic types - -type ( - _C_short C.short - _C_int C.int - _C_long C.long - _C_long_long C.longlong -) - -// Time - -type Timespec C.struct_timespec - -type Timeval C.struct_timeval - -type Timeval32 C.struct_timeval32 - -// Processes - -type Rusage C.struct_rusage - -type Rlimit C.struct_rlimit - -type _Gid_t C.gid_t - -// Files - -type Stat_t C.struct_stat64 - -type Statfs_t C.struct_statfs64 - -type Flock_t C.struct_flock - -type Fstore_t C.struct_fstore - -type Radvisory_t C.struct_radvisory - -type Fbootstraptransfer_t C.struct_fbootstraptransfer - -type Log2phys_t C.struct_log2phys - -type Fsid C.struct_fsid - -type Dirent C.struct_dirent - -// Sockets - -type RawSockaddrInet4 C.struct_sockaddr_in - -type RawSockaddrInet6 C.struct_sockaddr_in6 - -type RawSockaddrUnix C.struct_sockaddr_un - -type RawSockaddrDatalink C.struct_sockaddr_dl - -type RawSockaddr C.struct_sockaddr - -type RawSockaddrAny C.struct_sockaddr_any - -type _Socklen C.socklen_t - -type Linger C.struct_linger - -type Iovec C.struct_iovec - -type IPMreq C.struct_ip_mreq - -type IPv6Mreq C.struct_ipv6_mreq - -type Msghdr C.struct_msghdr - -type Cmsghdr C.struct_cmsghdr - -type Inet4Pktinfo C.struct_in_pktinfo - -type Inet6Pktinfo C.struct_in6_pktinfo - -type IPv6MTUInfo C.struct_ip6_mtuinfo - -type ICMPv6Filter C.struct_icmp6_filter - -const ( - SizeofSockaddrInet4 = C.sizeof_struct_sockaddr_in - SizeofSockaddrInet6 = C.sizeof_struct_sockaddr_in6 - SizeofSockaddrAny = C.sizeof_struct_sockaddr_any - SizeofSockaddrUnix = C.sizeof_struct_sockaddr_un - SizeofSockaddrDatalink = C.sizeof_struct_sockaddr_dl - SizeofLinger = C.sizeof_struct_linger - SizeofIPMreq = C.sizeof_struct_ip_mreq - SizeofIPv6Mreq = C.sizeof_struct_ipv6_mreq - SizeofMsghdr = C.sizeof_struct_msghdr - SizeofCmsghdr = C.sizeof_struct_cmsghdr - SizeofInet4Pktinfo = C.sizeof_struct_in_pktinfo - SizeofInet6Pktinfo = C.sizeof_struct_in6_pktinfo - SizeofIPv6MTUInfo = C.sizeof_struct_ip6_mtuinfo - SizeofICMPv6Filter = C.sizeof_struct_icmp6_filter -) - -// Ptrace requests - -const ( - PTRACE_TRACEME = C.PT_TRACE_ME - PTRACE_CONT = C.PT_CONTINUE - PTRACE_KILL = C.PT_KILL -) - -// Events (kqueue, kevent) - -type Kevent_t C.struct_kevent - -// Select - -type FdSet C.fd_set - -// Routing and interface messages - -const ( - SizeofIfMsghdr = C.sizeof_struct_if_msghdr - SizeofIfData = C.sizeof_struct_if_data - SizeofIfaMsghdr = C.sizeof_struct_ifa_msghdr - SizeofIfmaMsghdr = C.sizeof_struct_ifma_msghdr - SizeofIfmaMsghdr2 = C.sizeof_struct_ifma_msghdr2 - SizeofRtMsghdr = C.sizeof_struct_rt_msghdr - SizeofRtMetrics = C.sizeof_struct_rt_metrics -) - -type IfMsghdr C.struct_if_msghdr - -type IfData C.struct_if_data - -type IfaMsghdr C.struct_ifa_msghdr - -type IfmaMsghdr C.struct_ifma_msghdr - -type IfmaMsghdr2 C.struct_ifma_msghdr2 - -type RtMsghdr C.struct_rt_msghdr - -type RtMetrics C.struct_rt_metrics - -// Berkeley packet filter - -const ( - SizeofBpfVersion = C.sizeof_struct_bpf_version - SizeofBpfStat = C.sizeof_struct_bpf_stat - SizeofBpfProgram = C.sizeof_struct_bpf_program - SizeofBpfInsn = C.sizeof_struct_bpf_insn - SizeofBpfHdr = C.sizeof_struct_bpf_hdr -) - -type BpfVersion C.struct_bpf_version - -type BpfStat C.struct_bpf_stat - -type BpfProgram C.struct_bpf_program - -type BpfInsn C.struct_bpf_insn - -type BpfHdr C.struct_bpf_hdr - -// Terminal handling - -type Termios C.struct_termios - -type Winsize C.struct_winsize - -// fchmodat-like syscalls. - -const ( - AT_FDCWD = C.AT_FDCWD - AT_REMOVEDIR = C.AT_REMOVEDIR - AT_SYMLINK_FOLLOW = C.AT_SYMLINK_FOLLOW - AT_SYMLINK_NOFOLLOW = C.AT_SYMLINK_NOFOLLOW -) - -// poll - -type PollFd C.struct_pollfd - -const ( - POLLERR = C.POLLERR - POLLHUP = C.POLLHUP - POLLIN = C.POLLIN - POLLNVAL = C.POLLNVAL - POLLOUT = C.POLLOUT - POLLPRI = C.POLLPRI - POLLRDBAND = C.POLLRDBAND - POLLRDNORM = C.POLLRDNORM - POLLWRBAND = C.POLLWRBAND - POLLWRNORM = C.POLLWRNORM -) - -// uname - -type Utsname C.struct_utsname diff --git a/vendor/golang.org/x/sys/unix/types_dragonfly.go b/vendor/golang.org/x/sys/unix/types_dragonfly.go deleted file mode 100644 index 3365dd79d0..0000000000 --- a/vendor/golang.org/x/sys/unix/types_dragonfly.go +++ /dev/null @@ -1,263 +0,0 @@ -// Copyright 2009 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build ignore - -/* -Input to cgo -godefs. See README.md -*/ - -// +godefs map struct_in_addr [4]byte /* in_addr */ -// +godefs map struct_in6_addr [16]byte /* in6_addr */ - -package unix - -/* -#define KERNEL -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -enum { - sizeofPtr = sizeof(void*), -}; - -union sockaddr_all { - struct sockaddr s1; // this one gets used for fields - struct sockaddr_in s2; // these pad it out - struct sockaddr_in6 s3; - struct sockaddr_un s4; - struct sockaddr_dl s5; -}; - -struct sockaddr_any { - struct sockaddr addr; - char pad[sizeof(union sockaddr_all) - sizeof(struct sockaddr)]; -}; - -*/ -import "C" - -// Machine characteristics - -const ( - SizeofPtr = C.sizeofPtr - SizeofShort = C.sizeof_short - SizeofInt = C.sizeof_int - SizeofLong = C.sizeof_long - SizeofLongLong = C.sizeof_longlong -) - -// Basic types - -type ( - _C_short C.short - _C_int C.int - _C_long C.long - _C_long_long C.longlong -) - -// Time - -type Timespec C.struct_timespec - -type Timeval C.struct_timeval - -// Processes - -type Rusage C.struct_rusage - -type Rlimit C.struct_rlimit - -type _Gid_t C.gid_t - -// Files - -type Stat_t C.struct_stat - -type Statfs_t C.struct_statfs - -type Flock_t C.struct_flock - -type Dirent C.struct_dirent - -type Fsid C.struct_fsid - -// File system limits - -const ( - PathMax = C.PATH_MAX -) - -// Sockets - -type RawSockaddrInet4 C.struct_sockaddr_in - -type RawSockaddrInet6 C.struct_sockaddr_in6 - -type RawSockaddrUnix C.struct_sockaddr_un - -type RawSockaddrDatalink C.struct_sockaddr_dl - -type RawSockaddr C.struct_sockaddr - -type RawSockaddrAny C.struct_sockaddr_any - -type _Socklen C.socklen_t - -type Linger C.struct_linger - -type Iovec C.struct_iovec - -type IPMreq C.struct_ip_mreq - -type IPv6Mreq C.struct_ipv6_mreq - -type Msghdr C.struct_msghdr - -type Cmsghdr C.struct_cmsghdr - -type Inet6Pktinfo C.struct_in6_pktinfo - -type IPv6MTUInfo C.struct_ip6_mtuinfo - -type ICMPv6Filter C.struct_icmp6_filter - -const ( - SizeofSockaddrInet4 = C.sizeof_struct_sockaddr_in - SizeofSockaddrInet6 = C.sizeof_struct_sockaddr_in6 - SizeofSockaddrAny = C.sizeof_struct_sockaddr_any - SizeofSockaddrUnix = C.sizeof_struct_sockaddr_un - SizeofSockaddrDatalink = C.sizeof_struct_sockaddr_dl - SizeofLinger = C.sizeof_struct_linger - SizeofIPMreq = C.sizeof_struct_ip_mreq - SizeofIPv6Mreq = C.sizeof_struct_ipv6_mreq - SizeofMsghdr = C.sizeof_struct_msghdr - SizeofCmsghdr = C.sizeof_struct_cmsghdr - SizeofInet6Pktinfo = C.sizeof_struct_in6_pktinfo - SizeofIPv6MTUInfo = C.sizeof_struct_ip6_mtuinfo - SizeofICMPv6Filter = C.sizeof_struct_icmp6_filter -) - -// Ptrace requests - -const ( - PTRACE_TRACEME = C.PT_TRACE_ME - PTRACE_CONT = C.PT_CONTINUE - PTRACE_KILL = C.PT_KILL -) - -// Events (kqueue, kevent) - -type Kevent_t C.struct_kevent - -// Select - -type FdSet C.fd_set - -// Routing and interface messages - -const ( - SizeofIfMsghdr = C.sizeof_struct_if_msghdr - SizeofIfData = C.sizeof_struct_if_data - SizeofIfaMsghdr = C.sizeof_struct_ifa_msghdr - SizeofIfmaMsghdr = C.sizeof_struct_ifma_msghdr - SizeofIfAnnounceMsghdr = C.sizeof_struct_if_announcemsghdr - SizeofRtMsghdr = C.sizeof_struct_rt_msghdr - SizeofRtMetrics = C.sizeof_struct_rt_metrics -) - -type IfMsghdr C.struct_if_msghdr - -type IfData C.struct_if_data - -type IfaMsghdr C.struct_ifa_msghdr - -type IfmaMsghdr C.struct_ifma_msghdr - -type IfAnnounceMsghdr C.struct_if_announcemsghdr - -type RtMsghdr C.struct_rt_msghdr - -type RtMetrics C.struct_rt_metrics - -// Berkeley packet filter - -const ( - SizeofBpfVersion = C.sizeof_struct_bpf_version - SizeofBpfStat = C.sizeof_struct_bpf_stat - SizeofBpfProgram = C.sizeof_struct_bpf_program - SizeofBpfInsn = C.sizeof_struct_bpf_insn - SizeofBpfHdr = C.sizeof_struct_bpf_hdr -) - -type BpfVersion C.struct_bpf_version - -type BpfStat C.struct_bpf_stat - -type BpfProgram C.struct_bpf_program - -type BpfInsn C.struct_bpf_insn - -type BpfHdr C.struct_bpf_hdr - -// Terminal handling - -type Termios C.struct_termios - -type Winsize C.struct_winsize - -// fchmodat-like syscalls. - -const ( - AT_FDCWD = C.AT_FDCWD - AT_SYMLINK_NOFOLLOW = C.AT_SYMLINK_NOFOLLOW -) - -// poll - -type PollFd C.struct_pollfd - -const ( - POLLERR = C.POLLERR - POLLHUP = C.POLLHUP - POLLIN = C.POLLIN - POLLNVAL = C.POLLNVAL - POLLOUT = C.POLLOUT - POLLPRI = C.POLLPRI - POLLRDBAND = C.POLLRDBAND - POLLRDNORM = C.POLLRDNORM - POLLWRBAND = C.POLLWRBAND - POLLWRNORM = C.POLLWRNORM -) - -// Uname - -type Utsname C.struct_utsname diff --git a/vendor/golang.org/x/sys/unix/types_freebsd.go b/vendor/golang.org/x/sys/unix/types_freebsd.go deleted file mode 100644 index 7470798951..0000000000 --- a/vendor/golang.org/x/sys/unix/types_freebsd.go +++ /dev/null @@ -1,356 +0,0 @@ -// Copyright 2009 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build ignore - -/* -Input to cgo -godefs. See README.md -*/ - -// +godefs map struct_in_addr [4]byte /* in_addr */ -// +godefs map struct_in6_addr [16]byte /* in6_addr */ - -package unix - -/* -#define _WANT_FREEBSD11_STAT 1 -#define _WANT_FREEBSD11_STATFS 1 -#define _WANT_FREEBSD11_DIRENT 1 -#define _WANT_FREEBSD11_KEVENT 1 - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -enum { - sizeofPtr = sizeof(void*), -}; - -union sockaddr_all { - struct sockaddr s1; // this one gets used for fields - struct sockaddr_in s2; // these pad it out - struct sockaddr_in6 s3; - struct sockaddr_un s4; - struct sockaddr_dl s5; -}; - -struct sockaddr_any { - struct sockaddr addr; - char pad[sizeof(union sockaddr_all) - sizeof(struct sockaddr)]; -}; - -// This structure is a duplicate of if_data on FreeBSD 8-STABLE. -// See /usr/include/net/if.h. -struct if_data8 { - u_char ifi_type; - u_char ifi_physical; - u_char ifi_addrlen; - u_char ifi_hdrlen; - u_char ifi_link_state; - u_char ifi_spare_char1; - u_char ifi_spare_char2; - u_char ifi_datalen; - u_long ifi_mtu; - u_long ifi_metric; - u_long ifi_baudrate; - u_long ifi_ipackets; - u_long ifi_ierrors; - u_long ifi_opackets; - u_long ifi_oerrors; - u_long ifi_collisions; - u_long ifi_ibytes; - u_long ifi_obytes; - u_long ifi_imcasts; - u_long ifi_omcasts; - u_long ifi_iqdrops; - u_long ifi_noproto; - u_long ifi_hwassist; -// FIXME: these are now unions, so maybe need to change definitions? -#undef ifi_epoch - time_t ifi_epoch; -#undef ifi_lastchange - struct timeval ifi_lastchange; -}; - -// This structure is a duplicate of if_msghdr on FreeBSD 8-STABLE. -// See /usr/include/net/if.h. -struct if_msghdr8 { - u_short ifm_msglen; - u_char ifm_version; - u_char ifm_type; - int ifm_addrs; - int ifm_flags; - u_short ifm_index; - struct if_data8 ifm_data; -}; -*/ -import "C" - -// Machine characteristics - -const ( - SizeofPtr = C.sizeofPtr - SizeofShort = C.sizeof_short - SizeofInt = C.sizeof_int - SizeofLong = C.sizeof_long - SizeofLongLong = C.sizeof_longlong -) - -// Basic types - -type ( - _C_short C.short - _C_int C.int - _C_long C.long - _C_long_long C.longlong -) - -// Time - -type Timespec C.struct_timespec - -type Timeval C.struct_timeval - -// Processes - -type Rusage C.struct_rusage - -type Rlimit C.struct_rlimit - -type _Gid_t C.gid_t - -// Files - -const ( - _statfsVersion = C.STATFS_VERSION - _dirblksiz = C.DIRBLKSIZ -) - -type Stat_t C.struct_stat - -type stat_freebsd11_t C.struct_freebsd11_stat - -type Statfs_t C.struct_statfs - -type statfs_freebsd11_t C.struct_freebsd11_statfs - -type Flock_t C.struct_flock - -type Dirent C.struct_dirent - -type dirent_freebsd11 C.struct_freebsd11_dirent - -type Fsid C.struct_fsid - -// File system limits - -const ( - PathMax = C.PATH_MAX -) - -// Advice to Fadvise - -const ( - FADV_NORMAL = C.POSIX_FADV_NORMAL - FADV_RANDOM = C.POSIX_FADV_RANDOM - FADV_SEQUENTIAL = C.POSIX_FADV_SEQUENTIAL - FADV_WILLNEED = C.POSIX_FADV_WILLNEED - FADV_DONTNEED = C.POSIX_FADV_DONTNEED - FADV_NOREUSE = C.POSIX_FADV_NOREUSE -) - -// Sockets - -type RawSockaddrInet4 C.struct_sockaddr_in - -type RawSockaddrInet6 C.struct_sockaddr_in6 - -type RawSockaddrUnix C.struct_sockaddr_un - -type RawSockaddrDatalink C.struct_sockaddr_dl - -type RawSockaddr C.struct_sockaddr - -type RawSockaddrAny C.struct_sockaddr_any - -type _Socklen C.socklen_t - -type Linger C.struct_linger - -type Iovec C.struct_iovec - -type IPMreq C.struct_ip_mreq - -type IPMreqn C.struct_ip_mreqn - -type IPv6Mreq C.struct_ipv6_mreq - -type Msghdr C.struct_msghdr - -type Cmsghdr C.struct_cmsghdr - -type Inet6Pktinfo C.struct_in6_pktinfo - -type IPv6MTUInfo C.struct_ip6_mtuinfo - -type ICMPv6Filter C.struct_icmp6_filter - -const ( - SizeofSockaddrInet4 = C.sizeof_struct_sockaddr_in - SizeofSockaddrInet6 = C.sizeof_struct_sockaddr_in6 - SizeofSockaddrAny = C.sizeof_struct_sockaddr_any - SizeofSockaddrUnix = C.sizeof_struct_sockaddr_un - SizeofSockaddrDatalink = C.sizeof_struct_sockaddr_dl - SizeofLinger = C.sizeof_struct_linger - SizeofIPMreq = C.sizeof_struct_ip_mreq - SizeofIPMreqn = C.sizeof_struct_ip_mreqn - SizeofIPv6Mreq = C.sizeof_struct_ipv6_mreq - SizeofMsghdr = C.sizeof_struct_msghdr - SizeofCmsghdr = C.sizeof_struct_cmsghdr - SizeofInet6Pktinfo = C.sizeof_struct_in6_pktinfo - SizeofIPv6MTUInfo = C.sizeof_struct_ip6_mtuinfo - SizeofICMPv6Filter = C.sizeof_struct_icmp6_filter -) - -// Ptrace requests - -const ( - PTRACE_TRACEME = C.PT_TRACE_ME - PTRACE_CONT = C.PT_CONTINUE - PTRACE_KILL = C.PT_KILL -) - -// Events (kqueue, kevent) - -type Kevent_t C.struct_kevent_freebsd11 - -// Select - -type FdSet C.fd_set - -// Routing and interface messages - -const ( - sizeofIfMsghdr = C.sizeof_struct_if_msghdr - SizeofIfMsghdr = C.sizeof_struct_if_msghdr8 - sizeofIfData = C.sizeof_struct_if_data - SizeofIfData = C.sizeof_struct_if_data8 - SizeofIfaMsghdr = C.sizeof_struct_ifa_msghdr - SizeofIfmaMsghdr = C.sizeof_struct_ifma_msghdr - SizeofIfAnnounceMsghdr = C.sizeof_struct_if_announcemsghdr - SizeofRtMsghdr = C.sizeof_struct_rt_msghdr - SizeofRtMetrics = C.sizeof_struct_rt_metrics -) - -type ifMsghdr C.struct_if_msghdr - -type IfMsghdr C.struct_if_msghdr8 - -type ifData C.struct_if_data - -type IfData C.struct_if_data8 - -type IfaMsghdr C.struct_ifa_msghdr - -type IfmaMsghdr C.struct_ifma_msghdr - -type IfAnnounceMsghdr C.struct_if_announcemsghdr - -type RtMsghdr C.struct_rt_msghdr - -type RtMetrics C.struct_rt_metrics - -// Berkeley packet filter - -const ( - SizeofBpfVersion = C.sizeof_struct_bpf_version - SizeofBpfStat = C.sizeof_struct_bpf_stat - SizeofBpfZbuf = C.sizeof_struct_bpf_zbuf - SizeofBpfProgram = C.sizeof_struct_bpf_program - SizeofBpfInsn = C.sizeof_struct_bpf_insn - SizeofBpfHdr = C.sizeof_struct_bpf_hdr - SizeofBpfZbufHeader = C.sizeof_struct_bpf_zbuf_header -) - -type BpfVersion C.struct_bpf_version - -type BpfStat C.struct_bpf_stat - -type BpfZbuf C.struct_bpf_zbuf - -type BpfProgram C.struct_bpf_program - -type BpfInsn C.struct_bpf_insn - -type BpfHdr C.struct_bpf_hdr - -type BpfZbufHeader C.struct_bpf_zbuf_header - -// Terminal handling - -type Termios C.struct_termios - -type Winsize C.struct_winsize - -// fchmodat-like syscalls. - -const ( - AT_FDCWD = C.AT_FDCWD - AT_REMOVEDIR = C.AT_REMOVEDIR - AT_SYMLINK_FOLLOW = C.AT_SYMLINK_FOLLOW - AT_SYMLINK_NOFOLLOW = C.AT_SYMLINK_NOFOLLOW -) - -// poll - -type PollFd C.struct_pollfd - -const ( - POLLERR = C.POLLERR - POLLHUP = C.POLLHUP - POLLIN = C.POLLIN - POLLINIGNEOF = C.POLLINIGNEOF - POLLNVAL = C.POLLNVAL - POLLOUT = C.POLLOUT - POLLPRI = C.POLLPRI - POLLRDBAND = C.POLLRDBAND - POLLRDNORM = C.POLLRDNORM - POLLWRBAND = C.POLLWRBAND - POLLWRNORM = C.POLLWRNORM -) - -// Capabilities - -type CapRights C.struct_cap_rights - -// Uname - -type Utsname C.struct_utsname diff --git a/vendor/golang.org/x/sys/unix/types_netbsd.go b/vendor/golang.org/x/sys/unix/types_netbsd.go deleted file mode 100644 index 2dd4f9542c..0000000000 --- a/vendor/golang.org/x/sys/unix/types_netbsd.go +++ /dev/null @@ -1,289 +0,0 @@ -// Copyright 2009 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build ignore - -/* -Input to cgo -godefs. See README.md -*/ - -// +godefs map struct_in_addr [4]byte /* in_addr */ -// +godefs map struct_in6_addr [16]byte /* in6_addr */ - -package unix - -/* -#define KERNEL -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -enum { - sizeofPtr = sizeof(void*), -}; - -union sockaddr_all { - struct sockaddr s1; // this one gets used for fields - struct sockaddr_in s2; // these pad it out - struct sockaddr_in6 s3; - struct sockaddr_un s4; - struct sockaddr_dl s5; -}; - -struct sockaddr_any { - struct sockaddr addr; - char pad[sizeof(union sockaddr_all) - sizeof(struct sockaddr)]; -}; - -*/ -import "C" - -// Machine characteristics - -const ( - SizeofPtr = C.sizeofPtr - SizeofShort = C.sizeof_short - SizeofInt = C.sizeof_int - SizeofLong = C.sizeof_long - SizeofLongLong = C.sizeof_longlong -) - -// Basic types - -type ( - _C_short C.short - _C_int C.int - _C_long C.long - _C_long_long C.longlong -) - -// Time - -type Timespec C.struct_timespec - -type Timeval C.struct_timeval - -// Processes - -type Rusage C.struct_rusage - -type Rlimit C.struct_rlimit - -type _Gid_t C.gid_t - -// Files - -type Stat_t C.struct_stat - -type Statfs_t C.struct_statfs - -type Flock_t C.struct_flock - -type Dirent C.struct_dirent - -type Fsid C.fsid_t - -// File system limits - -const ( - PathMax = C.PATH_MAX -) - -// Advice to Fadvise - -const ( - FADV_NORMAL = C.POSIX_FADV_NORMAL - FADV_RANDOM = C.POSIX_FADV_RANDOM - FADV_SEQUENTIAL = C.POSIX_FADV_SEQUENTIAL - FADV_WILLNEED = C.POSIX_FADV_WILLNEED - FADV_DONTNEED = C.POSIX_FADV_DONTNEED - FADV_NOREUSE = C.POSIX_FADV_NOREUSE -) - -// Sockets - -type RawSockaddrInet4 C.struct_sockaddr_in - -type RawSockaddrInet6 C.struct_sockaddr_in6 - -type RawSockaddrUnix C.struct_sockaddr_un - -type RawSockaddrDatalink C.struct_sockaddr_dl - -type RawSockaddr C.struct_sockaddr - -type RawSockaddrAny C.struct_sockaddr_any - -type _Socklen C.socklen_t - -type Linger C.struct_linger - -type Iovec C.struct_iovec - -type IPMreq C.struct_ip_mreq - -type IPv6Mreq C.struct_ipv6_mreq - -type Msghdr C.struct_msghdr - -type Cmsghdr C.struct_cmsghdr - -type Inet6Pktinfo C.struct_in6_pktinfo - -type IPv6MTUInfo C.struct_ip6_mtuinfo - -type ICMPv6Filter C.struct_icmp6_filter - -const ( - SizeofSockaddrInet4 = C.sizeof_struct_sockaddr_in - SizeofSockaddrInet6 = C.sizeof_struct_sockaddr_in6 - SizeofSockaddrAny = C.sizeof_struct_sockaddr_any - SizeofSockaddrUnix = C.sizeof_struct_sockaddr_un - SizeofSockaddrDatalink = C.sizeof_struct_sockaddr_dl - SizeofLinger = C.sizeof_struct_linger - SizeofIPMreq = C.sizeof_struct_ip_mreq - SizeofIPv6Mreq = C.sizeof_struct_ipv6_mreq - SizeofMsghdr = C.sizeof_struct_msghdr - SizeofCmsghdr = C.sizeof_struct_cmsghdr - SizeofInet6Pktinfo = C.sizeof_struct_in6_pktinfo - SizeofIPv6MTUInfo = C.sizeof_struct_ip6_mtuinfo - SizeofICMPv6Filter = C.sizeof_struct_icmp6_filter -) - -// Ptrace requests - -const ( - PTRACE_TRACEME = C.PT_TRACE_ME - PTRACE_CONT = C.PT_CONTINUE - PTRACE_KILL = C.PT_KILL -) - -// Events (kqueue, kevent) - -type Kevent_t C.struct_kevent - -// Select - -type FdSet C.fd_set - -// Routing and interface messages - -const ( - SizeofIfMsghdr = C.sizeof_struct_if_msghdr - SizeofIfData = C.sizeof_struct_if_data - SizeofIfaMsghdr = C.sizeof_struct_ifa_msghdr - SizeofIfAnnounceMsghdr = C.sizeof_struct_if_announcemsghdr - SizeofRtMsghdr = C.sizeof_struct_rt_msghdr - SizeofRtMetrics = C.sizeof_struct_rt_metrics -) - -type IfMsghdr C.struct_if_msghdr - -type IfData C.struct_if_data - -type IfaMsghdr C.struct_ifa_msghdr - -type IfAnnounceMsghdr C.struct_if_announcemsghdr - -type RtMsghdr C.struct_rt_msghdr - -type RtMetrics C.struct_rt_metrics - -type Mclpool C.struct_mclpool - -// Berkeley packet filter - -const ( - SizeofBpfVersion = C.sizeof_struct_bpf_version - SizeofBpfStat = C.sizeof_struct_bpf_stat - SizeofBpfProgram = C.sizeof_struct_bpf_program - SizeofBpfInsn = C.sizeof_struct_bpf_insn - SizeofBpfHdr = C.sizeof_struct_bpf_hdr -) - -type BpfVersion C.struct_bpf_version - -type BpfStat C.struct_bpf_stat - -type BpfProgram C.struct_bpf_program - -type BpfInsn C.struct_bpf_insn - -type BpfHdr C.struct_bpf_hdr - -type BpfTimeval C.struct_bpf_timeval - -// Terminal handling - -type Termios C.struct_termios - -type Winsize C.struct_winsize - -type Ptmget C.struct_ptmget - -// fchmodat-like syscalls. - -const ( - AT_FDCWD = C.AT_FDCWD - AT_SYMLINK_NOFOLLOW = C.AT_SYMLINK_NOFOLLOW -) - -// poll - -type PollFd C.struct_pollfd - -const ( - POLLERR = C.POLLERR - POLLHUP = C.POLLHUP - POLLIN = C.POLLIN - POLLNVAL = C.POLLNVAL - POLLOUT = C.POLLOUT - POLLPRI = C.POLLPRI - POLLRDBAND = C.POLLRDBAND - POLLRDNORM = C.POLLRDNORM - POLLWRBAND = C.POLLWRBAND - POLLWRNORM = C.POLLWRNORM -) - -// Sysctl - -type Sysctlnode C.struct_sysctlnode - -// Uname - -type Utsname C.struct_utsname - -// Clockinfo - -const SizeofClockinfo = C.sizeof_struct_clockinfo - -type Clockinfo C.struct_clockinfo diff --git a/vendor/golang.org/x/sys/unix/types_openbsd.go b/vendor/golang.org/x/sys/unix/types_openbsd.go deleted file mode 100644 index 4e5e57f9a6..0000000000 --- a/vendor/golang.org/x/sys/unix/types_openbsd.go +++ /dev/null @@ -1,276 +0,0 @@ -// Copyright 2009 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build ignore - -/* -Input to cgo -godefs. See README.md -*/ - -// +godefs map struct_in_addr [4]byte /* in_addr */ -// +godefs map struct_in6_addr [16]byte /* in6_addr */ - -package unix - -/* -#define KERNEL -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -enum { - sizeofPtr = sizeof(void*), -}; - -union sockaddr_all { - struct sockaddr s1; // this one gets used for fields - struct sockaddr_in s2; // these pad it out - struct sockaddr_in6 s3; - struct sockaddr_un s4; - struct sockaddr_dl s5; -}; - -struct sockaddr_any { - struct sockaddr addr; - char pad[sizeof(union sockaddr_all) - sizeof(struct sockaddr)]; -}; - -*/ -import "C" - -// Machine characteristics - -const ( - SizeofPtr = C.sizeofPtr - SizeofShort = C.sizeof_short - SizeofInt = C.sizeof_int - SizeofLong = C.sizeof_long - SizeofLongLong = C.sizeof_longlong -) - -// Basic types - -type ( - _C_short C.short - _C_int C.int - _C_long C.long - _C_long_long C.longlong -) - -// Time - -type Timespec C.struct_timespec - -type Timeval C.struct_timeval - -// Processes - -type Rusage C.struct_rusage - -type Rlimit C.struct_rlimit - -type _Gid_t C.gid_t - -// Files - -type Stat_t C.struct_stat - -type Statfs_t C.struct_statfs - -type Flock_t C.struct_flock - -type Dirent C.struct_dirent - -type Fsid C.fsid_t - -// File system limits - -const ( - PathMax = C.PATH_MAX -) - -// Sockets - -type RawSockaddrInet4 C.struct_sockaddr_in - -type RawSockaddrInet6 C.struct_sockaddr_in6 - -type RawSockaddrUnix C.struct_sockaddr_un - -type RawSockaddrDatalink C.struct_sockaddr_dl - -type RawSockaddr C.struct_sockaddr - -type RawSockaddrAny C.struct_sockaddr_any - -type _Socklen C.socklen_t - -type Linger C.struct_linger - -type Iovec C.struct_iovec - -type IPMreq C.struct_ip_mreq - -type IPv6Mreq C.struct_ipv6_mreq - -type Msghdr C.struct_msghdr - -type Cmsghdr C.struct_cmsghdr - -type Inet6Pktinfo C.struct_in6_pktinfo - -type IPv6MTUInfo C.struct_ip6_mtuinfo - -type ICMPv6Filter C.struct_icmp6_filter - -const ( - SizeofSockaddrInet4 = C.sizeof_struct_sockaddr_in - SizeofSockaddrInet6 = C.sizeof_struct_sockaddr_in6 - SizeofSockaddrAny = C.sizeof_struct_sockaddr_any - SizeofSockaddrUnix = C.sizeof_struct_sockaddr_un - SizeofSockaddrDatalink = C.sizeof_struct_sockaddr_dl - SizeofLinger = C.sizeof_struct_linger - SizeofIPMreq = C.sizeof_struct_ip_mreq - SizeofIPv6Mreq = C.sizeof_struct_ipv6_mreq - SizeofMsghdr = C.sizeof_struct_msghdr - SizeofCmsghdr = C.sizeof_struct_cmsghdr - SizeofInet6Pktinfo = C.sizeof_struct_in6_pktinfo - SizeofIPv6MTUInfo = C.sizeof_struct_ip6_mtuinfo - SizeofICMPv6Filter = C.sizeof_struct_icmp6_filter -) - -// Ptrace requests - -const ( - PTRACE_TRACEME = C.PT_TRACE_ME - PTRACE_CONT = C.PT_CONTINUE - PTRACE_KILL = C.PT_KILL -) - -// Events (kqueue, kevent) - -type Kevent_t C.struct_kevent - -// Select - -type FdSet C.fd_set - -// Routing and interface messages - -const ( - SizeofIfMsghdr = C.sizeof_struct_if_msghdr - SizeofIfData = C.sizeof_struct_if_data - SizeofIfaMsghdr = C.sizeof_struct_ifa_msghdr - SizeofIfAnnounceMsghdr = C.sizeof_struct_if_announcemsghdr - SizeofRtMsghdr = C.sizeof_struct_rt_msghdr - SizeofRtMetrics = C.sizeof_struct_rt_metrics -) - -type IfMsghdr C.struct_if_msghdr - -type IfData C.struct_if_data - -type IfaMsghdr C.struct_ifa_msghdr - -type IfAnnounceMsghdr C.struct_if_announcemsghdr - -type RtMsghdr C.struct_rt_msghdr - -type RtMetrics C.struct_rt_metrics - -type Mclpool C.struct_mclpool - -// Berkeley packet filter - -const ( - SizeofBpfVersion = C.sizeof_struct_bpf_version - SizeofBpfStat = C.sizeof_struct_bpf_stat - SizeofBpfProgram = C.sizeof_struct_bpf_program - SizeofBpfInsn = C.sizeof_struct_bpf_insn - SizeofBpfHdr = C.sizeof_struct_bpf_hdr -) - -type BpfVersion C.struct_bpf_version - -type BpfStat C.struct_bpf_stat - -type BpfProgram C.struct_bpf_program - -type BpfInsn C.struct_bpf_insn - -type BpfHdr C.struct_bpf_hdr - -type BpfTimeval C.struct_bpf_timeval - -// Terminal handling - -type Termios C.struct_termios - -type Winsize C.struct_winsize - -// fchmodat-like syscalls. - -const ( - AT_FDCWD = C.AT_FDCWD - AT_SYMLINK_NOFOLLOW = C.AT_SYMLINK_NOFOLLOW -) - -// poll - -type PollFd C.struct_pollfd - -const ( - POLLERR = C.POLLERR - POLLHUP = C.POLLHUP - POLLIN = C.POLLIN - POLLNVAL = C.POLLNVAL - POLLOUT = C.POLLOUT - POLLPRI = C.POLLPRI - POLLRDBAND = C.POLLRDBAND - POLLRDNORM = C.POLLRDNORM - POLLWRBAND = C.POLLWRBAND - POLLWRNORM = C.POLLWRNORM -) - -// Signal Sets - -type Sigset_t C.sigset_t - -// Uname - -type Utsname C.struct_utsname - -// Uvmexp - -const SizeofUvmexp = C.sizeof_struct_uvmexp - -type Uvmexp C.struct_uvmexp diff --git a/vendor/golang.org/x/sys/unix/types_solaris.go b/vendor/golang.org/x/sys/unix/types_solaris.go deleted file mode 100644 index 2b716f9348..0000000000 --- a/vendor/golang.org/x/sys/unix/types_solaris.go +++ /dev/null @@ -1,266 +0,0 @@ -// Copyright 2009 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build ignore - -/* -Input to cgo -godefs. See README.md -*/ - -// +godefs map struct_in_addr [4]byte /* in_addr */ -// +godefs map struct_in6_addr [16]byte /* in6_addr */ - -package unix - -/* -#define KERNEL -// These defines ensure that builds done on newer versions of Solaris are -// backwards-compatible with older versions of Solaris and -// OpenSolaris-based derivatives. -#define __USE_SUNOS_SOCKETS__ // msghdr -#define __USE_LEGACY_PROTOTYPES__ // iovec -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -enum { - sizeofPtr = sizeof(void*), -}; - -union sockaddr_all { - struct sockaddr s1; // this one gets used for fields - struct sockaddr_in s2; // these pad it out - struct sockaddr_in6 s3; - struct sockaddr_un s4; - struct sockaddr_dl s5; -}; - -struct sockaddr_any { - struct sockaddr addr; - char pad[sizeof(union sockaddr_all) - sizeof(struct sockaddr)]; -}; - -*/ -import "C" - -// Machine characteristics - -const ( - SizeofPtr = C.sizeofPtr - SizeofShort = C.sizeof_short - SizeofInt = C.sizeof_int - SizeofLong = C.sizeof_long - SizeofLongLong = C.sizeof_longlong - PathMax = C.PATH_MAX - MaxHostNameLen = C.MAXHOSTNAMELEN -) - -// Basic types - -type ( - _C_short C.short - _C_int C.int - _C_long C.long - _C_long_long C.longlong -) - -// Time - -type Timespec C.struct_timespec - -type Timeval C.struct_timeval - -type Timeval32 C.struct_timeval32 - -type Tms C.struct_tms - -type Utimbuf C.struct_utimbuf - -// Processes - -type Rusage C.struct_rusage - -type Rlimit C.struct_rlimit - -type _Gid_t C.gid_t - -// Files - -type Stat_t C.struct_stat - -type Flock_t C.struct_flock - -type Dirent C.struct_dirent - -// Filesystems - -type _Fsblkcnt_t C.fsblkcnt_t - -type Statvfs_t C.struct_statvfs - -// Sockets - -type RawSockaddrInet4 C.struct_sockaddr_in - -type RawSockaddrInet6 C.struct_sockaddr_in6 - -type RawSockaddrUnix C.struct_sockaddr_un - -type RawSockaddrDatalink C.struct_sockaddr_dl - -type RawSockaddr C.struct_sockaddr - -type RawSockaddrAny C.struct_sockaddr_any - -type _Socklen C.socklen_t - -type Linger C.struct_linger - -type Iovec C.struct_iovec - -type IPMreq C.struct_ip_mreq - -type IPv6Mreq C.struct_ipv6_mreq - -type Msghdr C.struct_msghdr - -type Cmsghdr C.struct_cmsghdr - -type Inet6Pktinfo C.struct_in6_pktinfo - -type IPv6MTUInfo C.struct_ip6_mtuinfo - -type ICMPv6Filter C.struct_icmp6_filter - -const ( - SizeofSockaddrInet4 = C.sizeof_struct_sockaddr_in - SizeofSockaddrInet6 = C.sizeof_struct_sockaddr_in6 - SizeofSockaddrAny = C.sizeof_struct_sockaddr_any - SizeofSockaddrUnix = C.sizeof_struct_sockaddr_un - SizeofSockaddrDatalink = C.sizeof_struct_sockaddr_dl - SizeofLinger = C.sizeof_struct_linger - SizeofIPMreq = C.sizeof_struct_ip_mreq - SizeofIPv6Mreq = C.sizeof_struct_ipv6_mreq - SizeofMsghdr = C.sizeof_struct_msghdr - SizeofCmsghdr = C.sizeof_struct_cmsghdr - SizeofInet6Pktinfo = C.sizeof_struct_in6_pktinfo - SizeofIPv6MTUInfo = C.sizeof_struct_ip6_mtuinfo - SizeofICMPv6Filter = C.sizeof_struct_icmp6_filter -) - -// Select - -type FdSet C.fd_set - -// Misc - -type Utsname C.struct_utsname - -type Ustat_t C.struct_ustat - -const ( - AT_FDCWD = C.AT_FDCWD - AT_SYMLINK_NOFOLLOW = C.AT_SYMLINK_NOFOLLOW - AT_SYMLINK_FOLLOW = C.AT_SYMLINK_FOLLOW - AT_REMOVEDIR = C.AT_REMOVEDIR - AT_EACCESS = C.AT_EACCESS -) - -// Routing and interface messages - -const ( - SizeofIfMsghdr = C.sizeof_struct_if_msghdr - SizeofIfData = C.sizeof_struct_if_data - SizeofIfaMsghdr = C.sizeof_struct_ifa_msghdr - SizeofRtMsghdr = C.sizeof_struct_rt_msghdr - SizeofRtMetrics = C.sizeof_struct_rt_metrics -) - -type IfMsghdr C.struct_if_msghdr - -type IfData C.struct_if_data - -type IfaMsghdr C.struct_ifa_msghdr - -type RtMsghdr C.struct_rt_msghdr - -type RtMetrics C.struct_rt_metrics - -// Berkeley packet filter - -const ( - SizeofBpfVersion = C.sizeof_struct_bpf_version - SizeofBpfStat = C.sizeof_struct_bpf_stat - SizeofBpfProgram = C.sizeof_struct_bpf_program - SizeofBpfInsn = C.sizeof_struct_bpf_insn - SizeofBpfHdr = C.sizeof_struct_bpf_hdr -) - -type BpfVersion C.struct_bpf_version - -type BpfStat C.struct_bpf_stat - -type BpfProgram C.struct_bpf_program - -type BpfInsn C.struct_bpf_insn - -type BpfTimeval C.struct_bpf_timeval - -type BpfHdr C.struct_bpf_hdr - -// Terminal handling - -type Termios C.struct_termios - -type Termio C.struct_termio - -type Winsize C.struct_winsize - -// poll - -type PollFd C.struct_pollfd - -const ( - POLLERR = C.POLLERR - POLLHUP = C.POLLHUP - POLLIN = C.POLLIN - POLLNVAL = C.POLLNVAL - POLLOUT = C.POLLOUT - POLLPRI = C.POLLPRI - POLLRDBAND = C.POLLRDBAND - POLLRDNORM = C.POLLRDNORM - POLLWRBAND = C.POLLWRBAND - POLLWRNORM = C.POLLWRNORM -) diff --git a/vendor/golang.org/x/text/unicode/bidi/gen_trieval.go b/vendor/golang.org/x/text/unicode/bidi/gen_trieval.go deleted file mode 100644 index 9cb9942894..0000000000 --- a/vendor/golang.org/x/text/unicode/bidi/gen_trieval.go +++ /dev/null @@ -1,64 +0,0 @@ -// Copyright 2015 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build ignore - -package main - -// Class is the Unicode BiDi class. Each rune has a single class. -type Class uint - -const ( - L Class = iota // LeftToRight - R // RightToLeft - EN // EuropeanNumber - ES // EuropeanSeparator - ET // EuropeanTerminator - AN // ArabicNumber - CS // CommonSeparator - B // ParagraphSeparator - S // SegmentSeparator - WS // WhiteSpace - ON // OtherNeutral - BN // BoundaryNeutral - NSM // NonspacingMark - AL // ArabicLetter - Control // Control LRO - PDI - - numClass - - LRO // LeftToRightOverride - RLO // RightToLeftOverride - LRE // LeftToRightEmbedding - RLE // RightToLeftEmbedding - PDF // PopDirectionalFormat - LRI // LeftToRightIsolate - RLI // RightToLeftIsolate - FSI // FirstStrongIsolate - PDI // PopDirectionalIsolate - - unknownClass = ^Class(0) -) - -var controlToClass = map[rune]Class{ - 0x202D: LRO, // LeftToRightOverride, - 0x202E: RLO, // RightToLeftOverride, - 0x202A: LRE, // LeftToRightEmbedding, - 0x202B: RLE, // RightToLeftEmbedding, - 0x202C: PDF, // PopDirectionalFormat, - 0x2066: LRI, // LeftToRightIsolate, - 0x2067: RLI, // RightToLeftIsolate, - 0x2068: FSI, // FirstStrongIsolate, - 0x2069: PDI, // PopDirectionalIsolate, -} - -// A trie entry has the following bits: -// 7..5 XOR mask for brackets -// 4 1: Bracket open, 0: Bracket close -// 3..0 Class type - -const ( - openMask = 0x10 - xorMaskShift = 5 -) diff --git a/vendor/golang.org/x/text/unicode/norm/triegen.go b/vendor/golang.org/x/text/unicode/norm/triegen.go deleted file mode 100644 index 45d711900d..0000000000 --- a/vendor/golang.org/x/text/unicode/norm/triegen.go +++ /dev/null @@ -1,117 +0,0 @@ -// Copyright 2011 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build ignore - -// Trie table generator. -// Used by make*tables tools to generate a go file with trie data structures -// for mapping UTF-8 to a 16-bit value. All but the last byte in a UTF-8 byte -// sequence are used to lookup offsets in the index table to be used for the -// next byte. The last byte is used to index into a table with 16-bit values. - -package main - -import ( - "fmt" - "io" -) - -const maxSparseEntries = 16 - -type normCompacter struct { - sparseBlocks [][]uint64 - sparseOffset []uint16 - sparseCount int - name string -} - -func mostFrequentStride(a []uint64) int { - counts := make(map[int]int) - var v int - for _, x := range a { - if stride := int(x) - v; v != 0 && stride >= 0 { - counts[stride]++ - } - v = int(x) - } - var maxs, maxc int - for stride, cnt := range counts { - if cnt > maxc || (cnt == maxc && stride < maxs) { - maxs, maxc = stride, cnt - } - } - return maxs -} - -func countSparseEntries(a []uint64) int { - stride := mostFrequentStride(a) - var v, count int - for _, tv := range a { - if int(tv)-v != stride { - if tv != 0 { - count++ - } - } - v = int(tv) - } - return count -} - -func (c *normCompacter) Size(v []uint64) (sz int, ok bool) { - if n := countSparseEntries(v); n <= maxSparseEntries { - return (n+1)*4 + 2, true - } - return 0, false -} - -func (c *normCompacter) Store(v []uint64) uint32 { - h := uint32(len(c.sparseOffset)) - c.sparseBlocks = append(c.sparseBlocks, v) - c.sparseOffset = append(c.sparseOffset, uint16(c.sparseCount)) - c.sparseCount += countSparseEntries(v) + 1 - return h -} - -func (c *normCompacter) Handler() string { - return c.name + "Sparse.lookup" -} - -func (c *normCompacter) Print(w io.Writer) (retErr error) { - p := func(f string, x ...interface{}) { - if _, err := fmt.Fprintf(w, f, x...); retErr == nil && err != nil { - retErr = err - } - } - - ls := len(c.sparseBlocks) - p("// %sSparseOffset: %d entries, %d bytes\n", c.name, ls, ls*2) - p("var %sSparseOffset = %#v\n\n", c.name, c.sparseOffset) - - ns := c.sparseCount - p("// %sSparseValues: %d entries, %d bytes\n", c.name, ns, ns*4) - p("var %sSparseValues = [%d]valueRange {", c.name, ns) - for i, b := range c.sparseBlocks { - p("\n// Block %#x, offset %#x", i, c.sparseOffset[i]) - var v int - stride := mostFrequentStride(b) - n := countSparseEntries(b) - p("\n{value:%#04x,lo:%#02x},", stride, uint8(n)) - for i, nv := range b { - if int(nv)-v != stride { - if v != 0 { - p(",hi:%#02x},", 0x80+i-1) - } - if nv != 0 { - p("\n{value:%#04x,lo:%#02x", nv, 0x80+i) - } - } - v = int(nv) - } - if v != 0 { - p(",hi:%#02x},", 0x80+len(b)-1) - } - } - p("\n}\n\n") - return -} diff --git a/vendor/golang.org/x/text/width/gen.go b/vendor/golang.org/x/text/width/gen.go deleted file mode 100644 index 092277e1f6..0000000000 --- a/vendor/golang.org/x/text/width/gen.go +++ /dev/null @@ -1,115 +0,0 @@ -// Copyright 2015 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build ignore - -// This program generates the trie for width operations. The generated table -// includes width category information as well as the normalization mappings. -package main - -import ( - "bytes" - "fmt" - "io" - "log" - "math" - "unicode/utf8" - - "golang.org/x/text/internal/gen" - "golang.org/x/text/internal/triegen" -) - -// See gen_common.go for flags. - -func main() { - gen.Init() - genTables() - genTests() - gen.Repackage("gen_trieval.go", "trieval.go", "width") - gen.Repackage("gen_common.go", "common_test.go", "width") -} - -func genTables() { - t := triegen.NewTrie("width") - // fold and inverse mappings. See mapComment for a description of the format - // of each entry. Add dummy value to make an index of 0 mean no mapping. - inverse := [][4]byte{{}} - mapping := map[[4]byte]int{[4]byte{}: 0} - - getWidthData(func(r rune, tag elem, alt rune) { - idx := 0 - if alt != 0 { - var buf [4]byte - buf[0] = byte(utf8.EncodeRune(buf[1:], alt)) - s := string(r) - buf[buf[0]] ^= s[len(s)-1] - var ok bool - if idx, ok = mapping[buf]; !ok { - idx = len(mapping) - if idx > math.MaxUint8 { - log.Fatalf("Index %d does not fit in a byte.", idx) - } - mapping[buf] = idx - inverse = append(inverse, buf) - } - } - t.Insert(r, uint64(tag|elem(idx))) - }) - - w := &bytes.Buffer{} - gen.WriteUnicodeVersion(w) - - sz, err := t.Gen(w) - if err != nil { - log.Fatal(err) - } - - sz += writeMappings(w, inverse) - - fmt.Fprintf(w, "// Total table size %d bytes (%dKiB)\n", sz, sz/1024) - - gen.WriteVersionedGoFile(*outputFile, "width", w.Bytes()) -} - -const inverseDataComment = ` -// inverseData contains 4-byte entries of the following format: -// <0 padding> -// The last byte of the UTF-8-encoded rune is xor-ed with the last byte of the -// UTF-8 encoding of the original rune. Mappings often have the following -// pattern: -// Ａ -> A (U+FF21 -> U+0041) -// Ｂ -> B (U+FF22 -> U+0042) -// ... -// By xor-ing the last byte the same entry can be shared by many mappings. This -// reduces the total number of distinct entries by about two thirds. -// The resulting entry for the aforementioned mappings is -// { 0x01, 0xE0, 0x00, 0x00 } -// Using this entry to map U+FF21 (UTF-8 [EF BC A1]), we get -// E0 ^ A1 = 41. -// Similarly, for U+FF22 (UTF-8 [EF BC A2]), we get -// E0 ^ A2 = 42. -// Note that because of the xor-ing, the byte sequence stored in the entry is -// not valid UTF-8.` - -func writeMappings(w io.Writer, data [][4]byte) int { - fmt.Fprintln(w, inverseDataComment) - fmt.Fprintf(w, "var inverseData = [%d][4]byte{\n", len(data)) - for _, x := range data { - fmt.Fprintf(w, "{ 0x%02x, 0x%02x, 0x%02x, 0x%02x },\n", x[0], x[1], x[2], x[3]) - } - fmt.Fprintln(w, "}") - return len(data) * 4 -} - -func genTests() { - w := &bytes.Buffer{} - fmt.Fprintf(w, "\nvar mapRunes = map[rune]struct{r rune; e elem}{\n") - getWidthData(func(r rune, tag elem, alt rune) { - if alt != 0 { - fmt.Fprintf(w, "\t0x%X: {0x%X, 0x%X},\n", r, alt, tag) - } - }) - fmt.Fprintln(w, "}") - gen.WriteGoFile("runes_test.go", "width", w.Bytes()) -} diff --git a/vendor/golang.org/x/text/width/gen_common.go b/vendor/golang.org/x/text/width/gen_common.go deleted file mode 100644 index 601e752684..0000000000 --- a/vendor/golang.org/x/text/width/gen_common.go +++ /dev/null @@ -1,96 +0,0 @@ -// Copyright 2015 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build ignore - -package main - -// This code is shared between the main code generator and the test code. - -import ( - "flag" - "log" - "strconv" - "strings" - - "golang.org/x/text/internal/gen" - "golang.org/x/text/internal/ucd" -) - -var ( - outputFile = flag.String("out", "tables.go", "output file") -) - -var typeMap = map[string]elem{ - "A": tagAmbiguous, - "N": tagNeutral, - "Na": tagNarrow, - "W": tagWide, - "F": tagFullwidth, - "H": tagHalfwidth, -} - -// getWidthData calls f for every entry for which it is defined. -// -// f may be called multiple times for the same rune. The last call to f is the -// correct value. f is not called for all runes. The default tag type is -// Neutral. -func getWidthData(f func(r rune, tag elem, alt rune)) { - // Set the default values for Unified Ideographs. In line with Annex 11, - // we encode full ranges instead of the defined runes in Unified_Ideograph. - for _, b := range []struct{ lo, hi rune }{ - {0x4E00, 0x9FFF}, // the CJK Unified Ideographs block, - {0x3400, 0x4DBF}, // the CJK Unified Ideographs Externsion A block, - {0xF900, 0xFAFF}, // the CJK Compatibility Ideographs block, - {0x20000, 0x2FFFF}, // the Supplementary Ideographic Plane, - {0x30000, 0x3FFFF}, // the Tertiary Ideographic Plane, - } { - for r := b.lo; r <= b.hi; r++ { - f(r, tagWide, 0) - } - } - - inverse := map[rune]rune{} - maps := map[string]bool{ - "": true, - "": true, - } - - // We cannot reuse package norm's decomposition, as we need an unexpanded - // decomposition. We make use of the opportunity to verify that the - // decomposition type is as expected. - ucd.Parse(gen.OpenUCDFile("UnicodeData.txt"), func(p *ucd.Parser) { - r := p.Rune(0) - s := strings.SplitN(p.String(ucd.DecompMapping), " ", 2) - if !maps[s[0]] { - return - } - x, err := strconv.ParseUint(s[1], 16, 32) - if err != nil { - log.Fatalf("Error parsing rune %q", s[1]) - } - if inverse[r] != 0 || inverse[rune(x)] != 0 { - log.Fatalf("Circular dependency in mapping between %U and %U", r, x) - } - inverse[r] = rune(x) - inverse[rune(x)] = r - }) - - // ; - ucd.Parse(gen.OpenUCDFile("EastAsianWidth.txt"), func(p *ucd.Parser) { - tag, ok := typeMap[p.String(1)] - if !ok { - log.Fatalf("Unknown width type %q", p.String(1)) - } - r := p.Rune(0) - alt, ok := inverse[r] - if tag == tagFullwidth || tag == tagHalfwidth && r != wonSign { - tag |= tagNeedsFold - if !ok { - log.Fatalf("Narrow or wide rune %U has no decomposition", r) - } - } - f(r, tag, alt) - }) -} diff --git a/vendor/golang.org/x/text/width/gen_trieval.go b/vendor/golang.org/x/text/width/gen_trieval.go deleted file mode 100644 index c17334aa61..0000000000 --- a/vendor/golang.org/x/text/width/gen_trieval.go +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright 2015 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build ignore - -package main - -// elem is an entry of the width trie. The high byte is used to encode the type -// of the rune. The low byte is used to store the index to a mapping entry in -// the inverseData array. -type elem uint16 - -const ( - tagNeutral elem = iota << typeShift - tagAmbiguous - tagWide - tagNarrow - tagFullwidth - tagHalfwidth -) - -const ( - numTypeBits = 3 - typeShift = 16 - numTypeBits - - // tagNeedsFold is true for all fullwidth and halfwidth runes except for - // the Won sign U+20A9. - tagNeedsFold = 0x1000 - - // The Korean Won sign is halfwidth, but SHOULD NOT be mapped to a wide - // variant. - wonSign rune = 0x20A9 -) diff --git a/vendor/golang.org/x/tools/go/gcexportdata/main.go b/vendor/golang.org/x/tools/go/gcexportdata/main.go deleted file mode 100644 index 2713dce64a..0000000000 --- a/vendor/golang.org/x/tools/go/gcexportdata/main.go +++ /dev/null @@ -1,99 +0,0 @@ -// Copyright 2017 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build ignore - -// The gcexportdata command is a diagnostic tool that displays the -// contents of gc export data files. -package main - -import ( - "flag" - "fmt" - "go/token" - "go/types" - "log" - "os" - - "golang.org/x/tools/go/gcexportdata" - "golang.org/x/tools/go/types/typeutil" -) - -var packageFlag = flag.String("package", "", "alternative package to print") - -func main() { - log.SetPrefix("gcexportdata: ") - log.SetFlags(0) - flag.Usage = func() { - fmt.Fprintln(os.Stderr, "usage: gcexportdata [-package path] file.a") - } - flag.Parse() - if flag.NArg() != 1 { - flag.Usage() - os.Exit(2) - } - filename := flag.Args()[0] - - f, err := os.Open(filename) - if err != nil { - log.Fatal(err) - } - - r, err := gcexportdata.NewReader(f) - if err != nil { - log.Fatalf("%s: %s", filename, err) - } - - // Decode the package. - const primary = "" - imports := make(map[string]*types.Package) - fset := token.NewFileSet() - pkg, err := gcexportdata.Read(r, fset, imports, primary) - if err != nil { - log.Fatalf("%s: %s", filename, err) - } - - // Optionally select an indirectly mentioned package. - if *packageFlag != "" { - pkg = imports[*packageFlag] - if pkg == nil { - fmt.Fprintf(os.Stderr, "export data file %s does not mention %s; has:\n", - filename, *packageFlag) - for p := range imports { - if p != primary { - fmt.Fprintf(os.Stderr, "\t%s\n", p) - } - } - os.Exit(1) - } - } - - // Print all package-level declarations, including non-exported ones. - fmt.Printf("package %s\n", pkg.Name()) - for _, imp := range pkg.Imports() { - fmt.Printf("import %q\n", imp.Path()) - } - qual := func(p *types.Package) string { - if pkg == p { - return "" - } - return p.Name() - } - scope := pkg.Scope() - for _, name := range scope.Names() { - obj := scope.Lookup(name) - fmt.Printf("%s: %s\n", - fset.Position(obj.Pos()), - types.ObjectString(obj, qual)) - - // For types, print each method. - if _, ok := obj.(*types.TypeName); ok { - for _, method := range typeutil.IntuitiveMethodSet(obj.Type(), nil) { - fmt.Printf("%s: %s\n", - fset.Position(method.Obj().Pos()), - types.SelectionString(method, qual)) - } - } - } -} diff --git a/vendor/golang.org/x/tools/imports/mkindex.go b/vendor/golang.org/x/tools/imports/mkindex.go deleted file mode 100644 index 755e2394f2..0000000000 --- a/vendor/golang.org/x/tools/imports/mkindex.go +++ /dev/null @@ -1,173 +0,0 @@ -// +build ignore - -// Copyright 2013 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// Command mkindex creates the file "pkgindex.go" containing an index of the Go -// standard library. The file is intended to be built as part of the imports -// package, so that the package may be used in environments where a GOROOT is -// not available (such as App Engine). -package main - -import ( - "bytes" - "fmt" - "go/ast" - "go/build" - "go/format" - "go/parser" - "go/token" - "io/ioutil" - "log" - "os" - "path" - "path/filepath" - "strings" -) - -var ( - pkgIndex = make(map[string][]pkg) - exports = make(map[string]map[string]bool) -) - -func main() { - // Don't use GOPATH. - ctx := build.Default - ctx.GOPATH = "" - - // Populate pkgIndex global from GOROOT. - for _, path := range ctx.SrcDirs() { - f, err := os.Open(path) - if err != nil { - log.Print(err) - continue - } - children, err := f.Readdir(-1) - f.Close() - if err != nil { - log.Print(err) - continue - } - for _, child := range children { - if child.IsDir() { - loadPkg(path, child.Name()) - } - } - } - // Populate exports global. - for _, ps := range pkgIndex { - for _, p := range ps { - e := loadExports(p.dir) - if e != nil { - exports[p.dir] = e - } - } - } - - // Construct source file. - var buf bytes.Buffer - fmt.Fprint(&buf, pkgIndexHead) - fmt.Fprintf(&buf, "var pkgIndexMaster = %#v\n", pkgIndex) - fmt.Fprintf(&buf, "var exportsMaster = %#v\n", exports) - src := buf.Bytes() - - // Replace main.pkg type name with pkg. - src = bytes.Replace(src, []byte("main.pkg"), []byte("pkg"), -1) - // Replace actual GOROOT with "/go". - src = bytes.Replace(src, []byte(ctx.GOROOT), []byte("/go"), -1) - // Add some line wrapping. - src = bytes.Replace(src, []byte("}, "), []byte("},\n"), -1) - src = bytes.Replace(src, []byte("true, "), []byte("true,\n"), -1) - - var err error - src, err = format.Source(src) - if err != nil { - log.Fatal(err) - } - - // Write out source file. - err = ioutil.WriteFile("pkgindex.go", src, 0644) - if err != nil { - log.Fatal(err) - } -} - -const pkgIndexHead = `package imports - -func init() { - pkgIndexOnce.Do(func() { - pkgIndex.m = pkgIndexMaster - }) - loadExports = func(dir string) map[string]bool { - return exportsMaster[dir] - } -} -` - -type pkg struct { - importpath string // full pkg import path, e.g. "net/http" - dir string // absolute file path to pkg directory e.g. "/usr/lib/go/src/fmt" -} - -var fset = token.NewFileSet() - -func loadPkg(root, importpath string) { - shortName := path.Base(importpath) - if shortName == "testdata" { - return - } - - dir := filepath.Join(root, importpath) - pkgIndex[shortName] = append(pkgIndex[shortName], pkg{ - importpath: importpath, - dir: dir, - }) - - pkgDir, err := os.Open(dir) - if err != nil { - return - } - children, err := pkgDir.Readdir(-1) - pkgDir.Close() - if err != nil { - return - } - for _, child := range children { - name := child.Name() - if name == "" { - continue - } - if c := name[0]; c == '.' || ('0' <= c && c <= '9') { - continue - } - if child.IsDir() { - loadPkg(root, filepath.Join(importpath, name)) - } - } -} - -func loadExports(dir string) map[string]bool { - exports := make(map[string]bool) - buildPkg, err := build.ImportDir(dir, 0) - if err != nil { - if strings.Contains(err.Error(), "no buildable Go source files in") { - return nil - } - log.Printf("could not import %q: %v", dir, err) - return nil - } - for _, file := range buildPkg.GoFiles { - f, err := parser.ParseFile(fset, filepath.Join(dir, file), nil, 0) - if err != nil { - log.Printf("could not parse %q: %v", file, err) - continue - } - for name := range f.Scope.Objects { - if ast.IsExported(name) { - exports[name] = true - } - } - } - return exports -} diff --git a/vendor/golang.org/x/tools/imports/mkstdlib.go b/vendor/golang.org/x/tools/imports/mkstdlib.go deleted file mode 100644 index 5059ad4d7d..0000000000 --- a/vendor/golang.org/x/tools/imports/mkstdlib.go +++ /dev/null @@ -1,112 +0,0 @@ -// +build ignore - -// mkstdlib generates the zstdlib.go file, containing the Go standard -// library API symbols. It's baked into the binary to avoid scanning -// GOPATH in the common case. -package main - -import ( - "bufio" - "bytes" - "fmt" - "go/format" - "io" - "io/ioutil" - "log" - "os" - "path/filepath" - "regexp" - "runtime" - "sort" - "strings" -) - -func mustOpen(name string) io.Reader { - f, err := os.Open(name) - if err != nil { - log.Fatal(err) - } - return f -} - -func api(base string) string { - return filepath.Join(runtime.GOROOT(), "api", base) -} - -var sym = regexp.MustCompile(`^pkg (\S+).*?, (?:var|func|type|const) ([A-Z]\w*)`) - -var unsafeSyms = map[string]bool{"Alignof": true, "ArbitraryType": true, "Offsetof": true, "Pointer": true, "Sizeof": true} - -func main() { - var buf bytes.Buffer - outf := func(format string, args ...interface{}) { - fmt.Fprintf(&buf, format, args...) - } - outf("// Code generated by mkstdlib.go. DO NOT EDIT.\n\n") - outf("package imports\n") - outf("var stdlib = map[string]map[string]bool{\n") - f := io.MultiReader( - mustOpen(api("go1.txt")), - mustOpen(api("go1.1.txt")), - mustOpen(api("go1.2.txt")), - mustOpen(api("go1.3.txt")), - mustOpen(api("go1.4.txt")), - mustOpen(api("go1.5.txt")), - mustOpen(api("go1.6.txt")), - mustOpen(api("go1.7.txt")), - mustOpen(api("go1.8.txt")), - mustOpen(api("go1.9.txt")), - mustOpen(api("go1.10.txt")), - mustOpen(api("go1.11.txt")), - mustOpen(api("go1.12.txt")), - ) - sc := bufio.NewScanner(f) - - pkgs := map[string]map[string]bool{ - "unsafe": unsafeSyms, - } - paths := []string{"unsafe"} - - for sc.Scan() { - l := sc.Text() - has := func(v string) bool { return strings.Contains(l, v) } - if has("struct, ") || has("interface, ") || has(", method (") { - continue - } - if m := sym.FindStringSubmatch(l); m != nil { - path, sym := m[1], m[2] - - if _, ok := pkgs[path]; !ok { - pkgs[path] = map[string]bool{} - paths = append(paths, path) - } - pkgs[path][sym] = true - } - } - if err := sc.Err(); err != nil { - log.Fatal(err) - } - sort.Strings(paths) - for _, path := range paths { - outf("\t%q: map[string]bool{\n", path) - pkg := pkgs[path] - var syms []string - for sym := range pkg { - syms = append(syms, sym) - } - sort.Strings(syms) - for _, sym := range syms { - outf("\t\t%q: true,\n", sym) - } - outf("},\n") - } - outf("}\n") - fmtbuf, err := format.Source(buf.Bytes()) - if err != nil { - log.Fatal(err) - } - err = ioutil.WriteFile("zstdlib.go", fmtbuf, 0666) - if err != nil { - log.Fatal(err) - } -} diff --git a/vendor/modules.txt b/vendor/modules.txt index 535ec60fb5..3cdadee2a0 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,16 +1,16 @@ # cloud.google.com/go v0.34.0 +cloud.google.com/go/compute/metadata cloud.google.com/go/monitoring/apiv3 cloud.google.com/go/trace/apiv2 -cloud.google.com/go/compute/metadata # contrib.go.opencensus.io/exporter/stackdriver v0.8.0 contrib.go.opencensus.io/exporter/stackdriver contrib.go.opencensus.io/exporter/stackdriver/monitoredresource # fortio.org/fortio v1.3.1 fortio.org/fortio/fhttp -fortio.org/fortio/stats fortio.org/fortio/fnet fortio.org/fortio/log fortio.org/fortio/periodic +fortio.org/fortio/stats fortio.org/fortio/version # github.com/PuerkitoBio/purell v1.1.0 github.com/PuerkitoBio/purell @@ -19,35 +19,35 @@ github.com/PuerkitoBio/urlesc # github.com/ahmetb/gen-crd-api-reference-docs v0.1.1 github.com/ahmetb/gen-crd-api-reference-docs # github.com/aws/aws-sdk-go v1.16.20 -github.com/aws/aws-sdk-go/aws/ec2metadata -github.com/aws/aws-sdk-go/aws/session github.com/aws/aws-sdk-go/aws github.com/aws/aws-sdk-go/aws/awserr +github.com/aws/aws-sdk-go/aws/awsutil github.com/aws/aws-sdk-go/aws/client github.com/aws/aws-sdk-go/aws/client/metadata github.com/aws/aws-sdk-go/aws/corehandlers -github.com/aws/aws-sdk-go/aws/request -github.com/aws/aws-sdk-go/internal/sdkuri github.com/aws/aws-sdk-go/aws/credentials +github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds +github.com/aws/aws-sdk-go/aws/credentials/endpointcreds github.com/aws/aws-sdk-go/aws/credentials/processcreds github.com/aws/aws-sdk-go/aws/credentials/stscreds github.com/aws/aws-sdk-go/aws/csm github.com/aws/aws-sdk-go/aws/defaults +github.com/aws/aws-sdk-go/aws/ec2metadata github.com/aws/aws-sdk-go/aws/endpoints +github.com/aws/aws-sdk-go/aws/request +github.com/aws/aws-sdk-go/aws/session +github.com/aws/aws-sdk-go/aws/signer/v4 github.com/aws/aws-sdk-go/internal/ini -github.com/aws/aws-sdk-go/internal/shareddefaults github.com/aws/aws-sdk-go/internal/sdkio github.com/aws/aws-sdk-go/internal/sdkrand -github.com/aws/aws-sdk-go/aws/awsutil -github.com/aws/aws-sdk-go/service/sts -github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds -github.com/aws/aws-sdk-go/aws/credentials/endpointcreds -github.com/aws/aws-sdk-go/aws/signer/v4 +github.com/aws/aws-sdk-go/internal/sdkuri +github.com/aws/aws-sdk-go/internal/shareddefaults +github.com/aws/aws-sdk-go/private/protocol github.com/aws/aws-sdk-go/private/protocol/query -github.com/aws/aws-sdk-go/private/protocol/rest github.com/aws/aws-sdk-go/private/protocol/query/queryutil +github.com/aws/aws-sdk-go/private/protocol/rest github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil -github.com/aws/aws-sdk-go/private/protocol +github.com/aws/aws-sdk-go/service/sts # github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 github.com/beorn7/perks/quantile # github.com/davecgh/go-spew v1.1.1 @@ -74,34 +74,32 @@ github.com/golang/glog # github.com/golang/groupcache v0.0.0-20171101203131-84a468cf14b4 github.com/golang/groupcache/lru # github.com/golang/protobuf v1.3.2 -github.com/golang/protobuf/protoc-gen-go github.com/golang/protobuf/descriptor +github.com/golang/protobuf/jsonpb github.com/golang/protobuf/proto +github.com/golang/protobuf/protoc-gen-go +github.com/golang/protobuf/protoc-gen-go/descriptor github.com/golang/protobuf/protoc-gen-go/generator +github.com/golang/protobuf/protoc-gen-go/generator/internal/remap github.com/golang/protobuf/protoc-gen-go/grpc github.com/golang/protobuf/protoc-gen-go/plugin -github.com/golang/protobuf/jsonpb -github.com/golang/protobuf/protoc-gen-go/descriptor +github.com/golang/protobuf/ptypes github.com/golang/protobuf/ptypes/any github.com/golang/protobuf/ptypes/duration +github.com/golang/protobuf/ptypes/empty +github.com/golang/protobuf/ptypes/struct github.com/golang/protobuf/ptypes/timestamp -<<<<<<< HEAD github.com/golang/protobuf/protoc-gen-go/descriptor github.com/golang/protobuf/ptypes github.com/golang/protobuf/ptypes/wrappers github.com/golang/protobuf/protoc-gen-go/generator/internal/remap github.com/golang/protobuf/ptypes/struct github.com/golang/protobuf/ptypes/empty -======= github.com/golang/protobuf/ptypes/wrappers -<<<<<<< HEAD ->>>>>>> Update GRPC to v1.20.1 -======= github.com/golang/protobuf/ptypes github.com/golang/protobuf/protoc-gen-go/generator/internal/remap github.com/golang/protobuf/ptypes/struct github.com/golang/protobuf/ptypes/empty ->>>>>>> go mod vendor # github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c github.com/google/btree # github.com/google/gofuzz v1.0.0 @@ -118,30 +116,30 @@ github.com/googleapis/gnostic/extensions github.com/gregjones/httpcache github.com/gregjones/httpcache/diskcache # github.com/grpc-ecosystem/grpc-gateway v1.11.3 -github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway -github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger -github.com/grpc-ecosystem/grpc-gateway/runtime -github.com/grpc-ecosystem/grpc-gateway/utilities github.com/grpc-ecosystem/grpc-gateway/codegenerator +github.com/grpc-ecosystem/grpc-gateway/internal +github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/descriptor +github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/generator github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/gengateway -github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/genswagger -github.com/grpc-ecosystem/grpc-gateway/internal github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/httprule -github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/generator +github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger +github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/genswagger github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/options +github.com/grpc-ecosystem/grpc-gateway/runtime +github.com/grpc-ecosystem/grpc-gateway/utilities # github.com/hashicorp/golang-lru v0.5.1 github.com/hashicorp/golang-lru github.com/hashicorp/golang-lru/simplelru # github.com/hashicorp/hcl v1.0.0 github.com/hashicorp/hcl -github.com/hashicorp/hcl/hcl/printer github.com/hashicorp/hcl/hcl/ast github.com/hashicorp/hcl/hcl/parser -github.com/hashicorp/hcl/hcl/token -github.com/hashicorp/hcl/json/parser +github.com/hashicorp/hcl/hcl/printer github.com/hashicorp/hcl/hcl/scanner github.com/hashicorp/hcl/hcl/strconv +github.com/hashicorp/hcl/hcl/token +github.com/hashicorp/hcl/json/parser github.com/hashicorp/hcl/json/scanner github.com/hashicorp/hcl/json/token # github.com/heptiolabs/healthcheck v0.0.0-20171201210846-da5fdee475fb @@ -159,9 +157,9 @@ github.com/konsorten/go-windows-terminal-sequences # github.com/magiconair/properties v1.8.0 github.com/magiconair/properties # github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329 +github.com/mailru/easyjson/buffer github.com/mailru/easyjson/jlexer github.com/mailru/easyjson/jwriter -github.com/mailru/easyjson/buffer # github.com/mattbaird/jsonpatch v0.0.0-20171005235357-81af80346b1a github.com/mattbaird/jsonpatch # github.com/matttproud/golang_protobuf_extensions v1.0.1 @@ -193,13 +191,13 @@ github.com/prometheus/client_golang/prometheus/testutil github.com/prometheus/client_model/go # github.com/prometheus/common v0.0.0-20181126121408-4724e9255275 github.com/prometheus/common/expfmt -github.com/prometheus/common/model github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg +github.com/prometheus/common/model # github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a github.com/prometheus/procfs +github.com/prometheus/procfs/internal/util github.com/prometheus/procfs/nfs github.com/prometheus/procfs/xfs -github.com/prometheus/procfs/internal/util # github.com/russross/blackfriday/v2 v2.0.1 github.com/russross/blackfriday/v2 # github.com/shurcooL/sanitized_anchor_name v1.0.0 @@ -220,10 +218,7 @@ github.com/spf13/viper # github.com/stretchr/testify v1.3.0 github.com/stretchr/testify/assert # go.opencensus.io v0.18.0 -<<<<<<< HEAD -<<<<<<< HEAD go.opencensus.io/plugin/ochttp -======= go.opencensus.io go.opencensus.io/exemplar go.opencensus.io/exporter/prometheus @@ -234,11 +229,9 @@ go.opencensus.io/plugin/ochttp go.opencensus.io/plugin/ochttp/propagation/b3 go.opencensus.io/stats go.opencensus.io/stats/internal ->>>>>>> Update GRPC to v1.20.1 go.opencensus.io/stats/view go.opencensus.io/stats go.opencensus.io/tag -<<<<<<< HEAD go.opencensus.io/exporter/prometheus go.opencensus.io/plugin/ochttp/propagation/b3 go.opencensus.io/trace @@ -248,19 +241,15 @@ go.opencensus.io/internal/tagencoding go.opencensus.io/stats/internal go.opencensus.io go.opencensus.io/internal -======= go.opencensus.io/trace ->>>>>>> Update GRPC to v1.20.1 go.opencensus.io/trace/internal -======= go.opencensus.io/plugin/ochttp -go.opencensus.io/stats/view +go.opencensus.io/plugin/ochttp/propagation/b3 go.opencensus.io/stats +go.opencensus.io/stats/internal +go.opencensus.io/stats/view go.opencensus.io/tag -go.opencensus.io/exporter/prometheus -go.opencensus.io/plugin/ochttp/propagation/b3 go.opencensus.io/trace ->>>>>>> go mod vendor go.opencensus.io/trace/propagation go.opencensus.io/exemplar go.opencensus.io/internal/tagencoding @@ -268,19 +257,19 @@ go.opencensus.io/stats/internal go.opencensus.io go.opencensus.io/internal go.opencensus.io/trace/internal +go.opencensus.io/trace/propagation go.opencensus.io/trace/tracestate -go.opencensus.io/plugin/ocgrpc # golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 golang.org/x/crypto/ssh/terminal # golang.org/x/net v0.0.0-20190311183353-d8887717615a golang.org/x/net/context -golang.org/x/net/http2 -golang.org/x/net/trace +golang.org/x/net/context/ctxhttp golang.org/x/net/http/httpguts +golang.org/x/net/http2 golang.org/x/net/http2/hpack golang.org/x/net/idna golang.org/x/net/internal/timeseries -golang.org/x/net/context/ctxhttp +golang.org/x/net/trace # golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890 golang.org/x/oauth2/google golang.org/x/oauth2 @@ -292,101 +281,94 @@ golang.org/x/sync/semaphore # golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a golang.org/x/sys/unix golang.org/x/sys/windows -<<<<<<< HEAD # golang.org/x/text v0.3.0 golang.org/x/text/transform golang.org/x/text/unicode/norm -======= # golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db -<<<<<<< HEAD ->>>>>>> Update GRPC to v1.20.1 golang.org/x/text/secure/bidirule -======= ->>>>>>> go mod vendor golang.org/x/text/transform golang.org/x/text/unicode/norm golang.org/x/text/secure/bidirule +golang.org/x/text/transform golang.org/x/text/unicode/bidi +golang.org/x/text/unicode/norm golang.org/x/text/width # golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2 golang.org/x/time/rate # golang.org/x/tools v0.0.0-20190328211700-ab21143f2384 golang.org/x/tools/cmd/goimports -golang.org/x/tools/imports golang.org/x/tools/go/ast/astutil +golang.org/x/tools/go/gcexportdata +golang.org/x/tools/go/internal/gcimporter +golang.org/x/tools/go/internal/packagesdriver golang.org/x/tools/go/packages +golang.org/x/tools/imports +golang.org/x/tools/internal/fastwalk golang.org/x/tools/internal/gopathwalk golang.org/x/tools/internal/module -golang.org/x/tools/go/gcexportdata -golang.org/x/tools/go/internal/packagesdriver golang.org/x/tools/internal/semver -golang.org/x/tools/internal/fastwalk -golang.org/x/tools/go/internal/gcimporter # google.golang.org/api v0.0.0-20190117000611-43037ff31f69 +google.golang.org/api/googleapi/transport +google.golang.org/api/internal +google.golang.org/api/iterator google.golang.org/api/option google.golang.org/api/support/bundler -google.golang.org/api/iterator google.golang.org/api/transport -google.golang.org/api/internal google.golang.org/api/transport/grpc google.golang.org/api/transport/http -google.golang.org/api/googleapi/transport google.golang.org/api/transport/http/internal/propagation # google.golang.org/appengine v1.4.0 google.golang.org/appengine -google.golang.org/appengine/urlfetch google.golang.org/appengine/internal google.golang.org/appengine/internal/app_identity -<<<<<<< HEAD -<<<<<<< HEAD google.golang.org/appengine/internal/modules google.golang.org/appengine/socket google.golang.org/appengine/internal/urlfetch -======= ->>>>>>> Update GRPC to v1.20.1 -======= google.golang.org/appengine/internal/modules google.golang.org/appengine/internal/urlfetch google.golang.org/appengine/socket ->>>>>>> go mod vendor google.golang.org/appengine/internal/base google.golang.org/appengine/internal/datastore google.golang.org/appengine/internal/log +google.golang.org/appengine/internal/modules google.golang.org/appengine/internal/remote_api google.golang.org/appengine/internal/socket +google.golang.org/appengine/internal/urlfetch +google.golang.org/appengine/socket +google.golang.org/appengine/urlfetch # google.golang.org/genproto v0.0.0-20191009194640-548a555dbc03 +google.golang.org/genproto/googleapis/api google.golang.org/genproto/googleapis/api/annotations -<<<<<<< HEAD google.golang.org/genproto/googleapis/rpc/status google.golang.org/genproto/googleapis/api/distribution -======= ->>>>>>> go mod vendor google.golang.org/genproto/googleapis/api/httpbody google.golang.org/genproto/protobuf/field_mask google.golang.org/genproto/googleapis/rpc/status google.golang.org/genproto/googleapis/api/distribution +google.golang.org/genproto/googleapis/api/httpbody google.golang.org/genproto/googleapis/api/label google.golang.org/genproto/googleapis/api/metric google.golang.org/genproto/googleapis/api/monitoredres google.golang.org/genproto/googleapis/devtools/cloudtrace/v2 google.golang.org/genproto/googleapis/monitoring/v3 -<<<<<<< HEAD google.golang.org/genproto/protobuf/field_mask -======= google.golang.org/genproto/googleapis/api ->>>>>>> go mod vendor +google.golang.org/genproto/googleapis/rpc/status +google.golang.org/genproto/protobuf/field_mask # google.golang.org/grpc v1.20.1 google.golang.org/grpc -google.golang.org/grpc/codes -google.golang.org/grpc/grpclog -google.golang.org/grpc/status -google.golang.org/grpc/metadata google.golang.org/grpc/balancer +google.golang.org/grpc/balancer/base google.golang.org/grpc/balancer/roundrobin +google.golang.org/grpc/binarylog/grpc_binarylog_v1 +google.golang.org/grpc/codes google.golang.org/grpc/connectivity google.golang.org/grpc/credentials +google.golang.org/grpc/credentials/internal +google.golang.org/grpc/credentials/oauth google.golang.org/grpc/encoding google.golang.org/grpc/encoding/proto +google.golang.org/grpc/grpclog google.golang.org/grpc/internal google.golang.org/grpc/internal/backoff google.golang.org/grpc/internal/balancerload @@ -395,69 +377,54 @@ google.golang.org/grpc/internal/channelz google.golang.org/grpc/internal/envconfig google.golang.org/grpc/internal/grpcrand google.golang.org/grpc/internal/grpcsync +google.golang.org/grpc/internal/syscall google.golang.org/grpc/internal/transport google.golang.org/grpc/keepalive +google.golang.org/grpc/metadata google.golang.org/grpc/naming google.golang.org/grpc/peer google.golang.org/grpc/resolver google.golang.org/grpc/resolver/dns google.golang.org/grpc/resolver/passthrough google.golang.org/grpc/stats +google.golang.org/grpc/status google.golang.org/grpc/tap -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> go mod vendor google.golang.org/grpc/balancer/base google.golang.org/grpc/credentials/internal google.golang.org/grpc/binarylog/grpc_binarylog_v1 google.golang.org/grpc/internal/syscall google.golang.org/grpc/credentials/oauth -<<<<<<< HEAD # gopkg.in/fsnotify.v1 v1.4.7 gopkg.in/fsnotify.v1 -======= ->>>>>>> Update GRPC to v1.20.1 -======= ->>>>>>> go mod vendor +# gopkg.in/fsnotify.v1 v1.4.7 +gopkg.in/fsnotify.v1 # gopkg.in/inf.v0 v0.9.1 gopkg.in/inf.v0 # gopkg.in/natefinch/lumberjack.v2 v2.0.0-20170531160350-a96e63847dc3 gopkg.in/natefinch/lumberjack.v2 # gopkg.in/yaml.v2 v2.2.4 gopkg.in/yaml.v2 -<<<<<<< HEAD # k8s.io/api v0.0.0-20191004102255-dacd7df5a50b k8s.io/api/apps/v1 k8s.io/api/core/v1 k8s.io/api/admissionregistration/v1beta1 k8s.io/api/extensions/v1beta1 -======= # k8s.io/api v0.0.0-20190708094356-59223ed9f6ce -<<<<<<< HEAD ->>>>>>> Update GRPC to v1.20.1 -======= k8s.io/api/apps/v1 k8s.io/api/core/v1 k8s.io/api/admissionregistration/v1beta1 k8s.io/api/extensions/v1beta1 ->>>>>>> go mod vendor k8s.io/api/admission/v1beta1 -k8s.io/api/rbac/v1 k8s.io/api/admissionregistration/v1alpha1 +k8s.io/api/admissionregistration/v1beta1 +k8s.io/api/apps/v1 k8s.io/api/apps/v1beta1 k8s.io/api/apps/v1beta2 -<<<<<<< HEAD -<<<<<<< HEAD k8s.io/api/auditregistration/v1alpha1 -======= k8s.io/api/authentication/v1 k8s.io/api/authentication/v1beta1 k8s.io/api/authorization/v1 k8s.io/api/authorization/v1beta1 ->>>>>>> Update GRPC to v1.20.1 -======= ->>>>>>> go mod vendor k8s.io/api/autoscaling/v1 k8s.io/api/autoscaling/v2beta1 k8s.io/api/autoscaling/v2beta2 @@ -466,9 +433,12 @@ k8s.io/api/batch/v1beta1 k8s.io/api/batch/v2alpha1 k8s.io/api/certificates/v1beta1 k8s.io/api/coordination/v1beta1 +k8s.io/api/core/v1 k8s.io/api/events/v1beta1 +k8s.io/api/extensions/v1beta1 k8s.io/api/networking/v1 k8s.io/api/policy/v1beta1 +k8s.io/api/rbac/v1 k8s.io/api/rbac/v1alpha1 k8s.io/api/rbac/v1beta1 k8s.io/api/scheduling/v1alpha1 @@ -477,34 +447,27 @@ k8s.io/api/settings/v1alpha1 k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> go mod vendor k8s.io/api/authentication/v1 k8s.io/api/authentication/v1beta1 k8s.io/api/authorization/v1 k8s.io/api/authorization/v1beta1 -<<<<<<< HEAD # k8s.io/apiextensions-apiserver v0.0.0-20191004105443-a7d558db75c6 k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1 -======= # k8s.io/apiextensions-apiserver v0.0.0-20190708094842-2e94e9ac9840 k8s.io/apiextensions-apiserver/pkg/apis/apiextensions ->>>>>>> Update GRPC to v1.20.1 k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1 -======= # k8s.io/apiextensions-apiserver v0.0.0-20190708094842-2e94e9ac9840 ->>>>>>> go mod vendor k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1 +# k8s.io/apiextensions-apiserver v0.0.0-20190708094842-2e94e9ac9840 +k8s.io/apiextensions-apiserver/pkg/apis/apiextensions k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1 +k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme -k8s.io/apiextensions-apiserver/pkg/apis/apiextensions +k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1 k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake -<<<<<<< HEAD # k8s.io/apimachinery v0.0.0-20191004074956-01f8b7d1121a => ./vendor_fixes/k8s.io/apimachinery k8s.io/apimachinery/pkg/api/errors k8s.io/apimachinery/pkg/apis/meta/v1 @@ -512,28 +475,30 @@ k8s.io/apimachinery/pkg/runtime k8s.io/apimachinery/pkg/api/resource k8s.io/apimachinery/pkg/util/clock k8s.io/apimachinery/pkg/util/wait -======= # k8s.io/apimachinery v0.0.0-20190221084156-01f179d85dbc => ./vendor_fixes/k8s.io/apimachinery +k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors k8s.io/apimachinery/pkg/apis/meta/v1 -<<<<<<< HEAD k8s.io/apimachinery/pkg/apis/meta/v1/unstructured k8s.io/apimachinery/pkg/apis/meta/v1beta1 k8s.io/apimachinery/pkg/conversion k8s.io/apimachinery/pkg/conversion/queryparams k8s.io/apimachinery/pkg/fields ->>>>>>> Update GRPC to v1.20.1 k8s.io/apimachinery/pkg/labels k8s.io/apimachinery/pkg/runtime/schema -<<<<<<< HEAD -======= k8s.io/apimachinery/pkg/runtime +k8s.io/apimachinery/pkg/api/meta k8s.io/apimachinery/pkg/api/resource -k8s.io/apimachinery/pkg/util/clock -k8s.io/apimachinery/pkg/util/wait +k8s.io/apimachinery/pkg/apis/meta/internalversion +k8s.io/apimachinery/pkg/apis/meta/v1 +k8s.io/apimachinery/pkg/apis/meta/v1/unstructured +k8s.io/apimachinery/pkg/apis/meta/v1beta1 +k8s.io/apimachinery/pkg/conversion +k8s.io/apimachinery/pkg/conversion/queryparams +k8s.io/apimachinery/pkg/fields k8s.io/apimachinery/pkg/labels +k8s.io/apimachinery/pkg/runtime k8s.io/apimachinery/pkg/runtime/schema ->>>>>>> go mod vendor k8s.io/apimachinery/pkg/util/intstr k8s.io/apimachinery/pkg/util/validation k8s.io/apimachinery/pkg/types @@ -555,29 +520,37 @@ k8s.io/apimachinery/pkg/util/sets k8s.io/apimachinery/pkg/runtime/serializer/streaming k8s.io/apimachinery/pkg/util/net k8s.io/apimachinery/pkg/version -<<<<<<< HEAD -======= k8s.io/apimachinery/pkg/runtime/serializer ->>>>>>> Update GRPC to v1.20.1 -======= ->>>>>>> go mod vendor +k8s.io/apimachinery/pkg/runtime/serializer k8s.io/apimachinery/pkg/runtime/serializer/json k8s.io/apimachinery/pkg/runtime/serializer/protobuf k8s.io/apimachinery/pkg/runtime/serializer/recognizer +k8s.io/apimachinery/pkg/runtime/serializer/streaming k8s.io/apimachinery/pkg/runtime/serializer/versioning -k8s.io/apimachinery/pkg/api/meta -k8s.io/apimachinery/pkg/util/strategicpatch +k8s.io/apimachinery/pkg/selection +k8s.io/apimachinery/pkg/types k8s.io/apimachinery/pkg/util/cache +k8s.io/apimachinery/pkg/util/clock k8s.io/apimachinery/pkg/util/diff -k8s.io/apimachinery/pkg/util/rand -k8s.io/apimachinery/third_party/forked/golang/reflect +k8s.io/apimachinery/pkg/util/errors k8s.io/apimachinery/pkg/util/framer -k8s.io/apimachinery/pkg/apis/meta/v1/unstructured -k8s.io/apimachinery/pkg/apis/meta/v1beta1 +k8s.io/apimachinery/pkg/util/intstr +k8s.io/apimachinery/pkg/util/json k8s.io/apimachinery/pkg/util/mergepatch +k8s.io/apimachinery/pkg/util/naming +k8s.io/apimachinery/pkg/util/net +k8s.io/apimachinery/pkg/util/rand +k8s.io/apimachinery/pkg/util/runtime +k8s.io/apimachinery/pkg/util/sets +k8s.io/apimachinery/pkg/util/strategicpatch +k8s.io/apimachinery/pkg/util/uuid +k8s.io/apimachinery/pkg/util/validation +k8s.io/apimachinery/pkg/util/validation/field +k8s.io/apimachinery/pkg/util/wait +k8s.io/apimachinery/pkg/util/yaml +k8s.io/apimachinery/pkg/version +k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json -<<<<<<< HEAD -<<<<<<< HEAD k8s.io/apimachinery/pkg/apis/meta/internalversion # k8s.io/client-go v0.0.0-20191004102537-eb5b9a8cfde7 k8s.io/client-go/informers @@ -585,11 +558,8 @@ k8s.io/client-go/kubernetes k8s.io/client-go/rest k8s.io/client-go/tools/clientcmd k8s.io/client-go/kubernetes/scheme -======= k8s.io/apimachinery/third_party/forked/golang/reflect # k8s.io/client-go v9.0.0+incompatible ->>>>>>> Update GRPC to v1.20.1 -======= k8s.io/apimachinery/pkg/apis/meta/internalversion # k8s.io/client-go v9.0.0+incompatible k8s.io/client-go/informers @@ -597,14 +567,10 @@ k8s.io/client-go/kubernetes k8s.io/client-go/rest k8s.io/client-go/tools/clientcmd k8s.io/client-go/kubernetes/scheme ->>>>>>> go mod vendor +k8s.io/apimachinery/third_party/forked/golang/reflect +# k8s.io/client-go v9.0.0+incompatible k8s.io/client-go/discovery -k8s.io/client-go/util/flowcontrol k8s.io/client-go/discovery/fake -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> go mod vendor k8s.io/client-go/testing k8s.io/client-go/tools/cache k8s.io/client-go/kubernetes/typed/core/v1 @@ -615,41 +581,61 @@ k8s.io/client-go/util/workqueue k8s.io/client-go/tools/metrics k8s.io/client-go/kubernetes/fake k8s.io/client-go/plugin/pkg/client/auth/gcp -<<<<<<< HEAD -======= k8s.io/client-go/informers ->>>>>>> Update GRPC to v1.20.1 ======= >>>>>>> go mod vendor +======= +k8s.io/client-go/informers k8s.io/client-go/informers/admissionregistration +k8s.io/client-go/informers/admissionregistration/v1alpha1 +k8s.io/client-go/informers/admissionregistration/v1beta1 k8s.io/client-go/informers/apps -<<<<<<< HEAD -<<<<<<< HEAD -k8s.io/client-go/informers/auditregistration -======= k8s.io/client-go/informers/apps/v1 k8s.io/client-go/informers/apps/v1beta1 k8s.io/client-go/informers/apps/v1beta2 ->>>>>>> Update GRPC to v1.20.1 -======= ->>>>>>> go mod vendor +k8s.io/client-go/informers/apps/v1 +k8s.io/client-go/informers/apps/v1beta1 +k8s.io/client-go/informers/apps/v1beta2 k8s.io/client-go/informers/autoscaling +k8s.io/client-go/informers/autoscaling/v1 +k8s.io/client-go/informers/autoscaling/v2beta1 +k8s.io/client-go/informers/autoscaling/v2beta2 k8s.io/client-go/informers/batch +k8s.io/client-go/informers/batch/v1 +k8s.io/client-go/informers/batch/v1beta1 +k8s.io/client-go/informers/batch/v2alpha1 k8s.io/client-go/informers/certificates +k8s.io/client-go/informers/certificates/v1beta1 k8s.io/client-go/informers/coordination +k8s.io/client-go/informers/coordination/v1beta1 k8s.io/client-go/informers/core +k8s.io/client-go/informers/core/v1 k8s.io/client-go/informers/events +k8s.io/client-go/informers/events/v1beta1 k8s.io/client-go/informers/extensions +k8s.io/client-go/informers/extensions/v1beta1 k8s.io/client-go/informers/internalinterfaces k8s.io/client-go/informers/networking +k8s.io/client-go/informers/networking/v1 k8s.io/client-go/informers/policy +k8s.io/client-go/informers/policy/v1beta1 k8s.io/client-go/informers/rbac +k8s.io/client-go/informers/rbac/v1 +k8s.io/client-go/informers/rbac/v1alpha1 +k8s.io/client-go/informers/rbac/v1beta1 k8s.io/client-go/informers/scheduling +k8s.io/client-go/informers/scheduling/v1alpha1 +k8s.io/client-go/informers/scheduling/v1beta1 k8s.io/client-go/informers/settings +k8s.io/client-go/informers/settings/v1alpha1 k8s.io/client-go/informers/storage +k8s.io/client-go/informers/storage/v1 +k8s.io/client-go/informers/storage/v1alpha1 +k8s.io/client-go/informers/storage/v1beta1 +k8s.io/client-go/kubernetes +k8s.io/client-go/kubernetes/fake +k8s.io/client-go/kubernetes/scheme k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1 -<<<<<<< HEAD -<<<<<<< HEAD k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1 k8s.io/client-go/kubernetes/typed/apps/v1 k8s.io/client-go/kubernetes/typed/apps/v1beta1 @@ -694,30 +680,13 @@ k8s.io/client-go/tools/pager k8s.io/client-go/util/buffer k8s.io/client-go/util/retry k8s.io/client-go/tools/reference -======= ->>>>>>> Update GRPC to v1.20.1 k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/fake -======= ->>>>>>> go mod vendor k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1 k8s.io/client-go/kubernetes/typed/apps/v1 k8s.io/client-go/kubernetes/typed/apps/v1beta1 k8s.io/client-go/kubernetes/typed/apps/v1beta2 -<<<<<<< HEAD k8s.io/client-go/kubernetes/typed/apps/v1beta2/fake -<<<<<<< HEAD -k8s.io/client-go/kubernetes/typed/auditregistration/v1alpha1/fake -======= -k8s.io/client-go/kubernetes/typed/authentication/v1 ->>>>>>> Update GRPC to v1.20.1 -k8s.io/client-go/kubernetes/typed/authentication/v1/fake -======= -k8s.io/client-go/kubernetes/typed/authentication/v1 ->>>>>>> go mod vendor k8s.io/client-go/kubernetes/typed/authentication/v1beta1 -k8s.io/client-go/kubernetes/typed/authorization/v1 -k8s.io/client-go/kubernetes/typed/authorization/v1beta1 -k8s.io/client-go/kubernetes/typed/autoscaling/v1 k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1 k8s.io/client-go/kubernetes/typed/autoscaling/v2beta2 k8s.io/client-go/kubernetes/typed/batch/v1 @@ -752,51 +721,76 @@ k8s.io/client-go/tools/pager k8s.io/client-go/util/buffer k8s.io/client-go/util/retry k8s.io/client-go/tools/reference +======= +>>>>>>> Fixed conflict and regen everything. k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/fake +k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1 k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1/fake +k8s.io/client-go/kubernetes/typed/apps/v1 k8s.io/client-go/kubernetes/typed/apps/v1/fake +k8s.io/client-go/kubernetes/typed/apps/v1beta1 k8s.io/client-go/kubernetes/typed/apps/v1beta1/fake +k8s.io/client-go/kubernetes/typed/apps/v1beta2 k8s.io/client-go/kubernetes/typed/apps/v1beta2/fake +k8s.io/client-go/kubernetes/typed/authentication/v1 k8s.io/client-go/kubernetes/typed/authentication/v1/fake +k8s.io/client-go/kubernetes/typed/authentication/v1beta1 k8s.io/client-go/kubernetes/typed/authentication/v1beta1/fake +k8s.io/client-go/kubernetes/typed/authorization/v1 k8s.io/client-go/kubernetes/typed/authorization/v1/fake +k8s.io/client-go/kubernetes/typed/authorization/v1beta1 k8s.io/client-go/kubernetes/typed/authorization/v1beta1/fake +k8s.io/client-go/kubernetes/typed/autoscaling/v1 k8s.io/client-go/kubernetes/typed/autoscaling/v1/fake +k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1 k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1/fake +k8s.io/client-go/kubernetes/typed/autoscaling/v2beta2 k8s.io/client-go/kubernetes/typed/autoscaling/v2beta2/fake +k8s.io/client-go/kubernetes/typed/batch/v1 k8s.io/client-go/kubernetes/typed/batch/v1/fake +k8s.io/client-go/kubernetes/typed/batch/v1beta1 k8s.io/client-go/kubernetes/typed/batch/v1beta1/fake +k8s.io/client-go/kubernetes/typed/batch/v2alpha1 k8s.io/client-go/kubernetes/typed/batch/v2alpha1/fake +k8s.io/client-go/kubernetes/typed/certificates/v1beta1 k8s.io/client-go/kubernetes/typed/certificates/v1beta1/fake +k8s.io/client-go/kubernetes/typed/coordination/v1beta1 k8s.io/client-go/kubernetes/typed/coordination/v1beta1/fake +k8s.io/client-go/kubernetes/typed/core/v1 k8s.io/client-go/kubernetes/typed/core/v1/fake +k8s.io/client-go/kubernetes/typed/events/v1beta1 k8s.io/client-go/kubernetes/typed/events/v1beta1/fake +k8s.io/client-go/kubernetes/typed/extensions/v1beta1 k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake +k8s.io/client-go/kubernetes/typed/networking/v1 k8s.io/client-go/kubernetes/typed/networking/v1/fake +k8s.io/client-go/kubernetes/typed/policy/v1beta1 k8s.io/client-go/kubernetes/typed/policy/v1beta1/fake +k8s.io/client-go/kubernetes/typed/rbac/v1 k8s.io/client-go/kubernetes/typed/rbac/v1/fake +k8s.io/client-go/kubernetes/typed/rbac/v1alpha1 k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/fake +k8s.io/client-go/kubernetes/typed/rbac/v1beta1 k8s.io/client-go/kubernetes/typed/rbac/v1beta1/fake +k8s.io/client-go/kubernetes/typed/scheduling/v1alpha1 k8s.io/client-go/kubernetes/typed/scheduling/v1alpha1/fake +k8s.io/client-go/kubernetes/typed/scheduling/v1beta1 k8s.io/client-go/kubernetes/typed/scheduling/v1beta1/fake +k8s.io/client-go/kubernetes/typed/settings/v1alpha1 k8s.io/client-go/kubernetes/typed/settings/v1alpha1/fake +k8s.io/client-go/kubernetes/typed/storage/v1 k8s.io/client-go/kubernetes/typed/storage/v1/fake +k8s.io/client-go/kubernetes/typed/storage/v1alpha1 k8s.io/client-go/kubernetes/typed/storage/v1alpha1/fake +k8s.io/client-go/kubernetes/typed/storage/v1beta1 k8s.io/client-go/kubernetes/typed/storage/v1beta1/fake -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> go mod vendor k8s.io/client-go/util/jsonpath k8s.io/client-go/informers/admissionregistration/v1alpha1 k8s.io/client-go/informers/admissionregistration/v1beta1 k8s.io/client-go/informers/apps/v1 k8s.io/client-go/informers/apps/v1beta1 k8s.io/client-go/informers/apps/v1beta2 -<<<<<<< HEAD k8s.io/client-go/informers/auditregistration/v1alpha1 -======= ->>>>>>> go mod vendor k8s.io/client-go/informers/autoscaling/v1 k8s.io/client-go/informers/autoscaling/v2beta1 k8s.io/client-go/informers/autoscaling/v2beta2 @@ -824,11 +818,6 @@ k8s.io/client-go/pkg/apis/clientauthentication/v1beta1 k8s.io/client-go/util/connrotation k8s.io/client-go/tools/clientcmd/api/v1 k8s.io/client-go/third_party/forked/golang/template -<<<<<<< HEAD -======= ->>>>>>> Update GRPC to v1.20.1 -======= ->>>>>>> go mod vendor k8s.io/client-go/listers/admissionregistration/v1alpha1 k8s.io/client-go/listers/admissionregistration/v1beta1 k8s.io/client-go/listers/apps/v1 @@ -843,6 +832,7 @@ k8s.io/client-go/listers/batch/v1beta1 k8s.io/client-go/listers/batch/v2alpha1 k8s.io/client-go/listers/certificates/v1beta1 k8s.io/client-go/listers/coordination/v1beta1 +k8s.io/client-go/listers/core/v1 k8s.io/client-go/listers/events/v1beta1 k8s.io/client-go/listers/extensions/v1beta1 k8s.io/client-go/listers/networking/v1 @@ -856,6 +846,36 @@ k8s.io/client-go/listers/settings/v1alpha1 k8s.io/client-go/listers/storage/v1 k8s.io/client-go/listers/storage/v1alpha1 k8s.io/client-go/listers/storage/v1beta1 +k8s.io/client-go/pkg/apis/clientauthentication +k8s.io/client-go/pkg/apis/clientauthentication/v1alpha1 +k8s.io/client-go/pkg/apis/clientauthentication/v1beta1 +k8s.io/client-go/pkg/version +k8s.io/client-go/plugin/pkg/client/auth/exec +k8s.io/client-go/plugin/pkg/client/auth/gcp +k8s.io/client-go/rest +k8s.io/client-go/rest/watch +k8s.io/client-go/testing +k8s.io/client-go/third_party/forked/golang/template +k8s.io/client-go/tools/auth +k8s.io/client-go/tools/cache +k8s.io/client-go/tools/clientcmd +k8s.io/client-go/tools/clientcmd/api +k8s.io/client-go/tools/clientcmd/api/latest +k8s.io/client-go/tools/clientcmd/api/v1 +k8s.io/client-go/tools/metrics +k8s.io/client-go/tools/pager +k8s.io/client-go/tools/record +k8s.io/client-go/tools/reference +k8s.io/client-go/transport +k8s.io/client-go/util/buffer +k8s.io/client-go/util/cert +k8s.io/client-go/util/connrotation +k8s.io/client-go/util/flowcontrol +k8s.io/client-go/util/homedir +k8s.io/client-go/util/integer +k8s.io/client-go/util/jsonpath +k8s.io/client-go/util/retry +k8s.io/client-go/util/workqueue # k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6 k8s.io/gengo/parser k8s.io/gengo/types From 3570badde0dffffcf7c4abce3cccc104d087dbdd Mon Sep 17 00:00:00 2001 From: Cyril Tovena Date: Sun, 24 Nov 2019 18:15:07 -0500 Subject: [PATCH 7/9] go mod verify, vendor. Signed-off-by: Cyril Tovena --- go.sum | 25 +- vendor/golang.org/x/sys/unix/mksyscall.go | 406 ------- vendor/golang.org/x/text/unicode/bidi/gen.go | 137 --- .../x/text/unicode/bidi/gen_ranges.go | 61 - .../x/text/unicode/norm/maketables.go | 1011 ----------------- vendor/gopkg.in/yaml.v2/decode.go | 38 - vendor/gopkg.in/yaml.v2/resolve.go | 2 +- vendor/gopkg.in/yaml.v2/scannerc.go | 16 - vendor/modules.txt | 285 +---- 9 files changed, 16 insertions(+), 1965 deletions(-) delete mode 100644 vendor/golang.org/x/sys/unix/mksyscall.go delete mode 100644 vendor/golang.org/x/text/unicode/bidi/gen.go delete mode 100644 vendor/golang.org/x/text/unicode/bidi/gen_ranges.go delete mode 100644 vendor/golang.org/x/text/unicode/norm/maketables.go diff --git a/go.sum b/go.sum index f0082d0fff..86b1b7361b 100644 --- a/go.sum +++ b/go.sum @@ -88,12 +88,9 @@ github.com/gregjones/httpcache v0.0.0-20181110185634-c63ab54fda8f/go.mod h1:Fecb github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw= github.com/grpc-ecosystem/grpc-gateway v1.5.1 h1:3scN4iuXkNOyP98jF55Lv8a9j1o/IwvnDIZ0LHJK1nk= github.com/grpc-ecosystem/grpc-gateway v1.5.1/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw= -<<<<<<< HEAD -======= github.com/grpc-ecosystem/grpc-gateway v1.11.3 h1:h8+NsYENhxNTuq+dobk3+ODoJtwY4Fu0WQXsxJfL8aM= github.com/grpc-ecosystem/grpc-gateway v1.11.3/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= ->>>>>>> Update GRPC to v1.20.1 github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= @@ -116,8 +113,10 @@ github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvW github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= @@ -144,11 +143,8 @@ github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGV github.com/onsi/gomega v1.5.0 h1:izbySO9zDPmjJ8rDjLvkA2zJHIo+HkYXHnf7eN7SSyo= github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= -<<<<<<< HEAD -======= github.com/pborman/uuid v0.0.0-20180906182336-adf5a7427709 h1:zNBQb37RGLmJybyMcs983HfUfpkw9OTFD9tbBfAViHE= github.com/pborman/uuid v0.0.0-20180906182336-adf5a7427709/go.mod h1:VyrYX9gd7irzKovcSS6BIIEwPRkP2Wm2m9ufcdFSJ34= ->>>>>>> Update GRPC to v1.20.1 github.com/pborman/uuid v1.2.0 h1:J7Q5mO4ysT1dv8hyrUGHb9+ooztCXu1D8MY8DZYsu3g= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc= @@ -221,12 +217,9 @@ golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181201002055-351d144fa1fc h1:a3CU5tJYVj92DY2LaA1kUkrsqD5/3mLDhx2NcNqyW+0= golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -<<<<<<< HEAD -======= golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190206173232-65e2d4e15006/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= ->>>>>>> Update GRPC to v1.20.1 golang.org/x/net v0.0.0-20190311183353-d8887717615a h1:oWX7TPOiFAMXLq8o0ikBYfCJVlRHBcsciT5bXOrH628= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/oauth2 v0.0.0-20180603041954-1e0a3fa8ba9a/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -290,6 +283,7 @@ gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0 h1:FVCohIoYO7IJoDDVpV2pdq7SgrMH6wHnuTyrdr gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0/go.mod h1:OdE7CF6DbADk7lN8LIKRzRJTTZXIjtWgA5THM5lhBAw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= @@ -307,22 +301,19 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -<<<<<<< HEAD +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +k8s.io/api v0.0.0-20190708094356-59223ed9f6ce h1:5dyrqZX6sr+cG/e26KF2p6GuTIABBACjjGSOSdjS9sI= +k8s.io/api v0.0.0-20190708094356-59223ed9f6ce/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA= k8s.io/api v0.0.0-20191004102255-dacd7df5a50b h1:38Nx0U83WjBqn1hUWxlgKc7mvH7WhyHfypxeW3zWwCQ= k8s.io/api v0.0.0-20191004102255-dacd7df5a50b/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA= +k8s.io/apiextensions-apiserver v0.0.0-20190708094842-2e94e9ac9840 h1:+vX94wCTxanQ/Uea8/pQqDHQIwiw4qsQFaJ2kz/DRj8= +k8s.io/apiextensions-apiserver v0.0.0-20190708094842-2e94e9ac9840/go.mod h1:IxkesAMoaCRoLrPJdZNZUQp9NfZnzqaVzLhb2VEQzXE= k8s.io/apiextensions-apiserver v0.0.0-20191004105443-a7d558db75c6 h1:4MLSmJeNPWjrmHsWnCNFTmqQx+pMiAXqkXLLCTY3SnM= k8s.io/apiextensions-apiserver v0.0.0-20191004105443-a7d558db75c6/go.mod h1:IxkesAMoaCRoLrPJdZNZUQp9NfZnzqaVzLhb2VEQzXE= k8s.io/client-go v0.0.0-20191004102537-eb5b9a8cfde7 h1:WyPHgjjXvF4zVVwKGZKKiJGBUW45AuN44uSOuH8euuE= k8s.io/client-go v0.0.0-20191004102537-eb5b9a8cfde7/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s= -======= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -k8s.io/api v0.0.0-20190708094356-59223ed9f6ce h1:5dyrqZX6sr+cG/e26KF2p6GuTIABBACjjGSOSdjS9sI= -k8s.io/api v0.0.0-20190708094356-59223ed9f6ce/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA= -k8s.io/apiextensions-apiserver v0.0.0-20190708094842-2e94e9ac9840 h1:+vX94wCTxanQ/Uea8/pQqDHQIwiw4qsQFaJ2kz/DRj8= -k8s.io/apiextensions-apiserver v0.0.0-20190708094842-2e94e9ac9840/go.mod h1:IxkesAMoaCRoLrPJdZNZUQp9NfZnzqaVzLhb2VEQzXE= k8s.io/client-go v9.0.0+incompatible h1:2kqW3X2xQ9SbFvWZjGEHBLlWc1LG9JIJNXWkuqwdZ3A= k8s.io/client-go v9.0.0+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s= ->>>>>>> Update GRPC to v1.20.1 k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6 h1:4s3/R4+OYYYUKptXPhZKjQ04WJ6EhQQVFdjOFvCazDk= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= diff --git a/vendor/golang.org/x/sys/unix/mksyscall.go b/vendor/golang.org/x/sys/unix/mksyscall.go deleted file mode 100644 index 7a939887b6..0000000000 --- a/vendor/golang.org/x/sys/unix/mksyscall.go +++ /dev/null @@ -1,406 +0,0 @@ -// Copyright 2018 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build ignore - -/* -This program reads a file containing function prototypes -(like syscall_darwin.go) and generates system call bodies. -The prototypes are marked by lines beginning with "//sys" -and read like func declarations if //sys is replaced by func, but: - * The parameter lists must give a name for each argument. - This includes return parameters. - * The parameter lists must give a type for each argument: - the (x, y, z int) shorthand is not allowed. - * If the return parameter is an error number, it must be named errno. - -A line beginning with //sysnb is like //sys, except that the -goroutine will not be suspended during the execution of the system -call. This must only be used for system calls which can never -block, as otherwise the system call could cause all goroutines to -hang. -*/ -package main - -import ( - "bufio" - "flag" - "fmt" - "os" - "regexp" - "strings" -) - -var ( - b32 = flag.Bool("b32", false, "32bit big-endian") - l32 = flag.Bool("l32", false, "32bit little-endian") - plan9 = flag.Bool("plan9", false, "plan9") - openbsd = flag.Bool("openbsd", false, "openbsd") - netbsd = flag.Bool("netbsd", false, "netbsd") - dragonfly = flag.Bool("dragonfly", false, "dragonfly") - arm = flag.Bool("arm", false, "arm") // 64-bit value should use (even, odd)-pair - tags = flag.String("tags", "", "build tags") - filename = flag.String("output", "", "output file name (standard output if omitted)") -) - -// cmdLine returns this programs's commandline arguments -func cmdLine() string { - return "go run mksyscall.go " + strings.Join(os.Args[1:], " ") -} - -// buildTags returns build tags -func buildTags() string { - return *tags -} - -// Param is function parameter -type Param struct { - Name string - Type string -} - -// usage prints the program usage -func usage() { - fmt.Fprintf(os.Stderr, "usage: go run mksyscall.go [-b32 | -l32] [-tags x,y] [file ...]\n") - os.Exit(1) -} - -// parseParamList parses parameter list and returns a slice of parameters -func parseParamList(list string) []string { - list = strings.TrimSpace(list) - if list == "" { - return []string{} - } - return regexp.MustCompile(`\s*,\s*`).Split(list, -1) -} - -// parseParam splits a parameter into name and type -func parseParam(p string) Param { - ps := regexp.MustCompile(`^(\S*) (\S*)$`).FindStringSubmatch(p) - if ps == nil { - fmt.Fprintf(os.Stderr, "malformed parameter: %s\n", p) - os.Exit(1) - } - return Param{ps[1], ps[2]} -} - -func main() { - // Get the OS and architecture (using GOARCH_TARGET if it exists) - goos := os.Getenv("GOOS") - if goos == "" { - fmt.Fprintln(os.Stderr, "GOOS not defined in environment") - os.Exit(1) - } - goarch := os.Getenv("GOARCH_TARGET") - if goarch == "" { - goarch = os.Getenv("GOARCH") - } - - // Check that we are using the Docker-based build system if we should - if goos == "linux" { - if os.Getenv("GOLANG_SYS_BUILD") != "docker" { - fmt.Fprintf(os.Stderr, "In the Docker-based build system, mksyscall should not be called directly.\n") - fmt.Fprintf(os.Stderr, "See README.md\n") - os.Exit(1) - } - } - - flag.Usage = usage - flag.Parse() - if len(flag.Args()) <= 0 { - fmt.Fprintf(os.Stderr, "no files to parse provided\n") - usage() - } - - endianness := "" - if *b32 { - endianness = "big-endian" - } else if *l32 { - endianness = "little-endian" - } - - libc := false - if goos == "darwin" && strings.Contains(buildTags(), ",go1.12") { - libc = true - } - trampolines := map[string]bool{} - - text := "" - for _, path := range flag.Args() { - file, err := os.Open(path) - if err != nil { - fmt.Fprintf(os.Stderr, err.Error()) - os.Exit(1) - } - s := bufio.NewScanner(file) - for s.Scan() { - t := s.Text() - t = strings.TrimSpace(t) - t = regexp.MustCompile(`\s+`).ReplaceAllString(t, ` `) - nonblock := regexp.MustCompile(`^\/\/sysnb `).FindStringSubmatch(t) - if regexp.MustCompile(`^\/\/sys `).FindStringSubmatch(t) == nil && nonblock == nil { - continue - } - - // Line must be of the form - // func Open(path string, mode int, perm int) (fd int, errno error) - // Split into name, in params, out params. - f := regexp.MustCompile(`^\/\/sys(nb)? (\w+)\(([^()]*)\)\s*(?:\(([^()]+)\))?\s*(?:=\s*((?i)SYS_[A-Z0-9_]+))?$`).FindStringSubmatch(t) - if f == nil { - fmt.Fprintf(os.Stderr, "%s:%s\nmalformed //sys declaration\n", path, t) - os.Exit(1) - } - funct, inps, outps, sysname := f[2], f[3], f[4], f[5] - - // Split argument lists on comma. - in := parseParamList(inps) - out := parseParamList(outps) - - // Try in vain to keep people from editing this file. - // The theory is that they jump into the middle of the file - // without reading the header. - text += "// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT\n\n" - - // Go function header. - outDecl := "" - if len(out) > 0 { - outDecl = fmt.Sprintf(" (%s)", strings.Join(out, ", ")) - } - text += fmt.Sprintf("func %s(%s)%s {\n", funct, strings.Join(in, ", "), outDecl) - - // Check if err return available - errvar := "" - for _, param := range out { - p := parseParam(param) - if p.Type == "error" { - errvar = p.Name - break - } - } - - // Prepare arguments to Syscall. - var args []string - n := 0 - for _, param := range in { - p := parseParam(param) - if regexp.MustCompile(`^\*`).FindStringSubmatch(p.Type) != nil { - args = append(args, "uintptr(unsafe.Pointer("+p.Name+"))") - } else if p.Type == "string" && errvar != "" { - text += fmt.Sprintf("\tvar _p%d *byte\n", n) - text += fmt.Sprintf("\t_p%d, %s = BytePtrFromString(%s)\n", n, errvar, p.Name) - text += fmt.Sprintf("\tif %s != nil {\n\t\treturn\n\t}\n", errvar) - args = append(args, fmt.Sprintf("uintptr(unsafe.Pointer(_p%d))", n)) - n++ - } else if p.Type == "string" { - fmt.Fprintf(os.Stderr, path+":"+funct+" uses string arguments, but has no error return\n") - text += fmt.Sprintf("\tvar _p%d *byte\n", n) - text += fmt.Sprintf("\t_p%d, _ = BytePtrFromString(%s)\n", n, p.Name) - args = append(args, fmt.Sprintf("uintptr(unsafe.Pointer(_p%d))", n)) - n++ - } else if regexp.MustCompile(`^\[\](.*)`).FindStringSubmatch(p.Type) != nil { - // Convert slice into pointer, length. - // Have to be careful not to take address of &a[0] if len == 0: - // pass dummy pointer in that case. - // Used to pass nil, but some OSes or simulators reject write(fd, nil, 0). - text += fmt.Sprintf("\tvar _p%d unsafe.Pointer\n", n) - text += fmt.Sprintf("\tif len(%s) > 0 {\n\t\t_p%d = unsafe.Pointer(&%s[0])\n\t}", p.Name, n, p.Name) - text += fmt.Sprintf(" else {\n\t\t_p%d = unsafe.Pointer(&_zero)\n\t}\n", n) - args = append(args, fmt.Sprintf("uintptr(_p%d)", n), fmt.Sprintf("uintptr(len(%s))", p.Name)) - n++ - } else if p.Type == "int64" && (*openbsd || *netbsd) { - args = append(args, "0") - if endianness == "big-endian" { - args = append(args, fmt.Sprintf("uintptr(%s>>32)", p.Name), fmt.Sprintf("uintptr(%s)", p.Name)) - } else if endianness == "little-endian" { - args = append(args, fmt.Sprintf("uintptr(%s)", p.Name), fmt.Sprintf("uintptr(%s>>32)", p.Name)) - } else { - args = append(args, fmt.Sprintf("uintptr(%s)", p.Name)) - } - } else if p.Type == "int64" && *dragonfly { - if regexp.MustCompile(`^(?i)extp(read|write)`).FindStringSubmatch(funct) == nil { - args = append(args, "0") - } - if endianness == "big-endian" { - args = append(args, fmt.Sprintf("uintptr(%s>>32)", p.Name), fmt.Sprintf("uintptr(%s)", p.Name)) - } else if endianness == "little-endian" { - args = append(args, fmt.Sprintf("uintptr(%s)", p.Name), fmt.Sprintf("uintptr(%s>>32)", p.Name)) - } else { - args = append(args, fmt.Sprintf("uintptr(%s)", p.Name)) - } -<<<<<<< HEAD - } else if p.Type == "int64" && endianness != "" { -======= - } else if (p.Type == "int64" || p.Type == "uint64") && endianness != "" { ->>>>>>> go mod vendor - if len(args)%2 == 1 && *arm { - // arm abi specifies 64-bit argument uses - // (even, odd) pair - args = append(args, "0") - } - if endianness == "big-endian" { - args = append(args, fmt.Sprintf("uintptr(%s>>32)", p.Name), fmt.Sprintf("uintptr(%s)", p.Name)) - } else { - args = append(args, fmt.Sprintf("uintptr(%s)", p.Name), fmt.Sprintf("uintptr(%s>>32)", p.Name)) - } - } else { - args = append(args, fmt.Sprintf("uintptr(%s)", p.Name)) - } - } - - // Determine which form to use; pad args with zeros. - asm := "Syscall" - if nonblock != nil { - if errvar == "" && goos == "linux" { - asm = "RawSyscallNoError" - } else { - asm = "RawSyscall" - } - } else { - if errvar == "" && goos == "linux" { - asm = "SyscallNoError" - } - } - if len(args) <= 3 { - for len(args) < 3 { - args = append(args, "0") - } - } else if len(args) <= 6 { - asm += "6" - for len(args) < 6 { - args = append(args, "0") - } - } else if len(args) <= 9 { - asm += "9" - for len(args) < 9 { - args = append(args, "0") - } - } else { - fmt.Fprintf(os.Stderr, "%s:%s too many arguments to system call\n", path, funct) - } - - // System call number. - if sysname == "" { - sysname = "SYS_" + funct - sysname = regexp.MustCompile(`([a-z])([A-Z])`).ReplaceAllString(sysname, `${1}_$2`) - sysname = strings.ToUpper(sysname) - } - - var libcFn string - if libc { - asm = "syscall_" + strings.ToLower(asm[:1]) + asm[1:] // internal syscall call - sysname = strings.TrimPrefix(sysname, "SYS_") // remove SYS_ - sysname = strings.ToLower(sysname) // lowercase - if sysname == "getdirentries64" { - // Special case - libSystem name and - // raw syscall name don't match. - sysname = "__getdirentries64" - } - libcFn = sysname - sysname = "funcPC(libc_" + sysname + "_trampoline)" - } - - // Actual call. - arglist := strings.Join(args, ", ") - call := fmt.Sprintf("%s(%s, %s)", asm, sysname, arglist) - - // Assign return values. - body := "" - ret := []string{"_", "_", "_"} - doErrno := false - for i := 0; i < len(out); i++ { - p := parseParam(out[i]) - reg := "" - if p.Name == "err" && !*plan9 { - reg = "e1" - ret[2] = reg - doErrno = true - } else if p.Name == "err" && *plan9 { - ret[0] = "r0" - ret[2] = "e1" - break - } else { - reg = fmt.Sprintf("r%d", i) - ret[i] = reg - } - if p.Type == "bool" { - reg = fmt.Sprintf("%s != 0", reg) - } - if p.Type == "int64" && endianness != "" { - // 64-bit number in r1:r0 or r0:r1. - if i+2 > len(out) { - fmt.Fprintf(os.Stderr, "%s:%s not enough registers for int64 return\n", path, funct) - } - if endianness == "big-endian" { - reg = fmt.Sprintf("int64(r%d)<<32 | int64(r%d)", i, i+1) - } else { - reg = fmt.Sprintf("int64(r%d)<<32 | int64(r%d)", i+1, i) - } - ret[i] = fmt.Sprintf("r%d", i) - ret[i+1] = fmt.Sprintf("r%d", i+1) - } - if reg != "e1" || *plan9 { - body += fmt.Sprintf("\t%s = %s(%s)\n", p.Name, p.Type, reg) - } - } - if ret[0] == "_" && ret[1] == "_" && ret[2] == "_" { - text += fmt.Sprintf("\t%s\n", call) - } else { - if errvar == "" && goos == "linux" { - // raw syscall without error on Linux, see golang.org/issue/22924 - text += fmt.Sprintf("\t%s, %s := %s\n", ret[0], ret[1], call) - } else { - text += fmt.Sprintf("\t%s, %s, %s := %s\n", ret[0], ret[1], ret[2], call) - } - } - text += body - - if *plan9 && ret[2] == "e1" { - text += "\tif int32(r0) == -1 {\n" - text += "\t\terr = e1\n" - text += "\t}\n" - } else if doErrno { - text += "\tif e1 != 0 {\n" - text += "\t\terr = errnoErr(e1)\n" - text += "\t}\n" - } - text += "\treturn\n" - text += "}\n\n" - - if libc && !trampolines[libcFn] { - // some system calls share a trampoline, like read and readlen. - trampolines[libcFn] = true - // Declare assembly trampoline. - text += fmt.Sprintf("func libc_%s_trampoline()\n", libcFn) - // Assembly trampoline calls the libc_* function, which this magic - // redirects to use the function from libSystem. - text += fmt.Sprintf("//go:linkname libc_%s libc_%s\n", libcFn, libcFn) - text += fmt.Sprintf("//go:cgo_import_dynamic libc_%s %s \"/usr/lib/libSystem.B.dylib\"\n", libcFn, libcFn) - text += "\n" - } - } - if err := s.Err(); err != nil { - fmt.Fprintf(os.Stderr, err.Error()) - os.Exit(1) - } - file.Close() - } - fmt.Printf(srcTemplate, cmdLine(), buildTags(), text) -} - -const srcTemplate = `// %s -// Code generated by the command above; see README.md. DO NOT EDIT. - -// +build %s - -package unix - -import ( - "syscall" - "unsafe" -) - -var _ syscall.Errno - -%s -` diff --git a/vendor/golang.org/x/text/unicode/bidi/gen.go b/vendor/golang.org/x/text/unicode/bidi/gen.go deleted file mode 100644 index d06558eba7..0000000000 --- a/vendor/golang.org/x/text/unicode/bidi/gen.go +++ /dev/null @@ -1,137 +0,0 @@ -// Copyright 2015 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build ignore - -package main - -import ( - "flag" - "log" - - "golang.org/x/text/internal/gen" - "golang.org/x/text/internal/triegen" - "golang.org/x/text/internal/ucd" -) - -var outputFile = flag.String("out", "tables.go", "output file") - -func main() { - gen.Init() - gen.Repackage("gen_trieval.go", "trieval.go", "bidi") - gen.Repackage("gen_ranges.go", "ranges_test.go", "bidi") - - genTables() -} - -// bidiClass names and codes taken from class "bc" in -<<<<<<< HEAD -// http://www.unicode.org/Public/8.0.0/ucd/PropertyValueAliases.txt -======= -// https://www.unicode.org/Public/8.0.0/ucd/PropertyValueAliases.txt ->>>>>>> go mod vendor -var bidiClass = map[string]Class{ - "AL": AL, // ArabicLetter - "AN": AN, // ArabicNumber - "B": B, // ParagraphSeparator - "BN": BN, // BoundaryNeutral - "CS": CS, // CommonSeparator - "EN": EN, // EuropeanNumber - "ES": ES, // EuropeanSeparator - "ET": ET, // EuropeanTerminator - "L": L, // LeftToRight - "NSM": NSM, // NonspacingMark - "ON": ON, // OtherNeutral - "R": R, // RightToLeft - "S": S, // SegmentSeparator - "WS": WS, // WhiteSpace - - "FSI": Control, - "PDF": Control, - "PDI": Control, - "LRE": Control, - "LRI": Control, - "LRO": Control, - "RLE": Control, - "RLI": Control, - "RLO": Control, -} - -func genTables() { - if numClass > 0x0F { - log.Fatalf("Too many Class constants (%#x > 0x0F).", numClass) - } - w := gen.NewCodeWriter() - defer w.WriteVersionedGoFile(*outputFile, "bidi") - - gen.WriteUnicodeVersion(w) - - t := triegen.NewTrie("bidi") - - // Build data about bracket mapping. These bits need to be or-ed with - // any other bits. - orMask := map[rune]uint64{} - - xorMap := map[rune]int{} - xorMasks := []rune{0} // First value is no-op. - - ucd.Parse(gen.OpenUCDFile("BidiBrackets.txt"), func(p *ucd.Parser) { - r1 := p.Rune(0) - r2 := p.Rune(1) - xor := r1 ^ r2 - if _, ok := xorMap[xor]; !ok { - xorMap[xor] = len(xorMasks) - xorMasks = append(xorMasks, xor) - } - entry := uint64(xorMap[xor]) << xorMaskShift - switch p.String(2) { - case "o": - entry |= openMask - case "c", "n": - default: - log.Fatalf("Unknown bracket class %q.", p.String(2)) - } - orMask[r1] = entry - }) - - w.WriteComment(` - xorMasks contains masks to be xor-ed with brackets to get the reverse - version.`) - w.WriteVar("xorMasks", xorMasks) - - done := map[rune]bool{} - - insert := func(r rune, c Class) { - if !done[r] { - t.Insert(r, orMask[r]|uint64(c)) - done[r] = true - } - } - - // Insert the derived BiDi properties. - ucd.Parse(gen.OpenUCDFile("extracted/DerivedBidiClass.txt"), func(p *ucd.Parser) { - r := p.Rune(0) - class, ok := bidiClass[p.String(1)] - if !ok { - log.Fatalf("%U: Unknown BiDi class %q", r, p.String(1)) - } - insert(r, class) - }) - visitDefaults(insert) - - // TODO: use sparse blocks. This would reduce table size considerably - // from the looks of it. - - sz, err := t.Gen(w) - if err != nil { - log.Fatal(err) - } - w.Size += sz -} - -// dummy values to make methods in gen_common compile. The real versions -// will be generated by this file to tables.go. -var ( - xorMasks []rune -) diff --git a/vendor/golang.org/x/text/unicode/bidi/gen_ranges.go b/vendor/golang.org/x/text/unicode/bidi/gen_ranges.go deleted file mode 100644 index 191658a7f0..0000000000 --- a/vendor/golang.org/x/text/unicode/bidi/gen_ranges.go +++ /dev/null @@ -1,61 +0,0 @@ -// Copyright 2015 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build ignore - -package main - -import ( - "unicode" - - "golang.org/x/text/internal/gen" - "golang.org/x/text/internal/ucd" - "golang.org/x/text/unicode/rangetable" -) - -// These tables are hand-extracted from: -<<<<<<< HEAD -// http://www.unicode.org/Public/8.0.0/ucd/extracted/DerivedBidiClass.txt -======= -// https://www.unicode.org/Public/8.0.0/ucd/extracted/DerivedBidiClass.txt ->>>>>>> go mod vendor -func visitDefaults(fn func(r rune, c Class)) { - // first write default values for ranges listed above. - visitRunes(fn, AL, []rune{ - 0x0600, 0x07BF, // Arabic - 0x08A0, 0x08FF, // Arabic Extended-A - 0xFB50, 0xFDCF, // Arabic Presentation Forms - 0xFDF0, 0xFDFF, - 0xFE70, 0xFEFF, - 0x0001EE00, 0x0001EEFF, // Arabic Mathematical Alpha Symbols - }) - visitRunes(fn, R, []rune{ - 0x0590, 0x05FF, // Hebrew - 0x07C0, 0x089F, // Nko et al. - 0xFB1D, 0xFB4F, - 0x00010800, 0x00010FFF, // Cypriot Syllabary et. al. - 0x0001E800, 0x0001EDFF, - 0x0001EF00, 0x0001EFFF, - }) - visitRunes(fn, ET, []rune{ // European Terminator - 0x20A0, 0x20Cf, // Currency symbols - }) - rangetable.Visit(unicode.Noncharacter_Code_Point, func(r rune) { - fn(r, BN) // Boundary Neutral - }) - ucd.Parse(gen.OpenUCDFile("DerivedCoreProperties.txt"), func(p *ucd.Parser) { - if p.String(1) == "Default_Ignorable_Code_Point" { - fn(p.Rune(0), BN) // Boundary Neutral - } - }) -} - -func visitRunes(fn func(r rune, c Class), c Class, runes []rune) { - for i := 0; i < len(runes); i += 2 { - lo, hi := runes[i], runes[i+1] - for j := lo; j <= hi; j++ { - fn(j, c) - } - } -} diff --git a/vendor/golang.org/x/text/unicode/norm/maketables.go b/vendor/golang.org/x/text/unicode/norm/maketables.go deleted file mode 100644 index c89f0d9d54..0000000000 --- a/vendor/golang.org/x/text/unicode/norm/maketables.go +++ /dev/null @@ -1,1011 +0,0 @@ -// Copyright 2011 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build ignore - -// Normalization table generator. -// Data read from the web. -// See forminfo.go for a description of the trie values associated with each rune. - -package main - -import ( - "bytes" -<<<<<<< HEAD -======= - "encoding/binary" ->>>>>>> go mod vendor - "flag" - "fmt" - "io" - "log" - "sort" - "strconv" - "strings" - - "golang.org/x/text/internal/gen" - "golang.org/x/text/internal/triegen" - "golang.org/x/text/internal/ucd" -) - -func main() { - gen.Init() - loadUnicodeData() - compactCCC() - loadCompositionExclusions() - completeCharFields(FCanonical) - completeCharFields(FCompatibility) - computeNonStarterCounts() - verifyComputed() - printChars() - testDerived() - printTestdata() - makeTables() -} - -var ( - tablelist = flag.String("tables", - "all", - "comma-separated list of which tables to generate; "+ - "can be 'decomp', 'recomp', 'info' and 'all'") - test = flag.Bool("test", - false, - "test existing tables against DerivedNormalizationProps and generate test data for regression testing") - verbose = flag.Bool("verbose", - false, - "write data to stdout as it is parsed") -) - -const MaxChar = 0x10FFFF // anything above this shouldn't exist - -// Quick Check properties of runes allow us to quickly -// determine whether a rune may occur in a normal form. -// For a given normal form, a rune may be guaranteed to occur -// verbatim (QC=Yes), may or may not combine with another -// rune (QC=Maybe), or may not occur (QC=No). -type QCResult int - -const ( - QCUnknown QCResult = iota - QCYes - QCNo - QCMaybe -) - -func (r QCResult) String() string { - switch r { - case QCYes: - return "Yes" - case QCNo: - return "No" - case QCMaybe: - return "Maybe" - } - return "***UNKNOWN***" -} - -const ( - FCanonical = iota // NFC or NFD - FCompatibility // NFKC or NFKD - FNumberOfFormTypes -) - -const ( - MComposed = iota // NFC or NFKC - MDecomposed // NFD or NFKD - MNumberOfModes -) - -// This contains only the properties we're interested in. -type Char struct { - name string - codePoint rune // if zero, this index is not a valid code point. - ccc uint8 // canonical combining class - origCCC uint8 - excludeInComp bool // from CompositionExclusions.txt - compatDecomp bool // it has a compatibility expansion - - nTrailingNonStarters uint8 - nLeadingNonStarters uint8 // must be equal to trailing if non-zero - - forms [FNumberOfFormTypes]FormInfo // For FCanonical and FCompatibility - - state State -} - -var chars = make([]Char, MaxChar+1) -var cccMap = make(map[uint8]uint8) - -func (c Char) String() string { - buf := new(bytes.Buffer) - - fmt.Fprintf(buf, "%U [%s]:\n", c.codePoint, c.name) - fmt.Fprintf(buf, " ccc: %v\n", c.ccc) - fmt.Fprintf(buf, " excludeInComp: %v\n", c.excludeInComp) - fmt.Fprintf(buf, " compatDecomp: %v\n", c.compatDecomp) - fmt.Fprintf(buf, " state: %v\n", c.state) - fmt.Fprintf(buf, " NFC:\n") - fmt.Fprint(buf, c.forms[FCanonical]) - fmt.Fprintf(buf, " NFKC:\n") - fmt.Fprint(buf, c.forms[FCompatibility]) - - return buf.String() -} - -// In UnicodeData.txt, some ranges are marked like this: -// 3400;;Lo;0;L;;;;;N;;;;; -// 4DB5;;Lo;0;L;;;;;N;;;;; -// parseCharacter keeps a state variable indicating the weirdness. -type State int - -const ( - SNormal State = iota // known to be zero for the type - SFirst - SLast - SMissing -) - -var lastChar = rune('\u0000') - -func (c Char) isValid() bool { - return c.codePoint != 0 && c.state != SMissing -} - -type FormInfo struct { - quickCheck [MNumberOfModes]QCResult // index: MComposed or MDecomposed - verified [MNumberOfModes]bool // index: MComposed or MDecomposed - - combinesForward bool // May combine with rune on the right - combinesBackward bool // May combine with rune on the left - isOneWay bool // Never appears in result - inDecomp bool // Some decompositions result in this char. - decomp Decomposition - expandedDecomp Decomposition -} - -func (f FormInfo) String() string { - buf := bytes.NewBuffer(make([]byte, 0)) - - fmt.Fprintf(buf, " quickCheck[C]: %v\n", f.quickCheck[MComposed]) - fmt.Fprintf(buf, " quickCheck[D]: %v\n", f.quickCheck[MDecomposed]) - fmt.Fprintf(buf, " cmbForward: %v\n", f.combinesForward) - fmt.Fprintf(buf, " cmbBackward: %v\n", f.combinesBackward) - fmt.Fprintf(buf, " isOneWay: %v\n", f.isOneWay) - fmt.Fprintf(buf, " inDecomp: %v\n", f.inDecomp) - fmt.Fprintf(buf, " decomposition: %X\n", f.decomp) - fmt.Fprintf(buf, " expandedDecomp: %X\n", f.expandedDecomp) - - return buf.String() -} - -type Decomposition []rune - -func parseDecomposition(s string, skipfirst bool) (a []rune, err error) { - decomp := strings.Split(s, " ") - if len(decomp) > 0 && skipfirst { - decomp = decomp[1:] - } - for _, d := range decomp { - point, err := strconv.ParseUint(d, 16, 64) - if err != nil { - return a, err - } - a = append(a, rune(point)) - } - return a, nil -} - -func loadUnicodeData() { - f := gen.OpenUCDFile("UnicodeData.txt") - defer f.Close() - p := ucd.New(f) - for p.Next() { - r := p.Rune(ucd.CodePoint) - char := &chars[r] - - char.ccc = uint8(p.Uint(ucd.CanonicalCombiningClass)) - decmap := p.String(ucd.DecompMapping) - - exp, err := parseDecomposition(decmap, false) - isCompat := false - if err != nil { - if len(decmap) > 0 { - exp, err = parseDecomposition(decmap, true) - if err != nil { - log.Fatalf(`%U: bad decomp |%v|: "%s"`, r, decmap, err) - } - isCompat = true - } - } - - char.name = p.String(ucd.Name) - char.codePoint = r - char.forms[FCompatibility].decomp = exp - if !isCompat { - char.forms[FCanonical].decomp = exp - } else { - char.compatDecomp = true - } - if len(decmap) > 0 { - char.forms[FCompatibility].decomp = exp - } - } - if err := p.Err(); err != nil { - log.Fatal(err) - } -} - -// compactCCC converts the sparse set of CCC values to a continguous one, -// reducing the number of bits needed from 8 to 6. -func compactCCC() { - m := make(map[uint8]uint8) - for i := range chars { - c := &chars[i] - m[c.ccc] = 0 - } - cccs := []int{} - for v, _ := range m { - cccs = append(cccs, int(v)) - } - sort.Ints(cccs) - for i, c := range cccs { - cccMap[uint8(i)] = uint8(c) - m[uint8(c)] = uint8(i) - } - for i := range chars { - c := &chars[i] - c.origCCC = c.ccc - c.ccc = m[c.ccc] - } - if len(m) >= 1<<6 { - log.Fatalf("too many difference CCC values: %d >= 64", len(m)) - } -} - -// CompositionExclusions.txt has form: -// 0958 # ... -<<<<<<< HEAD -// See http://unicode.org/reports/tr44/ for full explanation -======= -// See https://unicode.org/reports/tr44/ for full explanation ->>>>>>> go mod vendor -func loadCompositionExclusions() { - f := gen.OpenUCDFile("CompositionExclusions.txt") - defer f.Close() - p := ucd.New(f) - for p.Next() { - c := &chars[p.Rune(0)] - if c.excludeInComp { - log.Fatalf("%U: Duplicate entry in exclusions.", c.codePoint) - } - c.excludeInComp = true - } - if e := p.Err(); e != nil { - log.Fatal(e) - } -} - -// hasCompatDecomp returns true if any of the recursive -// decompositions contains a compatibility expansion. -// In this case, the character may not occur in NFK*. -func hasCompatDecomp(r rune) bool { - c := &chars[r] - if c.compatDecomp { - return true - } - for _, d := range c.forms[FCompatibility].decomp { - if hasCompatDecomp(d) { - return true - } - } - return false -} - -// Hangul related constants. -const ( - HangulBase = 0xAC00 - HangulEnd = 0xD7A4 // hangulBase + Jamo combinations (19 * 21 * 28) - - JamoLBase = 0x1100 - JamoLEnd = 0x1113 - JamoVBase = 0x1161 - JamoVEnd = 0x1176 - JamoTBase = 0x11A8 - JamoTEnd = 0x11C3 - - JamoLVTCount = 19 * 21 * 28 - JamoTCount = 28 -) - -func isHangul(r rune) bool { - return HangulBase <= r && r < HangulEnd -} - -func isHangulWithoutJamoT(r rune) bool { - if !isHangul(r) { - return false - } - r -= HangulBase - return r < JamoLVTCount && r%JamoTCount == 0 -} - -func ccc(r rune) uint8 { - return chars[r].ccc -} - -// Insert a rune in a buffer, ordered by Canonical Combining Class. -func insertOrdered(b Decomposition, r rune) Decomposition { - n := len(b) - b = append(b, 0) - cc := ccc(r) - if cc > 0 { - // Use bubble sort. - for ; n > 0; n-- { - if ccc(b[n-1]) <= cc { - break - } - b[n] = b[n-1] - } - } - b[n] = r - return b -} - -// Recursively decompose. -func decomposeRecursive(form int, r rune, d Decomposition) Decomposition { - dcomp := chars[r].forms[form].decomp - if len(dcomp) == 0 { - return insertOrdered(d, r) - } - for _, c := range dcomp { - d = decomposeRecursive(form, c, d) - } - return d -} - -func completeCharFields(form int) { - // Phase 0: pre-expand decomposition. - for i := range chars { - f := &chars[i].forms[form] - if len(f.decomp) == 0 { - continue - } - exp := make(Decomposition, 0) - for _, c := range f.decomp { - exp = decomposeRecursive(form, c, exp) - } - f.expandedDecomp = exp - } - - // Phase 1: composition exclusion, mark decomposition. - for i := range chars { - c := &chars[i] - f := &c.forms[form] - - // Marks script-specific exclusions and version restricted. - f.isOneWay = c.excludeInComp - - // Singletons - f.isOneWay = f.isOneWay || len(f.decomp) == 1 - - // Non-starter decompositions - if len(f.decomp) > 1 { - chk := c.ccc != 0 || chars[f.decomp[0]].ccc != 0 - f.isOneWay = f.isOneWay || chk - } - - // Runes that decompose into more than two runes. - f.isOneWay = f.isOneWay || len(f.decomp) > 2 - - if form == FCompatibility { - f.isOneWay = f.isOneWay || hasCompatDecomp(c.codePoint) - } - - for _, r := range f.decomp { - chars[r].forms[form].inDecomp = true - } - } - - // Phase 2: forward and backward combining. - for i := range chars { - c := &chars[i] - f := &c.forms[form] - - if !f.isOneWay && len(f.decomp) == 2 { - f0 := &chars[f.decomp[0]].forms[form] - f1 := &chars[f.decomp[1]].forms[form] - if !f0.isOneWay { - f0.combinesForward = true - } - if !f1.isOneWay { - f1.combinesBackward = true - } - } - if isHangulWithoutJamoT(rune(i)) { - f.combinesForward = true - } - } - - // Phase 3: quick check values. - for i := range chars { - c := &chars[i] - f := &c.forms[form] - - switch { - case len(f.decomp) > 0: - f.quickCheck[MDecomposed] = QCNo - case isHangul(rune(i)): - f.quickCheck[MDecomposed] = QCNo - default: - f.quickCheck[MDecomposed] = QCYes - } - switch { - case f.isOneWay: - f.quickCheck[MComposed] = QCNo - case (i & 0xffff00) == JamoLBase: - f.quickCheck[MComposed] = QCYes - if JamoLBase <= i && i < JamoLEnd { - f.combinesForward = true - } - if JamoVBase <= i && i < JamoVEnd { - f.quickCheck[MComposed] = QCMaybe - f.combinesBackward = true - f.combinesForward = true - } - if JamoTBase <= i && i < JamoTEnd { - f.quickCheck[MComposed] = QCMaybe - f.combinesBackward = true - } - case !f.combinesBackward: - f.quickCheck[MComposed] = QCYes - default: - f.quickCheck[MComposed] = QCMaybe - } - } -} - -func computeNonStarterCounts() { - // Phase 4: leading and trailing non-starter count - for i := range chars { - c := &chars[i] - - runes := []rune{rune(i)} - // We always use FCompatibility so that the CGJ insertion points do not - // change for repeated normalizations with different forms. - if exp := c.forms[FCompatibility].expandedDecomp; len(exp) > 0 { - runes = exp - } - // We consider runes that combine backwards to be non-starters for the - // purpose of Stream-Safe Text Processing. - for _, r := range runes { - if cr := &chars[r]; cr.ccc == 0 && !cr.forms[FCompatibility].combinesBackward { - break - } - c.nLeadingNonStarters++ - } - for i := len(runes) - 1; i >= 0; i-- { - if cr := &chars[runes[i]]; cr.ccc == 0 && !cr.forms[FCompatibility].combinesBackward { - break - } - c.nTrailingNonStarters++ - } - if c.nTrailingNonStarters > 3 { - log.Fatalf("%U: Decomposition with more than 3 (%d) trailing modifiers (%U)", i, c.nTrailingNonStarters, runes) - } - - if isHangul(rune(i)) { - c.nTrailingNonStarters = 2 - if isHangulWithoutJamoT(rune(i)) { - c.nTrailingNonStarters = 1 - } - } - - if l, t := c.nLeadingNonStarters, c.nTrailingNonStarters; l > 0 && l != t { - log.Fatalf("%U: number of leading and trailing non-starters should be equal (%d vs %d)", i, l, t) - } - if t := c.nTrailingNonStarters; t > 3 { - log.Fatalf("%U: number of trailing non-starters is %d > 3", t) - } - } -} - -func printBytes(w io.Writer, b []byte, name string) { - fmt.Fprintf(w, "// %s: %d bytes\n", name, len(b)) - fmt.Fprintf(w, "var %s = [...]byte {", name) - for i, c := range b { - switch { - case i%64 == 0: - fmt.Fprintf(w, "\n// Bytes %x - %x\n", i, i+63) - case i%8 == 0: - fmt.Fprintf(w, "\n") - } - fmt.Fprintf(w, "0x%.2X, ", c) - } - fmt.Fprint(w, "\n}\n\n") -} - -// See forminfo.go for format. -func makeEntry(f *FormInfo, c *Char) uint16 { - e := uint16(0) - if r := c.codePoint; HangulBase <= r && r < HangulEnd { - e |= 0x40 - } - if f.combinesForward { - e |= 0x20 - } - if f.quickCheck[MDecomposed] == QCNo { - e |= 0x4 - } - switch f.quickCheck[MComposed] { - case QCYes: - case QCNo: - e |= 0x10 - case QCMaybe: - e |= 0x18 - default: - log.Fatalf("Illegal quickcheck value %v.", f.quickCheck[MComposed]) - } - e |= uint16(c.nTrailingNonStarters) - return e -} - -// decompSet keeps track of unique decompositions, grouped by whether -// the decomposition is followed by a trailing and/or leading CCC. -type decompSet [7]map[string]bool - -const ( - normalDecomp = iota - firstMulti - firstCCC - endMulti - firstLeadingCCC - firstCCCZeroExcept - firstStarterWithNLead - lastDecomp -) - -var cname = []string{"firstMulti", "firstCCC", "endMulti", "firstLeadingCCC", "firstCCCZeroExcept", "firstStarterWithNLead", "lastDecomp"} - -func makeDecompSet() decompSet { - m := decompSet{} - for i := range m { - m[i] = make(map[string]bool) - } - return m -} -func (m *decompSet) insert(key int, s string) { - m[key][s] = true -} - -func printCharInfoTables(w io.Writer) int { - mkstr := func(r rune, f *FormInfo) (int, string) { - d := f.expandedDecomp - s := string([]rune(d)) - if max := 1 << 6; len(s) >= max { - const msg = "%U: too many bytes in decomposition: %d >= %d" - log.Fatalf(msg, r, len(s), max) - } - head := uint8(len(s)) - if f.quickCheck[MComposed] != QCYes { - head |= 0x40 - } - if f.combinesForward { - head |= 0x80 - } - s = string([]byte{head}) + s - - lccc := ccc(d[0]) - tccc := ccc(d[len(d)-1]) - cc := ccc(r) - if cc != 0 && lccc == 0 && tccc == 0 { - log.Fatalf("%U: trailing and leading ccc are 0 for non-zero ccc %d", r, cc) - } - if tccc < lccc && lccc != 0 { - const msg = "%U: lccc (%d) must be <= tcc (%d)" - log.Fatalf(msg, r, lccc, tccc) - } - index := normalDecomp - nTrail := chars[r].nTrailingNonStarters - nLead := chars[r].nLeadingNonStarters - if tccc > 0 || lccc > 0 || nTrail > 0 { - tccc <<= 2 - tccc |= nTrail - s += string([]byte{tccc}) - index = endMulti - for _, r := range d[1:] { - if ccc(r) == 0 { - index = firstCCC - } - } - if lccc > 0 || nLead > 0 { - s += string([]byte{lccc}) - if index == firstCCC { - log.Fatalf("%U: multi-segment decomposition not supported for decompositions with leading CCC != 0", r) - } - index = firstLeadingCCC - } - if cc != lccc { - if cc != 0 { - log.Fatalf("%U: for lccc != ccc, expected ccc to be 0; was %d", r, cc) - } - index = firstCCCZeroExcept - } - } else if len(d) > 1 { - index = firstMulti - } - return index, s - } - - decompSet := makeDecompSet() - const nLeadStr = "\x00\x01" // 0-byte length and tccc with nTrail. - decompSet.insert(firstStarterWithNLead, nLeadStr) - - // Store the uniqued decompositions in a byte buffer, - // preceded by their byte length. - for _, c := range chars { - for _, f := range c.forms { - if len(f.expandedDecomp) == 0 { - continue - } - if f.combinesBackward { - log.Fatalf("%U: combinesBackward and decompose", c.codePoint) - } - index, s := mkstr(c.codePoint, &f) - decompSet.insert(index, s) - } - } - - decompositions := bytes.NewBuffer(make([]byte, 0, 10000)) - size := 0 - positionMap := make(map[string]uint16) - decompositions.WriteString("\000") - fmt.Fprintln(w, "const (") - for i, m := range decompSet { - sa := []string{} - for s := range m { - sa = append(sa, s) - } - sort.Strings(sa) - for _, s := range sa { - p := decompositions.Len() - decompositions.WriteString(s) - positionMap[s] = uint16(p) - } - if cname[i] != "" { - fmt.Fprintf(w, "%s = 0x%X\n", cname[i], decompositions.Len()) - } - } - fmt.Fprintln(w, "maxDecomp = 0x8000") - fmt.Fprintln(w, ")") - b := decompositions.Bytes() - printBytes(w, b, "decomps") - size += len(b) - - varnames := []string{"nfc", "nfkc"} - for i := 0; i < FNumberOfFormTypes; i++ { - trie := triegen.NewTrie(varnames[i]) - - for r, c := range chars { - f := c.forms[i] - d := f.expandedDecomp - if len(d) != 0 { - _, key := mkstr(c.codePoint, &f) - trie.Insert(rune(r), uint64(positionMap[key])) - if c.ccc != ccc(d[0]) { - // We assume the lead ccc of a decomposition !=0 in this case. - if ccc(d[0]) == 0 { - log.Fatalf("Expected leading CCC to be non-zero; ccc is %d", c.ccc) - } - } - } else if c.nLeadingNonStarters > 0 && len(f.expandedDecomp) == 0 && c.ccc == 0 && !f.combinesBackward { - // Handle cases where it can't be detected that the nLead should be equal - // to nTrail. - trie.Insert(c.codePoint, uint64(positionMap[nLeadStr])) - } else if v := makeEntry(&f, &c)<<8 | uint16(c.ccc); v != 0 { - trie.Insert(c.codePoint, uint64(0x8000|v)) - } - } - sz, err := trie.Gen(w, triegen.Compact(&normCompacter{name: varnames[i]})) - if err != nil { - log.Fatal(err) - } - size += sz - } - return size -} - -func contains(sa []string, s string) bool { - for _, a := range sa { - if a == s { - return true - } - } - return false -} - -func makeTables() { - w := &bytes.Buffer{} - - size := 0 - if *tablelist == "" { - return - } - list := strings.Split(*tablelist, ",") - if *tablelist == "all" { - list = []string{"recomp", "info"} - } - - // Compute maximum decomposition size. - max := 0 - for _, c := range chars { - if n := len(string(c.forms[FCompatibility].expandedDecomp)); n > max { - max = n - } - } -<<<<<<< HEAD -======= - fmt.Fprintln(w, `import "sync"`) - fmt.Fprintln(w) ->>>>>>> go mod vendor - - fmt.Fprintln(w, "const (") - fmt.Fprintln(w, "\t// Version is the Unicode edition from which the tables are derived.") - fmt.Fprintf(w, "\tVersion = %q\n", gen.UnicodeVersion()) - fmt.Fprintln(w) - fmt.Fprintln(w, "\t// MaxTransformChunkSize indicates the maximum number of bytes that Transform") - fmt.Fprintln(w, "\t// may need to write atomically for any Form. Making a destination buffer at") - fmt.Fprintln(w, "\t// least this size ensures that Transform can always make progress and that") - fmt.Fprintln(w, "\t// the user does not need to grow the buffer on an ErrShortDst.") - fmt.Fprintf(w, "\tMaxTransformChunkSize = %d+maxNonStarters*4\n", len(string(0x034F))+max) - fmt.Fprintln(w, ")\n") - - // Print the CCC remap table. - size += len(cccMap) - fmt.Fprintf(w, "var ccc = [%d]uint8{", len(cccMap)) - for i := 0; i < len(cccMap); i++ { - if i%8 == 0 { - fmt.Fprintln(w) - } - fmt.Fprintf(w, "%3d, ", cccMap[uint8(i)]) - } - fmt.Fprintln(w, "\n}\n") - - if contains(list, "info") { - size += printCharInfoTables(w) - } - - if contains(list, "recomp") { - // Note that we use 32 bit keys, instead of 64 bit. - // This clips the bits of three entries, but we know - // this won't cause a collision. The compiler will catch - // any changes made to UnicodeData.txt that introduces - // a collision. - // Note that the recomposition map for NFC and NFKC - // are identical. - - // Recomposition map - nrentries := 0 - for _, c := range chars { - f := c.forms[FCanonical] - if !f.isOneWay && len(f.decomp) > 0 { - nrentries++ - } - } - sz := nrentries * 8 - size += sz - fmt.Fprintf(w, "// recompMap: %d bytes (entries only)\n", sz) -<<<<<<< HEAD - fmt.Fprintln(w, "var recompMap = map[uint32]rune{") -======= - fmt.Fprintln(w, "var recompMap map[uint32]rune") - fmt.Fprintln(w, "var recompMapOnce sync.Once\n") - fmt.Fprintln(w, `const recompMapPacked = "" +`) - var buf [8]byte ->>>>>>> go mod vendor - for i, c := range chars { - f := c.forms[FCanonical] - d := f.decomp - if !f.isOneWay && len(d) > 0 { - key := uint32(uint16(d[0]))<<16 + uint32(uint16(d[1])) -<<<<<<< HEAD - fmt.Fprintf(w, "0x%.8X: 0x%.4X,\n", key, i) - } - } - fmt.Fprintf(w, "}\n\n") -======= - binary.BigEndian.PutUint32(buf[:4], key) - binary.BigEndian.PutUint32(buf[4:], uint32(i)) - fmt.Fprintf(w, "\t\t%q + // 0x%.8X: 0x%.8X\n", string(buf[:]), key, uint32(i)) - } - } - // hack so we don't have to special case the trailing plus sign - fmt.Fprintf(w, ` ""`) - fmt.Fprintln(w) ->>>>>>> go mod vendor - } - - fmt.Fprintf(w, "// Total size of tables: %dKB (%d bytes)\n", (size+512)/1024, size) - gen.WriteVersionedGoFile("tables.go", "norm", w.Bytes()) -} - -func printChars() { - if *verbose { - for _, c := range chars { - if !c.isValid() || c.state == SMissing { - continue - } - fmt.Println(c) - } - } -} - -// verifyComputed does various consistency tests. -func verifyComputed() { - for i, c := range chars { - for _, f := range c.forms { - isNo := (f.quickCheck[MDecomposed] == QCNo) - if (len(f.decomp) > 0) != isNo && !isHangul(rune(i)) { - log.Fatalf("%U: NF*D QC must be No if rune decomposes", i) - } - - isMaybe := f.quickCheck[MComposed] == QCMaybe - if f.combinesBackward != isMaybe { - log.Fatalf("%U: NF*C QC must be Maybe if combinesBackward", i) - } - if len(f.decomp) > 0 && f.combinesForward && isMaybe { - log.Fatalf("%U: NF*C QC must be Yes or No if combinesForward and decomposes", i) - } - - if len(f.expandedDecomp) != 0 { - continue - } - if a, b := c.nLeadingNonStarters > 0, (c.ccc > 0 || f.combinesBackward); a != b { - // We accept these runes to be treated differently (it only affects - // segment breaking in iteration, most likely on improper use), but - // reconsider if more characters are added. - // U+FF9E HALFWIDTH KATAKANA VOICED SOUND MARK;Lm;0;L; 3099;;;;N;;;;; - // U+FF9F HALFWIDTH KATAKANA SEMI-VOICED SOUND MARK;Lm;0;L; 309A;;;;N;;;;; - // U+3133 HANGUL LETTER KIYEOK-SIOS;Lo;0;L; 11AA;;;;N;HANGUL LETTER GIYEOG SIOS;;;; - // U+318E HANGUL LETTER ARAEAE;Lo;0;L; 11A1;;;;N;HANGUL LETTER ALAE AE;;;; - // U+FFA3 HALFWIDTH HANGUL LETTER KIYEOK-SIOS;Lo;0;L; 3133;;;;N;HALFWIDTH HANGUL LETTER GIYEOG SIOS;;;; - // U+FFDC HALFWIDTH HANGUL LETTER I;Lo;0;L; 3163;;;;N;;;;; - if i != 0xFF9E && i != 0xFF9F && !(0x3133 <= i && i <= 0x318E) && !(0xFFA3 <= i && i <= 0xFFDC) { - log.Fatalf("%U: nLead was %v; want %v", i, a, b) - } - } - } - nfc := c.forms[FCanonical] - nfkc := c.forms[FCompatibility] - if nfc.combinesBackward != nfkc.combinesBackward { - log.Fatalf("%U: Cannot combine combinesBackward\n", c.codePoint) - } - } -} - -// Use values in DerivedNormalizationProps.txt to compare against the -// values we computed. -// DerivedNormalizationProps.txt has form: -// 00C0..00C5 ; NFD_QC; N # ... -// 0374 ; NFD_QC; N # ... -<<<<<<< HEAD -// See http://unicode.org/reports/tr44/ for full explanation -======= -// See https://unicode.org/reports/tr44/ for full explanation ->>>>>>> go mod vendor -func testDerived() { - f := gen.OpenUCDFile("DerivedNormalizationProps.txt") - defer f.Close() - p := ucd.New(f) - for p.Next() { - r := p.Rune(0) - c := &chars[r] - - var ftype, mode int - qt := p.String(1) - switch qt { - case "NFC_QC": - ftype, mode = FCanonical, MComposed - case "NFD_QC": - ftype, mode = FCanonical, MDecomposed - case "NFKC_QC": - ftype, mode = FCompatibility, MComposed - case "NFKD_QC": - ftype, mode = FCompatibility, MDecomposed - default: - continue - } - var qr QCResult - switch p.String(2) { - case "Y": - qr = QCYes - case "N": - qr = QCNo - case "M": - qr = QCMaybe - default: - log.Fatalf(`Unexpected quick check value "%s"`, p.String(2)) - } - if got := c.forms[ftype].quickCheck[mode]; got != qr { - log.Printf("%U: FAILED %s (was %v need %v)\n", r, qt, got, qr) - } - c.forms[ftype].verified[mode] = true - } - if err := p.Err(); err != nil { - log.Fatal(err) - } - // Any unspecified value must be QCYes. Verify this. - for i, c := range chars { - for j, fd := range c.forms { - for k, qr := range fd.quickCheck { - if !fd.verified[k] && qr != QCYes { - m := "%U: FAIL F:%d M:%d (was %v need Yes) %s\n" - log.Printf(m, i, j, k, qr, c.name) - } - } - } - } -} - -var testHeader = `const ( - Yes = iota - No - Maybe -) - -type formData struct { - qc uint8 - combinesForward bool - decomposition string -} - -type runeData struct { - r rune - ccc uint8 - nLead uint8 - nTrail uint8 - f [2]formData // 0: canonical; 1: compatibility -} - -func f(qc uint8, cf bool, dec string) [2]formData { - return [2]formData{{qc, cf, dec}, {qc, cf, dec}} -} - -func g(qc, qck uint8, cf, cfk bool, d, dk string) [2]formData { - return [2]formData{{qc, cf, d}, {qck, cfk, dk}} -} - -var testData = []runeData{ -` - -func printTestdata() { - type lastInfo struct { - ccc uint8 - nLead uint8 - nTrail uint8 - f string - } - - last := lastInfo{} - w := &bytes.Buffer{} - fmt.Fprintf(w, testHeader) - for r, c := range chars { - f := c.forms[FCanonical] - qc, cf, d := f.quickCheck[MComposed], f.combinesForward, string(f.expandedDecomp) - f = c.forms[FCompatibility] - qck, cfk, dk := f.quickCheck[MComposed], f.combinesForward, string(f.expandedDecomp) - s := "" - if d == dk && qc == qck && cf == cfk { - s = fmt.Sprintf("f(%s, %v, %q)", qc, cf, d) - } else { - s = fmt.Sprintf("g(%s, %s, %v, %v, %q, %q)", qc, qck, cf, cfk, d, dk) - } - current := lastInfo{c.ccc, c.nLeadingNonStarters, c.nTrailingNonStarters, s} - if last != current { - fmt.Fprintf(w, "\t{0x%x, %d, %d, %d, %s},\n", r, c.origCCC, c.nLeadingNonStarters, c.nTrailingNonStarters, s) - last = current - } - } - fmt.Fprintln(w, "}") - gen.WriteVersionedGoFile("data_test.go", "norm", w.Bytes()) -} diff --git a/vendor/gopkg.in/yaml.v2/decode.go b/vendor/gopkg.in/yaml.v2/decode.go index 5310876555..e4e56e28e0 100644 --- a/vendor/gopkg.in/yaml.v2/decode.go +++ b/vendor/gopkg.in/yaml.v2/decode.go @@ -229,10 +229,6 @@ type decoder struct { mapType reflect.Type terrors []string strict bool - - decodeCount int - aliasCount int - aliasDepth int } var ( @@ -318,39 +314,7 @@ func (d *decoder) prepare(n *node, out reflect.Value) (newout reflect.Value, unm return out, false, false } -const ( - // 400,000 decode operations is ~500kb of dense object declarations, or ~5kb of dense object declarations with 10000% alias expansion - alias_ratio_range_low = 400000 - // 4,000,000 decode operations is ~5MB of dense object declarations, or ~4.5MB of dense object declarations with 10% alias expansion - alias_ratio_range_high = 4000000 - // alias_ratio_range is the range over which we scale allowed alias ratios - alias_ratio_range = float64(alias_ratio_range_high - alias_ratio_range_low) -) - -func allowedAliasRatio(decodeCount int) float64 { - switch { - case decodeCount <= alias_ratio_range_low: - // allow 99% to come from alias expansion for small-to-medium documents - return 0.99 - case decodeCount >= alias_ratio_range_high: - // allow 10% to come from alias expansion for very large documents - return 0.10 - default: - // scale smoothly from 99% down to 10% over the range. - // this maps to 396,000 - 400,000 allowed alias-driven decodes over the range. - // 400,000 decode operations is ~100MB of allocations in worst-case scenarios (single-item maps). - return 0.99 - 0.89*(float64(decodeCount-alias_ratio_range_low)/alias_ratio_range) - } -} - func (d *decoder) unmarshal(n *node, out reflect.Value) (good bool) { - d.decodeCount++ - if d.aliasDepth > 0 { - d.aliasCount++ - } - if d.aliasCount > 100 && d.decodeCount > 1000 && float64(d.aliasCount)/float64(d.decodeCount) > allowedAliasRatio(d.decodeCount) { - failf("document contains excessive aliasing") - } switch n.kind { case documentNode: return d.document(n, out) @@ -389,9 +353,7 @@ func (d *decoder) alias(n *node, out reflect.Value) (good bool) { failf("anchor '%s' value contains itself", n.value) } d.aliases[n] = true - d.aliasDepth++ good = d.unmarshal(n.alias, out) - d.aliasDepth-- delete(d.aliases, n) return good } diff --git a/vendor/gopkg.in/yaml.v2/resolve.go b/vendor/gopkg.in/yaml.v2/resolve.go index 4120e0c916..6c151db6fb 100644 --- a/vendor/gopkg.in/yaml.v2/resolve.go +++ b/vendor/gopkg.in/yaml.v2/resolve.go @@ -81,7 +81,7 @@ func resolvableTag(tag string) bool { return false } -var yamlStyleFloat = regexp.MustCompile(`^[-+]?(\.[0-9]+|[0-9]+(\.[0-9]*)?)([eE][-+]?[0-9]+)?$`) +var yamlStyleFloat = regexp.MustCompile(`^[-+]?[0-9]*\.?[0-9]+([eE][-+][0-9]+)?$`) func resolve(tag string, in string) (rtag string, out interface{}) { if !resolvableTag(tag) { diff --git a/vendor/gopkg.in/yaml.v2/scannerc.go b/vendor/gopkg.in/yaml.v2/scannerc.go index 570b8ecd10..077fd1dd2d 100644 --- a/vendor/gopkg.in/yaml.v2/scannerc.go +++ b/vendor/gopkg.in/yaml.v2/scannerc.go @@ -906,9 +906,6 @@ func yaml_parser_remove_simple_key(parser *yaml_parser_t) bool { return true } -// max_flow_level limits the flow_level -const max_flow_level = 10000 - // Increase the flow level and resize the simple key list if needed. func yaml_parser_increase_flow_level(parser *yaml_parser_t) bool { // Reset the simple key on the next level. @@ -916,11 +913,6 @@ func yaml_parser_increase_flow_level(parser *yaml_parser_t) bool { // Increase the flow level. parser.flow_level++ - if parser.flow_level > max_flow_level { - return yaml_parser_set_scanner_error(parser, - "while increasing flow level", parser.simple_keys[len(parser.simple_keys)-1].mark, - fmt.Sprintf("exceeded max depth of %d", max_flow_level)) - } return true } @@ -933,9 +925,6 @@ func yaml_parser_decrease_flow_level(parser *yaml_parser_t) bool { return true } -// max_indents limits the indents stack size -const max_indents = 10000 - // Push the current indentation level to the stack and set the new level // the current column is greater than the indentation level. In this case, // append or insert the specified token into the token queue. @@ -950,11 +939,6 @@ func yaml_parser_roll_indent(parser *yaml_parser_t, column, number int, typ yaml // indentation level. parser.indents = append(parser.indents, parser.indent) parser.indent = column - if len(parser.indents) > max_indents { - return yaml_parser_set_scanner_error(parser, - "while increasing indent level", parser.simple_keys[len(parser.simple_keys)-1].mark, - fmt.Sprintf("exceeded max depth of %d", max_indents)) - } // Create a token and insert it into the queue. token := yaml_token_t{ diff --git a/vendor/modules.txt b/vendor/modules.txt index 3cdadee2a0..25e79c78e0 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -89,17 +89,7 @@ github.com/golang/protobuf/ptypes/duration github.com/golang/protobuf/ptypes/empty github.com/golang/protobuf/ptypes/struct github.com/golang/protobuf/ptypes/timestamp -github.com/golang/protobuf/protoc-gen-go/descriptor -github.com/golang/protobuf/ptypes github.com/golang/protobuf/ptypes/wrappers -github.com/golang/protobuf/protoc-gen-go/generator/internal/remap -github.com/golang/protobuf/ptypes/struct -github.com/golang/protobuf/ptypes/empty -github.com/golang/protobuf/ptypes/wrappers -github.com/golang/protobuf/ptypes -github.com/golang/protobuf/protoc-gen-go/generator/internal/remap -github.com/golang/protobuf/ptypes/struct -github.com/golang/protobuf/ptypes/empty # github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c github.com/google/btree # github.com/google/gofuzz v1.0.0 @@ -218,7 +208,6 @@ github.com/spf13/viper # github.com/stretchr/testify v1.3.0 github.com/stretchr/testify/assert # go.opencensus.io v0.18.0 -go.opencensus.io/plugin/ochttp go.opencensus.io go.opencensus.io/exemplar go.opencensus.io/exporter/prometheus @@ -230,33 +219,9 @@ go.opencensus.io/plugin/ochttp/propagation/b3 go.opencensus.io/stats go.opencensus.io/stats/internal go.opencensus.io/stats/view -go.opencensus.io/stats go.opencensus.io/tag -go.opencensus.io/exporter/prometheus -go.opencensus.io/plugin/ochttp/propagation/b3 -go.opencensus.io/trace -go.opencensus.io/trace/propagation -go.opencensus.io/exemplar -go.opencensus.io/internal/tagencoding -go.opencensus.io/stats/internal -go.opencensus.io -go.opencensus.io/internal go.opencensus.io/trace go.opencensus.io/trace/internal -go.opencensus.io/plugin/ochttp -go.opencensus.io/plugin/ochttp/propagation/b3 -go.opencensus.io/stats -go.opencensus.io/stats/internal -go.opencensus.io/stats/view -go.opencensus.io/tag -go.opencensus.io/trace -go.opencensus.io/trace/propagation -go.opencensus.io/exemplar -go.opencensus.io/internal/tagencoding -go.opencensus.io/stats/internal -go.opencensus.io -go.opencensus.io/internal -go.opencensus.io/trace/internal go.opencensus.io/trace/propagation go.opencensus.io/trace/tracestate # golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 @@ -271,8 +236,8 @@ golang.org/x/net/idna golang.org/x/net/internal/timeseries golang.org/x/net/trace # golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890 -golang.org/x/oauth2/google golang.org/x/oauth2 +golang.org/x/oauth2/google golang.org/x/oauth2/internal golang.org/x/oauth2/jws golang.org/x/oauth2/jwt @@ -282,12 +247,6 @@ golang.org/x/sync/semaphore golang.org/x/sys/unix golang.org/x/sys/windows # golang.org/x/text v0.3.0 -golang.org/x/text/transform -golang.org/x/text/unicode/norm -# golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db -golang.org/x/text/secure/bidirule -golang.org/x/text/transform -golang.org/x/text/unicode/norm golang.org/x/text/secure/bidirule golang.org/x/text/transform golang.org/x/text/unicode/bidi @@ -321,12 +280,6 @@ google.golang.org/api/transport/http/internal/propagation google.golang.org/appengine google.golang.org/appengine/internal google.golang.org/appengine/internal/app_identity -google.golang.org/appengine/internal/modules -google.golang.org/appengine/socket -google.golang.org/appengine/internal/urlfetch -google.golang.org/appengine/internal/modules -google.golang.org/appengine/internal/urlfetch -google.golang.org/appengine/socket google.golang.org/appengine/internal/base google.golang.org/appengine/internal/datastore google.golang.org/appengine/internal/log @@ -339,11 +292,6 @@ google.golang.org/appengine/urlfetch # google.golang.org/genproto v0.0.0-20191009194640-548a555dbc03 google.golang.org/genproto/googleapis/api google.golang.org/genproto/googleapis/api/annotations -google.golang.org/genproto/googleapis/rpc/status -google.golang.org/genproto/googleapis/api/distribution -google.golang.org/genproto/googleapis/api/httpbody -google.golang.org/genproto/protobuf/field_mask -google.golang.org/genproto/googleapis/rpc/status google.golang.org/genproto/googleapis/api/distribution google.golang.org/genproto/googleapis/api/httpbody google.golang.org/genproto/googleapis/api/label @@ -351,8 +299,6 @@ google.golang.org/genproto/googleapis/api/metric google.golang.org/genproto/googleapis/api/monitoredres google.golang.org/genproto/googleapis/devtools/cloudtrace/v2 google.golang.org/genproto/googleapis/monitoring/v3 -google.golang.org/genproto/protobuf/field_mask -google.golang.org/genproto/googleapis/api google.golang.org/genproto/googleapis/rpc/status google.golang.org/genproto/protobuf/field_mask # google.golang.org/grpc v1.20.1 @@ -389,31 +335,15 @@ google.golang.org/grpc/resolver/passthrough google.golang.org/grpc/stats google.golang.org/grpc/status google.golang.org/grpc/tap -google.golang.org/grpc/balancer/base -google.golang.org/grpc/credentials/internal -google.golang.org/grpc/binarylog/grpc_binarylog_v1 -google.golang.org/grpc/internal/syscall -google.golang.org/grpc/credentials/oauth -# gopkg.in/fsnotify.v1 v1.4.7 -gopkg.in/fsnotify.v1 # gopkg.in/fsnotify.v1 v1.4.7 gopkg.in/fsnotify.v1 # gopkg.in/inf.v0 v0.9.1 gopkg.in/inf.v0 # gopkg.in/natefinch/lumberjack.v2 v2.0.0-20170531160350-a96e63847dc3 gopkg.in/natefinch/lumberjack.v2 -# gopkg.in/yaml.v2 v2.2.4 +# gopkg.in/yaml.v2 v2.2.2 gopkg.in/yaml.v2 # k8s.io/api v0.0.0-20191004102255-dacd7df5a50b -k8s.io/api/apps/v1 -k8s.io/api/core/v1 -k8s.io/api/admissionregistration/v1beta1 -k8s.io/api/extensions/v1beta1 -# k8s.io/api v0.0.0-20190708094356-59223ed9f6ce -k8s.io/api/apps/v1 -k8s.io/api/core/v1 -k8s.io/api/admissionregistration/v1beta1 -k8s.io/api/extensions/v1beta1 k8s.io/api/admission/v1beta1 k8s.io/api/admissionregistration/v1alpha1 k8s.io/api/admissionregistration/v1beta1 @@ -447,20 +377,7 @@ k8s.io/api/settings/v1alpha1 k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 -k8s.io/api/authentication/v1 -k8s.io/api/authentication/v1beta1 -k8s.io/api/authorization/v1 -k8s.io/api/authorization/v1beta1 # k8s.io/apiextensions-apiserver v0.0.0-20191004105443-a7d558db75c6 -k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset -k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1 -# k8s.io/apiextensions-apiserver v0.0.0-20190708094842-2e94e9ac9840 -k8s.io/apiextensions-apiserver/pkg/apis/apiextensions -k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1 -# k8s.io/apiextensions-apiserver v0.0.0-20190708094842-2e94e9ac9840 -k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset -k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1 -# k8s.io/apiextensions-apiserver v0.0.0-20190708094842-2e94e9ac9840 k8s.io/apiextensions-apiserver/pkg/apis/apiextensions k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1 k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset @@ -469,24 +386,8 @@ k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1 k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake # k8s.io/apimachinery v0.0.0-20191004074956-01f8b7d1121a => ./vendor_fixes/k8s.io/apimachinery -k8s.io/apimachinery/pkg/api/errors -k8s.io/apimachinery/pkg/apis/meta/v1 -k8s.io/apimachinery/pkg/runtime -k8s.io/apimachinery/pkg/api/resource -k8s.io/apimachinery/pkg/util/clock -k8s.io/apimachinery/pkg/util/wait -# k8s.io/apimachinery v0.0.0-20190221084156-01f179d85dbc => ./vendor_fixes/k8s.io/apimachinery k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors -k8s.io/apimachinery/pkg/apis/meta/v1 -k8s.io/apimachinery/pkg/apis/meta/v1/unstructured -k8s.io/apimachinery/pkg/apis/meta/v1beta1 -k8s.io/apimachinery/pkg/conversion -k8s.io/apimachinery/pkg/conversion/queryparams -k8s.io/apimachinery/pkg/fields -k8s.io/apimachinery/pkg/labels -k8s.io/apimachinery/pkg/runtime/schema -k8s.io/apimachinery/pkg/runtime k8s.io/apimachinery/pkg/api/meta k8s.io/apimachinery/pkg/api/resource k8s.io/apimachinery/pkg/apis/meta/internalversion @@ -499,28 +400,6 @@ k8s.io/apimachinery/pkg/fields k8s.io/apimachinery/pkg/labels k8s.io/apimachinery/pkg/runtime k8s.io/apimachinery/pkg/runtime/schema -k8s.io/apimachinery/pkg/util/intstr -k8s.io/apimachinery/pkg/util/validation -k8s.io/apimachinery/pkg/types -k8s.io/apimachinery/pkg/runtime/serializer -k8s.io/apimachinery/pkg/util/runtime -k8s.io/apimachinery/pkg/watch -k8s.io/apimachinery/pkg/api/equality -k8s.io/apimachinery/pkg/util/uuid -k8s.io/apimachinery/pkg/util/errors -k8s.io/apimachinery/pkg/fields -k8s.io/apimachinery/pkg/util/yaml -k8s.io/apimachinery/pkg/util/validation/field -k8s.io/apimachinery/pkg/conversion -k8s.io/apimachinery/pkg/selection -k8s.io/apimachinery/pkg/conversion/queryparams -k8s.io/apimachinery/pkg/util/json -k8s.io/apimachinery/pkg/util/naming -k8s.io/apimachinery/pkg/util/sets -k8s.io/apimachinery/pkg/runtime/serializer/streaming -k8s.io/apimachinery/pkg/util/net -k8s.io/apimachinery/pkg/version -k8s.io/apimachinery/pkg/runtime/serializer k8s.io/apimachinery/pkg/runtime/serializer k8s.io/apimachinery/pkg/runtime/serializer/json k8s.io/apimachinery/pkg/runtime/serializer/protobuf @@ -551,40 +430,10 @@ k8s.io/apimachinery/pkg/util/yaml k8s.io/apimachinery/pkg/version k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json -k8s.io/apimachinery/pkg/apis/meta/internalversion -# k8s.io/client-go v0.0.0-20191004102537-eb5b9a8cfde7 -k8s.io/client-go/informers -k8s.io/client-go/kubernetes -k8s.io/client-go/rest -k8s.io/client-go/tools/clientcmd -k8s.io/client-go/kubernetes/scheme -k8s.io/apimachinery/third_party/forked/golang/reflect -# k8s.io/client-go v9.0.0+incompatible -k8s.io/apimachinery/pkg/apis/meta/internalversion -# k8s.io/client-go v9.0.0+incompatible -k8s.io/client-go/informers -k8s.io/client-go/kubernetes -k8s.io/client-go/rest -k8s.io/client-go/tools/clientcmd -k8s.io/client-go/kubernetes/scheme k8s.io/apimachinery/third_party/forked/golang/reflect -# k8s.io/client-go v9.0.0+incompatible +# k8s.io/client-go v0.0.0-20191004102537-eb5b9a8cfde7 k8s.io/client-go/discovery k8s.io/client-go/discovery/fake -k8s.io/client-go/testing -k8s.io/client-go/tools/cache -k8s.io/client-go/kubernetes/typed/core/v1 -k8s.io/client-go/tools/record -k8s.io/client-go/informers/core/v1 -k8s.io/client-go/listers/core/v1 -k8s.io/client-go/util/workqueue -k8s.io/client-go/tools/metrics -k8s.io/client-go/kubernetes/fake -k8s.io/client-go/plugin/pkg/client/auth/gcp -k8s.io/client-go/informers -======= ->>>>>>> go mod vendor -======= k8s.io/client-go/informers k8s.io/client-go/informers/admissionregistration k8s.io/client-go/informers/admissionregistration/v1alpha1 @@ -593,9 +442,8 @@ k8s.io/client-go/informers/apps k8s.io/client-go/informers/apps/v1 k8s.io/client-go/informers/apps/v1beta1 k8s.io/client-go/informers/apps/v1beta2 -k8s.io/client-go/informers/apps/v1 -k8s.io/client-go/informers/apps/v1beta1 -k8s.io/client-go/informers/apps/v1beta2 +k8s.io/client-go/informers/auditregistration +k8s.io/client-go/informers/auditregistration/v1alpha1 k8s.io/client-go/informers/autoscaling k8s.io/client-go/informers/autoscaling/v1 k8s.io/client-go/informers/autoscaling/v2beta1 @@ -636,93 +484,6 @@ k8s.io/client-go/kubernetes k8s.io/client-go/kubernetes/fake k8s.io/client-go/kubernetes/scheme k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1 -k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1 -k8s.io/client-go/kubernetes/typed/apps/v1 -k8s.io/client-go/kubernetes/typed/apps/v1beta1 -k8s.io/client-go/kubernetes/typed/apps/v1beta2 -k8s.io/client-go/kubernetes/typed/auditregistration/v1alpha1 -k8s.io/client-go/kubernetes/typed/authentication/v1 -k8s.io/client-go/kubernetes/typed/authentication/v1beta1 -k8s.io/client-go/kubernetes/typed/authorization/v1 -k8s.io/client-go/kubernetes/typed/authorization/v1beta1 -k8s.io/client-go/kubernetes/typed/autoscaling/v1 -k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1 -k8s.io/client-go/kubernetes/typed/autoscaling/v2beta2 -k8s.io/client-go/kubernetes/typed/batch/v1 -k8s.io/client-go/kubernetes/typed/batch/v1beta1 -k8s.io/client-go/kubernetes/typed/batch/v2alpha1 -k8s.io/client-go/kubernetes/typed/certificates/v1beta1 -k8s.io/client-go/kubernetes/typed/coordination/v1beta1 -k8s.io/client-go/kubernetes/typed/events/v1beta1 -k8s.io/client-go/kubernetes/typed/extensions/v1beta1 -k8s.io/client-go/kubernetes/typed/networking/v1 -k8s.io/client-go/kubernetes/typed/policy/v1beta1 -k8s.io/client-go/kubernetes/typed/rbac/v1 -k8s.io/client-go/kubernetes/typed/rbac/v1alpha1 -k8s.io/client-go/kubernetes/typed/rbac/v1beta1 -k8s.io/client-go/kubernetes/typed/scheduling/v1alpha1 -k8s.io/client-go/kubernetes/typed/scheduling/v1beta1 -k8s.io/client-go/kubernetes/typed/settings/v1alpha1 -k8s.io/client-go/kubernetes/typed/storage/v1 -k8s.io/client-go/kubernetes/typed/storage/v1alpha1 -k8s.io/client-go/kubernetes/typed/storage/v1beta1 -k8s.io/client-go/pkg/version -k8s.io/client-go/plugin/pkg/client/auth/exec -k8s.io/client-go/rest/watch -k8s.io/client-go/tools/clientcmd/api -k8s.io/client-go/transport -k8s.io/client-go/util/cert -k8s.io/client-go/tools/auth -k8s.io/client-go/tools/clientcmd/api/latest -k8s.io/client-go/util/homedir -k8s.io/client-go/util/integer -k8s.io/client-go/tools/pager -k8s.io/client-go/util/buffer -k8s.io/client-go/util/retry -k8s.io/client-go/tools/reference -k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/fake -k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1 -k8s.io/client-go/kubernetes/typed/apps/v1 -k8s.io/client-go/kubernetes/typed/apps/v1beta1 -k8s.io/client-go/kubernetes/typed/apps/v1beta2 -k8s.io/client-go/kubernetes/typed/apps/v1beta2/fake -k8s.io/client-go/kubernetes/typed/authentication/v1beta1 -k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1 -k8s.io/client-go/kubernetes/typed/autoscaling/v2beta2 -k8s.io/client-go/kubernetes/typed/batch/v1 -k8s.io/client-go/kubernetes/typed/batch/v1beta1 -k8s.io/client-go/kubernetes/typed/batch/v2alpha1 -k8s.io/client-go/kubernetes/typed/certificates/v1beta1 -k8s.io/client-go/kubernetes/typed/coordination/v1beta1 -k8s.io/client-go/kubernetes/typed/events/v1beta1 -k8s.io/client-go/kubernetes/typed/extensions/v1beta1 -k8s.io/client-go/kubernetes/typed/networking/v1 -k8s.io/client-go/kubernetes/typed/policy/v1beta1 -k8s.io/client-go/kubernetes/typed/rbac/v1 -k8s.io/client-go/kubernetes/typed/rbac/v1alpha1 -k8s.io/client-go/kubernetes/typed/rbac/v1beta1 -k8s.io/client-go/kubernetes/typed/scheduling/v1alpha1 -k8s.io/client-go/kubernetes/typed/scheduling/v1beta1 -k8s.io/client-go/kubernetes/typed/settings/v1alpha1 -k8s.io/client-go/kubernetes/typed/storage/v1 -k8s.io/client-go/kubernetes/typed/storage/v1alpha1 -k8s.io/client-go/kubernetes/typed/storage/v1beta1 -k8s.io/client-go/pkg/version -k8s.io/client-go/plugin/pkg/client/auth/exec -k8s.io/client-go/rest/watch -k8s.io/client-go/tools/clientcmd/api -k8s.io/client-go/transport -k8s.io/client-go/util/cert -k8s.io/client-go/tools/auth -k8s.io/client-go/tools/clientcmd/api/latest -k8s.io/client-go/util/homedir -k8s.io/client-go/util/integer -k8s.io/client-go/tools/pager -k8s.io/client-go/util/buffer -k8s.io/client-go/util/retry -k8s.io/client-go/tools/reference -======= ->>>>>>> Fixed conflict and regen everything. k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/fake k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1 k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1/fake @@ -732,6 +493,8 @@ k8s.io/client-go/kubernetes/typed/apps/v1beta1 k8s.io/client-go/kubernetes/typed/apps/v1beta1/fake k8s.io/client-go/kubernetes/typed/apps/v1beta2 k8s.io/client-go/kubernetes/typed/apps/v1beta2/fake +k8s.io/client-go/kubernetes/typed/auditregistration/v1alpha1 +k8s.io/client-go/kubernetes/typed/auditregistration/v1alpha1/fake k8s.io/client-go/kubernetes/typed/authentication/v1 k8s.io/client-go/kubernetes/typed/authentication/v1/fake k8s.io/client-go/kubernetes/typed/authentication/v1beta1 @@ -784,40 +547,6 @@ k8s.io/client-go/kubernetes/typed/storage/v1alpha1 k8s.io/client-go/kubernetes/typed/storage/v1alpha1/fake k8s.io/client-go/kubernetes/typed/storage/v1beta1 k8s.io/client-go/kubernetes/typed/storage/v1beta1/fake -k8s.io/client-go/util/jsonpath -k8s.io/client-go/informers/admissionregistration/v1alpha1 -k8s.io/client-go/informers/admissionregistration/v1beta1 -k8s.io/client-go/informers/apps/v1 -k8s.io/client-go/informers/apps/v1beta1 -k8s.io/client-go/informers/apps/v1beta2 -k8s.io/client-go/informers/auditregistration/v1alpha1 -k8s.io/client-go/informers/autoscaling/v1 -k8s.io/client-go/informers/autoscaling/v2beta1 -k8s.io/client-go/informers/autoscaling/v2beta2 -k8s.io/client-go/informers/batch/v1 -k8s.io/client-go/informers/batch/v1beta1 -k8s.io/client-go/informers/batch/v2alpha1 -k8s.io/client-go/informers/certificates/v1beta1 -k8s.io/client-go/informers/coordination/v1beta1 -k8s.io/client-go/informers/events/v1beta1 -k8s.io/client-go/informers/extensions/v1beta1 -k8s.io/client-go/informers/networking/v1 -k8s.io/client-go/informers/policy/v1beta1 -k8s.io/client-go/informers/rbac/v1 -k8s.io/client-go/informers/rbac/v1alpha1 -k8s.io/client-go/informers/rbac/v1beta1 -k8s.io/client-go/informers/scheduling/v1alpha1 -k8s.io/client-go/informers/scheduling/v1beta1 -k8s.io/client-go/informers/settings/v1alpha1 -k8s.io/client-go/informers/storage/v1 -k8s.io/client-go/informers/storage/v1alpha1 -k8s.io/client-go/informers/storage/v1beta1 -k8s.io/client-go/pkg/apis/clientauthentication -k8s.io/client-go/pkg/apis/clientauthentication/v1alpha1 -k8s.io/client-go/pkg/apis/clientauthentication/v1beta1 -k8s.io/client-go/util/connrotation -k8s.io/client-go/tools/clientcmd/api/v1 -k8s.io/client-go/third_party/forked/golang/template k8s.io/client-go/listers/admissionregistration/v1alpha1 k8s.io/client-go/listers/admissionregistration/v1beta1 k8s.io/client-go/listers/apps/v1 From 46371b40604cf5108a9d376c5e55296a60ee111e Mon Sep 17 00:00:00 2001 From: Cyril Tovena Date: Mon, 25 Nov 2019 12:01:53 -0500 Subject: [PATCH 8/9] Update vendor and generated files Signed-off-by: Cyril Tovena --- pkg/sdk/sdk.pb.go | 22 +- sdks/cpp/cmake/prerequisites.cmake | 12 +- sdks/cpp/include/agones/sdk.pb.h | 1872 ++++------ sdks/cpp/include/google/api/annotations.pb.h | 40 +- sdks/cpp/include/google/api/http.pb.h | 1406 ++++---- sdks/cpp/src/agones/sdk.pb.cc | 3255 +++++++++++++----- sdks/cpp/src/google/annotations.pb.cc | 67 +- sdks/cpp/src/google/http.pb.cc | 1610 ++++++--- sdks/nodejs/lib/google/api/annotations_pb.js | 1 - sdks/nodejs/lib/google/api/http_pb.js | 178 +- sdks/nodejs/lib/sdk_pb.js | 337 +- sdks/rust/src/grpc/sdk.rs | 211 +- 12 files changed, 5165 insertions(+), 3846 deletions(-) diff --git a/pkg/sdk/sdk.pb.go b/pkg/sdk/sdk.pb.go index b1fe512b00..5b2ac72eb9 100644 --- a/pkg/sdk/sdk.pb.go +++ b/pkg/sdk/sdk.pb.go @@ -54,7 +54,7 @@ func (m *Empty) Reset() { *m = Empty{} } func (m *Empty) String() string { return proto.CompactTextString(m) } func (*Empty) ProtoMessage() {} func (*Empty) Descriptor() ([]byte, []int) { - return fileDescriptor_sdk_a78acec69435dcb9, []int{0} + return fileDescriptor_sdk_74162870a323c7c1, []int{0} } func (m *Empty) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Empty.Unmarshal(m, b) @@ -87,7 +87,7 @@ func (m *KeyValue) Reset() { *m = KeyValue{} } func (m *KeyValue) String() string { return proto.CompactTextString(m) } func (*KeyValue) ProtoMessage() {} func (*KeyValue) Descriptor() ([]byte, []int) { - return fileDescriptor_sdk_a78acec69435dcb9, []int{1} + return fileDescriptor_sdk_74162870a323c7c1, []int{1} } func (m *KeyValue) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_KeyValue.Unmarshal(m, b) @@ -133,7 +133,7 @@ func (m *Duration) Reset() { *m = Duration{} } func (m *Duration) String() string { return proto.CompactTextString(m) } func (*Duration) ProtoMessage() {} func (*Duration) Descriptor() ([]byte, []int) { - return fileDescriptor_sdk_a78acec69435dcb9, []int{2} + return fileDescriptor_sdk_74162870a323c7c1, []int{2} } func (m *Duration) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Duration.Unmarshal(m, b) @@ -176,7 +176,7 @@ func (m *GameServer) Reset() { *m = GameServer{} } func (m *GameServer) String() string { return proto.CompactTextString(m) } func (*GameServer) ProtoMessage() {} func (*GameServer) Descriptor() ([]byte, []int) { - return fileDescriptor_sdk_a78acec69435dcb9, []int{3} + return fileDescriptor_sdk_74162870a323c7c1, []int{3} } func (m *GameServer) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GameServer.Unmarshal(m, b) @@ -239,7 +239,7 @@ func (m *GameServer_ObjectMeta) Reset() { *m = GameServer_ObjectMeta{} } func (m *GameServer_ObjectMeta) String() string { return proto.CompactTextString(m) } func (*GameServer_ObjectMeta) ProtoMessage() {} func (*GameServer_ObjectMeta) Descriptor() ([]byte, []int) { - return fileDescriptor_sdk_a78acec69435dcb9, []int{3, 0} + return fileDescriptor_sdk_74162870a323c7c1, []int{3, 0} } func (m *GameServer_ObjectMeta) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GameServer_ObjectMeta.Unmarshal(m, b) @@ -333,7 +333,7 @@ func (m *GameServer_Spec) Reset() { *m = GameServer_Spec{} } func (m *GameServer_Spec) String() string { return proto.CompactTextString(m) } func (*GameServer_Spec) ProtoMessage() {} func (*GameServer_Spec) Descriptor() ([]byte, []int) { - return fileDescriptor_sdk_a78acec69435dcb9, []int{3, 1} + return fileDescriptor_sdk_74162870a323c7c1, []int{3, 1} } func (m *GameServer_Spec) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GameServer_Spec.Unmarshal(m, b) @@ -374,7 +374,7 @@ func (m *GameServer_Spec_Health) Reset() { *m = GameServer_Spec_Health{} func (m *GameServer_Spec_Health) String() string { return proto.CompactTextString(m) } func (*GameServer_Spec_Health) ProtoMessage() {} func (*GameServer_Spec_Health) Descriptor() ([]byte, []int) { - return fileDescriptor_sdk_a78acec69435dcb9, []int{3, 1, 0} + return fileDescriptor_sdk_74162870a323c7c1, []int{3, 1, 0} } func (m *GameServer_Spec_Health) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GameServer_Spec_Health.Unmarshal(m, b) @@ -435,7 +435,7 @@ func (m *GameServer_Status) Reset() { *m = GameServer_Status{} } func (m *GameServer_Status) String() string { return proto.CompactTextString(m) } func (*GameServer_Status) ProtoMessage() {} func (*GameServer_Status) Descriptor() ([]byte, []int) { - return fileDescriptor_sdk_a78acec69435dcb9, []int{3, 2} + return fileDescriptor_sdk_74162870a323c7c1, []int{3, 2} } func (m *GameServer_Status) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GameServer_Status.Unmarshal(m, b) @@ -488,7 +488,7 @@ func (m *GameServer_Status_Port) Reset() { *m = GameServer_Status_Port{} func (m *GameServer_Status_Port) String() string { return proto.CompactTextString(m) } func (*GameServer_Status_Port) ProtoMessage() {} func (*GameServer_Status_Port) Descriptor() ([]byte, []int) { - return fileDescriptor_sdk_a78acec69435dcb9, []int{3, 2, 0} + return fileDescriptor_sdk_74162870a323c7c1, []int{3, 2, 0} } func (m *GameServer_Status_Port) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GameServer_Status_Port.Unmarshal(m, b) @@ -952,9 +952,9 @@ var _SDK_serviceDesc = grpc.ServiceDesc{ Metadata: "sdk.proto", } -func init() { proto.RegisterFile("sdk.proto", fileDescriptor_sdk_a78acec69435dcb9) } +func init() { proto.RegisterFile("sdk.proto", fileDescriptor_sdk_74162870a323c7c1) } -var fileDescriptor_sdk_a78acec69435dcb9 = []byte{ +var fileDescriptor_sdk_74162870a323c7c1 = []byte{ // 843 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0x5f, 0x8f, 0xdb, 0x44, 0x10, 0xc0, 0xe5, 0x4b, 0xe2, 0x24, 0x13, 0xee, 0xdf, 0xde, 0x55, 0x72, 0xad, 0x8a, 0x16, 0x8b, diff --git a/sdks/cpp/cmake/prerequisites.cmake b/sdks/cpp/cmake/prerequisites.cmake index 79669c6c4b..3ccd8c39ca 100644 --- a/sdks/cpp/cmake/prerequisites.cmake +++ b/sdks/cpp/cmake/prerequisites.cmake @@ -31,7 +31,7 @@ endif() # gRPC repo and version set(gRPC_GIT_REPO "https://github.com/gRPC/gRPC.git") -set(gRPC_GIT_TAG $ENV{GRPC_RELEASE_TAG}) +set(gRPC_GIT_TAG "v1.20.1") # OpenSSL required only for successful build gRPC set(OPENSSL_GIT_REPO "https://github.com/openssl/openssl.git") @@ -100,7 +100,7 @@ function(invoke_cmake_build NAME CMAKELISTS_PATH) set(BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/${NAME}/.bin) set(INSTALL_DIR ${AGONES_THIRDPARTY_INSTALL_PATH}/${NAME}) file(MAKE_DIRECTORY ${BUILD_DIR}) - + # Makefile generation set(ARG_BUILD_TYPE "") set(ARG_CONFIG_DEBUG "--config" "Debug") @@ -117,7 +117,7 @@ function(invoke_cmake_build NAME CMAKELISTS_PATH) if (${AGONES_BUILD_THIRDPARTY_DEBUG}) execute_and_check(${BUILD_DIR} ${CMAKE_COMMAND} --build . ${ARG_CONFIG_DEBUG} --target install) endif() - + execute_and_check(${BUILD_DIR} ${CMAKE_COMMAND} --build . ${ARG_CONFIG_RELEASE} --target install) set(${NAME}_DIR "${INSTALL_DIR}" CACHE PATH "CMake package directory for ${NAME}" FORCE) endfunction(invoke_cmake_build) @@ -166,7 +166,7 @@ if (NOT ${gRPC_FOUND}) endif() set(ZLIB_PARAM "-DZLIB_LIBRARY=${ZLIB_LIBRARY}") endif() - + invoke_cmake_build(c-ares ${gRPC_SOURCE_DIR}/third_party/cares/cares "-DCARES_STATIC=ON" "-DCARES_SHARED=OFF" @@ -177,7 +177,7 @@ if (NOT ${gRPC_FOUND}) "-Dprotobuf_MSVC_STATIC_RUNTIME=OFF" "-Dprotobuf_BUILD_TESTS=OFF" ) - + # Build gRPC as cmake package set(OPENSSL_PARAM "") if (DEFINED OPENSSL_ROOT_DIR) @@ -192,7 +192,7 @@ if (NOT ${gRPC_FOUND}) "-DCMAKE_CXX_FLAGS=-D_WIN32_WINNT=${GRPC_WINVER}" ) endif() - + invoke_cmake_build(gRPC ${gRPC_SOURCE_DIR} "${OPENSSL_PARAM}" "-DZLIB_ROOT=${zlib_DIR}" diff --git a/sdks/cpp/include/agones/sdk.pb.h b/sdks/cpp/include/agones/sdk.pb.h index 99e310241e..e00103961e 100644 --- a/sdks/cpp/include/agones/sdk.pb.h +++ b/sdks/cpp/include/agones/sdk.pb.h @@ -16,19 +16,19 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: sdk.proto -#ifndef GOOGLE_PROTOBUF_INCLUDED_sdk_2eproto -#define GOOGLE_PROTOBUF_INCLUDED_sdk_2eproto +#ifndef PROTOBUF_INCLUDED_sdk_2eproto +#define PROTOBUF_INCLUDED_sdk_2eproto #include #include #include -#if PROTOBUF_VERSION < 3010000 +#if PROTOBUF_VERSION < 3007000 #error This file was generated by a newer version of protoc which is #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3010001 < PROTOBUF_MIN_PROTOC_VERSION +#if 3007000 < PROTOBUF_MIN_PROTOC_VERSION #error This file was generated by an older version of protoc which is #error incompatible with your Protocol Buffer headers. Please #error regenerate this file with a newer version of protoc. @@ -42,7 +42,6 @@ #include #include #include -#include #include #include // IWYU pragma: export #include // IWYU pragma: export @@ -54,25 +53,20 @@ // @@protoc_insertion_point(includes) #include #define PROTOBUF_INTERNAL_EXPORT_sdk_2eproto AGONES_EXPORT -PROTOBUF_NAMESPACE_OPEN -namespace internal { -class AnyMetadata; -} // namespace internal -PROTOBUF_NAMESPACE_CLOSE // Internal implementation detail -- do not use these members. struct AGONES_EXPORT TableStruct_sdk_2eproto { - static const ::PROTOBUF_NAMESPACE_ID::internal::ParseTableField entries[] + static const ::google::protobuf::internal::ParseTableField entries[] PROTOBUF_SECTION_VARIABLE(protodesc_cold); - static const ::PROTOBUF_NAMESPACE_ID::internal::AuxillaryParseTableField aux[] + static const ::google::protobuf::internal::AuxillaryParseTableField aux[] PROTOBUF_SECTION_VARIABLE(protodesc_cold); - static const ::PROTOBUF_NAMESPACE_ID::internal::ParseTable schema[11] + static const ::google::protobuf::internal::ParseTable schema[11] PROTOBUF_SECTION_VARIABLE(protodesc_cold); - static const ::PROTOBUF_NAMESPACE_ID::internal::FieldMetadata field_metadata[]; - static const ::PROTOBUF_NAMESPACE_ID::internal::SerializationTable serialization_table[]; - static const ::PROTOBUF_NAMESPACE_ID::uint32 offsets[]; + static const ::google::protobuf::internal::FieldMetadata field_metadata[]; + static const ::google::protobuf::internal::SerializationTable serialization_table[]; + static const ::google::protobuf::uint32 offsets[]; }; -extern AGONES_EXPORT const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_sdk_2eproto; +void AGONES_EXPORT AddDescriptors_sdk_2eproto(); namespace agones { namespace dev { namespace sdk { @@ -112,7 +106,8 @@ AGONES_EXPORT extern KeyValueDefaultTypeInternal _KeyValue_default_instance_; } // namespace sdk } // namespace dev } // namespace agones -PROTOBUF_NAMESPACE_OPEN +namespace google { +namespace protobuf { template<> AGONES_EXPORT ::agones::dev::sdk::Duration* Arena::CreateMaybeMessage<::agones::dev::sdk::Duration>(Arena*); template<> AGONES_EXPORT ::agones::dev::sdk::Empty* Arena::CreateMaybeMessage<::agones::dev::sdk::Empty>(Arena*); template<> AGONES_EXPORT ::agones::dev::sdk::GameServer* Arena::CreateMaybeMessage<::agones::dev::sdk::GameServer>(Arena*); @@ -124,29 +119,32 @@ template<> AGONES_EXPORT ::agones::dev::sdk::GameServer_Spec_Health* Arena::Crea template<> AGONES_EXPORT ::agones::dev::sdk::GameServer_Status* Arena::CreateMaybeMessage<::agones::dev::sdk::GameServer_Status>(Arena*); template<> AGONES_EXPORT ::agones::dev::sdk::GameServer_Status_Port* Arena::CreateMaybeMessage<::agones::dev::sdk::GameServer_Status_Port>(Arena*); template<> AGONES_EXPORT ::agones::dev::sdk::KeyValue* Arena::CreateMaybeMessage<::agones::dev::sdk::KeyValue>(Arena*); -PROTOBUF_NAMESPACE_CLOSE +} // namespace protobuf +} // namespace google namespace agones { namespace dev { namespace sdk { // =================================================================== -class AGONES_EXPORT Empty : - public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:agones.dev.sdk.Empty) */ { +class AGONES_EXPORT Empty final : + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:agones.dev.sdk.Empty) */ { public: Empty(); virtual ~Empty(); Empty(const Empty& from); - Empty(Empty&& from) noexcept - : Empty() { - *this = ::std::move(from); - } inline Empty& operator=(const Empty& from) { CopyFrom(from); return *this; } + #if LANG_CXX11 + Empty(Empty&& from) noexcept + : Empty() { + *this = ::std::move(from); + } + inline Empty& operator=(Empty&& from) noexcept { if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) { if (this != &from) InternalSwap(&from); @@ -155,15 +153,9 @@ class AGONES_EXPORT Empty : } return *this; } - - static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { - return GetDescriptor(); - } - static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { - return GetMetadataStatic().descriptor; - } - static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { - return GetMetadataStatic().reflection; + #endif + static const ::google::protobuf::Descriptor* descriptor() { + return default_instance().GetDescriptor(); } static const Empty& default_instance(); @@ -175,13 +167,10 @@ class AGONES_EXPORT Empty : static constexpr int kIndexInFileMessages = 0; + void Swap(Empty* other); friend void swap(Empty& a, Empty& b) { a.Swap(&b); } - inline void Swap(Empty* other) { - if (other == this) return; - InternalSwap(other); - } // implements Message ---------------------------------------------- @@ -189,33 +178,37 @@ class AGONES_EXPORT Empty : return CreateMaybeMessage(nullptr); } - Empty* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { + Empty* New(::google::protobuf::Arena* arena) const final { return CreateMaybeMessage(arena); } - void CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final; - void MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final; + void CopyFrom(const ::google::protobuf::Message& from) final; + void MergeFrom(const ::google::protobuf::Message& from) final; void CopyFrom(const Empty& from); void MergeFrom(const Empty& from); PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; size_t ByteSizeLong() const final; - const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - ::PROTOBUF_NAMESPACE_ID::uint8* InternalSerializeWithCachedSizesToArray( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); + ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } + #else + bool MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) final; + #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + void SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const final; + ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(Empty* other); - friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; - static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { - return "agones.dev.sdk.Empty"; - } private: - inline ::PROTOBUF_NAMESPACE_ID::Arena* GetArenaNoVirtual() const { + inline ::google::protobuf::Arena* GetArenaNoVirtual() const { return nullptr; } inline void* MaybeArenaPtr() const { @@ -223,14 +216,7 @@ class AGONES_EXPORT Empty : } public: - ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; - private: - static ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadataStatic() { - ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&::descriptor_table_sdk_2eproto); - return ::descriptor_table_sdk_2eproto.file_level_metadata[kIndexInFileMessages]; - } - - public: + ::google::protobuf::Metadata GetMetadata() const final; // nested types ---------------------------------------------------- @@ -238,30 +224,32 @@ class AGONES_EXPORT Empty : // @@protoc_insertion_point(class_scope:agones.dev.sdk.Empty) private: - class _Internal; + class HasBitSetters; - ::PROTOBUF_NAMESPACE_ID::internal::InternalMetadataWithArena _internal_metadata_; - mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; + mutable ::google::protobuf::internal::CachedSize _cached_size_; friend struct ::TableStruct_sdk_2eproto; }; // ------------------------------------------------------------------- -class AGONES_EXPORT KeyValue : - public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:agones.dev.sdk.KeyValue) */ { +class AGONES_EXPORT KeyValue final : + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:agones.dev.sdk.KeyValue) */ { public: KeyValue(); virtual ~KeyValue(); KeyValue(const KeyValue& from); - KeyValue(KeyValue&& from) noexcept - : KeyValue() { - *this = ::std::move(from); - } inline KeyValue& operator=(const KeyValue& from) { CopyFrom(from); return *this; } + #if LANG_CXX11 + KeyValue(KeyValue&& from) noexcept + : KeyValue() { + *this = ::std::move(from); + } + inline KeyValue& operator=(KeyValue&& from) noexcept { if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) { if (this != &from) InternalSwap(&from); @@ -270,15 +258,9 @@ class AGONES_EXPORT KeyValue : } return *this; } - - static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { - return GetDescriptor(); - } - static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { - return GetMetadataStatic().descriptor; - } - static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { - return GetMetadataStatic().reflection; + #endif + static const ::google::protobuf::Descriptor* descriptor() { + return default_instance().GetDescriptor(); } static const KeyValue& default_instance(); @@ -290,13 +272,10 @@ class AGONES_EXPORT KeyValue : static constexpr int kIndexInFileMessages = 1; + void Swap(KeyValue* other); friend void swap(KeyValue& a, KeyValue& b) { a.Swap(&b); } - inline void Swap(KeyValue* other) { - if (other == this) return; - InternalSwap(other); - } // implements Message ---------------------------------------------- @@ -304,33 +283,37 @@ class AGONES_EXPORT KeyValue : return CreateMaybeMessage(nullptr); } - KeyValue* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { + KeyValue* New(::google::protobuf::Arena* arena) const final { return CreateMaybeMessage(arena); } - void CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final; - void MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final; + void CopyFrom(const ::google::protobuf::Message& from) final; + void MergeFrom(const ::google::protobuf::Message& from) final; void CopyFrom(const KeyValue& from); void MergeFrom(const KeyValue& from); PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; size_t ByteSizeLong() const final; - const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - ::PROTOBUF_NAMESPACE_ID::uint8* InternalSerializeWithCachedSizesToArray( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); + ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } + #else + bool MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) final; + #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + void SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const final; + ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(KeyValue* other); - friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; - static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { - return "agones.dev.sdk.KeyValue"; - } private: - inline ::PROTOBUF_NAMESPACE_ID::Arena* GetArenaNoVirtual() const { + inline ::google::protobuf::Arena* GetArenaNoVirtual() const { return nullptr; } inline void* MaybeArenaPtr() const { @@ -338,83 +321,70 @@ class AGONES_EXPORT KeyValue : } public: - ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; - private: - static ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadataStatic() { - ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&::descriptor_table_sdk_2eproto); - return ::descriptor_table_sdk_2eproto.file_level_metadata[kIndexInFileMessages]; - } - - public: + ::google::protobuf::Metadata GetMetadata() const final; // nested types ---------------------------------------------------- // accessors ------------------------------------------------------- - enum : int { - kKeyFieldNumber = 1, - kValueFieldNumber = 2, - }; // string key = 1; void clear_key(); - const std::string& key() const; - void set_key(const std::string& value); - void set_key(std::string&& value); + static const int kKeyFieldNumber = 1; + const ::std::string& key() const; + void set_key(const ::std::string& value); + #if LANG_CXX11 + void set_key(::std::string&& value); + #endif void set_key(const char* value); void set_key(const char* value, size_t size); - std::string* mutable_key(); - std::string* release_key(); - void set_allocated_key(std::string* key); - private: - const std::string& _internal_key() const; - void _internal_set_key(const std::string& value); - std::string* _internal_mutable_key(); - public: + ::std::string* mutable_key(); + ::std::string* release_key(); + void set_allocated_key(::std::string* key); // string value = 2; void clear_value(); - const std::string& value() const; - void set_value(const std::string& value); - void set_value(std::string&& value); + static const int kValueFieldNumber = 2; + const ::std::string& value() const; + void set_value(const ::std::string& value); + #if LANG_CXX11 + void set_value(::std::string&& value); + #endif void set_value(const char* value); void set_value(const char* value, size_t size); - std::string* mutable_value(); - std::string* release_value(); - void set_allocated_value(std::string* value); - private: - const std::string& _internal_value() const; - void _internal_set_value(const std::string& value); - std::string* _internal_mutable_value(); - public: + ::std::string* mutable_value(); + ::std::string* release_value(); + void set_allocated_value(::std::string* value); // @@protoc_insertion_point(class_scope:agones.dev.sdk.KeyValue) private: - class _Internal; + class HasBitSetters; - ::PROTOBUF_NAMESPACE_ID::internal::InternalMetadataWithArena _internal_metadata_; - ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr key_; - ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr value_; - mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; + ::google::protobuf::internal::ArenaStringPtr key_; + ::google::protobuf::internal::ArenaStringPtr value_; + mutable ::google::protobuf::internal::CachedSize _cached_size_; friend struct ::TableStruct_sdk_2eproto; }; // ------------------------------------------------------------------- -class AGONES_EXPORT Duration : - public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:agones.dev.sdk.Duration) */ { +class AGONES_EXPORT Duration final : + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:agones.dev.sdk.Duration) */ { public: Duration(); virtual ~Duration(); Duration(const Duration& from); - Duration(Duration&& from) noexcept - : Duration() { - *this = ::std::move(from); - } inline Duration& operator=(const Duration& from) { CopyFrom(from); return *this; } + #if LANG_CXX11 + Duration(Duration&& from) noexcept + : Duration() { + *this = ::std::move(from); + } + inline Duration& operator=(Duration&& from) noexcept { if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) { if (this != &from) InternalSwap(&from); @@ -423,15 +393,9 @@ class AGONES_EXPORT Duration : } return *this; } - - static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { - return GetDescriptor(); - } - static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { - return GetMetadataStatic().descriptor; - } - static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { - return GetMetadataStatic().reflection; + #endif + static const ::google::protobuf::Descriptor* descriptor() { + return default_instance().GetDescriptor(); } static const Duration& default_instance(); @@ -443,13 +407,10 @@ class AGONES_EXPORT Duration : static constexpr int kIndexInFileMessages = 2; + void Swap(Duration* other); friend void swap(Duration& a, Duration& b) { a.Swap(&b); } - inline void Swap(Duration* other) { - if (other == this) return; - InternalSwap(other); - } // implements Message ---------------------------------------------- @@ -457,33 +418,37 @@ class AGONES_EXPORT Duration : return CreateMaybeMessage(nullptr); } - Duration* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { + Duration* New(::google::protobuf::Arena* arena) const final { return CreateMaybeMessage(arena); } - void CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final; - void MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final; + void CopyFrom(const ::google::protobuf::Message& from) final; + void MergeFrom(const ::google::protobuf::Message& from) final; void CopyFrom(const Duration& from); void MergeFrom(const Duration& from); PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; size_t ByteSizeLong() const final; - const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - ::PROTOBUF_NAMESPACE_ID::uint8* InternalSerializeWithCachedSizesToArray( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); + ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } + #else + bool MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) final; + #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + void SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const final; + ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(Duration* other); - friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; - static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { - return "agones.dev.sdk.Duration"; - } private: - inline ::PROTOBUF_NAMESPACE_ID::Arena* GetArenaNoVirtual() const { + inline ::google::protobuf::Arena* GetArenaNoVirtual() const { return nullptr; } inline void* MaybeArenaPtr() const { @@ -491,126 +456,95 @@ class AGONES_EXPORT Duration : } public: - ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; - private: - static ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadataStatic() { - ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&::descriptor_table_sdk_2eproto); - return ::descriptor_table_sdk_2eproto.file_level_metadata[kIndexInFileMessages]; - } - - public: + ::google::protobuf::Metadata GetMetadata() const final; // nested types ---------------------------------------------------- // accessors ------------------------------------------------------- - enum : int { - kSecondsFieldNumber = 1, - }; // int64 seconds = 1; void clear_seconds(); - ::PROTOBUF_NAMESPACE_ID::int64 seconds() const; - void set_seconds(::PROTOBUF_NAMESPACE_ID::int64 value); - private: - ::PROTOBUF_NAMESPACE_ID::int64 _internal_seconds() const; - void _internal_set_seconds(::PROTOBUF_NAMESPACE_ID::int64 value); - public: + static const int kSecondsFieldNumber = 1; + ::google::protobuf::int64 seconds() const; + void set_seconds(::google::protobuf::int64 value); // @@protoc_insertion_point(class_scope:agones.dev.sdk.Duration) private: - class _Internal; + class HasBitSetters; - ::PROTOBUF_NAMESPACE_ID::internal::InternalMetadataWithArena _internal_metadata_; - ::PROTOBUF_NAMESPACE_ID::int64 seconds_; - mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; + ::google::protobuf::int64 seconds_; + mutable ::google::protobuf::internal::CachedSize _cached_size_; friend struct ::TableStruct_sdk_2eproto; }; // ------------------------------------------------------------------- -class GameServer_ObjectMeta_AnnotationsEntry_DoNotUse : public ::PROTOBUF_NAMESPACE_ID::internal::MapEntry { public: - typedef ::PROTOBUF_NAMESPACE_ID::internal::MapEntry SuperType; GameServer_ObjectMeta_AnnotationsEntry_DoNotUse(); - GameServer_ObjectMeta_AnnotationsEntry_DoNotUse(::PROTOBUF_NAMESPACE_ID::Arena* arena); + GameServer_ObjectMeta_AnnotationsEntry_DoNotUse(::google::protobuf::Arena* arena); void MergeFrom(const GameServer_ObjectMeta_AnnotationsEntry_DoNotUse& other); static const GameServer_ObjectMeta_AnnotationsEntry_DoNotUse* internal_default_instance() { return reinterpret_cast(&_GameServer_ObjectMeta_AnnotationsEntry_DoNotUse_default_instance_); } - static bool ValidateKey(std::string* s) { - return ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(s->data(), s->size(), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::PARSE, "agones.dev.sdk.GameServer.ObjectMeta.AnnotationsEntry.key"); - } - static bool ValidateValue(std::string* s) { - return ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(s->data(), s->size(), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::PARSE, "agones.dev.sdk.GameServer.ObjectMeta.AnnotationsEntry.value"); - } - void MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& other) final; - ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; - private: - static ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadataStatic() { - ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&::descriptor_table_sdk_2eproto); - return ::descriptor_table_sdk_2eproto.file_level_metadata[3]; - } - - public: + void MergeFrom(const ::google::protobuf::Message& other) final; + ::google::protobuf::Metadata GetMetadata() const; }; // ------------------------------------------------------------------- -class GameServer_ObjectMeta_LabelsEntry_DoNotUse : public ::PROTOBUF_NAMESPACE_ID::internal::MapEntry { public: - typedef ::PROTOBUF_NAMESPACE_ID::internal::MapEntry SuperType; GameServer_ObjectMeta_LabelsEntry_DoNotUse(); - GameServer_ObjectMeta_LabelsEntry_DoNotUse(::PROTOBUF_NAMESPACE_ID::Arena* arena); + GameServer_ObjectMeta_LabelsEntry_DoNotUse(::google::protobuf::Arena* arena); void MergeFrom(const GameServer_ObjectMeta_LabelsEntry_DoNotUse& other); static const GameServer_ObjectMeta_LabelsEntry_DoNotUse* internal_default_instance() { return reinterpret_cast(&_GameServer_ObjectMeta_LabelsEntry_DoNotUse_default_instance_); } - static bool ValidateKey(std::string* s) { - return ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(s->data(), s->size(), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::PARSE, "agones.dev.sdk.GameServer.ObjectMeta.LabelsEntry.key"); - } - static bool ValidateValue(std::string* s) { - return ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(s->data(), s->size(), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::PARSE, "agones.dev.sdk.GameServer.ObjectMeta.LabelsEntry.value"); - } - void MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& other) final; - ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; - private: - static ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadataStatic() { - ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&::descriptor_table_sdk_2eproto); - return ::descriptor_table_sdk_2eproto.file_level_metadata[4]; - } - - public: + void MergeFrom(const ::google::protobuf::Message& other) final; + ::google::protobuf::Metadata GetMetadata() const; }; // ------------------------------------------------------------------- -class AGONES_EXPORT GameServer_ObjectMeta : - public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:agones.dev.sdk.GameServer.ObjectMeta) */ { +class AGONES_EXPORT GameServer_ObjectMeta final : + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:agones.dev.sdk.GameServer.ObjectMeta) */ { public: GameServer_ObjectMeta(); virtual ~GameServer_ObjectMeta(); GameServer_ObjectMeta(const GameServer_ObjectMeta& from); - GameServer_ObjectMeta(GameServer_ObjectMeta&& from) noexcept - : GameServer_ObjectMeta() { - *this = ::std::move(from); - } inline GameServer_ObjectMeta& operator=(const GameServer_ObjectMeta& from) { CopyFrom(from); return *this; } + #if LANG_CXX11 + GameServer_ObjectMeta(GameServer_ObjectMeta&& from) noexcept + : GameServer_ObjectMeta() { + *this = ::std::move(from); + } + inline GameServer_ObjectMeta& operator=(GameServer_ObjectMeta&& from) noexcept { if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) { if (this != &from) InternalSwap(&from); @@ -619,15 +553,9 @@ class AGONES_EXPORT GameServer_ObjectMeta : } return *this; } - - static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { - return GetDescriptor(); - } - static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { - return GetMetadataStatic().descriptor; - } - static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { - return GetMetadataStatic().reflection; + #endif + static const ::google::protobuf::Descriptor* descriptor() { + return default_instance().GetDescriptor(); } static const GameServer_ObjectMeta& default_instance(); @@ -639,13 +567,10 @@ class AGONES_EXPORT GameServer_ObjectMeta : static constexpr int kIndexInFileMessages = 5; + void Swap(GameServer_ObjectMeta* other); friend void swap(GameServer_ObjectMeta& a, GameServer_ObjectMeta& b) { a.Swap(&b); } - inline void Swap(GameServer_ObjectMeta* other) { - if (other == this) return; - InternalSwap(other); - } // implements Message ---------------------------------------------- @@ -653,33 +578,37 @@ class AGONES_EXPORT GameServer_ObjectMeta : return CreateMaybeMessage(nullptr); } - GameServer_ObjectMeta* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { + GameServer_ObjectMeta* New(::google::protobuf::Arena* arena) const final { return CreateMaybeMessage(arena); } - void CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final; - void MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final; + void CopyFrom(const ::google::protobuf::Message& from) final; + void MergeFrom(const ::google::protobuf::Message& from) final; void CopyFrom(const GameServer_ObjectMeta& from); void MergeFrom(const GameServer_ObjectMeta& from); PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; size_t ByteSizeLong() const final; - const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - ::PROTOBUF_NAMESPACE_ID::uint8* InternalSerializeWithCachedSizesToArray( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); + ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } + #else + bool MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) final; + #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + void SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const final; + ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(GameServer_ObjectMeta* other); - friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; - static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { - return "agones.dev.sdk.GameServer.ObjectMeta"; - } private: - inline ::PROTOBUF_NAMESPACE_ID::Arena* GetArenaNoVirtual() const { + inline ::google::protobuf::Arena* GetArenaNoVirtual() const { return nullptr; } inline void* MaybeArenaPtr() const { @@ -687,201 +616,152 @@ class AGONES_EXPORT GameServer_ObjectMeta : } public: - ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; - private: - static ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadataStatic() { - ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&::descriptor_table_sdk_2eproto); - return ::descriptor_table_sdk_2eproto.file_level_metadata[kIndexInFileMessages]; - } - - public: + ::google::protobuf::Metadata GetMetadata() const final; // nested types ---------------------------------------------------- // accessors ------------------------------------------------------- - enum : int { - kAnnotationsFieldNumber = 8, - kLabelsFieldNumber = 9, - kNameFieldNumber = 1, - kNamespaceFieldNumber = 2, - kUidFieldNumber = 3, - kResourceVersionFieldNumber = 4, - kGenerationFieldNumber = 5, - kCreationTimestampFieldNumber = 6, - kDeletionTimestampFieldNumber = 7, - }; // map annotations = 8; int annotations_size() const; - private: - int _internal_annotations_size() const; - public: void clear_annotations(); - private: - const ::PROTOBUF_NAMESPACE_ID::Map< std::string, std::string >& - _internal_annotations() const; - ::PROTOBUF_NAMESPACE_ID::Map< std::string, std::string >* - _internal_mutable_annotations(); - public: - const ::PROTOBUF_NAMESPACE_ID::Map< std::string, std::string >& + static const int kAnnotationsFieldNumber = 8; + const ::google::protobuf::Map< ::std::string, ::std::string >& annotations() const; - ::PROTOBUF_NAMESPACE_ID::Map< std::string, std::string >* + ::google::protobuf::Map< ::std::string, ::std::string >* mutable_annotations(); // map labels = 9; int labels_size() const; - private: - int _internal_labels_size() const; - public: void clear_labels(); - private: - const ::PROTOBUF_NAMESPACE_ID::Map< std::string, std::string >& - _internal_labels() const; - ::PROTOBUF_NAMESPACE_ID::Map< std::string, std::string >* - _internal_mutable_labels(); - public: - const ::PROTOBUF_NAMESPACE_ID::Map< std::string, std::string >& + static const int kLabelsFieldNumber = 9; + const ::google::protobuf::Map< ::std::string, ::std::string >& labels() const; - ::PROTOBUF_NAMESPACE_ID::Map< std::string, std::string >* + ::google::protobuf::Map< ::std::string, ::std::string >* mutable_labels(); // string name = 1; void clear_name(); - const std::string& name() const; - void set_name(const std::string& value); - void set_name(std::string&& value); + static const int kNameFieldNumber = 1; + const ::std::string& name() const; + void set_name(const ::std::string& value); + #if LANG_CXX11 + void set_name(::std::string&& value); + #endif void set_name(const char* value); void set_name(const char* value, size_t size); - std::string* mutable_name(); - std::string* release_name(); - void set_allocated_name(std::string* name); - private: - const std::string& _internal_name() const; - void _internal_set_name(const std::string& value); - std::string* _internal_mutable_name(); - public: + ::std::string* mutable_name(); + ::std::string* release_name(); + void set_allocated_name(::std::string* name); // string namespace = 2; void clear_namespace_(); - const std::string& namespace_() const; - void set_namespace_(const std::string& value); - void set_namespace_(std::string&& value); + static const int kNamespaceFieldNumber = 2; + const ::std::string& namespace_() const; + void set_namespace_(const ::std::string& value); + #if LANG_CXX11 + void set_namespace_(::std::string&& value); + #endif void set_namespace_(const char* value); void set_namespace_(const char* value, size_t size); - std::string* mutable_namespace_(); - std::string* release_namespace_(); - void set_allocated_namespace_(std::string* namespace_); - private: - const std::string& _internal_namespace_() const; - void _internal_set_namespace_(const std::string& value); - std::string* _internal_mutable_namespace_(); - public: + ::std::string* mutable_namespace_(); + ::std::string* release_namespace_(); + void set_allocated_namespace_(::std::string* namespace_); // string uid = 3; void clear_uid(); - const std::string& uid() const; - void set_uid(const std::string& value); - void set_uid(std::string&& value); + static const int kUidFieldNumber = 3; + const ::std::string& uid() const; + void set_uid(const ::std::string& value); + #if LANG_CXX11 + void set_uid(::std::string&& value); + #endif void set_uid(const char* value); void set_uid(const char* value, size_t size); - std::string* mutable_uid(); - std::string* release_uid(); - void set_allocated_uid(std::string* uid); - private: - const std::string& _internal_uid() const; - void _internal_set_uid(const std::string& value); - std::string* _internal_mutable_uid(); - public: + ::std::string* mutable_uid(); + ::std::string* release_uid(); + void set_allocated_uid(::std::string* uid); // string resource_version = 4; void clear_resource_version(); - const std::string& resource_version() const; - void set_resource_version(const std::string& value); - void set_resource_version(std::string&& value); + static const int kResourceVersionFieldNumber = 4; + const ::std::string& resource_version() const; + void set_resource_version(const ::std::string& value); + #if LANG_CXX11 + void set_resource_version(::std::string&& value); + #endif void set_resource_version(const char* value); void set_resource_version(const char* value, size_t size); - std::string* mutable_resource_version(); - std::string* release_resource_version(); - void set_allocated_resource_version(std::string* resource_version); - private: - const std::string& _internal_resource_version() const; - void _internal_set_resource_version(const std::string& value); - std::string* _internal_mutable_resource_version(); - public: + ::std::string* mutable_resource_version(); + ::std::string* release_resource_version(); + void set_allocated_resource_version(::std::string* resource_version); // int64 generation = 5; void clear_generation(); - ::PROTOBUF_NAMESPACE_ID::int64 generation() const; - void set_generation(::PROTOBUF_NAMESPACE_ID::int64 value); - private: - ::PROTOBUF_NAMESPACE_ID::int64 _internal_generation() const; - void _internal_set_generation(::PROTOBUF_NAMESPACE_ID::int64 value); - public: + static const int kGenerationFieldNumber = 5; + ::google::protobuf::int64 generation() const; + void set_generation(::google::protobuf::int64 value); // int64 creation_timestamp = 6; void clear_creation_timestamp(); - ::PROTOBUF_NAMESPACE_ID::int64 creation_timestamp() const; - void set_creation_timestamp(::PROTOBUF_NAMESPACE_ID::int64 value); - private: - ::PROTOBUF_NAMESPACE_ID::int64 _internal_creation_timestamp() const; - void _internal_set_creation_timestamp(::PROTOBUF_NAMESPACE_ID::int64 value); - public: + static const int kCreationTimestampFieldNumber = 6; + ::google::protobuf::int64 creation_timestamp() const; + void set_creation_timestamp(::google::protobuf::int64 value); // int64 deletion_timestamp = 7; void clear_deletion_timestamp(); - ::PROTOBUF_NAMESPACE_ID::int64 deletion_timestamp() const; - void set_deletion_timestamp(::PROTOBUF_NAMESPACE_ID::int64 value); - private: - ::PROTOBUF_NAMESPACE_ID::int64 _internal_deletion_timestamp() const; - void _internal_set_deletion_timestamp(::PROTOBUF_NAMESPACE_ID::int64 value); - public: + static const int kDeletionTimestampFieldNumber = 7; + ::google::protobuf::int64 deletion_timestamp() const; + void set_deletion_timestamp(::google::protobuf::int64 value); // @@protoc_insertion_point(class_scope:agones.dev.sdk.GameServer.ObjectMeta) private: - class _Internal; + class HasBitSetters; - ::PROTOBUF_NAMESPACE_ID::internal::InternalMetadataWithArena _internal_metadata_; - ::PROTOBUF_NAMESPACE_ID::internal::MapField< + ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; + ::google::protobuf::internal::MapField< GameServer_ObjectMeta_AnnotationsEntry_DoNotUse, - std::string, std::string, - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::TYPE_STRING, - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::TYPE_STRING, + ::std::string, ::std::string, + ::google::protobuf::internal::WireFormatLite::TYPE_STRING, + ::google::protobuf::internal::WireFormatLite::TYPE_STRING, 0 > annotations_; - ::PROTOBUF_NAMESPACE_ID::internal::MapField< + ::google::protobuf::internal::MapField< GameServer_ObjectMeta_LabelsEntry_DoNotUse, - std::string, std::string, - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::TYPE_STRING, - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::TYPE_STRING, + ::std::string, ::std::string, + ::google::protobuf::internal::WireFormatLite::TYPE_STRING, + ::google::protobuf::internal::WireFormatLite::TYPE_STRING, 0 > labels_; - ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr name_; - ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr namespace__; - ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr uid_; - ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr resource_version_; - ::PROTOBUF_NAMESPACE_ID::int64 generation_; - ::PROTOBUF_NAMESPACE_ID::int64 creation_timestamp_; - ::PROTOBUF_NAMESPACE_ID::int64 deletion_timestamp_; - mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + ::google::protobuf::internal::ArenaStringPtr name_; + ::google::protobuf::internal::ArenaStringPtr namespace__; + ::google::protobuf::internal::ArenaStringPtr uid_; + ::google::protobuf::internal::ArenaStringPtr resource_version_; + ::google::protobuf::int64 generation_; + ::google::protobuf::int64 creation_timestamp_; + ::google::protobuf::int64 deletion_timestamp_; + mutable ::google::protobuf::internal::CachedSize _cached_size_; friend struct ::TableStruct_sdk_2eproto; }; // ------------------------------------------------------------------- -class AGONES_EXPORT GameServer_Spec_Health : - public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:agones.dev.sdk.GameServer.Spec.Health) */ { +class AGONES_EXPORT GameServer_Spec_Health final : + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:agones.dev.sdk.GameServer.Spec.Health) */ { public: GameServer_Spec_Health(); virtual ~GameServer_Spec_Health(); GameServer_Spec_Health(const GameServer_Spec_Health& from); - GameServer_Spec_Health(GameServer_Spec_Health&& from) noexcept - : GameServer_Spec_Health() { - *this = ::std::move(from); - } inline GameServer_Spec_Health& operator=(const GameServer_Spec_Health& from) { CopyFrom(from); return *this; } + #if LANG_CXX11 + GameServer_Spec_Health(GameServer_Spec_Health&& from) noexcept + : GameServer_Spec_Health() { + *this = ::std::move(from); + } + inline GameServer_Spec_Health& operator=(GameServer_Spec_Health&& from) noexcept { if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) { if (this != &from) InternalSwap(&from); @@ -890,15 +770,9 @@ class AGONES_EXPORT GameServer_Spec_Health : } return *this; } - - static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { - return GetDescriptor(); - } - static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { - return GetMetadataStatic().descriptor; - } - static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { - return GetMetadataStatic().reflection; + #endif + static const ::google::protobuf::Descriptor* descriptor() { + return default_instance().GetDescriptor(); } static const GameServer_Spec_Health& default_instance(); @@ -910,13 +784,10 @@ class AGONES_EXPORT GameServer_Spec_Health : static constexpr int kIndexInFileMessages = 6; + void Swap(GameServer_Spec_Health* other); friend void swap(GameServer_Spec_Health& a, GameServer_Spec_Health& b) { a.Swap(&b); } - inline void Swap(GameServer_Spec_Health* other) { - if (other == this) return; - InternalSwap(other); - } // implements Message ---------------------------------------------- @@ -924,33 +795,37 @@ class AGONES_EXPORT GameServer_Spec_Health : return CreateMaybeMessage(nullptr); } - GameServer_Spec_Health* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { + GameServer_Spec_Health* New(::google::protobuf::Arena* arena) const final { return CreateMaybeMessage(arena); } - void CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final; - void MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final; + void CopyFrom(const ::google::protobuf::Message& from) final; + void MergeFrom(const ::google::protobuf::Message& from) final; void CopyFrom(const GameServer_Spec_Health& from); void MergeFrom(const GameServer_Spec_Health& from); PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; size_t ByteSizeLong() const final; - const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - ::PROTOBUF_NAMESPACE_ID::uint8* InternalSerializeWithCachedSizesToArray( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); + ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } + #else + bool MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) final; + #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + void SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const final; + ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(GameServer_Spec_Health* other); - friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; - static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { - return "agones.dev.sdk.GameServer.Spec.Health"; - } private: - inline ::PROTOBUF_NAMESPACE_ID::Arena* GetArenaNoVirtual() const { + inline ::google::protobuf::Arena* GetArenaNoVirtual() const { return nullptr; } inline void* MaybeArenaPtr() const { @@ -958,91 +833,68 @@ class AGONES_EXPORT GameServer_Spec_Health : } public: - ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; - private: - static ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadataStatic() { - ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&::descriptor_table_sdk_2eproto); - return ::descriptor_table_sdk_2eproto.file_level_metadata[kIndexInFileMessages]; - } - - public: + ::google::protobuf::Metadata GetMetadata() const final; // nested types ---------------------------------------------------- // accessors ------------------------------------------------------- - enum : int { - kDisabledFieldNumber = 1, - kPeriodSecondsFieldNumber = 2, - kFailureThresholdFieldNumber = 3, - kInitialDelaySecondsFieldNumber = 4, - }; // bool disabled = 1; void clear_disabled(); + static const int kDisabledFieldNumber = 1; bool disabled() const; void set_disabled(bool value); - private: - bool _internal_disabled() const; - void _internal_set_disabled(bool value); - public: // int32 period_seconds = 2; void clear_period_seconds(); - ::PROTOBUF_NAMESPACE_ID::int32 period_seconds() const; - void set_period_seconds(::PROTOBUF_NAMESPACE_ID::int32 value); - private: - ::PROTOBUF_NAMESPACE_ID::int32 _internal_period_seconds() const; - void _internal_set_period_seconds(::PROTOBUF_NAMESPACE_ID::int32 value); - public: + static const int kPeriodSecondsFieldNumber = 2; + ::google::protobuf::int32 period_seconds() const; + void set_period_seconds(::google::protobuf::int32 value); // int32 failure_threshold = 3; void clear_failure_threshold(); - ::PROTOBUF_NAMESPACE_ID::int32 failure_threshold() const; - void set_failure_threshold(::PROTOBUF_NAMESPACE_ID::int32 value); - private: - ::PROTOBUF_NAMESPACE_ID::int32 _internal_failure_threshold() const; - void _internal_set_failure_threshold(::PROTOBUF_NAMESPACE_ID::int32 value); - public: + static const int kFailureThresholdFieldNumber = 3; + ::google::protobuf::int32 failure_threshold() const; + void set_failure_threshold(::google::protobuf::int32 value); // int32 initial_delay_seconds = 4; void clear_initial_delay_seconds(); - ::PROTOBUF_NAMESPACE_ID::int32 initial_delay_seconds() const; - void set_initial_delay_seconds(::PROTOBUF_NAMESPACE_ID::int32 value); - private: - ::PROTOBUF_NAMESPACE_ID::int32 _internal_initial_delay_seconds() const; - void _internal_set_initial_delay_seconds(::PROTOBUF_NAMESPACE_ID::int32 value); - public: + static const int kInitialDelaySecondsFieldNumber = 4; + ::google::protobuf::int32 initial_delay_seconds() const; + void set_initial_delay_seconds(::google::protobuf::int32 value); // @@protoc_insertion_point(class_scope:agones.dev.sdk.GameServer.Spec.Health) private: - class _Internal; + class HasBitSetters; - ::PROTOBUF_NAMESPACE_ID::internal::InternalMetadataWithArena _internal_metadata_; + ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; bool disabled_; - ::PROTOBUF_NAMESPACE_ID::int32 period_seconds_; - ::PROTOBUF_NAMESPACE_ID::int32 failure_threshold_; - ::PROTOBUF_NAMESPACE_ID::int32 initial_delay_seconds_; - mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + ::google::protobuf::int32 period_seconds_; + ::google::protobuf::int32 failure_threshold_; + ::google::protobuf::int32 initial_delay_seconds_; + mutable ::google::protobuf::internal::CachedSize _cached_size_; friend struct ::TableStruct_sdk_2eproto; }; // ------------------------------------------------------------------- -class AGONES_EXPORT GameServer_Spec : - public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:agones.dev.sdk.GameServer.Spec) */ { +class AGONES_EXPORT GameServer_Spec final : + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:agones.dev.sdk.GameServer.Spec) */ { public: GameServer_Spec(); virtual ~GameServer_Spec(); GameServer_Spec(const GameServer_Spec& from); - GameServer_Spec(GameServer_Spec&& from) noexcept - : GameServer_Spec() { - *this = ::std::move(from); - } inline GameServer_Spec& operator=(const GameServer_Spec& from) { CopyFrom(from); return *this; } + #if LANG_CXX11 + GameServer_Spec(GameServer_Spec&& from) noexcept + : GameServer_Spec() { + *this = ::std::move(from); + } + inline GameServer_Spec& operator=(GameServer_Spec&& from) noexcept { if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) { if (this != &from) InternalSwap(&from); @@ -1051,15 +903,9 @@ class AGONES_EXPORT GameServer_Spec : } return *this; } - - static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { - return GetDescriptor(); - } - static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { - return GetMetadataStatic().descriptor; - } - static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { - return GetMetadataStatic().reflection; + #endif + static const ::google::protobuf::Descriptor* descriptor() { + return default_instance().GetDescriptor(); } static const GameServer_Spec& default_instance(); @@ -1071,13 +917,10 @@ class AGONES_EXPORT GameServer_Spec : static constexpr int kIndexInFileMessages = 7; + void Swap(GameServer_Spec* other); friend void swap(GameServer_Spec& a, GameServer_Spec& b) { a.Swap(&b); } - inline void Swap(GameServer_Spec* other) { - if (other == this) return; - InternalSwap(other); - } // implements Message ---------------------------------------------- @@ -1085,33 +928,37 @@ class AGONES_EXPORT GameServer_Spec : return CreateMaybeMessage(nullptr); } - GameServer_Spec* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { + GameServer_Spec* New(::google::protobuf::Arena* arena) const final { return CreateMaybeMessage(arena); } - void CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final; - void MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final; + void CopyFrom(const ::google::protobuf::Message& from) final; + void MergeFrom(const ::google::protobuf::Message& from) final; void CopyFrom(const GameServer_Spec& from); void MergeFrom(const GameServer_Spec& from); PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; size_t ByteSizeLong() const final; - const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - ::PROTOBUF_NAMESPACE_ID::uint8* InternalSerializeWithCachedSizesToArray( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); + ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } + #else + bool MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) final; + #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + void SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const final; + ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(GameServer_Spec* other); - friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; - static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { - return "agones.dev.sdk.GameServer.Spec"; - } private: - inline ::PROTOBUF_NAMESPACE_ID::Arena* GetArenaNoVirtual() const { + inline ::google::protobuf::Arena* GetArenaNoVirtual() const { return nullptr; } inline void* MaybeArenaPtr() const { @@ -1119,14 +966,7 @@ class AGONES_EXPORT GameServer_Spec : } public: - ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; - private: - static ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadataStatic() { - ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&::descriptor_table_sdk_2eproto); - return ::descriptor_table_sdk_2eproto.file_level_metadata[kIndexInFileMessages]; - } - - public: + ::google::protobuf::Metadata GetMetadata() const final; // nested types ---------------------------------------------------- @@ -1134,51 +974,44 @@ class AGONES_EXPORT GameServer_Spec : // accessors ------------------------------------------------------- - enum : int { - kHealthFieldNumber = 1, - }; // .agones.dev.sdk.GameServer.Spec.Health health = 1; bool has_health() const; - private: - bool _internal_has_health() const; - public: void clear_health(); + static const int kHealthFieldNumber = 1; const ::agones::dev::sdk::GameServer_Spec_Health& health() const; ::agones::dev::sdk::GameServer_Spec_Health* release_health(); ::agones::dev::sdk::GameServer_Spec_Health* mutable_health(); void set_allocated_health(::agones::dev::sdk::GameServer_Spec_Health* health); - private: - const ::agones::dev::sdk::GameServer_Spec_Health& _internal_health() const; - ::agones::dev::sdk::GameServer_Spec_Health* _internal_mutable_health(); - public: // @@protoc_insertion_point(class_scope:agones.dev.sdk.GameServer.Spec) private: - class _Internal; + class HasBitSetters; - ::PROTOBUF_NAMESPACE_ID::internal::InternalMetadataWithArena _internal_metadata_; + ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; ::agones::dev::sdk::GameServer_Spec_Health* health_; - mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + mutable ::google::protobuf::internal::CachedSize _cached_size_; friend struct ::TableStruct_sdk_2eproto; }; // ------------------------------------------------------------------- -class AGONES_EXPORT GameServer_Status_Port : - public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:agones.dev.sdk.GameServer.Status.Port) */ { +class AGONES_EXPORT GameServer_Status_Port final : + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:agones.dev.sdk.GameServer.Status.Port) */ { public: GameServer_Status_Port(); virtual ~GameServer_Status_Port(); GameServer_Status_Port(const GameServer_Status_Port& from); - GameServer_Status_Port(GameServer_Status_Port&& from) noexcept - : GameServer_Status_Port() { - *this = ::std::move(from); - } inline GameServer_Status_Port& operator=(const GameServer_Status_Port& from) { CopyFrom(from); return *this; } + #if LANG_CXX11 + GameServer_Status_Port(GameServer_Status_Port&& from) noexcept + : GameServer_Status_Port() { + *this = ::std::move(from); + } + inline GameServer_Status_Port& operator=(GameServer_Status_Port&& from) noexcept { if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) { if (this != &from) InternalSwap(&from); @@ -1187,15 +1020,9 @@ class AGONES_EXPORT GameServer_Status_Port : } return *this; } - - static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { - return GetDescriptor(); - } - static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { - return GetMetadataStatic().descriptor; - } - static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { - return GetMetadataStatic().reflection; + #endif + static const ::google::protobuf::Descriptor* descriptor() { + return default_instance().GetDescriptor(); } static const GameServer_Status_Port& default_instance(); @@ -1207,13 +1034,10 @@ class AGONES_EXPORT GameServer_Status_Port : static constexpr int kIndexInFileMessages = 8; + void Swap(GameServer_Status_Port* other); friend void swap(GameServer_Status_Port& a, GameServer_Status_Port& b) { a.Swap(&b); } - inline void Swap(GameServer_Status_Port* other) { - if (other == this) return; - InternalSwap(other); - } // implements Message ---------------------------------------------- @@ -1221,33 +1045,37 @@ class AGONES_EXPORT GameServer_Status_Port : return CreateMaybeMessage(nullptr); } - GameServer_Status_Port* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { + GameServer_Status_Port* New(::google::protobuf::Arena* arena) const final { return CreateMaybeMessage(arena); } - void CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final; - void MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final; + void CopyFrom(const ::google::protobuf::Message& from) final; + void MergeFrom(const ::google::protobuf::Message& from) final; void CopyFrom(const GameServer_Status_Port& from); void MergeFrom(const GameServer_Status_Port& from); PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; size_t ByteSizeLong() const final; - const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - ::PROTOBUF_NAMESPACE_ID::uint8* InternalSerializeWithCachedSizesToArray( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); + ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } + #else + bool MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) final; + #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + void SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const final; + ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(GameServer_Status_Port* other); - friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; - static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { - return "agones.dev.sdk.GameServer.Status.Port"; - } private: - inline ::PROTOBUF_NAMESPACE_ID::Arena* GetArenaNoVirtual() const { + inline ::google::protobuf::Arena* GetArenaNoVirtual() const { return nullptr; } inline void* MaybeArenaPtr() const { @@ -1255,76 +1083,62 @@ class AGONES_EXPORT GameServer_Status_Port : } public: - ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; - private: - static ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadataStatic() { - ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&::descriptor_table_sdk_2eproto); - return ::descriptor_table_sdk_2eproto.file_level_metadata[kIndexInFileMessages]; - } - - public: + ::google::protobuf::Metadata GetMetadata() const final; // nested types ---------------------------------------------------- // accessors ------------------------------------------------------- - enum : int { - kNameFieldNumber = 1, - kPortFieldNumber = 2, - }; // string name = 1; void clear_name(); - const std::string& name() const; - void set_name(const std::string& value); - void set_name(std::string&& value); + static const int kNameFieldNumber = 1; + const ::std::string& name() const; + void set_name(const ::std::string& value); + #if LANG_CXX11 + void set_name(::std::string&& value); + #endif void set_name(const char* value); void set_name(const char* value, size_t size); - std::string* mutable_name(); - std::string* release_name(); - void set_allocated_name(std::string* name); - private: - const std::string& _internal_name() const; - void _internal_set_name(const std::string& value); - std::string* _internal_mutable_name(); - public: + ::std::string* mutable_name(); + ::std::string* release_name(); + void set_allocated_name(::std::string* name); // int32 port = 2; void clear_port(); - ::PROTOBUF_NAMESPACE_ID::int32 port() const; - void set_port(::PROTOBUF_NAMESPACE_ID::int32 value); - private: - ::PROTOBUF_NAMESPACE_ID::int32 _internal_port() const; - void _internal_set_port(::PROTOBUF_NAMESPACE_ID::int32 value); - public: + static const int kPortFieldNumber = 2; + ::google::protobuf::int32 port() const; + void set_port(::google::protobuf::int32 value); // @@protoc_insertion_point(class_scope:agones.dev.sdk.GameServer.Status.Port) private: - class _Internal; + class HasBitSetters; - ::PROTOBUF_NAMESPACE_ID::internal::InternalMetadataWithArena _internal_metadata_; - ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr name_; - ::PROTOBUF_NAMESPACE_ID::int32 port_; - mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; + ::google::protobuf::internal::ArenaStringPtr name_; + ::google::protobuf::int32 port_; + mutable ::google::protobuf::internal::CachedSize _cached_size_; friend struct ::TableStruct_sdk_2eproto; }; // ------------------------------------------------------------------- -class AGONES_EXPORT GameServer_Status : - public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:agones.dev.sdk.GameServer.Status) */ { +class AGONES_EXPORT GameServer_Status final : + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:agones.dev.sdk.GameServer.Status) */ { public: GameServer_Status(); virtual ~GameServer_Status(); GameServer_Status(const GameServer_Status& from); - GameServer_Status(GameServer_Status&& from) noexcept - : GameServer_Status() { - *this = ::std::move(from); - } inline GameServer_Status& operator=(const GameServer_Status& from) { CopyFrom(from); return *this; } + #if LANG_CXX11 + GameServer_Status(GameServer_Status&& from) noexcept + : GameServer_Status() { + *this = ::std::move(from); + } + inline GameServer_Status& operator=(GameServer_Status&& from) noexcept { if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) { if (this != &from) InternalSwap(&from); @@ -1333,15 +1147,9 @@ class AGONES_EXPORT GameServer_Status : } return *this; } - - static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { - return GetDescriptor(); - } - static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { - return GetMetadataStatic().descriptor; - } - static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { - return GetMetadataStatic().reflection; + #endif + static const ::google::protobuf::Descriptor* descriptor() { + return default_instance().GetDescriptor(); } static const GameServer_Status& default_instance(); @@ -1353,13 +1161,10 @@ class AGONES_EXPORT GameServer_Status : static constexpr int kIndexInFileMessages = 9; + void Swap(GameServer_Status* other); friend void swap(GameServer_Status& a, GameServer_Status& b) { a.Swap(&b); } - inline void Swap(GameServer_Status* other) { - if (other == this) return; - InternalSwap(other); - } // implements Message ---------------------------------------------- @@ -1367,33 +1172,37 @@ class AGONES_EXPORT GameServer_Status : return CreateMaybeMessage(nullptr); } - GameServer_Status* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { + GameServer_Status* New(::google::protobuf::Arena* arena) const final { return CreateMaybeMessage(arena); } - void CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final; - void MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final; + void CopyFrom(const ::google::protobuf::Message& from) final; + void MergeFrom(const ::google::protobuf::Message& from) final; void CopyFrom(const GameServer_Status& from); void MergeFrom(const GameServer_Status& from); PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; size_t ByteSizeLong() const final; - const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - ::PROTOBUF_NAMESPACE_ID::uint8* InternalSerializeWithCachedSizesToArray( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); + ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } + #else + bool MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) final; + #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + void SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const final; + ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(GameServer_Status* other); - friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; - static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { - return "agones.dev.sdk.GameServer.Status"; - } private: - inline ::PROTOBUF_NAMESPACE_ID::Arena* GetArenaNoVirtual() const { + inline ::google::protobuf::Arena* GetArenaNoVirtual() const { return nullptr; } inline void* MaybeArenaPtr() const { @@ -1401,14 +1210,7 @@ class AGONES_EXPORT GameServer_Status : } public: - ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; - private: - static ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadataStatic() { - ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&::descriptor_table_sdk_2eproto); - return ::descriptor_table_sdk_2eproto.file_level_metadata[kIndexInFileMessages]; - } - - public: + ::google::protobuf::Metadata GetMetadata() const final; // nested types ---------------------------------------------------- @@ -1416,90 +1218,77 @@ class AGONES_EXPORT GameServer_Status : // accessors ------------------------------------------------------- - enum : int { - kPortsFieldNumber = 3, - kStateFieldNumber = 1, - kAddressFieldNumber = 2, - }; // repeated .agones.dev.sdk.GameServer.Status.Port ports = 3; int ports_size() const; - private: - int _internal_ports_size() const; - public: void clear_ports(); + static const int kPortsFieldNumber = 3; ::agones::dev::sdk::GameServer_Status_Port* mutable_ports(int index); - ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::agones::dev::sdk::GameServer_Status_Port >* + ::google::protobuf::RepeatedPtrField< ::agones::dev::sdk::GameServer_Status_Port >* mutable_ports(); - private: - const ::agones::dev::sdk::GameServer_Status_Port& _internal_ports(int index) const; - ::agones::dev::sdk::GameServer_Status_Port* _internal_add_ports(); - public: const ::agones::dev::sdk::GameServer_Status_Port& ports(int index) const; ::agones::dev::sdk::GameServer_Status_Port* add_ports(); - const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::agones::dev::sdk::GameServer_Status_Port >& + const ::google::protobuf::RepeatedPtrField< ::agones::dev::sdk::GameServer_Status_Port >& ports() const; // string state = 1; void clear_state(); - const std::string& state() const; - void set_state(const std::string& value); - void set_state(std::string&& value); + static const int kStateFieldNumber = 1; + const ::std::string& state() const; + void set_state(const ::std::string& value); + #if LANG_CXX11 + void set_state(::std::string&& value); + #endif void set_state(const char* value); void set_state(const char* value, size_t size); - std::string* mutable_state(); - std::string* release_state(); - void set_allocated_state(std::string* state); - private: - const std::string& _internal_state() const; - void _internal_set_state(const std::string& value); - std::string* _internal_mutable_state(); - public: + ::std::string* mutable_state(); + ::std::string* release_state(); + void set_allocated_state(::std::string* state); // string address = 2; void clear_address(); - const std::string& address() const; - void set_address(const std::string& value); - void set_address(std::string&& value); + static const int kAddressFieldNumber = 2; + const ::std::string& address() const; + void set_address(const ::std::string& value); + #if LANG_CXX11 + void set_address(::std::string&& value); + #endif void set_address(const char* value); void set_address(const char* value, size_t size); - std::string* mutable_address(); - std::string* release_address(); - void set_allocated_address(std::string* address); - private: - const std::string& _internal_address() const; - void _internal_set_address(const std::string& value); - std::string* _internal_mutable_address(); - public: + ::std::string* mutable_address(); + ::std::string* release_address(); + void set_allocated_address(::std::string* address); // @@protoc_insertion_point(class_scope:agones.dev.sdk.GameServer.Status) private: - class _Internal; + class HasBitSetters; - ::PROTOBUF_NAMESPACE_ID::internal::InternalMetadataWithArena _internal_metadata_; - ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::agones::dev::sdk::GameServer_Status_Port > ports_; - ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr state_; - ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr address_; - mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; + ::google::protobuf::RepeatedPtrField< ::agones::dev::sdk::GameServer_Status_Port > ports_; + ::google::protobuf::internal::ArenaStringPtr state_; + ::google::protobuf::internal::ArenaStringPtr address_; + mutable ::google::protobuf::internal::CachedSize _cached_size_; friend struct ::TableStruct_sdk_2eproto; }; // ------------------------------------------------------------------- -class AGONES_EXPORT GameServer : - public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:agones.dev.sdk.GameServer) */ { +class AGONES_EXPORT GameServer final : + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:agones.dev.sdk.GameServer) */ { public: GameServer(); virtual ~GameServer(); GameServer(const GameServer& from); - GameServer(GameServer&& from) noexcept - : GameServer() { - *this = ::std::move(from); - } inline GameServer& operator=(const GameServer& from) { CopyFrom(from); return *this; } + #if LANG_CXX11 + GameServer(GameServer&& from) noexcept + : GameServer() { + *this = ::std::move(from); + } + inline GameServer& operator=(GameServer&& from) noexcept { if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) { if (this != &from) InternalSwap(&from); @@ -1508,15 +1297,9 @@ class AGONES_EXPORT GameServer : } return *this; } - - static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { - return GetDescriptor(); - } - static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { - return GetMetadataStatic().descriptor; - } - static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { - return GetMetadataStatic().reflection; + #endif + static const ::google::protobuf::Descriptor* descriptor() { + return default_instance().GetDescriptor(); } static const GameServer& default_instance(); @@ -1528,13 +1311,10 @@ class AGONES_EXPORT GameServer : static constexpr int kIndexInFileMessages = 10; + void Swap(GameServer* other); friend void swap(GameServer& a, GameServer& b) { a.Swap(&b); } - inline void Swap(GameServer* other) { - if (other == this) return; - InternalSwap(other); - } // implements Message ---------------------------------------------- @@ -1542,33 +1322,37 @@ class AGONES_EXPORT GameServer : return CreateMaybeMessage(nullptr); } - GameServer* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { + GameServer* New(::google::protobuf::Arena* arena) const final { return CreateMaybeMessage(arena); } - void CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final; - void MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final; + void CopyFrom(const ::google::protobuf::Message& from) final; + void MergeFrom(const ::google::protobuf::Message& from) final; void CopyFrom(const GameServer& from); void MergeFrom(const GameServer& from); PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; size_t ByteSizeLong() const final; - const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - ::PROTOBUF_NAMESPACE_ID::uint8* InternalSerializeWithCachedSizesToArray( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); + ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } + #else + bool MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) final; + #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + void SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const final; + ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(GameServer* other); - friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; - static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { - return "agones.dev.sdk.GameServer"; - } private: - inline ::PROTOBUF_NAMESPACE_ID::Arena* GetArenaNoVirtual() const { + inline ::google::protobuf::Arena* GetArenaNoVirtual() const { return nullptr; } inline void* MaybeArenaPtr() const { @@ -1576,14 +1360,7 @@ class AGONES_EXPORT GameServer : } public: - ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; - private: - static ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadataStatic() { - ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&::descriptor_table_sdk_2eproto); - return ::descriptor_table_sdk_2eproto.file_level_metadata[kIndexInFileMessages]; - } - - public: + ::google::protobuf::Metadata GetMetadata() const final; // nested types ---------------------------------------------------- @@ -1593,65 +1370,42 @@ class AGONES_EXPORT GameServer : // accessors ------------------------------------------------------- - enum : int { - kObjectMetaFieldNumber = 1, - kSpecFieldNumber = 2, - kStatusFieldNumber = 3, - }; // .agones.dev.sdk.GameServer.ObjectMeta object_meta = 1; bool has_object_meta() const; - private: - bool _internal_has_object_meta() const; - public: void clear_object_meta(); + static const int kObjectMetaFieldNumber = 1; const ::agones::dev::sdk::GameServer_ObjectMeta& object_meta() const; ::agones::dev::sdk::GameServer_ObjectMeta* release_object_meta(); ::agones::dev::sdk::GameServer_ObjectMeta* mutable_object_meta(); void set_allocated_object_meta(::agones::dev::sdk::GameServer_ObjectMeta* object_meta); - private: - const ::agones::dev::sdk::GameServer_ObjectMeta& _internal_object_meta() const; - ::agones::dev::sdk::GameServer_ObjectMeta* _internal_mutable_object_meta(); - public: // .agones.dev.sdk.GameServer.Spec spec = 2; bool has_spec() const; - private: - bool _internal_has_spec() const; - public: void clear_spec(); + static const int kSpecFieldNumber = 2; const ::agones::dev::sdk::GameServer_Spec& spec() const; ::agones::dev::sdk::GameServer_Spec* release_spec(); ::agones::dev::sdk::GameServer_Spec* mutable_spec(); void set_allocated_spec(::agones::dev::sdk::GameServer_Spec* spec); - private: - const ::agones::dev::sdk::GameServer_Spec& _internal_spec() const; - ::agones::dev::sdk::GameServer_Spec* _internal_mutable_spec(); - public: // .agones.dev.sdk.GameServer.Status status = 3; bool has_status() const; - private: - bool _internal_has_status() const; - public: void clear_status(); + static const int kStatusFieldNumber = 3; const ::agones::dev::sdk::GameServer_Status& status() const; ::agones::dev::sdk::GameServer_Status* release_status(); ::agones::dev::sdk::GameServer_Status* mutable_status(); void set_allocated_status(::agones::dev::sdk::GameServer_Status* status); - private: - const ::agones::dev::sdk::GameServer_Status& _internal_status() const; - ::agones::dev::sdk::GameServer_Status* _internal_mutable_status(); - public: // @@protoc_insertion_point(class_scope:agones.dev.sdk.GameServer) private: - class _Internal; + class HasBitSetters; - ::PROTOBUF_NAMESPACE_ID::internal::InternalMetadataWithArena _internal_metadata_; + ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; ::agones::dev::sdk::GameServer_ObjectMeta* object_meta_; ::agones::dev::sdk::GameServer_Spec* spec_; ::agones::dev::sdk::GameServer_Status* status_; - mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + mutable ::google::protobuf::internal::CachedSize _cached_size_; friend struct ::TableStruct_sdk_2eproto; }; // =================================================================== @@ -1671,121 +1425,107 @@ class AGONES_EXPORT GameServer : // string key = 1; inline void KeyValue::clear_key() { - key_.ClearToEmptyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + key_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } -inline const std::string& KeyValue::key() const { +inline const ::std::string& KeyValue::key() const { // @@protoc_insertion_point(field_get:agones.dev.sdk.KeyValue.key) - return _internal_key(); -} -inline void KeyValue::set_key(const std::string& value) { - _internal_set_key(value); - // @@protoc_insertion_point(field_set:agones.dev.sdk.KeyValue.key) -} -inline std::string* KeyValue::mutable_key() { - // @@protoc_insertion_point(field_mutable:agones.dev.sdk.KeyValue.key) - return _internal_mutable_key(); -} -inline const std::string& KeyValue::_internal_key() const { return key_.GetNoArena(); } -inline void KeyValue::_internal_set_key(const std::string& value) { +inline void KeyValue::set_key(const ::std::string& value) { - key_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value); + key_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); + // @@protoc_insertion_point(field_set:agones.dev.sdk.KeyValue.key) } -inline void KeyValue::set_key(std::string&& value) { +#if LANG_CXX11 +inline void KeyValue::set_key(::std::string&& value) { key_.SetNoArena( - &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); // @@protoc_insertion_point(field_set_rvalue:agones.dev.sdk.KeyValue.key) } +#endif inline void KeyValue::set_key(const char* value) { GOOGLE_DCHECK(value != nullptr); - key_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); + key_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:agones.dev.sdk.KeyValue.key) } inline void KeyValue::set_key(const char* value, size_t size) { - key_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + key_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:agones.dev.sdk.KeyValue.key) } -inline std::string* KeyValue::_internal_mutable_key() { +inline ::std::string* KeyValue::mutable_key() { - return key_.MutableNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + // @@protoc_insertion_point(field_mutable:agones.dev.sdk.KeyValue.key) + return key_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } -inline std::string* KeyValue::release_key() { +inline ::std::string* KeyValue::release_key() { // @@protoc_insertion_point(field_release:agones.dev.sdk.KeyValue.key) - return key_.ReleaseNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + return key_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } -inline void KeyValue::set_allocated_key(std::string* key) { +inline void KeyValue::set_allocated_key(::std::string* key) { if (key != nullptr) { } else { } - key_.SetAllocatedNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), key); + key_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), key); // @@protoc_insertion_point(field_set_allocated:agones.dev.sdk.KeyValue.key) } // string value = 2; inline void KeyValue::clear_value() { - value_.ClearToEmptyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + value_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } -inline const std::string& KeyValue::value() const { +inline const ::std::string& KeyValue::value() const { // @@protoc_insertion_point(field_get:agones.dev.sdk.KeyValue.value) - return _internal_value(); -} -inline void KeyValue::set_value(const std::string& value) { - _internal_set_value(value); - // @@protoc_insertion_point(field_set:agones.dev.sdk.KeyValue.value) -} -inline std::string* KeyValue::mutable_value() { - // @@protoc_insertion_point(field_mutable:agones.dev.sdk.KeyValue.value) - return _internal_mutable_value(); -} -inline const std::string& KeyValue::_internal_value() const { return value_.GetNoArena(); } -inline void KeyValue::_internal_set_value(const std::string& value) { +inline void KeyValue::set_value(const ::std::string& value) { - value_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value); + value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); + // @@protoc_insertion_point(field_set:agones.dev.sdk.KeyValue.value) } -inline void KeyValue::set_value(std::string&& value) { +#if LANG_CXX11 +inline void KeyValue::set_value(::std::string&& value) { value_.SetNoArena( - &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); // @@protoc_insertion_point(field_set_rvalue:agones.dev.sdk.KeyValue.value) } +#endif inline void KeyValue::set_value(const char* value) { GOOGLE_DCHECK(value != nullptr); - value_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); + value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:agones.dev.sdk.KeyValue.value) } inline void KeyValue::set_value(const char* value, size_t size) { - value_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:agones.dev.sdk.KeyValue.value) } -inline std::string* KeyValue::_internal_mutable_value() { +inline ::std::string* KeyValue::mutable_value() { - return value_.MutableNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + // @@protoc_insertion_point(field_mutable:agones.dev.sdk.KeyValue.value) + return value_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } -inline std::string* KeyValue::release_value() { +inline ::std::string* KeyValue::release_value() { // @@protoc_insertion_point(field_release:agones.dev.sdk.KeyValue.value) - return value_.ReleaseNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + return value_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } -inline void KeyValue::set_allocated_value(std::string* value) { +inline void KeyValue::set_allocated_value(::std::string* value) { if (value != nullptr) { } else { } - value_.SetAllocatedNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value); + value_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); // @@protoc_insertion_point(field_set_allocated:agones.dev.sdk.KeyValue.value) } @@ -1797,19 +1537,13 @@ inline void KeyValue::set_allocated_value(std::string* value) { inline void Duration::clear_seconds() { seconds_ = PROTOBUF_LONGLONG(0); } -inline ::PROTOBUF_NAMESPACE_ID::int64 Duration::_internal_seconds() const { - return seconds_; -} -inline ::PROTOBUF_NAMESPACE_ID::int64 Duration::seconds() const { +inline ::google::protobuf::int64 Duration::seconds() const { // @@protoc_insertion_point(field_get:agones.dev.sdk.Duration.seconds) - return _internal_seconds(); + return seconds_; } -inline void Duration::_internal_set_seconds(::PROTOBUF_NAMESPACE_ID::int64 value) { +inline void Duration::set_seconds(::google::protobuf::int64 value) { seconds_ = value; -} -inline void Duration::set_seconds(::PROTOBUF_NAMESPACE_ID::int64 value) { - _internal_set_seconds(value); // @@protoc_insertion_point(field_set:agones.dev.sdk.Duration.seconds) } @@ -1823,241 +1557,213 @@ inline void Duration::set_seconds(::PROTOBUF_NAMESPACE_ID::int64 value) { // string name = 1; inline void GameServer_ObjectMeta::clear_name() { - name_.ClearToEmptyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } -inline const std::string& GameServer_ObjectMeta::name() const { +inline const ::std::string& GameServer_ObjectMeta::name() const { // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.ObjectMeta.name) - return _internal_name(); -} -inline void GameServer_ObjectMeta::set_name(const std::string& value) { - _internal_set_name(value); - // @@protoc_insertion_point(field_set:agones.dev.sdk.GameServer.ObjectMeta.name) -} -inline std::string* GameServer_ObjectMeta::mutable_name() { - // @@protoc_insertion_point(field_mutable:agones.dev.sdk.GameServer.ObjectMeta.name) - return _internal_mutable_name(); -} -inline const std::string& GameServer_ObjectMeta::_internal_name() const { return name_.GetNoArena(); } -inline void GameServer_ObjectMeta::_internal_set_name(const std::string& value) { +inline void GameServer_ObjectMeta::set_name(const ::std::string& value) { - name_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value); + name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); + // @@protoc_insertion_point(field_set:agones.dev.sdk.GameServer.ObjectMeta.name) } -inline void GameServer_ObjectMeta::set_name(std::string&& value) { +#if LANG_CXX11 +inline void GameServer_ObjectMeta::set_name(::std::string&& value) { name_.SetNoArena( - &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); // @@protoc_insertion_point(field_set_rvalue:agones.dev.sdk.GameServer.ObjectMeta.name) } +#endif inline void GameServer_ObjectMeta::set_name(const char* value) { GOOGLE_DCHECK(value != nullptr); - name_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); + name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:agones.dev.sdk.GameServer.ObjectMeta.name) } inline void GameServer_ObjectMeta::set_name(const char* value, size_t size) { - name_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:agones.dev.sdk.GameServer.ObjectMeta.name) } -inline std::string* GameServer_ObjectMeta::_internal_mutable_name() { +inline ::std::string* GameServer_ObjectMeta::mutable_name() { - return name_.MutableNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + // @@protoc_insertion_point(field_mutable:agones.dev.sdk.GameServer.ObjectMeta.name) + return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } -inline std::string* GameServer_ObjectMeta::release_name() { +inline ::std::string* GameServer_ObjectMeta::release_name() { // @@protoc_insertion_point(field_release:agones.dev.sdk.GameServer.ObjectMeta.name) - return name_.ReleaseNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } -inline void GameServer_ObjectMeta::set_allocated_name(std::string* name) { +inline void GameServer_ObjectMeta::set_allocated_name(::std::string* name) { if (name != nullptr) { } else { } - name_.SetAllocatedNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), name); + name_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name); // @@protoc_insertion_point(field_set_allocated:agones.dev.sdk.GameServer.ObjectMeta.name) } // string namespace = 2; inline void GameServer_ObjectMeta::clear_namespace_() { - namespace__.ClearToEmptyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + namespace__.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } -inline const std::string& GameServer_ObjectMeta::namespace_() const { +inline const ::std::string& GameServer_ObjectMeta::namespace_() const { // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.ObjectMeta.namespace) - return _internal_namespace_(); -} -inline void GameServer_ObjectMeta::set_namespace_(const std::string& value) { - _internal_set_namespace_(value); - // @@protoc_insertion_point(field_set:agones.dev.sdk.GameServer.ObjectMeta.namespace) -} -inline std::string* GameServer_ObjectMeta::mutable_namespace_() { - // @@protoc_insertion_point(field_mutable:agones.dev.sdk.GameServer.ObjectMeta.namespace) - return _internal_mutable_namespace_(); -} -inline const std::string& GameServer_ObjectMeta::_internal_namespace_() const { return namespace__.GetNoArena(); } -inline void GameServer_ObjectMeta::_internal_set_namespace_(const std::string& value) { +inline void GameServer_ObjectMeta::set_namespace_(const ::std::string& value) { - namespace__.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value); + namespace__.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); + // @@protoc_insertion_point(field_set:agones.dev.sdk.GameServer.ObjectMeta.namespace) } -inline void GameServer_ObjectMeta::set_namespace_(std::string&& value) { +#if LANG_CXX11 +inline void GameServer_ObjectMeta::set_namespace_(::std::string&& value) { namespace__.SetNoArena( - &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); // @@protoc_insertion_point(field_set_rvalue:agones.dev.sdk.GameServer.ObjectMeta.namespace) } +#endif inline void GameServer_ObjectMeta::set_namespace_(const char* value) { GOOGLE_DCHECK(value != nullptr); - namespace__.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); + namespace__.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:agones.dev.sdk.GameServer.ObjectMeta.namespace) } inline void GameServer_ObjectMeta::set_namespace_(const char* value, size_t size) { - namespace__.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + namespace__.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:agones.dev.sdk.GameServer.ObjectMeta.namespace) } -inline std::string* GameServer_ObjectMeta::_internal_mutable_namespace_() { +inline ::std::string* GameServer_ObjectMeta::mutable_namespace_() { - return namespace__.MutableNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + // @@protoc_insertion_point(field_mutable:agones.dev.sdk.GameServer.ObjectMeta.namespace) + return namespace__.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } -inline std::string* GameServer_ObjectMeta::release_namespace_() { +inline ::std::string* GameServer_ObjectMeta::release_namespace_() { // @@protoc_insertion_point(field_release:agones.dev.sdk.GameServer.ObjectMeta.namespace) - return namespace__.ReleaseNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + return namespace__.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } -inline void GameServer_ObjectMeta::set_allocated_namespace_(std::string* namespace_) { +inline void GameServer_ObjectMeta::set_allocated_namespace_(::std::string* namespace_) { if (namespace_ != nullptr) { } else { } - namespace__.SetAllocatedNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), namespace_); + namespace__.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), namespace_); // @@protoc_insertion_point(field_set_allocated:agones.dev.sdk.GameServer.ObjectMeta.namespace) } // string uid = 3; inline void GameServer_ObjectMeta::clear_uid() { - uid_.ClearToEmptyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + uid_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } -inline const std::string& GameServer_ObjectMeta::uid() const { +inline const ::std::string& GameServer_ObjectMeta::uid() const { // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.ObjectMeta.uid) - return _internal_uid(); -} -inline void GameServer_ObjectMeta::set_uid(const std::string& value) { - _internal_set_uid(value); - // @@protoc_insertion_point(field_set:agones.dev.sdk.GameServer.ObjectMeta.uid) -} -inline std::string* GameServer_ObjectMeta::mutable_uid() { - // @@protoc_insertion_point(field_mutable:agones.dev.sdk.GameServer.ObjectMeta.uid) - return _internal_mutable_uid(); -} -inline const std::string& GameServer_ObjectMeta::_internal_uid() const { return uid_.GetNoArena(); } -inline void GameServer_ObjectMeta::_internal_set_uid(const std::string& value) { +inline void GameServer_ObjectMeta::set_uid(const ::std::string& value) { - uid_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value); + uid_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); + // @@protoc_insertion_point(field_set:agones.dev.sdk.GameServer.ObjectMeta.uid) } -inline void GameServer_ObjectMeta::set_uid(std::string&& value) { +#if LANG_CXX11 +inline void GameServer_ObjectMeta::set_uid(::std::string&& value) { uid_.SetNoArena( - &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); // @@protoc_insertion_point(field_set_rvalue:agones.dev.sdk.GameServer.ObjectMeta.uid) } +#endif inline void GameServer_ObjectMeta::set_uid(const char* value) { GOOGLE_DCHECK(value != nullptr); - uid_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); + uid_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:agones.dev.sdk.GameServer.ObjectMeta.uid) } inline void GameServer_ObjectMeta::set_uid(const char* value, size_t size) { - uid_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + uid_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:agones.dev.sdk.GameServer.ObjectMeta.uid) } -inline std::string* GameServer_ObjectMeta::_internal_mutable_uid() { +inline ::std::string* GameServer_ObjectMeta::mutable_uid() { - return uid_.MutableNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + // @@protoc_insertion_point(field_mutable:agones.dev.sdk.GameServer.ObjectMeta.uid) + return uid_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } -inline std::string* GameServer_ObjectMeta::release_uid() { +inline ::std::string* GameServer_ObjectMeta::release_uid() { // @@protoc_insertion_point(field_release:agones.dev.sdk.GameServer.ObjectMeta.uid) - return uid_.ReleaseNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + return uid_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } -inline void GameServer_ObjectMeta::set_allocated_uid(std::string* uid) { +inline void GameServer_ObjectMeta::set_allocated_uid(::std::string* uid) { if (uid != nullptr) { } else { } - uid_.SetAllocatedNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), uid); + uid_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), uid); // @@protoc_insertion_point(field_set_allocated:agones.dev.sdk.GameServer.ObjectMeta.uid) } // string resource_version = 4; inline void GameServer_ObjectMeta::clear_resource_version() { - resource_version_.ClearToEmptyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + resource_version_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } -inline const std::string& GameServer_ObjectMeta::resource_version() const { +inline const ::std::string& GameServer_ObjectMeta::resource_version() const { // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.ObjectMeta.resource_version) - return _internal_resource_version(); -} -inline void GameServer_ObjectMeta::set_resource_version(const std::string& value) { - _internal_set_resource_version(value); - // @@protoc_insertion_point(field_set:agones.dev.sdk.GameServer.ObjectMeta.resource_version) -} -inline std::string* GameServer_ObjectMeta::mutable_resource_version() { - // @@protoc_insertion_point(field_mutable:agones.dev.sdk.GameServer.ObjectMeta.resource_version) - return _internal_mutable_resource_version(); -} -inline const std::string& GameServer_ObjectMeta::_internal_resource_version() const { return resource_version_.GetNoArena(); } -inline void GameServer_ObjectMeta::_internal_set_resource_version(const std::string& value) { +inline void GameServer_ObjectMeta::set_resource_version(const ::std::string& value) { - resource_version_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value); + resource_version_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); + // @@protoc_insertion_point(field_set:agones.dev.sdk.GameServer.ObjectMeta.resource_version) } -inline void GameServer_ObjectMeta::set_resource_version(std::string&& value) { +#if LANG_CXX11 +inline void GameServer_ObjectMeta::set_resource_version(::std::string&& value) { resource_version_.SetNoArena( - &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); // @@protoc_insertion_point(field_set_rvalue:agones.dev.sdk.GameServer.ObjectMeta.resource_version) } +#endif inline void GameServer_ObjectMeta::set_resource_version(const char* value) { GOOGLE_DCHECK(value != nullptr); - resource_version_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); + resource_version_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:agones.dev.sdk.GameServer.ObjectMeta.resource_version) } inline void GameServer_ObjectMeta::set_resource_version(const char* value, size_t size) { - resource_version_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + resource_version_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:agones.dev.sdk.GameServer.ObjectMeta.resource_version) } -inline std::string* GameServer_ObjectMeta::_internal_mutable_resource_version() { +inline ::std::string* GameServer_ObjectMeta::mutable_resource_version() { - return resource_version_.MutableNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + // @@protoc_insertion_point(field_mutable:agones.dev.sdk.GameServer.ObjectMeta.resource_version) + return resource_version_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } -inline std::string* GameServer_ObjectMeta::release_resource_version() { +inline ::std::string* GameServer_ObjectMeta::release_resource_version() { // @@protoc_insertion_point(field_release:agones.dev.sdk.GameServer.ObjectMeta.resource_version) - return resource_version_.ReleaseNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + return resource_version_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } -inline void GameServer_ObjectMeta::set_allocated_resource_version(std::string* resource_version) { +inline void GameServer_ObjectMeta::set_allocated_resource_version(::std::string* resource_version) { if (resource_version != nullptr) { } else { } - resource_version_.SetAllocatedNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), resource_version); + resource_version_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), resource_version); // @@protoc_insertion_point(field_set_allocated:agones.dev.sdk.GameServer.ObjectMeta.resource_version) } @@ -2065,19 +1771,13 @@ inline void GameServer_ObjectMeta::set_allocated_resource_version(std::string* r inline void GameServer_ObjectMeta::clear_generation() { generation_ = PROTOBUF_LONGLONG(0); } -inline ::PROTOBUF_NAMESPACE_ID::int64 GameServer_ObjectMeta::_internal_generation() const { - return generation_; -} -inline ::PROTOBUF_NAMESPACE_ID::int64 GameServer_ObjectMeta::generation() const { +inline ::google::protobuf::int64 GameServer_ObjectMeta::generation() const { // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.ObjectMeta.generation) - return _internal_generation(); + return generation_; } -inline void GameServer_ObjectMeta::_internal_set_generation(::PROTOBUF_NAMESPACE_ID::int64 value) { +inline void GameServer_ObjectMeta::set_generation(::google::protobuf::int64 value) { generation_ = value; -} -inline void GameServer_ObjectMeta::set_generation(::PROTOBUF_NAMESPACE_ID::int64 value) { - _internal_set_generation(value); // @@protoc_insertion_point(field_set:agones.dev.sdk.GameServer.ObjectMeta.generation) } @@ -2085,19 +1785,13 @@ inline void GameServer_ObjectMeta::set_generation(::PROTOBUF_NAMESPACE_ID::int64 inline void GameServer_ObjectMeta::clear_creation_timestamp() { creation_timestamp_ = PROTOBUF_LONGLONG(0); } -inline ::PROTOBUF_NAMESPACE_ID::int64 GameServer_ObjectMeta::_internal_creation_timestamp() const { - return creation_timestamp_; -} -inline ::PROTOBUF_NAMESPACE_ID::int64 GameServer_ObjectMeta::creation_timestamp() const { +inline ::google::protobuf::int64 GameServer_ObjectMeta::creation_timestamp() const { // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.ObjectMeta.creation_timestamp) - return _internal_creation_timestamp(); + return creation_timestamp_; } -inline void GameServer_ObjectMeta::_internal_set_creation_timestamp(::PROTOBUF_NAMESPACE_ID::int64 value) { +inline void GameServer_ObjectMeta::set_creation_timestamp(::google::protobuf::int64 value) { creation_timestamp_ = value; -} -inline void GameServer_ObjectMeta::set_creation_timestamp(::PROTOBUF_NAMESPACE_ID::int64 value) { - _internal_set_creation_timestamp(value); // @@protoc_insertion_point(field_set:agones.dev.sdk.GameServer.ObjectMeta.creation_timestamp) } @@ -2105,78 +1799,50 @@ inline void GameServer_ObjectMeta::set_creation_timestamp(::PROTOBUF_NAMESPACE_I inline void GameServer_ObjectMeta::clear_deletion_timestamp() { deletion_timestamp_ = PROTOBUF_LONGLONG(0); } -inline ::PROTOBUF_NAMESPACE_ID::int64 GameServer_ObjectMeta::_internal_deletion_timestamp() const { - return deletion_timestamp_; -} -inline ::PROTOBUF_NAMESPACE_ID::int64 GameServer_ObjectMeta::deletion_timestamp() const { +inline ::google::protobuf::int64 GameServer_ObjectMeta::deletion_timestamp() const { // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.ObjectMeta.deletion_timestamp) - return _internal_deletion_timestamp(); + return deletion_timestamp_; } -inline void GameServer_ObjectMeta::_internal_set_deletion_timestamp(::PROTOBUF_NAMESPACE_ID::int64 value) { +inline void GameServer_ObjectMeta::set_deletion_timestamp(::google::protobuf::int64 value) { deletion_timestamp_ = value; -} -inline void GameServer_ObjectMeta::set_deletion_timestamp(::PROTOBUF_NAMESPACE_ID::int64 value) { - _internal_set_deletion_timestamp(value); // @@protoc_insertion_point(field_set:agones.dev.sdk.GameServer.ObjectMeta.deletion_timestamp) } // map annotations = 8; -inline int GameServer_ObjectMeta::_internal_annotations_size() const { - return annotations_.size(); -} inline int GameServer_ObjectMeta::annotations_size() const { - return _internal_annotations_size(); + return annotations_.size(); } inline void GameServer_ObjectMeta::clear_annotations() { annotations_.Clear(); } -inline const ::PROTOBUF_NAMESPACE_ID::Map< std::string, std::string >& -GameServer_ObjectMeta::_internal_annotations() const { - return annotations_.GetMap(); -} -inline const ::PROTOBUF_NAMESPACE_ID::Map< std::string, std::string >& +inline const ::google::protobuf::Map< ::std::string, ::std::string >& GameServer_ObjectMeta::annotations() const { // @@protoc_insertion_point(field_map:agones.dev.sdk.GameServer.ObjectMeta.annotations) - return _internal_annotations(); -} -inline ::PROTOBUF_NAMESPACE_ID::Map< std::string, std::string >* -GameServer_ObjectMeta::_internal_mutable_annotations() { - return annotations_.MutableMap(); + return annotations_.GetMap(); } -inline ::PROTOBUF_NAMESPACE_ID::Map< std::string, std::string >* +inline ::google::protobuf::Map< ::std::string, ::std::string >* GameServer_ObjectMeta::mutable_annotations() { // @@protoc_insertion_point(field_mutable_map:agones.dev.sdk.GameServer.ObjectMeta.annotations) - return _internal_mutable_annotations(); + return annotations_.MutableMap(); } // map labels = 9; -inline int GameServer_ObjectMeta::_internal_labels_size() const { - return labels_.size(); -} inline int GameServer_ObjectMeta::labels_size() const { - return _internal_labels_size(); + return labels_.size(); } inline void GameServer_ObjectMeta::clear_labels() { labels_.Clear(); } -inline const ::PROTOBUF_NAMESPACE_ID::Map< std::string, std::string >& -GameServer_ObjectMeta::_internal_labels() const { - return labels_.GetMap(); -} -inline const ::PROTOBUF_NAMESPACE_ID::Map< std::string, std::string >& +inline const ::google::protobuf::Map< ::std::string, ::std::string >& GameServer_ObjectMeta::labels() const { // @@protoc_insertion_point(field_map:agones.dev.sdk.GameServer.ObjectMeta.labels) - return _internal_labels(); -} -inline ::PROTOBUF_NAMESPACE_ID::Map< std::string, std::string >* -GameServer_ObjectMeta::_internal_mutable_labels() { - return labels_.MutableMap(); + return labels_.GetMap(); } -inline ::PROTOBUF_NAMESPACE_ID::Map< std::string, std::string >* +inline ::google::protobuf::Map< ::std::string, ::std::string >* GameServer_ObjectMeta::mutable_labels() { // @@protoc_insertion_point(field_mutable_map:agones.dev.sdk.GameServer.ObjectMeta.labels) - return _internal_mutable_labels(); + return labels_.MutableMap(); } // ------------------------------------------------------------------- @@ -2187,19 +1853,13 @@ GameServer_ObjectMeta::mutable_labels() { inline void GameServer_Spec_Health::clear_disabled() { disabled_ = false; } -inline bool GameServer_Spec_Health::_internal_disabled() const { - return disabled_; -} inline bool GameServer_Spec_Health::disabled() const { // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.Spec.Health.disabled) - return _internal_disabled(); + return disabled_; } -inline void GameServer_Spec_Health::_internal_set_disabled(bool value) { +inline void GameServer_Spec_Health::set_disabled(bool value) { disabled_ = value; -} -inline void GameServer_Spec_Health::set_disabled(bool value) { - _internal_set_disabled(value); // @@protoc_insertion_point(field_set:agones.dev.sdk.GameServer.Spec.Health.disabled) } @@ -2207,19 +1867,13 @@ inline void GameServer_Spec_Health::set_disabled(bool value) { inline void GameServer_Spec_Health::clear_period_seconds() { period_seconds_ = 0; } -inline ::PROTOBUF_NAMESPACE_ID::int32 GameServer_Spec_Health::_internal_period_seconds() const { - return period_seconds_; -} -inline ::PROTOBUF_NAMESPACE_ID::int32 GameServer_Spec_Health::period_seconds() const { +inline ::google::protobuf::int32 GameServer_Spec_Health::period_seconds() const { // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.Spec.Health.period_seconds) - return _internal_period_seconds(); + return period_seconds_; } -inline void GameServer_Spec_Health::_internal_set_period_seconds(::PROTOBUF_NAMESPACE_ID::int32 value) { +inline void GameServer_Spec_Health::set_period_seconds(::google::protobuf::int32 value) { period_seconds_ = value; -} -inline void GameServer_Spec_Health::set_period_seconds(::PROTOBUF_NAMESPACE_ID::int32 value) { - _internal_set_period_seconds(value); // @@protoc_insertion_point(field_set:agones.dev.sdk.GameServer.Spec.Health.period_seconds) } @@ -2227,19 +1881,13 @@ inline void GameServer_Spec_Health::set_period_seconds(::PROTOBUF_NAMESPACE_ID:: inline void GameServer_Spec_Health::clear_failure_threshold() { failure_threshold_ = 0; } -inline ::PROTOBUF_NAMESPACE_ID::int32 GameServer_Spec_Health::_internal_failure_threshold() const { - return failure_threshold_; -} -inline ::PROTOBUF_NAMESPACE_ID::int32 GameServer_Spec_Health::failure_threshold() const { +inline ::google::protobuf::int32 GameServer_Spec_Health::failure_threshold() const { // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.Spec.Health.failure_threshold) - return _internal_failure_threshold(); + return failure_threshold_; } -inline void GameServer_Spec_Health::_internal_set_failure_threshold(::PROTOBUF_NAMESPACE_ID::int32 value) { +inline void GameServer_Spec_Health::set_failure_threshold(::google::protobuf::int32 value) { failure_threshold_ = value; -} -inline void GameServer_Spec_Health::set_failure_threshold(::PROTOBUF_NAMESPACE_ID::int32 value) { - _internal_set_failure_threshold(value); // @@protoc_insertion_point(field_set:agones.dev.sdk.GameServer.Spec.Health.failure_threshold) } @@ -2247,19 +1895,13 @@ inline void GameServer_Spec_Health::set_failure_threshold(::PROTOBUF_NAMESPACE_I inline void GameServer_Spec_Health::clear_initial_delay_seconds() { initial_delay_seconds_ = 0; } -inline ::PROTOBUF_NAMESPACE_ID::int32 GameServer_Spec_Health::_internal_initial_delay_seconds() const { - return initial_delay_seconds_; -} -inline ::PROTOBUF_NAMESPACE_ID::int32 GameServer_Spec_Health::initial_delay_seconds() const { +inline ::google::protobuf::int32 GameServer_Spec_Health::initial_delay_seconds() const { // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.Spec.Health.initial_delay_seconds) - return _internal_initial_delay_seconds(); + return initial_delay_seconds_; } -inline void GameServer_Spec_Health::_internal_set_initial_delay_seconds(::PROTOBUF_NAMESPACE_ID::int32 value) { +inline void GameServer_Spec_Health::set_initial_delay_seconds(::google::protobuf::int32 value) { initial_delay_seconds_ = value; -} -inline void GameServer_Spec_Health::set_initial_delay_seconds(::PROTOBUF_NAMESPACE_ID::int32 value) { - _internal_set_initial_delay_seconds(value); // @@protoc_insertion_point(field_set:agones.dev.sdk.GameServer.Spec.Health.initial_delay_seconds) } @@ -2268,11 +1910,8 @@ inline void GameServer_Spec_Health::set_initial_delay_seconds(::PROTOBUF_NAMESPA // GameServer_Spec // .agones.dev.sdk.GameServer.Spec.Health health = 1; -inline bool GameServer_Spec::_internal_has_health() const { - return this != internal_default_instance() && health_ != nullptr; -} inline bool GameServer_Spec::has_health() const { - return _internal_has_health(); + return this != internal_default_instance() && health_ != nullptr; } inline void GameServer_Spec::clear_health() { if (GetArenaNoVirtual() == nullptr && health_ != nullptr) { @@ -2280,15 +1919,12 @@ inline void GameServer_Spec::clear_health() { } health_ = nullptr; } -inline const ::agones::dev::sdk::GameServer_Spec_Health& GameServer_Spec::_internal_health() const { +inline const ::agones::dev::sdk::GameServer_Spec_Health& GameServer_Spec::health() const { const ::agones::dev::sdk::GameServer_Spec_Health* p = health_; + // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.Spec.health) return p != nullptr ? *p : *reinterpret_cast( &::agones::dev::sdk::_GameServer_Spec_Health_default_instance_); } -inline const ::agones::dev::sdk::GameServer_Spec_Health& GameServer_Spec::health() const { - // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.Spec.health) - return _internal_health(); -} inline ::agones::dev::sdk::GameServer_Spec_Health* GameServer_Spec::release_health() { // @@protoc_insertion_point(field_release:agones.dev.sdk.GameServer.Spec.health) @@ -2296,27 +1932,24 @@ inline ::agones::dev::sdk::GameServer_Spec_Health* GameServer_Spec::release_heal health_ = nullptr; return temp; } -inline ::agones::dev::sdk::GameServer_Spec_Health* GameServer_Spec::_internal_mutable_health() { +inline ::agones::dev::sdk::GameServer_Spec_Health* GameServer_Spec::mutable_health() { if (health_ == nullptr) { auto* p = CreateMaybeMessage<::agones::dev::sdk::GameServer_Spec_Health>(GetArenaNoVirtual()); health_ = p; } - return health_; -} -inline ::agones::dev::sdk::GameServer_Spec_Health* GameServer_Spec::mutable_health() { // @@protoc_insertion_point(field_mutable:agones.dev.sdk.GameServer.Spec.health) - return _internal_mutable_health(); + return health_; } inline void GameServer_Spec::set_allocated_health(::agones::dev::sdk::GameServer_Spec_Health* health) { - ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaNoVirtual(); + ::google::protobuf::Arena* message_arena = GetArenaNoVirtual(); if (message_arena == nullptr) { delete health_; } if (health) { - ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena = nullptr; + ::google::protobuf::Arena* submessage_arena = nullptr; if (message_arena != submessage_arena) { - health = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage( + health = ::google::protobuf::internal::GetOwnedMessage( message_arena, health, submessage_arena); } @@ -2333,61 +1966,54 @@ inline void GameServer_Spec::set_allocated_health(::agones::dev::sdk::GameServer // string name = 1; inline void GameServer_Status_Port::clear_name() { - name_.ClearToEmptyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } -inline const std::string& GameServer_Status_Port::name() const { +inline const ::std::string& GameServer_Status_Port::name() const { // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.Status.Port.name) - return _internal_name(); -} -inline void GameServer_Status_Port::set_name(const std::string& value) { - _internal_set_name(value); - // @@protoc_insertion_point(field_set:agones.dev.sdk.GameServer.Status.Port.name) -} -inline std::string* GameServer_Status_Port::mutable_name() { - // @@protoc_insertion_point(field_mutable:agones.dev.sdk.GameServer.Status.Port.name) - return _internal_mutable_name(); -} -inline const std::string& GameServer_Status_Port::_internal_name() const { return name_.GetNoArena(); } -inline void GameServer_Status_Port::_internal_set_name(const std::string& value) { +inline void GameServer_Status_Port::set_name(const ::std::string& value) { - name_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value); + name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); + // @@protoc_insertion_point(field_set:agones.dev.sdk.GameServer.Status.Port.name) } -inline void GameServer_Status_Port::set_name(std::string&& value) { +#if LANG_CXX11 +inline void GameServer_Status_Port::set_name(::std::string&& value) { name_.SetNoArena( - &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); // @@protoc_insertion_point(field_set_rvalue:agones.dev.sdk.GameServer.Status.Port.name) } +#endif inline void GameServer_Status_Port::set_name(const char* value) { GOOGLE_DCHECK(value != nullptr); - name_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); + name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:agones.dev.sdk.GameServer.Status.Port.name) } inline void GameServer_Status_Port::set_name(const char* value, size_t size) { - name_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:agones.dev.sdk.GameServer.Status.Port.name) } -inline std::string* GameServer_Status_Port::_internal_mutable_name() { +inline ::std::string* GameServer_Status_Port::mutable_name() { - return name_.MutableNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + // @@protoc_insertion_point(field_mutable:agones.dev.sdk.GameServer.Status.Port.name) + return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } -inline std::string* GameServer_Status_Port::release_name() { +inline ::std::string* GameServer_Status_Port::release_name() { // @@protoc_insertion_point(field_release:agones.dev.sdk.GameServer.Status.Port.name) - return name_.ReleaseNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } -inline void GameServer_Status_Port::set_allocated_name(std::string* name) { +inline void GameServer_Status_Port::set_allocated_name(::std::string* name) { if (name != nullptr) { } else { } - name_.SetAllocatedNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), name); + name_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name); // @@protoc_insertion_point(field_set_allocated:agones.dev.sdk.GameServer.Status.Port.name) } @@ -2395,19 +2021,13 @@ inline void GameServer_Status_Port::set_allocated_name(std::string* name) { inline void GameServer_Status_Port::clear_port() { port_ = 0; } -inline ::PROTOBUF_NAMESPACE_ID::int32 GameServer_Status_Port::_internal_port() const { - return port_; -} -inline ::PROTOBUF_NAMESPACE_ID::int32 GameServer_Status_Port::port() const { +inline ::google::protobuf::int32 GameServer_Status_Port::port() const { // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.Status.Port.port) - return _internal_port(); + return port_; } -inline void GameServer_Status_Port::_internal_set_port(::PROTOBUF_NAMESPACE_ID::int32 value) { +inline void GameServer_Status_Port::set_port(::google::protobuf::int32 value) { port_ = value; -} -inline void GameServer_Status_Port::set_port(::PROTOBUF_NAMESPACE_ID::int32 value) { - _internal_set_port(value); // @@protoc_insertion_point(field_set:agones.dev.sdk.GameServer.Status.Port.port) } @@ -2417,130 +2037,113 @@ inline void GameServer_Status_Port::set_port(::PROTOBUF_NAMESPACE_ID::int32 valu // string state = 1; inline void GameServer_Status::clear_state() { - state_.ClearToEmptyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + state_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } -inline const std::string& GameServer_Status::state() const { +inline const ::std::string& GameServer_Status::state() const { // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.Status.state) - return _internal_state(); -} -inline void GameServer_Status::set_state(const std::string& value) { - _internal_set_state(value); - // @@protoc_insertion_point(field_set:agones.dev.sdk.GameServer.Status.state) -} -inline std::string* GameServer_Status::mutable_state() { - // @@protoc_insertion_point(field_mutable:agones.dev.sdk.GameServer.Status.state) - return _internal_mutable_state(); -} -inline const std::string& GameServer_Status::_internal_state() const { return state_.GetNoArena(); } -inline void GameServer_Status::_internal_set_state(const std::string& value) { +inline void GameServer_Status::set_state(const ::std::string& value) { - state_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value); + state_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); + // @@protoc_insertion_point(field_set:agones.dev.sdk.GameServer.Status.state) } -inline void GameServer_Status::set_state(std::string&& value) { +#if LANG_CXX11 +inline void GameServer_Status::set_state(::std::string&& value) { state_.SetNoArena( - &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); // @@protoc_insertion_point(field_set_rvalue:agones.dev.sdk.GameServer.Status.state) } +#endif inline void GameServer_Status::set_state(const char* value) { GOOGLE_DCHECK(value != nullptr); - state_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); + state_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:agones.dev.sdk.GameServer.Status.state) } inline void GameServer_Status::set_state(const char* value, size_t size) { - state_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + state_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:agones.dev.sdk.GameServer.Status.state) } -inline std::string* GameServer_Status::_internal_mutable_state() { +inline ::std::string* GameServer_Status::mutable_state() { - return state_.MutableNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + // @@protoc_insertion_point(field_mutable:agones.dev.sdk.GameServer.Status.state) + return state_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } -inline std::string* GameServer_Status::release_state() { +inline ::std::string* GameServer_Status::release_state() { // @@protoc_insertion_point(field_release:agones.dev.sdk.GameServer.Status.state) - return state_.ReleaseNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + return state_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } -inline void GameServer_Status::set_allocated_state(std::string* state) { +inline void GameServer_Status::set_allocated_state(::std::string* state) { if (state != nullptr) { } else { } - state_.SetAllocatedNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), state); + state_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), state); // @@protoc_insertion_point(field_set_allocated:agones.dev.sdk.GameServer.Status.state) } // string address = 2; inline void GameServer_Status::clear_address() { - address_.ClearToEmptyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + address_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } -inline const std::string& GameServer_Status::address() const { +inline const ::std::string& GameServer_Status::address() const { // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.Status.address) - return _internal_address(); -} -inline void GameServer_Status::set_address(const std::string& value) { - _internal_set_address(value); - // @@protoc_insertion_point(field_set:agones.dev.sdk.GameServer.Status.address) -} -inline std::string* GameServer_Status::mutable_address() { - // @@protoc_insertion_point(field_mutable:agones.dev.sdk.GameServer.Status.address) - return _internal_mutable_address(); -} -inline const std::string& GameServer_Status::_internal_address() const { return address_.GetNoArena(); } -inline void GameServer_Status::_internal_set_address(const std::string& value) { +inline void GameServer_Status::set_address(const ::std::string& value) { - address_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value); + address_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); + // @@protoc_insertion_point(field_set:agones.dev.sdk.GameServer.Status.address) } -inline void GameServer_Status::set_address(std::string&& value) { +#if LANG_CXX11 +inline void GameServer_Status::set_address(::std::string&& value) { address_.SetNoArena( - &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); // @@protoc_insertion_point(field_set_rvalue:agones.dev.sdk.GameServer.Status.address) } +#endif inline void GameServer_Status::set_address(const char* value) { GOOGLE_DCHECK(value != nullptr); - address_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); + address_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:agones.dev.sdk.GameServer.Status.address) } inline void GameServer_Status::set_address(const char* value, size_t size) { - address_.SetNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + address_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:agones.dev.sdk.GameServer.Status.address) } -inline std::string* GameServer_Status::_internal_mutable_address() { +inline ::std::string* GameServer_Status::mutable_address() { - return address_.MutableNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + // @@protoc_insertion_point(field_mutable:agones.dev.sdk.GameServer.Status.address) + return address_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } -inline std::string* GameServer_Status::release_address() { +inline ::std::string* GameServer_Status::release_address() { // @@protoc_insertion_point(field_release:agones.dev.sdk.GameServer.Status.address) - return address_.ReleaseNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + return address_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } -inline void GameServer_Status::set_allocated_address(std::string* address) { +inline void GameServer_Status::set_allocated_address(::std::string* address) { if (address != nullptr) { } else { } - address_.SetAllocatedNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), address); + address_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), address); // @@protoc_insertion_point(field_set_allocated:agones.dev.sdk.GameServer.Status.address) } // repeated .agones.dev.sdk.GameServer.Status.Port ports = 3; -inline int GameServer_Status::_internal_ports_size() const { - return ports_.size(); -} inline int GameServer_Status::ports_size() const { - return _internal_ports_size(); + return ports_.size(); } inline void GameServer_Status::clear_ports() { ports_.Clear(); @@ -2549,26 +2152,20 @@ inline ::agones::dev::sdk::GameServer_Status_Port* GameServer_Status::mutable_po // @@protoc_insertion_point(field_mutable:agones.dev.sdk.GameServer.Status.ports) return ports_.Mutable(index); } -inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::agones::dev::sdk::GameServer_Status_Port >* +inline ::google::protobuf::RepeatedPtrField< ::agones::dev::sdk::GameServer_Status_Port >* GameServer_Status::mutable_ports() { // @@protoc_insertion_point(field_mutable_list:agones.dev.sdk.GameServer.Status.ports) return &ports_; } -inline const ::agones::dev::sdk::GameServer_Status_Port& GameServer_Status::_internal_ports(int index) const { - return ports_.Get(index); -} inline const ::agones::dev::sdk::GameServer_Status_Port& GameServer_Status::ports(int index) const { // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.Status.ports) - return _internal_ports(index); -} -inline ::agones::dev::sdk::GameServer_Status_Port* GameServer_Status::_internal_add_ports() { - return ports_.Add(); + return ports_.Get(index); } inline ::agones::dev::sdk::GameServer_Status_Port* GameServer_Status::add_ports() { // @@protoc_insertion_point(field_add:agones.dev.sdk.GameServer.Status.ports) - return _internal_add_ports(); + return ports_.Add(); } -inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::agones::dev::sdk::GameServer_Status_Port >& +inline const ::google::protobuf::RepeatedPtrField< ::agones::dev::sdk::GameServer_Status_Port >& GameServer_Status::ports() const { // @@protoc_insertion_point(field_list:agones.dev.sdk.GameServer.Status.ports) return ports_; @@ -2579,11 +2176,8 @@ GameServer_Status::ports() const { // GameServer // .agones.dev.sdk.GameServer.ObjectMeta object_meta = 1; -inline bool GameServer::_internal_has_object_meta() const { - return this != internal_default_instance() && object_meta_ != nullptr; -} inline bool GameServer::has_object_meta() const { - return _internal_has_object_meta(); + return this != internal_default_instance() && object_meta_ != nullptr; } inline void GameServer::clear_object_meta() { if (GetArenaNoVirtual() == nullptr && object_meta_ != nullptr) { @@ -2591,15 +2185,12 @@ inline void GameServer::clear_object_meta() { } object_meta_ = nullptr; } -inline const ::agones::dev::sdk::GameServer_ObjectMeta& GameServer::_internal_object_meta() const { +inline const ::agones::dev::sdk::GameServer_ObjectMeta& GameServer::object_meta() const { const ::agones::dev::sdk::GameServer_ObjectMeta* p = object_meta_; + // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.object_meta) return p != nullptr ? *p : *reinterpret_cast( &::agones::dev::sdk::_GameServer_ObjectMeta_default_instance_); } -inline const ::agones::dev::sdk::GameServer_ObjectMeta& GameServer::object_meta() const { - // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.object_meta) - return _internal_object_meta(); -} inline ::agones::dev::sdk::GameServer_ObjectMeta* GameServer::release_object_meta() { // @@protoc_insertion_point(field_release:agones.dev.sdk.GameServer.object_meta) @@ -2607,27 +2198,24 @@ inline ::agones::dev::sdk::GameServer_ObjectMeta* GameServer::release_object_met object_meta_ = nullptr; return temp; } -inline ::agones::dev::sdk::GameServer_ObjectMeta* GameServer::_internal_mutable_object_meta() { +inline ::agones::dev::sdk::GameServer_ObjectMeta* GameServer::mutable_object_meta() { if (object_meta_ == nullptr) { auto* p = CreateMaybeMessage<::agones::dev::sdk::GameServer_ObjectMeta>(GetArenaNoVirtual()); object_meta_ = p; } - return object_meta_; -} -inline ::agones::dev::sdk::GameServer_ObjectMeta* GameServer::mutable_object_meta() { // @@protoc_insertion_point(field_mutable:agones.dev.sdk.GameServer.object_meta) - return _internal_mutable_object_meta(); + return object_meta_; } inline void GameServer::set_allocated_object_meta(::agones::dev::sdk::GameServer_ObjectMeta* object_meta) { - ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaNoVirtual(); + ::google::protobuf::Arena* message_arena = GetArenaNoVirtual(); if (message_arena == nullptr) { delete object_meta_; } if (object_meta) { - ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena = nullptr; + ::google::protobuf::Arena* submessage_arena = nullptr; if (message_arena != submessage_arena) { - object_meta = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage( + object_meta = ::google::protobuf::internal::GetOwnedMessage( message_arena, object_meta, submessage_arena); } @@ -2639,11 +2227,8 @@ inline void GameServer::set_allocated_object_meta(::agones::dev::sdk::GameServer } // .agones.dev.sdk.GameServer.Spec spec = 2; -inline bool GameServer::_internal_has_spec() const { - return this != internal_default_instance() && spec_ != nullptr; -} inline bool GameServer::has_spec() const { - return _internal_has_spec(); + return this != internal_default_instance() && spec_ != nullptr; } inline void GameServer::clear_spec() { if (GetArenaNoVirtual() == nullptr && spec_ != nullptr) { @@ -2651,15 +2236,12 @@ inline void GameServer::clear_spec() { } spec_ = nullptr; } -inline const ::agones::dev::sdk::GameServer_Spec& GameServer::_internal_spec() const { +inline const ::agones::dev::sdk::GameServer_Spec& GameServer::spec() const { const ::agones::dev::sdk::GameServer_Spec* p = spec_; + // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.spec) return p != nullptr ? *p : *reinterpret_cast( &::agones::dev::sdk::_GameServer_Spec_default_instance_); } -inline const ::agones::dev::sdk::GameServer_Spec& GameServer::spec() const { - // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.spec) - return _internal_spec(); -} inline ::agones::dev::sdk::GameServer_Spec* GameServer::release_spec() { // @@protoc_insertion_point(field_release:agones.dev.sdk.GameServer.spec) @@ -2667,27 +2249,24 @@ inline ::agones::dev::sdk::GameServer_Spec* GameServer::release_spec() { spec_ = nullptr; return temp; } -inline ::agones::dev::sdk::GameServer_Spec* GameServer::_internal_mutable_spec() { +inline ::agones::dev::sdk::GameServer_Spec* GameServer::mutable_spec() { if (spec_ == nullptr) { auto* p = CreateMaybeMessage<::agones::dev::sdk::GameServer_Spec>(GetArenaNoVirtual()); spec_ = p; } - return spec_; -} -inline ::agones::dev::sdk::GameServer_Spec* GameServer::mutable_spec() { // @@protoc_insertion_point(field_mutable:agones.dev.sdk.GameServer.spec) - return _internal_mutable_spec(); + return spec_; } inline void GameServer::set_allocated_spec(::agones::dev::sdk::GameServer_Spec* spec) { - ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaNoVirtual(); + ::google::protobuf::Arena* message_arena = GetArenaNoVirtual(); if (message_arena == nullptr) { delete spec_; } if (spec) { - ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena = nullptr; + ::google::protobuf::Arena* submessage_arena = nullptr; if (message_arena != submessage_arena) { - spec = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage( + spec = ::google::protobuf::internal::GetOwnedMessage( message_arena, spec, submessage_arena); } @@ -2699,11 +2278,8 @@ inline void GameServer::set_allocated_spec(::agones::dev::sdk::GameServer_Spec* } // .agones.dev.sdk.GameServer.Status status = 3; -inline bool GameServer::_internal_has_status() const { - return this != internal_default_instance() && status_ != nullptr; -} inline bool GameServer::has_status() const { - return _internal_has_status(); + return this != internal_default_instance() && status_ != nullptr; } inline void GameServer::clear_status() { if (GetArenaNoVirtual() == nullptr && status_ != nullptr) { @@ -2711,15 +2287,12 @@ inline void GameServer::clear_status() { } status_ = nullptr; } -inline const ::agones::dev::sdk::GameServer_Status& GameServer::_internal_status() const { +inline const ::agones::dev::sdk::GameServer_Status& GameServer::status() const { const ::agones::dev::sdk::GameServer_Status* p = status_; + // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.status) return p != nullptr ? *p : *reinterpret_cast( &::agones::dev::sdk::_GameServer_Status_default_instance_); } -inline const ::agones::dev::sdk::GameServer_Status& GameServer::status() const { - // @@protoc_insertion_point(field_get:agones.dev.sdk.GameServer.status) - return _internal_status(); -} inline ::agones::dev::sdk::GameServer_Status* GameServer::release_status() { // @@protoc_insertion_point(field_release:agones.dev.sdk.GameServer.status) @@ -2727,27 +2300,24 @@ inline ::agones::dev::sdk::GameServer_Status* GameServer::release_status() { status_ = nullptr; return temp; } -inline ::agones::dev::sdk::GameServer_Status* GameServer::_internal_mutable_status() { +inline ::agones::dev::sdk::GameServer_Status* GameServer::mutable_status() { if (status_ == nullptr) { auto* p = CreateMaybeMessage<::agones::dev::sdk::GameServer_Status>(GetArenaNoVirtual()); status_ = p; } - return status_; -} -inline ::agones::dev::sdk::GameServer_Status* GameServer::mutable_status() { // @@protoc_insertion_point(field_mutable:agones.dev.sdk.GameServer.status) - return _internal_mutable_status(); + return status_; } inline void GameServer::set_allocated_status(::agones::dev::sdk::GameServer_Status* status) { - ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaNoVirtual(); + ::google::protobuf::Arena* message_arena = GetArenaNoVirtual(); if (message_arena == nullptr) { delete status_; } if (status) { - ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena = nullptr; + ::google::protobuf::Arena* submessage_arena = nullptr; if (message_arena != submessage_arena) { - status = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage( + status = ::google::protobuf::internal::GetOwnedMessage( message_arena, status, submessage_arena); } @@ -2791,4 +2361,4 @@ inline void GameServer::set_allocated_status(::agones::dev::sdk::GameServer_Stat // @@protoc_insertion_point(global_scope) #include -#endif // GOOGLE_PROTOBUF_INCLUDED_GOOGLE_PROTOBUF_INCLUDED_sdk_2eproto +#endif // PROTOBUF_INCLUDED_sdk_2eproto diff --git a/sdks/cpp/include/google/api/annotations.pb.h b/sdks/cpp/include/google/api/annotations.pb.h index abb8fb9dff..2abd934c4a 100644 --- a/sdks/cpp/include/google/api/annotations.pb.h +++ b/sdks/cpp/include/google/api/annotations.pb.h @@ -16,19 +16,19 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/api/annotations.proto -#ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fapi_2fannotations_2eproto -#define GOOGLE_PROTOBUF_INCLUDED_google_2fapi_2fannotations_2eproto +#ifndef PROTOBUF_INCLUDED_google_2fapi_2fannotations_2eproto +#define PROTOBUF_INCLUDED_google_2fapi_2fannotations_2eproto #include #include #include -#if PROTOBUF_VERSION < 3010000 +#if PROTOBUF_VERSION < 3007000 #error This file was generated by a newer version of protoc which is #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3010001 < PROTOBUF_MIN_PROTOC_VERSION +#if 3007000 < PROTOBUF_MIN_PROTOC_VERSION #error This file was generated by an older version of protoc which is #error incompatible with your Protocol Buffer headers. Please #error regenerate this file with a newer version of protoc. @@ -42,7 +42,6 @@ #include #include #include -#include #include // IWYU pragma: export #include // IWYU pragma: export #include "google/api/http.pb.h" @@ -50,27 +49,24 @@ // @@protoc_insertion_point(includes) #include #define PROTOBUF_INTERNAL_EXPORT_google_2fapi_2fannotations_2eproto AGONES_EXPORT -PROTOBUF_NAMESPACE_OPEN -namespace internal { -class AnyMetadata; -} // namespace internal -PROTOBUF_NAMESPACE_CLOSE // Internal implementation detail -- do not use these members. struct AGONES_EXPORT TableStruct_google_2fapi_2fannotations_2eproto { - static const ::PROTOBUF_NAMESPACE_ID::internal::ParseTableField entries[] + static const ::google::protobuf::internal::ParseTableField entries[] PROTOBUF_SECTION_VARIABLE(protodesc_cold); - static const ::PROTOBUF_NAMESPACE_ID::internal::AuxillaryParseTableField aux[] + static const ::google::protobuf::internal::AuxillaryParseTableField aux[] PROTOBUF_SECTION_VARIABLE(protodesc_cold); - static const ::PROTOBUF_NAMESPACE_ID::internal::ParseTable schema[1] + static const ::google::protobuf::internal::ParseTable schema[1] PROTOBUF_SECTION_VARIABLE(protodesc_cold); - static const ::PROTOBUF_NAMESPACE_ID::internal::FieldMetadata field_metadata[]; - static const ::PROTOBUF_NAMESPACE_ID::internal::SerializationTable serialization_table[]; - static const ::PROTOBUF_NAMESPACE_ID::uint32 offsets[]; + static const ::google::protobuf::internal::FieldMetadata field_metadata[]; + static const ::google::protobuf::internal::SerializationTable serialization_table[]; + static const ::google::protobuf::uint32 offsets[]; }; -extern AGONES_EXPORT const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_google_2fapi_2fannotations_2eproto; -PROTOBUF_NAMESPACE_OPEN -PROTOBUF_NAMESPACE_CLOSE +void AGONES_EXPORT AddDescriptors_google_2fapi_2fannotations_2eproto(); +namespace google { +namespace protobuf { +} // namespace protobuf +} // namespace google namespace google { namespace api { @@ -80,8 +76,8 @@ namespace api { // =================================================================== static const int kHttpFieldNumber = 72295728; -AGONES_EXPORT extern ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier< ::google::protobuf::MethodOptions, - ::PROTOBUF_NAMESPACE_ID::internal::MessageTypeTraits< ::google::api::HttpRule >, 11, false > +AGONES_EXPORT extern ::google::protobuf::internal::ExtensionIdentifier< ::google::protobuf::MethodOptions, + ::google::protobuf::internal::MessageTypeTraits< ::google::api::HttpRule >, 11, false > http; // =================================================================== @@ -102,4 +98,4 @@ AGONES_EXPORT extern ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier< ::g // @@protoc_insertion_point(global_scope) #include -#endif // GOOGLE_PROTOBUF_INCLUDED_GOOGLE_PROTOBUF_INCLUDED_google_2fapi_2fannotations_2eproto +#endif // PROTOBUF_INCLUDED_google_2fapi_2fannotations_2eproto diff --git a/sdks/cpp/include/google/api/http.pb.h b/sdks/cpp/include/google/api/http.pb.h index 2858639d3c..96ac5f5800 100644 --- a/sdks/cpp/include/google/api/http.pb.h +++ b/sdks/cpp/include/google/api/http.pb.h @@ -16,19 +16,19 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/api/http.proto -#ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fapi_2fhttp_2eproto -#define GOOGLE_PROTOBUF_INCLUDED_google_2fapi_2fhttp_2eproto +#ifndef PROTOBUF_INCLUDED_google_2fapi_2fhttp_2eproto +#define PROTOBUF_INCLUDED_google_2fapi_2fhttp_2eproto #include #include #include -#if PROTOBUF_VERSION < 3010000 +#if PROTOBUF_VERSION < 3007000 #error This file was generated by a newer version of protoc which is #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3010001 < PROTOBUF_MIN_PROTOC_VERSION +#if 3007000 < PROTOBUF_MIN_PROTOC_VERSION #error This file was generated by an older version of protoc which is #error incompatible with your Protocol Buffer headers. Please #error regenerate this file with a newer version of protoc. @@ -42,7 +42,6 @@ #include #include #include -#include #include #include // IWYU pragma: export #include // IWYU pragma: export @@ -50,25 +49,20 @@ // @@protoc_insertion_point(includes) #include #define PROTOBUF_INTERNAL_EXPORT_google_2fapi_2fhttp_2eproto AGONES_EXPORT -PROTOBUF_NAMESPACE_OPEN -namespace internal { -class AnyMetadata; -} // namespace internal -PROTOBUF_NAMESPACE_CLOSE // Internal implementation detail -- do not use these members. struct AGONES_EXPORT TableStruct_google_2fapi_2fhttp_2eproto { - static const ::PROTOBUF_NAMESPACE_ID::internal::ParseTableField entries[] + static const ::google::protobuf::internal::ParseTableField entries[] PROTOBUF_SECTION_VARIABLE(protodesc_cold); - static const ::PROTOBUF_NAMESPACE_ID::internal::AuxillaryParseTableField aux[] + static const ::google::protobuf::internal::AuxillaryParseTableField aux[] PROTOBUF_SECTION_VARIABLE(protodesc_cold); - static const ::PROTOBUF_NAMESPACE_ID::internal::ParseTable schema[3] + static const ::google::protobuf::internal::ParseTable schema[3] PROTOBUF_SECTION_VARIABLE(protodesc_cold); - static const ::PROTOBUF_NAMESPACE_ID::internal::FieldMetadata field_metadata[]; - static const ::PROTOBUF_NAMESPACE_ID::internal::SerializationTable serialization_table[]; - static const ::PROTOBUF_NAMESPACE_ID::uint32 offsets[]; + static const ::google::protobuf::internal::FieldMetadata field_metadata[]; + static const ::google::protobuf::internal::SerializationTable serialization_table[]; + static const ::google::protobuf::uint32 offsets[]; }; -extern AGONES_EXPORT const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_google_2fapi_2fhttp_2eproto; +void AGONES_EXPORT AddDescriptors_google_2fapi_2fhttp_2eproto(); namespace google { namespace api { class CustomHttpPattern; @@ -81,33 +75,35 @@ class HttpRule; class HttpRuleDefaultTypeInternal; AGONES_EXPORT extern HttpRuleDefaultTypeInternal _HttpRule_default_instance_; } // namespace api -} // namespace google -PROTOBUF_NAMESPACE_OPEN +namespace protobuf { template<> AGONES_EXPORT ::google::api::CustomHttpPattern* Arena::CreateMaybeMessage<::google::api::CustomHttpPattern>(Arena*); template<> AGONES_EXPORT ::google::api::Http* Arena::CreateMaybeMessage<::google::api::Http>(Arena*); template<> AGONES_EXPORT ::google::api::HttpRule* Arena::CreateMaybeMessage<::google::api::HttpRule>(Arena*); -PROTOBUF_NAMESPACE_CLOSE +} // namespace protobuf +} // namespace google namespace google { namespace api { // =================================================================== -class AGONES_EXPORT Http : - public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.api.Http) */ { +class AGONES_EXPORT Http final : + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.api.Http) */ { public: Http(); virtual ~Http(); Http(const Http& from); - Http(Http&& from) noexcept - : Http() { - *this = ::std::move(from); - } inline Http& operator=(const Http& from) { CopyFrom(from); return *this; } + #if LANG_CXX11 + Http(Http&& from) noexcept + : Http() { + *this = ::std::move(from); + } + inline Http& operator=(Http&& from) noexcept { if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) { if (this != &from) InternalSwap(&from); @@ -116,21 +112,15 @@ class AGONES_EXPORT Http : } return *this; } - - inline ::PROTOBUF_NAMESPACE_ID::Arena* GetArena() const final { + #endif + inline ::google::protobuf::Arena* GetArena() const final { return GetArenaNoVirtual(); } inline void* GetMaybeArenaPointer() const final { return MaybeArenaPtr(); } - static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { - return GetDescriptor(); - } - static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { - return GetMetadataStatic().descriptor; - } - static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { - return GetMetadataStatic().reflection; + static const ::google::protobuf::Descriptor* descriptor() { + return default_instance().GetDescriptor(); } static const Http& default_instance(); @@ -142,22 +132,11 @@ class AGONES_EXPORT Http : static constexpr int kIndexInFileMessages = 0; + void UnsafeArenaSwap(Http* other); + void Swap(Http* other); friend void swap(Http& a, Http& b) { a.Swap(&b); } - inline void Swap(Http* other) { - if (other == this) return; - if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) { - InternalSwap(other); - } else { - ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); - } - } - void UnsafeArenaSwap(Http* other) { - if (other == this) return; - GOOGLE_DCHECK(GetArenaNoVirtual() == other->GetArenaNoVirtual()); - InternalSwap(other); - } // implements Message ---------------------------------------------- @@ -165,38 +144,42 @@ class AGONES_EXPORT Http : return CreateMaybeMessage(nullptr); } - Http* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { + Http* New(::google::protobuf::Arena* arena) const final { return CreateMaybeMessage(arena); } - void CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final; - void MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final; + void CopyFrom(const ::google::protobuf::Message& from) final; + void MergeFrom(const ::google::protobuf::Message& from) final; void CopyFrom(const Http& from); void MergeFrom(const Http& from); PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; size_t ByteSizeLong() const final; - const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - ::PROTOBUF_NAMESPACE_ID::uint8* InternalSerializeWithCachedSizesToArray( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); + ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } + #else + bool MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) final; + #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + void SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const final; + ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(Http* other); - friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; - static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { - return "google.api.Http"; - } protected: - explicit Http(::PROTOBUF_NAMESPACE_ID::Arena* arena); + explicit Http(::google::protobuf::Arena* arena); private: static void ArenaDtor(void* object); - inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena); + inline void RegisterArenaDtor(::google::protobuf::Arena* arena); private: - inline ::PROTOBUF_NAMESPACE_ID::Arena* GetArenaNoVirtual() const { + inline ::google::protobuf::Arena* GetArenaNoVirtual() const { return _internal_metadata_.arena(); } inline void* MaybeArenaPtr() const { @@ -204,81 +187,63 @@ class AGONES_EXPORT Http : } public: - ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; - private: - static ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadataStatic() { - ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&::descriptor_table_google_2fapi_2fhttp_2eproto); - return ::descriptor_table_google_2fapi_2fhttp_2eproto.file_level_metadata[kIndexInFileMessages]; - } - - public: + ::google::protobuf::Metadata GetMetadata() const final; // nested types ---------------------------------------------------- // accessors ------------------------------------------------------- - enum : int { - kRulesFieldNumber = 1, - kFullyDecodeReservedExpansionFieldNumber = 2, - }; // repeated .google.api.HttpRule rules = 1; int rules_size() const; - private: - int _internal_rules_size() const; - public: void clear_rules(); + static const int kRulesFieldNumber = 1; ::google::api::HttpRule* mutable_rules(int index); - ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::google::api::HttpRule >* + ::google::protobuf::RepeatedPtrField< ::google::api::HttpRule >* mutable_rules(); - private: - const ::google::api::HttpRule& _internal_rules(int index) const; - ::google::api::HttpRule* _internal_add_rules(); - public: const ::google::api::HttpRule& rules(int index) const; ::google::api::HttpRule* add_rules(); - const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::google::api::HttpRule >& + const ::google::protobuf::RepeatedPtrField< ::google::api::HttpRule >& rules() const; // bool fully_decode_reserved_expansion = 2; void clear_fully_decode_reserved_expansion(); + static const int kFullyDecodeReservedExpansionFieldNumber = 2; bool fully_decode_reserved_expansion() const; void set_fully_decode_reserved_expansion(bool value); - private: - bool _internal_fully_decode_reserved_expansion() const; - void _internal_set_fully_decode_reserved_expansion(bool value); - public: // @@protoc_insertion_point(class_scope:google.api.Http) private: - class _Internal; + class HasBitSetters; - ::PROTOBUF_NAMESPACE_ID::internal::InternalMetadataWithArena _internal_metadata_; - template friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; + ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; + template friend class ::google::protobuf::Arena::InternalHelper; typedef void InternalArenaConstructable_; typedef void DestructorSkippable_; - ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::google::api::HttpRule > rules_; + ::google::protobuf::RepeatedPtrField< ::google::api::HttpRule > rules_; bool fully_decode_reserved_expansion_; - mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + mutable ::google::protobuf::internal::CachedSize _cached_size_; friend struct ::TableStruct_google_2fapi_2fhttp_2eproto; }; // ------------------------------------------------------------------- -class AGONES_EXPORT HttpRule : - public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.api.HttpRule) */ { +class AGONES_EXPORT HttpRule final : + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.api.HttpRule) */ { public: HttpRule(); virtual ~HttpRule(); HttpRule(const HttpRule& from); - HttpRule(HttpRule&& from) noexcept - : HttpRule() { - *this = ::std::move(from); - } inline HttpRule& operator=(const HttpRule& from) { CopyFrom(from); return *this; } + #if LANG_CXX11 + HttpRule(HttpRule&& from) noexcept + : HttpRule() { + *this = ::std::move(from); + } + inline HttpRule& operator=(HttpRule&& from) noexcept { if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) { if (this != &from) InternalSwap(&from); @@ -287,21 +252,15 @@ class AGONES_EXPORT HttpRule : } return *this; } - - inline ::PROTOBUF_NAMESPACE_ID::Arena* GetArena() const final { + #endif + inline ::google::protobuf::Arena* GetArena() const final { return GetArenaNoVirtual(); } inline void* GetMaybeArenaPointer() const final { return MaybeArenaPtr(); } - static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { - return GetDescriptor(); - } - static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { - return GetMetadataStatic().descriptor; - } - static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { - return GetMetadataStatic().reflection; + static const ::google::protobuf::Descriptor* descriptor() { + return default_instance().GetDescriptor(); } static const HttpRule& default_instance(); @@ -323,22 +282,11 @@ class AGONES_EXPORT HttpRule : static constexpr int kIndexInFileMessages = 1; + void UnsafeArenaSwap(HttpRule* other); + void Swap(HttpRule* other); friend void swap(HttpRule& a, HttpRule& b) { a.Swap(&b); } - inline void Swap(HttpRule* other) { - if (other == this) return; - if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) { - InternalSwap(other); - } else { - ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); - } - } - void UnsafeArenaSwap(HttpRule* other) { - if (other == this) return; - GOOGLE_DCHECK(GetArenaNoVirtual() == other->GetArenaNoVirtual()); - InternalSwap(other); - } // implements Message ---------------------------------------------- @@ -346,38 +294,42 @@ class AGONES_EXPORT HttpRule : return CreateMaybeMessage(nullptr); } - HttpRule* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { + HttpRule* New(::google::protobuf::Arena* arena) const final { return CreateMaybeMessage(arena); } - void CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final; - void MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final; + void CopyFrom(const ::google::protobuf::Message& from) final; + void MergeFrom(const ::google::protobuf::Message& from) final; void CopyFrom(const HttpRule& from); void MergeFrom(const HttpRule& from); PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; size_t ByteSizeLong() const final; - const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - ::PROTOBUF_NAMESPACE_ID::uint8* InternalSerializeWithCachedSizesToArray( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); + ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } + #else + bool MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) final; + #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + void SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const final; + ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(HttpRule* other); - friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; - static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { - return "google.api.HttpRule"; - } protected: - explicit HttpRule(::PROTOBUF_NAMESPACE_ID::Arena* arena); + explicit HttpRule(::google::protobuf::Arena* arena); private: static void ArenaDtor(void* object); - inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena); + inline void RegisterArenaDtor(::google::protobuf::Arena* arena); private: - inline ::PROTOBUF_NAMESPACE_ID::Arena* GetArenaNoVirtual() const { + inline ::google::protobuf::Arena* GetArenaNoVirtual() const { return _internal_metadata_.arena(); } inline void* MaybeArenaPtr() const { @@ -385,278 +337,231 @@ class AGONES_EXPORT HttpRule : } public: - ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; - private: - static ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadataStatic() { - ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&::descriptor_table_google_2fapi_2fhttp_2eproto); - return ::descriptor_table_google_2fapi_2fhttp_2eproto.file_level_metadata[kIndexInFileMessages]; - } - - public: + ::google::protobuf::Metadata GetMetadata() const final; // nested types ---------------------------------------------------- // accessors ------------------------------------------------------- - enum : int { - kAdditionalBindingsFieldNumber = 11, - kSelectorFieldNumber = 1, - kBodyFieldNumber = 7, - kResponseBodyFieldNumber = 12, - kGetFieldNumber = 2, - kPutFieldNumber = 3, - kPostFieldNumber = 4, - kDeleteFieldNumber = 5, - kPatchFieldNumber = 6, - kCustomFieldNumber = 8, - }; // repeated .google.api.HttpRule additional_bindings = 11; int additional_bindings_size() const; - private: - int _internal_additional_bindings_size() const; - public: void clear_additional_bindings(); + static const int kAdditionalBindingsFieldNumber = 11; ::google::api::HttpRule* mutable_additional_bindings(int index); - ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::google::api::HttpRule >* + ::google::protobuf::RepeatedPtrField< ::google::api::HttpRule >* mutable_additional_bindings(); - private: - const ::google::api::HttpRule& _internal_additional_bindings(int index) const; - ::google::api::HttpRule* _internal_add_additional_bindings(); - public: const ::google::api::HttpRule& additional_bindings(int index) const; ::google::api::HttpRule* add_additional_bindings(); - const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::google::api::HttpRule >& + const ::google::protobuf::RepeatedPtrField< ::google::api::HttpRule >& additional_bindings() const; // string selector = 1; void clear_selector(); - const std::string& selector() const; - void set_selector(const std::string& value); - void set_selector(std::string&& value); + static const int kSelectorFieldNumber = 1; + const ::std::string& selector() const; + void set_selector(const ::std::string& value); + #if LANG_CXX11 + void set_selector(::std::string&& value); + #endif void set_selector(const char* value); void set_selector(const char* value, size_t size); - std::string* mutable_selector(); - std::string* release_selector(); - void set_allocated_selector(std::string* selector); + ::std::string* mutable_selector(); + ::std::string* release_selector(); + void set_allocated_selector(::std::string* selector); GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") - std::string* unsafe_arena_release_selector(); + ::std::string* unsafe_arena_release_selector(); GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") void unsafe_arena_set_allocated_selector( - std::string* selector); - private: - const std::string& _internal_selector() const; - void _internal_set_selector(const std::string& value); - std::string* _internal_mutable_selector(); - public: + ::std::string* selector); // string body = 7; void clear_body(); - const std::string& body() const; - void set_body(const std::string& value); - void set_body(std::string&& value); + static const int kBodyFieldNumber = 7; + const ::std::string& body() const; + void set_body(const ::std::string& value); + #if LANG_CXX11 + void set_body(::std::string&& value); + #endif void set_body(const char* value); void set_body(const char* value, size_t size); - std::string* mutable_body(); - std::string* release_body(); - void set_allocated_body(std::string* body); + ::std::string* mutable_body(); + ::std::string* release_body(); + void set_allocated_body(::std::string* body); GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") - std::string* unsafe_arena_release_body(); + ::std::string* unsafe_arena_release_body(); GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") void unsafe_arena_set_allocated_body( - std::string* body); - private: - const std::string& _internal_body() const; - void _internal_set_body(const std::string& value); - std::string* _internal_mutable_body(); - public: + ::std::string* body); // string response_body = 12; void clear_response_body(); - const std::string& response_body() const; - void set_response_body(const std::string& value); - void set_response_body(std::string&& value); + static const int kResponseBodyFieldNumber = 12; + const ::std::string& response_body() const; + void set_response_body(const ::std::string& value); + #if LANG_CXX11 + void set_response_body(::std::string&& value); + #endif void set_response_body(const char* value); void set_response_body(const char* value, size_t size); - std::string* mutable_response_body(); - std::string* release_response_body(); - void set_allocated_response_body(std::string* response_body); + ::std::string* mutable_response_body(); + ::std::string* release_response_body(); + void set_allocated_response_body(::std::string* response_body); GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") - std::string* unsafe_arena_release_response_body(); + ::std::string* unsafe_arena_release_response_body(); GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") void unsafe_arena_set_allocated_response_body( - std::string* response_body); - private: - const std::string& _internal_response_body() const; - void _internal_set_response_body(const std::string& value); - std::string* _internal_mutable_response_body(); - public: + ::std::string* response_body); // string get = 2; private: - bool _internal_has_get() const; + bool has_get() const; public: void clear_get(); - const std::string& get() const; - void set_get(const std::string& value); - void set_get(std::string&& value); + static const int kGetFieldNumber = 2; + const ::std::string& get() const; + void set_get(const ::std::string& value); + #if LANG_CXX11 + void set_get(::std::string&& value); + #endif void set_get(const char* value); void set_get(const char* value, size_t size); - std::string* mutable_get(); - std::string* release_get(); - void set_allocated_get(std::string* get); + ::std::string* mutable_get(); + ::std::string* release_get(); + void set_allocated_get(::std::string* get); GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") - std::string* unsafe_arena_release_get(); + ::std::string* unsafe_arena_release_get(); GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") void unsafe_arena_set_allocated_get( - std::string* get); - private: - const std::string& _internal_get() const; - void _internal_set_get(const std::string& value); - std::string* _internal_mutable_get(); - public: + ::std::string* get); // string put = 3; private: - bool _internal_has_put() const; + bool has_put() const; public: void clear_put(); - const std::string& put() const; - void set_put(const std::string& value); - void set_put(std::string&& value); + static const int kPutFieldNumber = 3; + const ::std::string& put() const; + void set_put(const ::std::string& value); + #if LANG_CXX11 + void set_put(::std::string&& value); + #endif void set_put(const char* value); void set_put(const char* value, size_t size); - std::string* mutable_put(); - std::string* release_put(); - void set_allocated_put(std::string* put); + ::std::string* mutable_put(); + ::std::string* release_put(); + void set_allocated_put(::std::string* put); GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") - std::string* unsafe_arena_release_put(); + ::std::string* unsafe_arena_release_put(); GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") void unsafe_arena_set_allocated_put( - std::string* put); - private: - const std::string& _internal_put() const; - void _internal_set_put(const std::string& value); - std::string* _internal_mutable_put(); - public: + ::std::string* put); // string post = 4; private: - bool _internal_has_post() const; + bool has_post() const; public: void clear_post(); - const std::string& post() const; - void set_post(const std::string& value); - void set_post(std::string&& value); + static const int kPostFieldNumber = 4; + const ::std::string& post() const; + void set_post(const ::std::string& value); + #if LANG_CXX11 + void set_post(::std::string&& value); + #endif void set_post(const char* value); void set_post(const char* value, size_t size); - std::string* mutable_post(); - std::string* release_post(); - void set_allocated_post(std::string* post); + ::std::string* mutable_post(); + ::std::string* release_post(); + void set_allocated_post(::std::string* post); GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") - std::string* unsafe_arena_release_post(); + ::std::string* unsafe_arena_release_post(); GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") void unsafe_arena_set_allocated_post( - std::string* post); - private: - const std::string& _internal_post() const; - void _internal_set_post(const std::string& value); - std::string* _internal_mutable_post(); - public: + ::std::string* post); // string delete = 5; private: - bool _internal_has_delete_() const; + bool has_delete_() const; public: void clear_delete_(); - const std::string& delete_() const; - void set_delete_(const std::string& value); - void set_delete_(std::string&& value); + static const int kDeleteFieldNumber = 5; + const ::std::string& delete_() const; + void set_delete_(const ::std::string& value); + #if LANG_CXX11 + void set_delete_(::std::string&& value); + #endif void set_delete_(const char* value); void set_delete_(const char* value, size_t size); - std::string* mutable_delete_(); - std::string* release_delete_(); - void set_allocated_delete_(std::string* delete_); + ::std::string* mutable_delete_(); + ::std::string* release_delete_(); + void set_allocated_delete_(::std::string* delete_); GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") - std::string* unsafe_arena_release_delete_(); + ::std::string* unsafe_arena_release_delete_(); GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") void unsafe_arena_set_allocated_delete_( - std::string* delete_); - private: - const std::string& _internal_delete_() const; - void _internal_set_delete_(const std::string& value); - std::string* _internal_mutable_delete_(); - public: + ::std::string* delete_); // string patch = 6; private: - bool _internal_has_patch() const; + bool has_patch() const; public: void clear_patch(); - const std::string& patch() const; - void set_patch(const std::string& value); - void set_patch(std::string&& value); + static const int kPatchFieldNumber = 6; + const ::std::string& patch() const; + void set_patch(const ::std::string& value); + #if LANG_CXX11 + void set_patch(::std::string&& value); + #endif void set_patch(const char* value); void set_patch(const char* value, size_t size); - std::string* mutable_patch(); - std::string* release_patch(); - void set_allocated_patch(std::string* patch); + ::std::string* mutable_patch(); + ::std::string* release_patch(); + void set_allocated_patch(::std::string* patch); GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") - std::string* unsafe_arena_release_patch(); + ::std::string* unsafe_arena_release_patch(); GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") void unsafe_arena_set_allocated_patch( - std::string* patch); - private: - const std::string& _internal_patch() const; - void _internal_set_patch(const std::string& value); - std::string* _internal_mutable_patch(); - public: + ::std::string* patch); // .google.api.CustomHttpPattern custom = 8; bool has_custom() const; - private: - bool _internal_has_custom() const; - public: void clear_custom(); + static const int kCustomFieldNumber = 8; const ::google::api::CustomHttpPattern& custom() const; ::google::api::CustomHttpPattern* release_custom(); ::google::api::CustomHttpPattern* mutable_custom(); void set_allocated_custom(::google::api::CustomHttpPattern* custom); - private: - const ::google::api::CustomHttpPattern& _internal_custom() const; - ::google::api::CustomHttpPattern* _internal_mutable_custom(); - public: void unsafe_arena_set_allocated_custom( ::google::api::CustomHttpPattern* custom); ::google::api::CustomHttpPattern* unsafe_arena_release_custom(); @@ -665,7 +570,7 @@ class AGONES_EXPORT HttpRule : PatternCase pattern_case() const; // @@protoc_insertion_point(class_scope:google.api.HttpRule) private: - class _Internal; + class HasBitSetters; void set_has_get(); void set_has_put(); void set_has_post(); @@ -676,46 +581,48 @@ class AGONES_EXPORT HttpRule : inline bool has_pattern() const; inline void clear_has_pattern(); - ::PROTOBUF_NAMESPACE_ID::internal::InternalMetadataWithArena _internal_metadata_; - template friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; + ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; + template friend class ::google::protobuf::Arena::InternalHelper; typedef void InternalArenaConstructable_; typedef void DestructorSkippable_; - ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::google::api::HttpRule > additional_bindings_; - ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr selector_; - ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr body_; - ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr response_body_; + ::google::protobuf::RepeatedPtrField< ::google::api::HttpRule > additional_bindings_; + ::google::protobuf::internal::ArenaStringPtr selector_; + ::google::protobuf::internal::ArenaStringPtr body_; + ::google::protobuf::internal::ArenaStringPtr response_body_; union PatternUnion { PatternUnion() {} - ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr get_; - ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr put_; - ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr post_; - ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr delete__; - ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr patch_; + ::google::protobuf::internal::ArenaStringPtr get_; + ::google::protobuf::internal::ArenaStringPtr put_; + ::google::protobuf::internal::ArenaStringPtr post_; + ::google::protobuf::internal::ArenaStringPtr delete__; + ::google::protobuf::internal::ArenaStringPtr patch_; ::google::api::CustomHttpPattern* custom_; } pattern_; - mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; - ::PROTOBUF_NAMESPACE_ID::uint32 _oneof_case_[1]; + mutable ::google::protobuf::internal::CachedSize _cached_size_; + ::google::protobuf::uint32 _oneof_case_[1]; friend struct ::TableStruct_google_2fapi_2fhttp_2eproto; }; // ------------------------------------------------------------------- -class AGONES_EXPORT CustomHttpPattern : - public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.api.CustomHttpPattern) */ { +class AGONES_EXPORT CustomHttpPattern final : + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.api.CustomHttpPattern) */ { public: CustomHttpPattern(); virtual ~CustomHttpPattern(); CustomHttpPattern(const CustomHttpPattern& from); - CustomHttpPattern(CustomHttpPattern&& from) noexcept - : CustomHttpPattern() { - *this = ::std::move(from); - } inline CustomHttpPattern& operator=(const CustomHttpPattern& from) { CopyFrom(from); return *this; } + #if LANG_CXX11 + CustomHttpPattern(CustomHttpPattern&& from) noexcept + : CustomHttpPattern() { + *this = ::std::move(from); + } + inline CustomHttpPattern& operator=(CustomHttpPattern&& from) noexcept { if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) { if (this != &from) InternalSwap(&from); @@ -724,21 +631,15 @@ class AGONES_EXPORT CustomHttpPattern : } return *this; } - - inline ::PROTOBUF_NAMESPACE_ID::Arena* GetArena() const final { + #endif + inline ::google::protobuf::Arena* GetArena() const final { return GetArenaNoVirtual(); } inline void* GetMaybeArenaPointer() const final { return MaybeArenaPtr(); } - static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { - return GetDescriptor(); - } - static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { - return GetMetadataStatic().descriptor; - } - static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { - return GetMetadataStatic().reflection; + static const ::google::protobuf::Descriptor* descriptor() { + return default_instance().GetDescriptor(); } static const CustomHttpPattern& default_instance(); @@ -750,22 +651,11 @@ class AGONES_EXPORT CustomHttpPattern : static constexpr int kIndexInFileMessages = 2; + void UnsafeArenaSwap(CustomHttpPattern* other); + void Swap(CustomHttpPattern* other); friend void swap(CustomHttpPattern& a, CustomHttpPattern& b) { a.Swap(&b); } - inline void Swap(CustomHttpPattern* other) { - if (other == this) return; - if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) { - InternalSwap(other); - } else { - ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); - } - } - void UnsafeArenaSwap(CustomHttpPattern* other) { - if (other == this) return; - GOOGLE_DCHECK(GetArenaNoVirtual() == other->GetArenaNoVirtual()); - InternalSwap(other); - } // implements Message ---------------------------------------------- @@ -773,38 +663,42 @@ class AGONES_EXPORT CustomHttpPattern : return CreateMaybeMessage(nullptr); } - CustomHttpPattern* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final { + CustomHttpPattern* New(::google::protobuf::Arena* arena) const final { return CreateMaybeMessage(arena); } - void CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final; - void MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final; + void CopyFrom(const ::google::protobuf::Message& from) final; + void MergeFrom(const ::google::protobuf::Message& from) final; void CopyFrom(const CustomHttpPattern& from); void MergeFrom(const CustomHttpPattern& from); PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; size_t ByteSizeLong() const final; - const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - ::PROTOBUF_NAMESPACE_ID::uint8* InternalSerializeWithCachedSizesToArray( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); + ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; } + #else + bool MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) final; + #endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + void SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const final; + ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const final; int GetCachedSize() const final { return _cached_size_.Get(); } private: - inline void SharedCtor(); - inline void SharedDtor(); + void SharedCtor(); + void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(CustomHttpPattern* other); - friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; - static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { - return "google.api.CustomHttpPattern"; - } protected: - explicit CustomHttpPattern(::PROTOBUF_NAMESPACE_ID::Arena* arena); + explicit CustomHttpPattern(::google::protobuf::Arena* arena); private: static void ArenaDtor(void* object); - inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena); + inline void RegisterArenaDtor(::google::protobuf::Arena* arena); private: - inline ::PROTOBUF_NAMESPACE_ID::Arena* GetArenaNoVirtual() const { + inline ::google::protobuf::Arena* GetArenaNoVirtual() const { return _internal_metadata_.arena(); } inline void* MaybeArenaPtr() const { @@ -812,84 +706,69 @@ class AGONES_EXPORT CustomHttpPattern : } public: - ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; - private: - static ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadataStatic() { - ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&::descriptor_table_google_2fapi_2fhttp_2eproto); - return ::descriptor_table_google_2fapi_2fhttp_2eproto.file_level_metadata[kIndexInFileMessages]; - } - - public: + ::google::protobuf::Metadata GetMetadata() const final; // nested types ---------------------------------------------------- // accessors ------------------------------------------------------- - enum : int { - kKindFieldNumber = 1, - kPathFieldNumber = 2, - }; // string kind = 1; void clear_kind(); - const std::string& kind() const; - void set_kind(const std::string& value); - void set_kind(std::string&& value); + static const int kKindFieldNumber = 1; + const ::std::string& kind() const; + void set_kind(const ::std::string& value); + #if LANG_CXX11 + void set_kind(::std::string&& value); + #endif void set_kind(const char* value); void set_kind(const char* value, size_t size); - std::string* mutable_kind(); - std::string* release_kind(); - void set_allocated_kind(std::string* kind); + ::std::string* mutable_kind(); + ::std::string* release_kind(); + void set_allocated_kind(::std::string* kind); GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") - std::string* unsafe_arena_release_kind(); + ::std::string* unsafe_arena_release_kind(); GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") void unsafe_arena_set_allocated_kind( - std::string* kind); - private: - const std::string& _internal_kind() const; - void _internal_set_kind(const std::string& value); - std::string* _internal_mutable_kind(); - public: + ::std::string* kind); // string path = 2; void clear_path(); - const std::string& path() const; - void set_path(const std::string& value); - void set_path(std::string&& value); + static const int kPathFieldNumber = 2; + const ::std::string& path() const; + void set_path(const ::std::string& value); + #if LANG_CXX11 + void set_path(::std::string&& value); + #endif void set_path(const char* value); void set_path(const char* value, size_t size); - std::string* mutable_path(); - std::string* release_path(); - void set_allocated_path(std::string* path); + ::std::string* mutable_path(); + ::std::string* release_path(); + void set_allocated_path(::std::string* path); GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") - std::string* unsafe_arena_release_path(); + ::std::string* unsafe_arena_release_path(); GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for" " string fields are deprecated and will be removed in a" " future release.") void unsafe_arena_set_allocated_path( - std::string* path); - private: - const std::string& _internal_path() const; - void _internal_set_path(const std::string& value); - std::string* _internal_mutable_path(); - public: + ::std::string* path); // @@protoc_insertion_point(class_scope:google.api.CustomHttpPattern) private: - class _Internal; + class HasBitSetters; - ::PROTOBUF_NAMESPACE_ID::internal::InternalMetadataWithArena _internal_metadata_; - template friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; + ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; + template friend class ::google::protobuf::Arena::InternalHelper; typedef void InternalArenaConstructable_; typedef void DestructorSkippable_; - ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr kind_; - ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr path_; - mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + ::google::protobuf::internal::ArenaStringPtr kind_; + ::google::protobuf::internal::ArenaStringPtr path_; + mutable ::google::protobuf::internal::CachedSize _cached_size_; friend struct ::TableStruct_google_2fapi_2fhttp_2eproto; }; // =================================================================== @@ -904,11 +783,8 @@ class AGONES_EXPORT CustomHttpPattern : // Http // repeated .google.api.HttpRule rules = 1; -inline int Http::_internal_rules_size() const { - return rules_.size(); -} inline int Http::rules_size() const { - return _internal_rules_size(); + return rules_.size(); } inline void Http::clear_rules() { rules_.Clear(); @@ -917,26 +793,20 @@ inline ::google::api::HttpRule* Http::mutable_rules(int index) { // @@protoc_insertion_point(field_mutable:google.api.Http.rules) return rules_.Mutable(index); } -inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::google::api::HttpRule >* +inline ::google::protobuf::RepeatedPtrField< ::google::api::HttpRule >* Http::mutable_rules() { // @@protoc_insertion_point(field_mutable_list:google.api.Http.rules) return &rules_; } -inline const ::google::api::HttpRule& Http::_internal_rules(int index) const { - return rules_.Get(index); -} inline const ::google::api::HttpRule& Http::rules(int index) const { // @@protoc_insertion_point(field_get:google.api.Http.rules) - return _internal_rules(index); -} -inline ::google::api::HttpRule* Http::_internal_add_rules() { - return rules_.Add(); + return rules_.Get(index); } inline ::google::api::HttpRule* Http::add_rules() { // @@protoc_insertion_point(field_add:google.api.Http.rules) - return _internal_add_rules(); + return rules_.Add(); } -inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::google::api::HttpRule >& +inline const ::google::protobuf::RepeatedPtrField< ::google::api::HttpRule >& Http::rules() const { // @@protoc_insertion_point(field_list:google.api.Http.rules) return rules_; @@ -946,19 +816,13 @@ Http::rules() const { inline void Http::clear_fully_decode_reserved_expansion() { fully_decode_reserved_expansion_ = false; } -inline bool Http::_internal_fully_decode_reserved_expansion() const { - return fully_decode_reserved_expansion_; -} inline bool Http::fully_decode_reserved_expansion() const { // @@protoc_insertion_point(field_get:google.api.Http.fully_decode_reserved_expansion) - return _internal_fully_decode_reserved_expansion(); + return fully_decode_reserved_expansion_; } -inline void Http::_internal_set_fully_decode_reserved_expansion(bool value) { +inline void Http::set_fully_decode_reserved_expansion(bool value) { fully_decode_reserved_expansion_ = value; -} -inline void Http::set_fully_decode_reserved_expansion(bool value) { - _internal_set_fully_decode_reserved_expansion(value); // @@protoc_insertion_point(field_set:google.api.Http.fully_decode_reserved_expansion) } @@ -968,182 +832,168 @@ inline void Http::set_fully_decode_reserved_expansion(bool value) { // string selector = 1; inline void HttpRule::clear_selector() { - selector_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + selector_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } -inline const std::string& HttpRule::selector() const { +inline const ::std::string& HttpRule::selector() const { // @@protoc_insertion_point(field_get:google.api.HttpRule.selector) - return _internal_selector(); -} -inline void HttpRule::set_selector(const std::string& value) { - _internal_set_selector(value); - // @@protoc_insertion_point(field_set:google.api.HttpRule.selector) -} -inline std::string* HttpRule::mutable_selector() { - // @@protoc_insertion_point(field_mutable:google.api.HttpRule.selector) - return _internal_mutable_selector(); -} -inline const std::string& HttpRule::_internal_selector() const { return selector_.Get(); } -inline void HttpRule::_internal_set_selector(const std::string& value) { +inline void HttpRule::set_selector(const ::std::string& value) { - selector_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual()); + selector_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual()); + // @@protoc_insertion_point(field_set:google.api.HttpRule.selector) } -inline void HttpRule::set_selector(std::string&& value) { +#if LANG_CXX11 +inline void HttpRule::set_selector(::std::string&& value) { selector_.Set( - &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArenaNoVirtual()); + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_rvalue:google.api.HttpRule.selector) } +#endif inline void HttpRule::set_selector(const char* value) { GOOGLE_DCHECK(value != nullptr); - selector_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value), + selector_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_char:google.api.HttpRule.selector) } inline void HttpRule::set_selector(const char* value, size_t size) { - selector_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string( + selector_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string( reinterpret_cast(value), size), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_pointer:google.api.HttpRule.selector) } -inline std::string* HttpRule::_internal_mutable_selector() { +inline ::std::string* HttpRule::mutable_selector() { - return selector_.Mutable(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + // @@protoc_insertion_point(field_mutable:google.api.HttpRule.selector) + return selector_.Mutable(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } -inline std::string* HttpRule::release_selector() { +inline ::std::string* HttpRule::release_selector() { // @@protoc_insertion_point(field_release:google.api.HttpRule.selector) - return selector_.Release(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + return selector_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } -inline void HttpRule::set_allocated_selector(std::string* selector) { +inline void HttpRule::set_allocated_selector(::std::string* selector) { if (selector != nullptr) { } else { } - selector_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), selector, + selector_.SetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), selector, GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_allocated:google.api.HttpRule.selector) } -inline std::string* HttpRule::unsafe_arena_release_selector() { +inline ::std::string* HttpRule::unsafe_arena_release_selector() { // @@protoc_insertion_point(field_unsafe_arena_release:google.api.HttpRule.selector) GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); - return selector_.UnsafeArenaRelease(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + return selector_.UnsafeArenaRelease(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } inline void HttpRule::unsafe_arena_set_allocated_selector( - std::string* selector) { + ::std::string* selector) { GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); if (selector != nullptr) { } else { } - selector_.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + selector_.UnsafeArenaSetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), selector, GetArenaNoVirtual()); // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.api.HttpRule.selector) } // string get = 2; -inline bool HttpRule::_internal_has_get() const { +inline bool HttpRule::has_get() const { return pattern_case() == kGet; } inline void HttpRule::set_has_get() { _oneof_case_[0] = kGet; } inline void HttpRule::clear_get() { - if (_internal_has_get()) { - pattern_.get_.Destroy(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + if (has_get()) { + pattern_.get_.Destroy(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); clear_has_pattern(); } } -inline const std::string& HttpRule::get() const { +inline const ::std::string& HttpRule::get() const { // @@protoc_insertion_point(field_get:google.api.HttpRule.get) - return _internal_get(); -} -inline void HttpRule::set_get(const std::string& value) { - _internal_set_get(value); - // @@protoc_insertion_point(field_set:google.api.HttpRule.get) -} -inline std::string* HttpRule::mutable_get() { - // @@protoc_insertion_point(field_mutable:google.api.HttpRule.get) - return _internal_mutable_get(); -} -inline const std::string& HttpRule::_internal_get() const { - if (_internal_has_get()) { + if (has_get()) { return pattern_.get_.Get(); } - return *&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(); + return *&::google::protobuf::internal::GetEmptyStringAlreadyInited(); } -inline void HttpRule::_internal_set_get(const std::string& value) { - if (!_internal_has_get()) { +inline void HttpRule::set_get(const ::std::string& value) { + if (!has_get()) { clear_pattern(); set_has_get(); - pattern_.get_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + pattern_.get_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - pattern_.get_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value, + pattern_.get_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual()); + // @@protoc_insertion_point(field_set:google.api.HttpRule.get) } -inline void HttpRule::set_get(std::string&& value) { +#if LANG_CXX11 +inline void HttpRule::set_get(::std::string&& value) { // @@protoc_insertion_point(field_set:google.api.HttpRule.get) - if (!_internal_has_get()) { + if (!has_get()) { clear_pattern(); set_has_get(); - pattern_.get_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + pattern_.get_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } pattern_.get_.Set( - &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArenaNoVirtual()); + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_rvalue:google.api.HttpRule.get) } +#endif inline void HttpRule::set_get(const char* value) { GOOGLE_DCHECK(value != nullptr); - if (!_internal_has_get()) { + if (!has_get()) { clear_pattern(); set_has_get(); - pattern_.get_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + pattern_.get_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - pattern_.get_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + pattern_.get_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_char:google.api.HttpRule.get) } inline void HttpRule::set_get(const char* value, size_t size) { - if (!_internal_has_get()) { + if (!has_get()) { clear_pattern(); set_has_get(); - pattern_.get_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + pattern_.get_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } pattern_.get_.Set( - &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string( reinterpret_cast(value), size), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_pointer:google.api.HttpRule.get) } -inline std::string* HttpRule::_internal_mutable_get() { - if (!_internal_has_get()) { +inline ::std::string* HttpRule::mutable_get() { + if (!has_get()) { clear_pattern(); set_has_get(); - pattern_.get_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + pattern_.get_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - return pattern_.get_.Mutable(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + return pattern_.get_.Mutable(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + // @@protoc_insertion_point(field_mutable:google.api.HttpRule.get) } -inline std::string* HttpRule::release_get() { +inline ::std::string* HttpRule::release_get() { // @@protoc_insertion_point(field_release:google.api.HttpRule.get) - if (_internal_has_get()) { + if (has_get()) { clear_has_pattern(); - return pattern_.get_.Release(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + return pattern_.get_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } else { return nullptr; } } -inline void HttpRule::set_allocated_get(std::string* get) { +inline void HttpRule::set_allocated_get(::std::string* get) { if (has_pattern()) { clear_pattern(); } @@ -1153,126 +1003,119 @@ inline void HttpRule::set_allocated_get(std::string* get) { } // @@protoc_insertion_point(field_set_allocated:google.api.HttpRule.get) } -inline std::string* HttpRule::unsafe_arena_release_get() { +inline ::std::string* HttpRule::unsafe_arena_release_get() { // @@protoc_insertion_point(field_unsafe_arena_release:google.api.HttpRule.get) GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); - if (_internal_has_get()) { + if (has_get()) { clear_has_pattern(); return pattern_.get_.UnsafeArenaRelease( - &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } else { return nullptr; } } -inline void HttpRule::unsafe_arena_set_allocated_get(std::string* get) { +inline void HttpRule::unsafe_arena_set_allocated_get(::std::string* get) { GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); - if (!_internal_has_get()) { - pattern_.get_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + if (!has_get()) { + pattern_.get_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } clear_pattern(); if (get) { set_has_get(); - pattern_.get_.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), get, GetArenaNoVirtual()); + pattern_.get_.UnsafeArenaSetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), get, GetArenaNoVirtual()); } // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.api.HttpRule.get) } // string put = 3; -inline bool HttpRule::_internal_has_put() const { +inline bool HttpRule::has_put() const { return pattern_case() == kPut; } inline void HttpRule::set_has_put() { _oneof_case_[0] = kPut; } inline void HttpRule::clear_put() { - if (_internal_has_put()) { - pattern_.put_.Destroy(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + if (has_put()) { + pattern_.put_.Destroy(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); clear_has_pattern(); } } -inline const std::string& HttpRule::put() const { +inline const ::std::string& HttpRule::put() const { // @@protoc_insertion_point(field_get:google.api.HttpRule.put) - return _internal_put(); -} -inline void HttpRule::set_put(const std::string& value) { - _internal_set_put(value); - // @@protoc_insertion_point(field_set:google.api.HttpRule.put) -} -inline std::string* HttpRule::mutable_put() { - // @@protoc_insertion_point(field_mutable:google.api.HttpRule.put) - return _internal_mutable_put(); -} -inline const std::string& HttpRule::_internal_put() const { - if (_internal_has_put()) { + if (has_put()) { return pattern_.put_.Get(); } - return *&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(); + return *&::google::protobuf::internal::GetEmptyStringAlreadyInited(); } -inline void HttpRule::_internal_set_put(const std::string& value) { - if (!_internal_has_put()) { +inline void HttpRule::set_put(const ::std::string& value) { + if (!has_put()) { clear_pattern(); set_has_put(); - pattern_.put_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + pattern_.put_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - pattern_.put_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value, + pattern_.put_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual()); + // @@protoc_insertion_point(field_set:google.api.HttpRule.put) } -inline void HttpRule::set_put(std::string&& value) { +#if LANG_CXX11 +inline void HttpRule::set_put(::std::string&& value) { // @@protoc_insertion_point(field_set:google.api.HttpRule.put) - if (!_internal_has_put()) { + if (!has_put()) { clear_pattern(); set_has_put(); - pattern_.put_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + pattern_.put_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } pattern_.put_.Set( - &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArenaNoVirtual()); + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_rvalue:google.api.HttpRule.put) } +#endif inline void HttpRule::set_put(const char* value) { GOOGLE_DCHECK(value != nullptr); - if (!_internal_has_put()) { + if (!has_put()) { clear_pattern(); set_has_put(); - pattern_.put_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + pattern_.put_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - pattern_.put_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + pattern_.put_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_char:google.api.HttpRule.put) } inline void HttpRule::set_put(const char* value, size_t size) { - if (!_internal_has_put()) { + if (!has_put()) { clear_pattern(); set_has_put(); - pattern_.put_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + pattern_.put_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } pattern_.put_.Set( - &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string( reinterpret_cast(value), size), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_pointer:google.api.HttpRule.put) } -inline std::string* HttpRule::_internal_mutable_put() { - if (!_internal_has_put()) { +inline ::std::string* HttpRule::mutable_put() { + if (!has_put()) { clear_pattern(); set_has_put(); - pattern_.put_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + pattern_.put_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - return pattern_.put_.Mutable(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + return pattern_.put_.Mutable(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + // @@protoc_insertion_point(field_mutable:google.api.HttpRule.put) } -inline std::string* HttpRule::release_put() { +inline ::std::string* HttpRule::release_put() { // @@protoc_insertion_point(field_release:google.api.HttpRule.put) - if (_internal_has_put()) { + if (has_put()) { clear_has_pattern(); - return pattern_.put_.Release(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + return pattern_.put_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } else { return nullptr; } } -inline void HttpRule::set_allocated_put(std::string* put) { +inline void HttpRule::set_allocated_put(::std::string* put) { if (has_pattern()) { clear_pattern(); } @@ -1282,126 +1125,119 @@ inline void HttpRule::set_allocated_put(std::string* put) { } // @@protoc_insertion_point(field_set_allocated:google.api.HttpRule.put) } -inline std::string* HttpRule::unsafe_arena_release_put() { +inline ::std::string* HttpRule::unsafe_arena_release_put() { // @@protoc_insertion_point(field_unsafe_arena_release:google.api.HttpRule.put) GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); - if (_internal_has_put()) { + if (has_put()) { clear_has_pattern(); return pattern_.put_.UnsafeArenaRelease( - &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } else { return nullptr; } } -inline void HttpRule::unsafe_arena_set_allocated_put(std::string* put) { +inline void HttpRule::unsafe_arena_set_allocated_put(::std::string* put) { GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); - if (!_internal_has_put()) { - pattern_.put_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + if (!has_put()) { + pattern_.put_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } clear_pattern(); if (put) { set_has_put(); - pattern_.put_.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), put, GetArenaNoVirtual()); + pattern_.put_.UnsafeArenaSetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), put, GetArenaNoVirtual()); } // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.api.HttpRule.put) } // string post = 4; -inline bool HttpRule::_internal_has_post() const { +inline bool HttpRule::has_post() const { return pattern_case() == kPost; } inline void HttpRule::set_has_post() { _oneof_case_[0] = kPost; } inline void HttpRule::clear_post() { - if (_internal_has_post()) { - pattern_.post_.Destroy(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + if (has_post()) { + pattern_.post_.Destroy(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); clear_has_pattern(); } } -inline const std::string& HttpRule::post() const { +inline const ::std::string& HttpRule::post() const { // @@protoc_insertion_point(field_get:google.api.HttpRule.post) - return _internal_post(); -} -inline void HttpRule::set_post(const std::string& value) { - _internal_set_post(value); - // @@protoc_insertion_point(field_set:google.api.HttpRule.post) -} -inline std::string* HttpRule::mutable_post() { - // @@protoc_insertion_point(field_mutable:google.api.HttpRule.post) - return _internal_mutable_post(); -} -inline const std::string& HttpRule::_internal_post() const { - if (_internal_has_post()) { + if (has_post()) { return pattern_.post_.Get(); } - return *&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(); + return *&::google::protobuf::internal::GetEmptyStringAlreadyInited(); } -inline void HttpRule::_internal_set_post(const std::string& value) { - if (!_internal_has_post()) { +inline void HttpRule::set_post(const ::std::string& value) { + if (!has_post()) { clear_pattern(); set_has_post(); - pattern_.post_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + pattern_.post_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - pattern_.post_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value, + pattern_.post_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual()); + // @@protoc_insertion_point(field_set:google.api.HttpRule.post) } -inline void HttpRule::set_post(std::string&& value) { +#if LANG_CXX11 +inline void HttpRule::set_post(::std::string&& value) { // @@protoc_insertion_point(field_set:google.api.HttpRule.post) - if (!_internal_has_post()) { + if (!has_post()) { clear_pattern(); set_has_post(); - pattern_.post_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + pattern_.post_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } pattern_.post_.Set( - &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArenaNoVirtual()); + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_rvalue:google.api.HttpRule.post) } +#endif inline void HttpRule::set_post(const char* value) { GOOGLE_DCHECK(value != nullptr); - if (!_internal_has_post()) { + if (!has_post()) { clear_pattern(); set_has_post(); - pattern_.post_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + pattern_.post_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - pattern_.post_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + pattern_.post_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_char:google.api.HttpRule.post) } inline void HttpRule::set_post(const char* value, size_t size) { - if (!_internal_has_post()) { + if (!has_post()) { clear_pattern(); set_has_post(); - pattern_.post_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + pattern_.post_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } pattern_.post_.Set( - &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string( reinterpret_cast(value), size), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_pointer:google.api.HttpRule.post) } -inline std::string* HttpRule::_internal_mutable_post() { - if (!_internal_has_post()) { +inline ::std::string* HttpRule::mutable_post() { + if (!has_post()) { clear_pattern(); set_has_post(); - pattern_.post_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + pattern_.post_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - return pattern_.post_.Mutable(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + return pattern_.post_.Mutable(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + // @@protoc_insertion_point(field_mutable:google.api.HttpRule.post) } -inline std::string* HttpRule::release_post() { +inline ::std::string* HttpRule::release_post() { // @@protoc_insertion_point(field_release:google.api.HttpRule.post) - if (_internal_has_post()) { + if (has_post()) { clear_has_pattern(); - return pattern_.post_.Release(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + return pattern_.post_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } else { return nullptr; } } -inline void HttpRule::set_allocated_post(std::string* post) { +inline void HttpRule::set_allocated_post(::std::string* post) { if (has_pattern()) { clear_pattern(); } @@ -1411,126 +1247,119 @@ inline void HttpRule::set_allocated_post(std::string* post) { } // @@protoc_insertion_point(field_set_allocated:google.api.HttpRule.post) } -inline std::string* HttpRule::unsafe_arena_release_post() { +inline ::std::string* HttpRule::unsafe_arena_release_post() { // @@protoc_insertion_point(field_unsafe_arena_release:google.api.HttpRule.post) GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); - if (_internal_has_post()) { + if (has_post()) { clear_has_pattern(); return pattern_.post_.UnsafeArenaRelease( - &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } else { return nullptr; } } -inline void HttpRule::unsafe_arena_set_allocated_post(std::string* post) { +inline void HttpRule::unsafe_arena_set_allocated_post(::std::string* post) { GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); - if (!_internal_has_post()) { - pattern_.post_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + if (!has_post()) { + pattern_.post_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } clear_pattern(); if (post) { set_has_post(); - pattern_.post_.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), post, GetArenaNoVirtual()); + pattern_.post_.UnsafeArenaSetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), post, GetArenaNoVirtual()); } // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.api.HttpRule.post) } // string delete = 5; -inline bool HttpRule::_internal_has_delete_() const { +inline bool HttpRule::has_delete_() const { return pattern_case() == kDelete; } inline void HttpRule::set_has_delete_() { _oneof_case_[0] = kDelete; } inline void HttpRule::clear_delete_() { - if (_internal_has_delete_()) { - pattern_.delete__.Destroy(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + if (has_delete_()) { + pattern_.delete__.Destroy(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); clear_has_pattern(); } } -inline const std::string& HttpRule::delete_() const { +inline const ::std::string& HttpRule::delete_() const { // @@protoc_insertion_point(field_get:google.api.HttpRule.delete) - return _internal_delete_(); -} -inline void HttpRule::set_delete_(const std::string& value) { - _internal_set_delete_(value); - // @@protoc_insertion_point(field_set:google.api.HttpRule.delete) -} -inline std::string* HttpRule::mutable_delete_() { - // @@protoc_insertion_point(field_mutable:google.api.HttpRule.delete) - return _internal_mutable_delete_(); -} -inline const std::string& HttpRule::_internal_delete_() const { - if (_internal_has_delete_()) { + if (has_delete_()) { return pattern_.delete__.Get(); } - return *&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(); + return *&::google::protobuf::internal::GetEmptyStringAlreadyInited(); } -inline void HttpRule::_internal_set_delete_(const std::string& value) { - if (!_internal_has_delete_()) { +inline void HttpRule::set_delete_(const ::std::string& value) { + if (!has_delete_()) { clear_pattern(); set_has_delete_(); - pattern_.delete__.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + pattern_.delete__.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - pattern_.delete__.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value, + pattern_.delete__.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual()); + // @@protoc_insertion_point(field_set:google.api.HttpRule.delete) } -inline void HttpRule::set_delete_(std::string&& value) { +#if LANG_CXX11 +inline void HttpRule::set_delete_(::std::string&& value) { // @@protoc_insertion_point(field_set:google.api.HttpRule.delete) - if (!_internal_has_delete_()) { + if (!has_delete_()) { clear_pattern(); set_has_delete_(); - pattern_.delete__.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + pattern_.delete__.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } pattern_.delete__.Set( - &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArenaNoVirtual()); + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_rvalue:google.api.HttpRule.delete) } +#endif inline void HttpRule::set_delete_(const char* value) { GOOGLE_DCHECK(value != nullptr); - if (!_internal_has_delete_()) { + if (!has_delete_()) { clear_pattern(); set_has_delete_(); - pattern_.delete__.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + pattern_.delete__.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - pattern_.delete__.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + pattern_.delete__.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_char:google.api.HttpRule.delete) } inline void HttpRule::set_delete_(const char* value, size_t size) { - if (!_internal_has_delete_()) { + if (!has_delete_()) { clear_pattern(); set_has_delete_(); - pattern_.delete__.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + pattern_.delete__.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } pattern_.delete__.Set( - &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string( reinterpret_cast(value), size), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_pointer:google.api.HttpRule.delete) } -inline std::string* HttpRule::_internal_mutable_delete_() { - if (!_internal_has_delete_()) { +inline ::std::string* HttpRule::mutable_delete_() { + if (!has_delete_()) { clear_pattern(); set_has_delete_(); - pattern_.delete__.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + pattern_.delete__.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - return pattern_.delete__.Mutable(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + return pattern_.delete__.Mutable(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + // @@protoc_insertion_point(field_mutable:google.api.HttpRule.delete) } -inline std::string* HttpRule::release_delete_() { +inline ::std::string* HttpRule::release_delete_() { // @@protoc_insertion_point(field_release:google.api.HttpRule.delete) - if (_internal_has_delete_()) { + if (has_delete_()) { clear_has_pattern(); - return pattern_.delete__.Release(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + return pattern_.delete__.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } else { return nullptr; } } -inline void HttpRule::set_allocated_delete_(std::string* delete_) { +inline void HttpRule::set_allocated_delete_(::std::string* delete_) { if (has_pattern()) { clear_pattern(); } @@ -1540,126 +1369,119 @@ inline void HttpRule::set_allocated_delete_(std::string* delete_) { } // @@protoc_insertion_point(field_set_allocated:google.api.HttpRule.delete) } -inline std::string* HttpRule::unsafe_arena_release_delete_() { +inline ::std::string* HttpRule::unsafe_arena_release_delete_() { // @@protoc_insertion_point(field_unsafe_arena_release:google.api.HttpRule.delete) GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); - if (_internal_has_delete_()) { + if (has_delete_()) { clear_has_pattern(); return pattern_.delete__.UnsafeArenaRelease( - &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } else { return nullptr; } } -inline void HttpRule::unsafe_arena_set_allocated_delete_(std::string* delete_) { +inline void HttpRule::unsafe_arena_set_allocated_delete_(::std::string* delete_) { GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); - if (!_internal_has_delete_()) { - pattern_.delete__.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + if (!has_delete_()) { + pattern_.delete__.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } clear_pattern(); if (delete_) { set_has_delete_(); - pattern_.delete__.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), delete_, GetArenaNoVirtual()); + pattern_.delete__.UnsafeArenaSetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), delete_, GetArenaNoVirtual()); } // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.api.HttpRule.delete) } // string patch = 6; -inline bool HttpRule::_internal_has_patch() const { +inline bool HttpRule::has_patch() const { return pattern_case() == kPatch; } inline void HttpRule::set_has_patch() { _oneof_case_[0] = kPatch; } inline void HttpRule::clear_patch() { - if (_internal_has_patch()) { - pattern_.patch_.Destroy(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + if (has_patch()) { + pattern_.patch_.Destroy(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); clear_has_pattern(); } } -inline const std::string& HttpRule::patch() const { +inline const ::std::string& HttpRule::patch() const { // @@protoc_insertion_point(field_get:google.api.HttpRule.patch) - return _internal_patch(); -} -inline void HttpRule::set_patch(const std::string& value) { - _internal_set_patch(value); - // @@protoc_insertion_point(field_set:google.api.HttpRule.patch) -} -inline std::string* HttpRule::mutable_patch() { - // @@protoc_insertion_point(field_mutable:google.api.HttpRule.patch) - return _internal_mutable_patch(); -} -inline const std::string& HttpRule::_internal_patch() const { - if (_internal_has_patch()) { + if (has_patch()) { return pattern_.patch_.Get(); } - return *&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(); + return *&::google::protobuf::internal::GetEmptyStringAlreadyInited(); } -inline void HttpRule::_internal_set_patch(const std::string& value) { - if (!_internal_has_patch()) { +inline void HttpRule::set_patch(const ::std::string& value) { + if (!has_patch()) { clear_pattern(); set_has_patch(); - pattern_.patch_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + pattern_.patch_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - pattern_.patch_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value, + pattern_.patch_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual()); + // @@protoc_insertion_point(field_set:google.api.HttpRule.patch) } -inline void HttpRule::set_patch(std::string&& value) { +#if LANG_CXX11 +inline void HttpRule::set_patch(::std::string&& value) { // @@protoc_insertion_point(field_set:google.api.HttpRule.patch) - if (!_internal_has_patch()) { + if (!has_patch()) { clear_pattern(); set_has_patch(); - pattern_.patch_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + pattern_.patch_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } pattern_.patch_.Set( - &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArenaNoVirtual()); + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_rvalue:google.api.HttpRule.patch) } +#endif inline void HttpRule::set_patch(const char* value) { GOOGLE_DCHECK(value != nullptr); - if (!_internal_has_patch()) { + if (!has_patch()) { clear_pattern(); set_has_patch(); - pattern_.patch_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + pattern_.patch_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - pattern_.patch_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + pattern_.patch_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_char:google.api.HttpRule.patch) } inline void HttpRule::set_patch(const char* value, size_t size) { - if (!_internal_has_patch()) { + if (!has_patch()) { clear_pattern(); set_has_patch(); - pattern_.patch_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + pattern_.patch_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } pattern_.patch_.Set( - &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string( reinterpret_cast(value), size), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_pointer:google.api.HttpRule.patch) } -inline std::string* HttpRule::_internal_mutable_patch() { - if (!_internal_has_patch()) { +inline ::std::string* HttpRule::mutable_patch() { + if (!has_patch()) { clear_pattern(); set_has_patch(); - pattern_.patch_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + pattern_.patch_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - return pattern_.patch_.Mutable(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + return pattern_.patch_.Mutable(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + // @@protoc_insertion_point(field_mutable:google.api.HttpRule.patch) } -inline std::string* HttpRule::release_patch() { +inline ::std::string* HttpRule::release_patch() { // @@protoc_insertion_point(field_release:google.api.HttpRule.patch) - if (_internal_has_patch()) { + if (has_patch()) { clear_has_pattern(); - return pattern_.patch_.Release(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + return pattern_.patch_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } else { return nullptr; } } -inline void HttpRule::set_allocated_patch(std::string* patch) { +inline void HttpRule::set_allocated_patch(::std::string* patch) { if (has_pattern()) { clear_pattern(); } @@ -1669,42 +1491,39 @@ inline void HttpRule::set_allocated_patch(std::string* patch) { } // @@protoc_insertion_point(field_set_allocated:google.api.HttpRule.patch) } -inline std::string* HttpRule::unsafe_arena_release_patch() { +inline ::std::string* HttpRule::unsafe_arena_release_patch() { // @@protoc_insertion_point(field_unsafe_arena_release:google.api.HttpRule.patch) GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); - if (_internal_has_patch()) { + if (has_patch()) { clear_has_pattern(); return pattern_.patch_.UnsafeArenaRelease( - &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } else { return nullptr; } } -inline void HttpRule::unsafe_arena_set_allocated_patch(std::string* patch) { +inline void HttpRule::unsafe_arena_set_allocated_patch(::std::string* patch) { GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); - if (!_internal_has_patch()) { - pattern_.patch_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + if (!has_patch()) { + pattern_.patch_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } clear_pattern(); if (patch) { set_has_patch(); - pattern_.patch_.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), patch, GetArenaNoVirtual()); + pattern_.patch_.UnsafeArenaSetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), patch, GetArenaNoVirtual()); } // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.api.HttpRule.patch) } // .google.api.CustomHttpPattern custom = 8; -inline bool HttpRule::_internal_has_custom() const { - return pattern_case() == kCustom; -} inline bool HttpRule::has_custom() const { - return _internal_has_custom(); + return pattern_case() == kCustom; } inline void HttpRule::set_has_custom() { _oneof_case_[0] = kCustom; } inline void HttpRule::clear_custom() { - if (_internal_has_custom()) { + if (has_custom()) { if (GetArenaNoVirtual() == nullptr) { delete pattern_.custom_; } @@ -1717,7 +1536,7 @@ inline ::google::api::CustomHttpPattern* HttpRule::release_custom() { clear_has_pattern(); ::google::api::CustomHttpPattern* temp = pattern_.custom_; if (GetArenaNoVirtual() != nullptr) { - temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); + temp = ::google::protobuf::internal::DuplicateIfNonNull(temp); } pattern_.custom_ = nullptr; return temp; @@ -1725,14 +1544,11 @@ inline ::google::api::CustomHttpPattern* HttpRule::release_custom() { return nullptr; } } -inline const ::google::api::CustomHttpPattern& HttpRule::_internal_custom() const { - return _internal_has_custom() - ? *pattern_.custom_ - : *reinterpret_cast< ::google::api::CustomHttpPattern*>(&::google::api::_CustomHttpPattern_default_instance_); -} inline const ::google::api::CustomHttpPattern& HttpRule::custom() const { // @@protoc_insertion_point(field_get:google.api.HttpRule.custom) - return _internal_custom(); + return has_custom() + ? *pattern_.custom_ + : *reinterpret_cast< ::google::api::CustomHttpPattern*>(&::google::api::_CustomHttpPattern_default_instance_); } inline ::google::api::CustomHttpPattern* HttpRule::unsafe_arena_release_custom() { // @@protoc_insertion_point(field_unsafe_arena_release:google.api.HttpRule.custom) @@ -1753,190 +1569,170 @@ inline void HttpRule::unsafe_arena_set_allocated_custom(::google::api::CustomHtt } // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.api.HttpRule.custom) } -inline ::google::api::CustomHttpPattern* HttpRule::_internal_mutable_custom() { - if (!_internal_has_custom()) { +inline ::google::api::CustomHttpPattern* HttpRule::mutable_custom() { + if (!has_custom()) { clear_pattern(); set_has_custom(); pattern_.custom_ = CreateMaybeMessage< ::google::api::CustomHttpPattern >( GetArenaNoVirtual()); } - return pattern_.custom_; -} -inline ::google::api::CustomHttpPattern* HttpRule::mutable_custom() { // @@protoc_insertion_point(field_mutable:google.api.HttpRule.custom) - return _internal_mutable_custom(); + return pattern_.custom_; } // string body = 7; inline void HttpRule::clear_body() { - body_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + body_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } -inline const std::string& HttpRule::body() const { +inline const ::std::string& HttpRule::body() const { // @@protoc_insertion_point(field_get:google.api.HttpRule.body) - return _internal_body(); -} -inline void HttpRule::set_body(const std::string& value) { - _internal_set_body(value); - // @@protoc_insertion_point(field_set:google.api.HttpRule.body) -} -inline std::string* HttpRule::mutable_body() { - // @@protoc_insertion_point(field_mutable:google.api.HttpRule.body) - return _internal_mutable_body(); -} -inline const std::string& HttpRule::_internal_body() const { return body_.Get(); } -inline void HttpRule::_internal_set_body(const std::string& value) { +inline void HttpRule::set_body(const ::std::string& value) { - body_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual()); + body_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual()); + // @@protoc_insertion_point(field_set:google.api.HttpRule.body) } -inline void HttpRule::set_body(std::string&& value) { +#if LANG_CXX11 +inline void HttpRule::set_body(::std::string&& value) { body_.Set( - &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArenaNoVirtual()); + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_rvalue:google.api.HttpRule.body) } +#endif inline void HttpRule::set_body(const char* value) { GOOGLE_DCHECK(value != nullptr); - body_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value), + body_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_char:google.api.HttpRule.body) } inline void HttpRule::set_body(const char* value, size_t size) { - body_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string( + body_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string( reinterpret_cast(value), size), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_pointer:google.api.HttpRule.body) } -inline std::string* HttpRule::_internal_mutable_body() { +inline ::std::string* HttpRule::mutable_body() { - return body_.Mutable(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + // @@protoc_insertion_point(field_mutable:google.api.HttpRule.body) + return body_.Mutable(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } -inline std::string* HttpRule::release_body() { +inline ::std::string* HttpRule::release_body() { // @@protoc_insertion_point(field_release:google.api.HttpRule.body) - return body_.Release(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + return body_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } -inline void HttpRule::set_allocated_body(std::string* body) { +inline void HttpRule::set_allocated_body(::std::string* body) { if (body != nullptr) { } else { } - body_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), body, + body_.SetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), body, GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_allocated:google.api.HttpRule.body) } -inline std::string* HttpRule::unsafe_arena_release_body() { +inline ::std::string* HttpRule::unsafe_arena_release_body() { // @@protoc_insertion_point(field_unsafe_arena_release:google.api.HttpRule.body) GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); - return body_.UnsafeArenaRelease(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + return body_.UnsafeArenaRelease(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } inline void HttpRule::unsafe_arena_set_allocated_body( - std::string* body) { + ::std::string* body) { GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); if (body != nullptr) { } else { } - body_.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + body_.UnsafeArenaSetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), body, GetArenaNoVirtual()); // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.api.HttpRule.body) } // string response_body = 12; inline void HttpRule::clear_response_body() { - response_body_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + response_body_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } -inline const std::string& HttpRule::response_body() const { +inline const ::std::string& HttpRule::response_body() const { // @@protoc_insertion_point(field_get:google.api.HttpRule.response_body) - return _internal_response_body(); -} -inline void HttpRule::set_response_body(const std::string& value) { - _internal_set_response_body(value); - // @@protoc_insertion_point(field_set:google.api.HttpRule.response_body) -} -inline std::string* HttpRule::mutable_response_body() { - // @@protoc_insertion_point(field_mutable:google.api.HttpRule.response_body) - return _internal_mutable_response_body(); -} -inline const std::string& HttpRule::_internal_response_body() const { return response_body_.Get(); } -inline void HttpRule::_internal_set_response_body(const std::string& value) { +inline void HttpRule::set_response_body(const ::std::string& value) { - response_body_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual()); + response_body_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual()); + // @@protoc_insertion_point(field_set:google.api.HttpRule.response_body) } -inline void HttpRule::set_response_body(std::string&& value) { +#if LANG_CXX11 +inline void HttpRule::set_response_body(::std::string&& value) { response_body_.Set( - &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArenaNoVirtual()); + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_rvalue:google.api.HttpRule.response_body) } +#endif inline void HttpRule::set_response_body(const char* value) { GOOGLE_DCHECK(value != nullptr); - response_body_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value), + response_body_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_char:google.api.HttpRule.response_body) } inline void HttpRule::set_response_body(const char* value, size_t size) { - response_body_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string( + response_body_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string( reinterpret_cast(value), size), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_pointer:google.api.HttpRule.response_body) } -inline std::string* HttpRule::_internal_mutable_response_body() { +inline ::std::string* HttpRule::mutable_response_body() { - return response_body_.Mutable(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + // @@protoc_insertion_point(field_mutable:google.api.HttpRule.response_body) + return response_body_.Mutable(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } -inline std::string* HttpRule::release_response_body() { +inline ::std::string* HttpRule::release_response_body() { // @@protoc_insertion_point(field_release:google.api.HttpRule.response_body) - return response_body_.Release(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + return response_body_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } -inline void HttpRule::set_allocated_response_body(std::string* response_body) { +inline void HttpRule::set_allocated_response_body(::std::string* response_body) { if (response_body != nullptr) { } else { } - response_body_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), response_body, + response_body_.SetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), response_body, GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_allocated:google.api.HttpRule.response_body) } -inline std::string* HttpRule::unsafe_arena_release_response_body() { +inline ::std::string* HttpRule::unsafe_arena_release_response_body() { // @@protoc_insertion_point(field_unsafe_arena_release:google.api.HttpRule.response_body) GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); - return response_body_.UnsafeArenaRelease(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + return response_body_.UnsafeArenaRelease(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } inline void HttpRule::unsafe_arena_set_allocated_response_body( - std::string* response_body) { + ::std::string* response_body) { GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); if (response_body != nullptr) { } else { } - response_body_.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + response_body_.UnsafeArenaSetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), response_body, GetArenaNoVirtual()); // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.api.HttpRule.response_body) } // repeated .google.api.HttpRule additional_bindings = 11; -inline int HttpRule::_internal_additional_bindings_size() const { - return additional_bindings_.size(); -} inline int HttpRule::additional_bindings_size() const { - return _internal_additional_bindings_size(); + return additional_bindings_.size(); } inline void HttpRule::clear_additional_bindings() { additional_bindings_.Clear(); @@ -1945,26 +1741,20 @@ inline ::google::api::HttpRule* HttpRule::mutable_additional_bindings(int index) // @@protoc_insertion_point(field_mutable:google.api.HttpRule.additional_bindings) return additional_bindings_.Mutable(index); } -inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::google::api::HttpRule >* +inline ::google::protobuf::RepeatedPtrField< ::google::api::HttpRule >* HttpRule::mutable_additional_bindings() { // @@protoc_insertion_point(field_mutable_list:google.api.HttpRule.additional_bindings) return &additional_bindings_; } -inline const ::google::api::HttpRule& HttpRule::_internal_additional_bindings(int index) const { - return additional_bindings_.Get(index); -} inline const ::google::api::HttpRule& HttpRule::additional_bindings(int index) const { // @@protoc_insertion_point(field_get:google.api.HttpRule.additional_bindings) - return _internal_additional_bindings(index); -} -inline ::google::api::HttpRule* HttpRule::_internal_add_additional_bindings() { - return additional_bindings_.Add(); + return additional_bindings_.Get(index); } inline ::google::api::HttpRule* HttpRule::add_additional_bindings() { // @@protoc_insertion_point(field_add:google.api.HttpRule.additional_bindings) - return _internal_add_additional_bindings(); + return additional_bindings_.Add(); } -inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::google::api::HttpRule >& +inline const ::google::protobuf::RepeatedPtrField< ::google::api::HttpRule >& HttpRule::additional_bindings() const { // @@protoc_insertion_point(field_list:google.api.HttpRule.additional_bindings) return additional_bindings_; @@ -1985,164 +1775,150 @@ inline HttpRule::PatternCase HttpRule::pattern_case() const { // string kind = 1; inline void CustomHttpPattern::clear_kind() { - kind_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + kind_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } -inline const std::string& CustomHttpPattern::kind() const { +inline const ::std::string& CustomHttpPattern::kind() const { // @@protoc_insertion_point(field_get:google.api.CustomHttpPattern.kind) - return _internal_kind(); -} -inline void CustomHttpPattern::set_kind(const std::string& value) { - _internal_set_kind(value); - // @@protoc_insertion_point(field_set:google.api.CustomHttpPattern.kind) -} -inline std::string* CustomHttpPattern::mutable_kind() { - // @@protoc_insertion_point(field_mutable:google.api.CustomHttpPattern.kind) - return _internal_mutable_kind(); -} -inline const std::string& CustomHttpPattern::_internal_kind() const { return kind_.Get(); } -inline void CustomHttpPattern::_internal_set_kind(const std::string& value) { +inline void CustomHttpPattern::set_kind(const ::std::string& value) { - kind_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual()); + kind_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual()); + // @@protoc_insertion_point(field_set:google.api.CustomHttpPattern.kind) } -inline void CustomHttpPattern::set_kind(std::string&& value) { +#if LANG_CXX11 +inline void CustomHttpPattern::set_kind(::std::string&& value) { kind_.Set( - &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArenaNoVirtual()); + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_rvalue:google.api.CustomHttpPattern.kind) } +#endif inline void CustomHttpPattern::set_kind(const char* value) { GOOGLE_DCHECK(value != nullptr); - kind_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value), + kind_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_char:google.api.CustomHttpPattern.kind) } inline void CustomHttpPattern::set_kind(const char* value, size_t size) { - kind_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string( + kind_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string( reinterpret_cast(value), size), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_pointer:google.api.CustomHttpPattern.kind) } -inline std::string* CustomHttpPattern::_internal_mutable_kind() { +inline ::std::string* CustomHttpPattern::mutable_kind() { - return kind_.Mutable(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + // @@protoc_insertion_point(field_mutable:google.api.CustomHttpPattern.kind) + return kind_.Mutable(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } -inline std::string* CustomHttpPattern::release_kind() { +inline ::std::string* CustomHttpPattern::release_kind() { // @@protoc_insertion_point(field_release:google.api.CustomHttpPattern.kind) - return kind_.Release(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + return kind_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } -inline void CustomHttpPattern::set_allocated_kind(std::string* kind) { +inline void CustomHttpPattern::set_allocated_kind(::std::string* kind) { if (kind != nullptr) { } else { } - kind_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), kind, + kind_.SetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), kind, GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_allocated:google.api.CustomHttpPattern.kind) } -inline std::string* CustomHttpPattern::unsafe_arena_release_kind() { +inline ::std::string* CustomHttpPattern::unsafe_arena_release_kind() { // @@protoc_insertion_point(field_unsafe_arena_release:google.api.CustomHttpPattern.kind) GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); - return kind_.UnsafeArenaRelease(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + return kind_.UnsafeArenaRelease(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } inline void CustomHttpPattern::unsafe_arena_set_allocated_kind( - std::string* kind) { + ::std::string* kind) { GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); if (kind != nullptr) { } else { } - kind_.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + kind_.UnsafeArenaSetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), kind, GetArenaNoVirtual()); // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.api.CustomHttpPattern.kind) } // string path = 2; inline void CustomHttpPattern::clear_path() { - path_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + path_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } -inline const std::string& CustomHttpPattern::path() const { +inline const ::std::string& CustomHttpPattern::path() const { // @@protoc_insertion_point(field_get:google.api.CustomHttpPattern.path) - return _internal_path(); -} -inline void CustomHttpPattern::set_path(const std::string& value) { - _internal_set_path(value); - // @@protoc_insertion_point(field_set:google.api.CustomHttpPattern.path) -} -inline std::string* CustomHttpPattern::mutable_path() { - // @@protoc_insertion_point(field_mutable:google.api.CustomHttpPattern.path) - return _internal_mutable_path(); -} -inline const std::string& CustomHttpPattern::_internal_path() const { return path_.Get(); } -inline void CustomHttpPattern::_internal_set_path(const std::string& value) { +inline void CustomHttpPattern::set_path(const ::std::string& value) { - path_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual()); + path_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual()); + // @@protoc_insertion_point(field_set:google.api.CustomHttpPattern.path) } -inline void CustomHttpPattern::set_path(std::string&& value) { +#if LANG_CXX11 +inline void CustomHttpPattern::set_path(::std::string&& value) { path_.Set( - &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArenaNoVirtual()); + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_rvalue:google.api.CustomHttpPattern.path) } +#endif inline void CustomHttpPattern::set_path(const char* value) { GOOGLE_DCHECK(value != nullptr); - path_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value), + path_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_char:google.api.CustomHttpPattern.path) } inline void CustomHttpPattern::set_path(const char* value, size_t size) { - path_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string( + path_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string( reinterpret_cast(value), size), GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_pointer:google.api.CustomHttpPattern.path) } -inline std::string* CustomHttpPattern::_internal_mutable_path() { +inline ::std::string* CustomHttpPattern::mutable_path() { - return path_.Mutable(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + // @@protoc_insertion_point(field_mutable:google.api.CustomHttpPattern.path) + return path_.Mutable(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } -inline std::string* CustomHttpPattern::release_path() { +inline ::std::string* CustomHttpPattern::release_path() { // @@protoc_insertion_point(field_release:google.api.CustomHttpPattern.path) - return path_.Release(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + return path_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } -inline void CustomHttpPattern::set_allocated_path(std::string* path) { +inline void CustomHttpPattern::set_allocated_path(::std::string* path) { if (path != nullptr) { } else { } - path_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), path, + path_.SetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), path, GetArenaNoVirtual()); // @@protoc_insertion_point(field_set_allocated:google.api.CustomHttpPattern.path) } -inline std::string* CustomHttpPattern::unsafe_arena_release_path() { +inline ::std::string* CustomHttpPattern::unsafe_arena_release_path() { // @@protoc_insertion_point(field_unsafe_arena_release:google.api.CustomHttpPattern.path) GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); - return path_.UnsafeArenaRelease(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + return path_.UnsafeArenaRelease(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } inline void CustomHttpPattern::unsafe_arena_set_allocated_path( - std::string* path) { + ::std::string* path) { GOOGLE_DCHECK(GetArenaNoVirtual() != nullptr); if (path != nullptr) { } else { } - path_.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + path_.UnsafeArenaSetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), path, GetArenaNoVirtual()); // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.api.CustomHttpPattern.path) } @@ -2163,4 +1939,4 @@ inline void CustomHttpPattern::unsafe_arena_set_allocated_path( // @@protoc_insertion_point(global_scope) #include -#endif // GOOGLE_PROTOBUF_INCLUDED_GOOGLE_PROTOBUF_INCLUDED_google_2fapi_2fhttp_2eproto +#endif // PROTOBUF_INCLUDED_google_2fapi_2fhttp_2eproto diff --git a/sdks/cpp/src/agones/sdk.pb.cc b/sdks/cpp/src/agones/sdk.pb.cc index 9f441bd5b6..f4dff61be6 100644 --- a/sdks/cpp/src/agones/sdk.pb.cc +++ b/sdks/cpp/src/agones/sdk.pb.cc @@ -20,134 +20,117 @@ #include +#include #include #include -#include +#include #include #include #include #include // @@protoc_insertion_point(includes) #include -extern PROTOBUF_INTERNAL_EXPORT_sdk_2eproto ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<2> scc_info_GameServer_ObjectMeta_sdk_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_sdk_2eproto ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<0> scc_info_GameServer_ObjectMeta_AnnotationsEntry_DoNotUse_sdk_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_sdk_2eproto ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<0> scc_info_GameServer_ObjectMeta_LabelsEntry_DoNotUse_sdk_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_sdk_2eproto ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<1> scc_info_GameServer_Spec_sdk_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_sdk_2eproto ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<0> scc_info_GameServer_Spec_Health_sdk_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_sdk_2eproto ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<1> scc_info_GameServer_Status_sdk_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_sdk_2eproto ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<0> scc_info_GameServer_Status_Port_sdk_2eproto; + +extern PROTOBUF_INTERNAL_EXPORT_sdk_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_GameServer_ObjectMeta_AnnotationsEntry_DoNotUse_sdk_2eproto; +extern PROTOBUF_INTERNAL_EXPORT_sdk_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_GameServer_ObjectMeta_LabelsEntry_DoNotUse_sdk_2eproto; +extern PROTOBUF_INTERNAL_EXPORT_sdk_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_GameServer_Spec_Health_sdk_2eproto; +extern PROTOBUF_INTERNAL_EXPORT_sdk_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_GameServer_Status_Port_sdk_2eproto; +extern PROTOBUF_INTERNAL_EXPORT_sdk_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_GameServer_Spec_sdk_2eproto; +extern PROTOBUF_INTERNAL_EXPORT_sdk_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_GameServer_Status_sdk_2eproto; +extern PROTOBUF_INTERNAL_EXPORT_sdk_2eproto ::google::protobuf::internal::SCCInfo<2> scc_info_GameServer_ObjectMeta_sdk_2eproto; namespace agones { namespace dev { namespace sdk { class EmptyDefaultTypeInternal { public: - ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed _instance; + ::google::protobuf::internal::ExplicitlyConstructed _instance; } _Empty_default_instance_; class KeyValueDefaultTypeInternal { public: - ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed _instance; + ::google::protobuf::internal::ExplicitlyConstructed _instance; } _KeyValue_default_instance_; class DurationDefaultTypeInternal { public: - ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed _instance; + ::google::protobuf::internal::ExplicitlyConstructed _instance; } _Duration_default_instance_; class GameServer_ObjectMeta_AnnotationsEntry_DoNotUseDefaultTypeInternal { public: - ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed _instance; + ::google::protobuf::internal::ExplicitlyConstructed _instance; } _GameServer_ObjectMeta_AnnotationsEntry_DoNotUse_default_instance_; class GameServer_ObjectMeta_LabelsEntry_DoNotUseDefaultTypeInternal { public: - ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed _instance; + ::google::protobuf::internal::ExplicitlyConstructed _instance; } _GameServer_ObjectMeta_LabelsEntry_DoNotUse_default_instance_; class GameServer_ObjectMetaDefaultTypeInternal { public: - ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed _instance; + ::google::protobuf::internal::ExplicitlyConstructed _instance; } _GameServer_ObjectMeta_default_instance_; class GameServer_Spec_HealthDefaultTypeInternal { public: - ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed _instance; + ::google::protobuf::internal::ExplicitlyConstructed _instance; } _GameServer_Spec_Health_default_instance_; class GameServer_SpecDefaultTypeInternal { public: - ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed _instance; + ::google::protobuf::internal::ExplicitlyConstructed _instance; } _GameServer_Spec_default_instance_; class GameServer_Status_PortDefaultTypeInternal { public: - ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed _instance; + ::google::protobuf::internal::ExplicitlyConstructed _instance; } _GameServer_Status_Port_default_instance_; class GameServer_StatusDefaultTypeInternal { public: - ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed _instance; + ::google::protobuf::internal::ExplicitlyConstructed _instance; } _GameServer_Status_default_instance_; class GameServerDefaultTypeInternal { public: - ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed _instance; + ::google::protobuf::internal::ExplicitlyConstructed _instance; } _GameServer_default_instance_; } // namespace sdk } // namespace dev } // namespace agones -static void InitDefaultsscc_info_Duration_sdk_2eproto() { - GOOGLE_PROTOBUF_VERIFY_VERSION; - - { - void* ptr = &::agones::dev::sdk::_Duration_default_instance_; - new (ptr) ::agones::dev::sdk::Duration(); - ::PROTOBUF_NAMESPACE_ID::internal::OnShutdownDestroyMessage(ptr); - } - ::agones::dev::sdk::Duration::InitAsDefaultInstance(); -} - -AGONES_EXPORT ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<0> scc_info_Duration_sdk_2eproto = - {{ATOMIC_VAR_INIT(::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase::kUninitialized), 0, 0, InitDefaultsscc_info_Duration_sdk_2eproto}, {}}; - -static void InitDefaultsscc_info_Empty_sdk_2eproto() { +static void InitDefaultsEmpty_sdk_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; { void* ptr = &::agones::dev::sdk::_Empty_default_instance_; new (ptr) ::agones::dev::sdk::Empty(); - ::PROTOBUF_NAMESPACE_ID::internal::OnShutdownDestroyMessage(ptr); + ::google::protobuf::internal::OnShutdownDestroyMessage(ptr); } ::agones::dev::sdk::Empty::InitAsDefaultInstance(); } -AGONES_EXPORT ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<0> scc_info_Empty_sdk_2eproto = - {{ATOMIC_VAR_INIT(::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase::kUninitialized), 0, 0, InitDefaultsscc_info_Empty_sdk_2eproto}, {}}; +AGONES_EXPORT ::google::protobuf::internal::SCCInfo<0> scc_info_Empty_sdk_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsEmpty_sdk_2eproto}, {}}; -static void InitDefaultsscc_info_GameServer_sdk_2eproto() { +static void InitDefaultsKeyValue_sdk_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; { - void* ptr = &::agones::dev::sdk::_GameServer_default_instance_; - new (ptr) ::agones::dev::sdk::GameServer(); - ::PROTOBUF_NAMESPACE_ID::internal::OnShutdownDestroyMessage(ptr); + void* ptr = &::agones::dev::sdk::_KeyValue_default_instance_; + new (ptr) ::agones::dev::sdk::KeyValue(); + ::google::protobuf::internal::OnShutdownDestroyMessage(ptr); } - ::agones::dev::sdk::GameServer::InitAsDefaultInstance(); + ::agones::dev::sdk::KeyValue::InitAsDefaultInstance(); } -AGONES_EXPORT ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<3> scc_info_GameServer_sdk_2eproto = - {{ATOMIC_VAR_INIT(::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase::kUninitialized), 3, 0, InitDefaultsscc_info_GameServer_sdk_2eproto}, { - &scc_info_GameServer_ObjectMeta_sdk_2eproto.base, - &scc_info_GameServer_Spec_sdk_2eproto.base, - &scc_info_GameServer_Status_sdk_2eproto.base,}}; +AGONES_EXPORT ::google::protobuf::internal::SCCInfo<0> scc_info_KeyValue_sdk_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsKeyValue_sdk_2eproto}, {}}; -static void InitDefaultsscc_info_GameServer_ObjectMeta_sdk_2eproto() { +static void InitDefaultsDuration_sdk_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; { - void* ptr = &::agones::dev::sdk::_GameServer_ObjectMeta_default_instance_; - new (ptr) ::agones::dev::sdk::GameServer_ObjectMeta(); - ::PROTOBUF_NAMESPACE_ID::internal::OnShutdownDestroyMessage(ptr); + void* ptr = &::agones::dev::sdk::_Duration_default_instance_; + new (ptr) ::agones::dev::sdk::Duration(); + ::google::protobuf::internal::OnShutdownDestroyMessage(ptr); } - ::agones::dev::sdk::GameServer_ObjectMeta::InitAsDefaultInstance(); + ::agones::dev::sdk::Duration::InitAsDefaultInstance(); } -AGONES_EXPORT ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<2> scc_info_GameServer_ObjectMeta_sdk_2eproto = - {{ATOMIC_VAR_INIT(::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase::kUninitialized), 2, 0, InitDefaultsscc_info_GameServer_ObjectMeta_sdk_2eproto}, { - &scc_info_GameServer_ObjectMeta_AnnotationsEntry_DoNotUse_sdk_2eproto.base, - &scc_info_GameServer_ObjectMeta_LabelsEntry_DoNotUse_sdk_2eproto.base,}}; +AGONES_EXPORT ::google::protobuf::internal::SCCInfo<0> scc_info_Duration_sdk_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsDuration_sdk_2eproto}, {}}; -static void InitDefaultsscc_info_GameServer_ObjectMeta_AnnotationsEntry_DoNotUse_sdk_2eproto() { +static void InitDefaultsGameServer_ObjectMeta_AnnotationsEntry_DoNotUse_sdk_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; { @@ -157,10 +140,10 @@ static void InitDefaultsscc_info_GameServer_ObjectMeta_AnnotationsEntry_DoNotUse ::agones::dev::sdk::GameServer_ObjectMeta_AnnotationsEntry_DoNotUse::InitAsDefaultInstance(); } -AGONES_EXPORT ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<0> scc_info_GameServer_ObjectMeta_AnnotationsEntry_DoNotUse_sdk_2eproto = - {{ATOMIC_VAR_INIT(::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase::kUninitialized), 0, 0, InitDefaultsscc_info_GameServer_ObjectMeta_AnnotationsEntry_DoNotUse_sdk_2eproto}, {}}; +AGONES_EXPORT ::google::protobuf::internal::SCCInfo<0> scc_info_GameServer_ObjectMeta_AnnotationsEntry_DoNotUse_sdk_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsGameServer_ObjectMeta_AnnotationsEntry_DoNotUse_sdk_2eproto}, {}}; -static void InitDefaultsscc_info_GameServer_ObjectMeta_LabelsEntry_DoNotUse_sdk_2eproto() { +static void InitDefaultsGameServer_ObjectMeta_LabelsEntry_DoNotUse_sdk_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; { @@ -170,86 +153,119 @@ static void InitDefaultsscc_info_GameServer_ObjectMeta_LabelsEntry_DoNotUse_sdk_ ::agones::dev::sdk::GameServer_ObjectMeta_LabelsEntry_DoNotUse::InitAsDefaultInstance(); } -AGONES_EXPORT ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<0> scc_info_GameServer_ObjectMeta_LabelsEntry_DoNotUse_sdk_2eproto = - {{ATOMIC_VAR_INIT(::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase::kUninitialized), 0, 0, InitDefaultsscc_info_GameServer_ObjectMeta_LabelsEntry_DoNotUse_sdk_2eproto}, {}}; +AGONES_EXPORT ::google::protobuf::internal::SCCInfo<0> scc_info_GameServer_ObjectMeta_LabelsEntry_DoNotUse_sdk_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsGameServer_ObjectMeta_LabelsEntry_DoNotUse_sdk_2eproto}, {}}; -static void InitDefaultsscc_info_GameServer_Spec_sdk_2eproto() { +static void InitDefaultsGameServer_ObjectMeta_sdk_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; { - void* ptr = &::agones::dev::sdk::_GameServer_Spec_default_instance_; - new (ptr) ::agones::dev::sdk::GameServer_Spec(); - ::PROTOBUF_NAMESPACE_ID::internal::OnShutdownDestroyMessage(ptr); + void* ptr = &::agones::dev::sdk::_GameServer_ObjectMeta_default_instance_; + new (ptr) ::agones::dev::sdk::GameServer_ObjectMeta(); + ::google::protobuf::internal::OnShutdownDestroyMessage(ptr); } - ::agones::dev::sdk::GameServer_Spec::InitAsDefaultInstance(); + ::agones::dev::sdk::GameServer_ObjectMeta::InitAsDefaultInstance(); } -AGONES_EXPORT ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<1> scc_info_GameServer_Spec_sdk_2eproto = - {{ATOMIC_VAR_INIT(::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase::kUninitialized), 1, 0, InitDefaultsscc_info_GameServer_Spec_sdk_2eproto}, { - &scc_info_GameServer_Spec_Health_sdk_2eproto.base,}}; +AGONES_EXPORT ::google::protobuf::internal::SCCInfo<2> scc_info_GameServer_ObjectMeta_sdk_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 2, InitDefaultsGameServer_ObjectMeta_sdk_2eproto}, { + &scc_info_GameServer_ObjectMeta_AnnotationsEntry_DoNotUse_sdk_2eproto.base, + &scc_info_GameServer_ObjectMeta_LabelsEntry_DoNotUse_sdk_2eproto.base,}}; -static void InitDefaultsscc_info_GameServer_Spec_Health_sdk_2eproto() { +static void InitDefaultsGameServer_Spec_Health_sdk_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; { void* ptr = &::agones::dev::sdk::_GameServer_Spec_Health_default_instance_; new (ptr) ::agones::dev::sdk::GameServer_Spec_Health(); - ::PROTOBUF_NAMESPACE_ID::internal::OnShutdownDestroyMessage(ptr); + ::google::protobuf::internal::OnShutdownDestroyMessage(ptr); } ::agones::dev::sdk::GameServer_Spec_Health::InitAsDefaultInstance(); } -AGONES_EXPORT ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<0> scc_info_GameServer_Spec_Health_sdk_2eproto = - {{ATOMIC_VAR_INIT(::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase::kUninitialized), 0, 0, InitDefaultsscc_info_GameServer_Spec_Health_sdk_2eproto}, {}}; +AGONES_EXPORT ::google::protobuf::internal::SCCInfo<0> scc_info_GameServer_Spec_Health_sdk_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsGameServer_Spec_Health_sdk_2eproto}, {}}; -static void InitDefaultsscc_info_GameServer_Status_sdk_2eproto() { +static void InitDefaultsGameServer_Spec_sdk_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; { - void* ptr = &::agones::dev::sdk::_GameServer_Status_default_instance_; - new (ptr) ::agones::dev::sdk::GameServer_Status(); - ::PROTOBUF_NAMESPACE_ID::internal::OnShutdownDestroyMessage(ptr); + void* ptr = &::agones::dev::sdk::_GameServer_Spec_default_instance_; + new (ptr) ::agones::dev::sdk::GameServer_Spec(); + ::google::protobuf::internal::OnShutdownDestroyMessage(ptr); } - ::agones::dev::sdk::GameServer_Status::InitAsDefaultInstance(); + ::agones::dev::sdk::GameServer_Spec::InitAsDefaultInstance(); } -AGONES_EXPORT ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<1> scc_info_GameServer_Status_sdk_2eproto = - {{ATOMIC_VAR_INIT(::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase::kUninitialized), 1, 0, InitDefaultsscc_info_GameServer_Status_sdk_2eproto}, { - &scc_info_GameServer_Status_Port_sdk_2eproto.base,}}; +AGONES_EXPORT ::google::protobuf::internal::SCCInfo<1> scc_info_GameServer_Spec_sdk_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsGameServer_Spec_sdk_2eproto}, { + &scc_info_GameServer_Spec_Health_sdk_2eproto.base,}}; -static void InitDefaultsscc_info_GameServer_Status_Port_sdk_2eproto() { +static void InitDefaultsGameServer_Status_Port_sdk_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; { void* ptr = &::agones::dev::sdk::_GameServer_Status_Port_default_instance_; new (ptr) ::agones::dev::sdk::GameServer_Status_Port(); - ::PROTOBUF_NAMESPACE_ID::internal::OnShutdownDestroyMessage(ptr); + ::google::protobuf::internal::OnShutdownDestroyMessage(ptr); } ::agones::dev::sdk::GameServer_Status_Port::InitAsDefaultInstance(); } -AGONES_EXPORT ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<0> scc_info_GameServer_Status_Port_sdk_2eproto = - {{ATOMIC_VAR_INIT(::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase::kUninitialized), 0, 0, InitDefaultsscc_info_GameServer_Status_Port_sdk_2eproto}, {}}; +AGONES_EXPORT ::google::protobuf::internal::SCCInfo<0> scc_info_GameServer_Status_Port_sdk_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsGameServer_Status_Port_sdk_2eproto}, {}}; -static void InitDefaultsscc_info_KeyValue_sdk_2eproto() { +static void InitDefaultsGameServer_Status_sdk_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; { - void* ptr = &::agones::dev::sdk::_KeyValue_default_instance_; - new (ptr) ::agones::dev::sdk::KeyValue(); - ::PROTOBUF_NAMESPACE_ID::internal::OnShutdownDestroyMessage(ptr); + void* ptr = &::agones::dev::sdk::_GameServer_Status_default_instance_; + new (ptr) ::agones::dev::sdk::GameServer_Status(); + ::google::protobuf::internal::OnShutdownDestroyMessage(ptr); } - ::agones::dev::sdk::KeyValue::InitAsDefaultInstance(); + ::agones::dev::sdk::GameServer_Status::InitAsDefaultInstance(); } -AGONES_EXPORT ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<0> scc_info_KeyValue_sdk_2eproto = - {{ATOMIC_VAR_INIT(::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase::kUninitialized), 0, 0, InitDefaultsscc_info_KeyValue_sdk_2eproto}, {}}; +AGONES_EXPORT ::google::protobuf::internal::SCCInfo<1> scc_info_GameServer_Status_sdk_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsGameServer_Status_sdk_2eproto}, { + &scc_info_GameServer_Status_Port_sdk_2eproto.base,}}; -static ::PROTOBUF_NAMESPACE_ID::Metadata file_level_metadata_sdk_2eproto[11]; -static constexpr ::PROTOBUF_NAMESPACE_ID::EnumDescriptor const** file_level_enum_descriptors_sdk_2eproto = nullptr; -static constexpr ::PROTOBUF_NAMESPACE_ID::ServiceDescriptor const** file_level_service_descriptors_sdk_2eproto = nullptr; +static void InitDefaultsGameServer_sdk_2eproto() { + GOOGLE_PROTOBUF_VERIFY_VERSION; + + { + void* ptr = &::agones::dev::sdk::_GameServer_default_instance_; + new (ptr) ::agones::dev::sdk::GameServer(); + ::google::protobuf::internal::OnShutdownDestroyMessage(ptr); + } + ::agones::dev::sdk::GameServer::InitAsDefaultInstance(); +} -const ::PROTOBUF_NAMESPACE_ID::uint32 TableStruct_sdk_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { +AGONES_EXPORT ::google::protobuf::internal::SCCInfo<3> scc_info_GameServer_sdk_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 3, InitDefaultsGameServer_sdk_2eproto}, { + &scc_info_GameServer_ObjectMeta_sdk_2eproto.base, + &scc_info_GameServer_Spec_sdk_2eproto.base, + &scc_info_GameServer_Status_sdk_2eproto.base,}}; + +void InitDefaults_sdk_2eproto() { + ::google::protobuf::internal::InitSCC(&scc_info_Empty_sdk_2eproto.base); + ::google::protobuf::internal::InitSCC(&scc_info_KeyValue_sdk_2eproto.base); + ::google::protobuf::internal::InitSCC(&scc_info_Duration_sdk_2eproto.base); + ::google::protobuf::internal::InitSCC(&scc_info_GameServer_ObjectMeta_AnnotationsEntry_DoNotUse_sdk_2eproto.base); + ::google::protobuf::internal::InitSCC(&scc_info_GameServer_ObjectMeta_LabelsEntry_DoNotUse_sdk_2eproto.base); + ::google::protobuf::internal::InitSCC(&scc_info_GameServer_ObjectMeta_sdk_2eproto.base); + ::google::protobuf::internal::InitSCC(&scc_info_GameServer_Spec_Health_sdk_2eproto.base); + ::google::protobuf::internal::InitSCC(&scc_info_GameServer_Spec_sdk_2eproto.base); + ::google::protobuf::internal::InitSCC(&scc_info_GameServer_Status_Port_sdk_2eproto.base); + ::google::protobuf::internal::InitSCC(&scc_info_GameServer_Status_sdk_2eproto.base); + ::google::protobuf::internal::InitSCC(&scc_info_GameServer_sdk_2eproto.base); +} + +::google::protobuf::Metadata file_level_metadata_sdk_2eproto[11]; +constexpr ::google::protobuf::EnumDescriptor const** file_level_enum_descriptors_sdk_2eproto = nullptr; +constexpr ::google::protobuf::ServiceDescriptor const** file_level_service_descriptors_sdk_2eproto = nullptr; + +const ::google::protobuf::uint32 TableStruct_sdk_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::agones::dev::sdk::Empty, _internal_metadata_), ~0u, // no _extensions_ @@ -339,7 +355,7 @@ const ::PROTOBUF_NAMESPACE_ID::uint32 TableStruct_sdk_2eproto::offsets[] PROTOBU PROTOBUF_FIELD_OFFSET(::agones::dev::sdk::GameServer, spec_), PROTOBUF_FIELD_OFFSET(::agones::dev::sdk::GameServer, status_), }; -static const ::PROTOBUF_NAMESPACE_ID::internal::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { +static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { { 0, -1, sizeof(::agones::dev::sdk::Empty)}, { 5, -1, sizeof(::agones::dev::sdk::KeyValue)}, { 12, -1, sizeof(::agones::dev::sdk::Duration)}, @@ -353,21 +369,27 @@ static const ::PROTOBUF_NAMESPACE_ID::internal::MigrationSchema schemas[] PROTOB { 80, -1, sizeof(::agones::dev::sdk::GameServer)}, }; -static ::PROTOBUF_NAMESPACE_ID::Message const * const file_default_instances[] = { - reinterpret_cast(&::agones::dev::sdk::_Empty_default_instance_), - reinterpret_cast(&::agones::dev::sdk::_KeyValue_default_instance_), - reinterpret_cast(&::agones::dev::sdk::_Duration_default_instance_), - reinterpret_cast(&::agones::dev::sdk::_GameServer_ObjectMeta_AnnotationsEntry_DoNotUse_default_instance_), - reinterpret_cast(&::agones::dev::sdk::_GameServer_ObjectMeta_LabelsEntry_DoNotUse_default_instance_), - reinterpret_cast(&::agones::dev::sdk::_GameServer_ObjectMeta_default_instance_), - reinterpret_cast(&::agones::dev::sdk::_GameServer_Spec_Health_default_instance_), - reinterpret_cast(&::agones::dev::sdk::_GameServer_Spec_default_instance_), - reinterpret_cast(&::agones::dev::sdk::_GameServer_Status_Port_default_instance_), - reinterpret_cast(&::agones::dev::sdk::_GameServer_Status_default_instance_), - reinterpret_cast(&::agones::dev::sdk::_GameServer_default_instance_), +static ::google::protobuf::Message const * const file_default_instances[] = { + reinterpret_cast(&::agones::dev::sdk::_Empty_default_instance_), + reinterpret_cast(&::agones::dev::sdk::_KeyValue_default_instance_), + reinterpret_cast(&::agones::dev::sdk::_Duration_default_instance_), + reinterpret_cast(&::agones::dev::sdk::_GameServer_ObjectMeta_AnnotationsEntry_DoNotUse_default_instance_), + reinterpret_cast(&::agones::dev::sdk::_GameServer_ObjectMeta_LabelsEntry_DoNotUse_default_instance_), + reinterpret_cast(&::agones::dev::sdk::_GameServer_ObjectMeta_default_instance_), + reinterpret_cast(&::agones::dev::sdk::_GameServer_Spec_Health_default_instance_), + reinterpret_cast(&::agones::dev::sdk::_GameServer_Spec_default_instance_), + reinterpret_cast(&::agones::dev::sdk::_GameServer_Status_Port_default_instance_), + reinterpret_cast(&::agones::dev::sdk::_GameServer_Status_default_instance_), + reinterpret_cast(&::agones::dev::sdk::_GameServer_default_instance_), +}; + +::google::protobuf::internal::AssignDescriptorsTable assign_descriptors_table_sdk_2eproto = { + {}, AddDescriptors_sdk_2eproto, "sdk.proto", schemas, + file_default_instances, TableStruct_sdk_2eproto::offsets, + file_level_metadata_sdk_2eproto, 11, file_level_enum_descriptors_sdk_2eproto, file_level_service_descriptors_sdk_2eproto, }; -const char descriptor_table_protodef_sdk_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = +const char descriptor_table_protodef_sdk_2eproto[] = "\n\tsdk.proto\022\016agones.dev.sdk\032\034google/api/" "annotations.proto\"\007\n\005Empty\"&\n\010KeyValue\022\013" "\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t\"\033\n\010Duration\022\017" @@ -415,33 +437,22 @@ const char descriptor_table_protodef_sdk_2eproto[] PROTOBUF_SECTION_VARIABLE(pro "gones.dev.sdk.Empty\"\023\202\323\344\223\002\r\"\010/reserve:\001*" "B\005Z\003sdkb\006proto3" ; -static const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable*const descriptor_table_sdk_2eproto_deps[1] = { - &::descriptor_table_google_2fapi_2fannotations_2eproto, -}; -static ::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase*const descriptor_table_sdk_2eproto_sccs[11] = { - &scc_info_Duration_sdk_2eproto.base, - &scc_info_Empty_sdk_2eproto.base, - &scc_info_GameServer_sdk_2eproto.base, - &scc_info_GameServer_ObjectMeta_sdk_2eproto.base, - &scc_info_GameServer_ObjectMeta_AnnotationsEntry_DoNotUse_sdk_2eproto.base, - &scc_info_GameServer_ObjectMeta_LabelsEntry_DoNotUse_sdk_2eproto.base, - &scc_info_GameServer_Spec_sdk_2eproto.base, - &scc_info_GameServer_Spec_Health_sdk_2eproto.base, - &scc_info_GameServer_Status_sdk_2eproto.base, - &scc_info_GameServer_Status_Port_sdk_2eproto.base, - &scc_info_KeyValue_sdk_2eproto.base, -}; -static ::PROTOBUF_NAMESPACE_ID::internal::once_flag descriptor_table_sdk_2eproto_once; -static bool descriptor_table_sdk_2eproto_initialized = false; -const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_sdk_2eproto = { - &descriptor_table_sdk_2eproto_initialized, descriptor_table_protodef_sdk_2eproto, "sdk.proto", 1815, - &descriptor_table_sdk_2eproto_once, descriptor_table_sdk_2eproto_sccs, descriptor_table_sdk_2eproto_deps, 11, 1, - schemas, file_default_instances, TableStruct_sdk_2eproto::offsets, - file_level_metadata_sdk_2eproto, 11, file_level_enum_descriptors_sdk_2eproto, file_level_service_descriptors_sdk_2eproto, +::google::protobuf::internal::DescriptorTable descriptor_table_sdk_2eproto = { + false, InitDefaults_sdk_2eproto, + descriptor_table_protodef_sdk_2eproto, + "sdk.proto", &assign_descriptors_table_sdk_2eproto, 1815, }; +void AddDescriptors_sdk_2eproto() { + static constexpr ::google::protobuf::internal::InitFunc deps[1] = + { + ::AddDescriptors_google_2fapi_2fannotations_2eproto, + }; + ::google::protobuf::internal::AddDescriptors(&descriptor_table_sdk_2eproto, deps, 1); +} + // Force running AddDescriptors() at dynamic initialization time. -static bool dynamic_init_dummy_sdk_2eproto = ( ::PROTOBUF_NAMESPACE_ID::internal::AddDescriptors(&descriptor_table_sdk_2eproto), true); +static bool dynamic_init_dummy_sdk_2eproto = []() { AddDescriptors_sdk_2eproto(); return true; }(); namespace agones { namespace dev { namespace sdk { @@ -450,17 +461,20 @@ namespace sdk { void Empty::InitAsDefaultInstance() { } -class Empty::_Internal { +class Empty::HasBitSetters { public: }; +#if !defined(_MSC_VER) || _MSC_VER >= 1900 +#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 + Empty::Empty() - : ::PROTOBUF_NAMESPACE_ID::Message(), _internal_metadata_(nullptr) { + : ::google::protobuf::Message(), _internal_metadata_(nullptr) { SharedCtor(); // @@protoc_insertion_point(constructor:agones.dev.sdk.Empty) } Empty::Empty(const Empty& from) - : ::PROTOBUF_NAMESPACE_ID::Message(), + : ::google::protobuf::Message(), _internal_metadata_(nullptr) { _internal_metadata_.MergeFrom(from._internal_metadata_); // @@protoc_insertion_point(copy_constructor:agones.dev.sdk.Empty) @@ -481,55 +495,97 @@ void Empty::SetCachedSize(int size) const { _cached_size_.Set(size); } const Empty& Empty::default_instance() { - ::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&::scc_info_Empty_sdk_2eproto.base); + ::google::protobuf::internal::InitSCC(&::scc_info_Empty_sdk_2eproto.base); return *internal_default_instance(); } void Empty::Clear() { // @@protoc_insertion_point(message_clear_start:agones.dev.sdk.Empty) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + ::google::protobuf::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; _internal_metadata_.Clear(); } -const char* Empty::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) { -#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure - while (!ctx->Done(&ptr)) { - ::PROTOBUF_NAMESPACE_ID::uint32 tag; - ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); - CHK_(ptr); +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +const char* Empty::_InternalParse(const char* begin, const char* end, void* object, + ::google::protobuf::internal::ParseContext* ctx) { + auto msg = static_cast(object); + ::google::protobuf::int32 size; (void)size; + int depth; (void)depth; + ::google::protobuf::uint32 tag; + ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; + auto ptr = begin; + while (ptr < end) { + ptr = ::google::protobuf::io::Parse32(ptr, &tag); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); switch (tag >> 3) { default: { if ((tag & 7) == 4 || tag == 0) { - ctx->SetLastTag(tag); - goto success; + ctx->EndGroup(tag); + return ptr; } - ptr = UnknownFieldParse(tag, &_internal_metadata_, ptr, ctx); - CHK_(ptr != nullptr); - continue; + auto res = UnknownFieldParse(tag, {_InternalParse, msg}, + ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); + ptr = res.first; + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); + if (res.second) return ptr; } } // switch } // while -success: return ptr; +} +#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +bool Empty::MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure + ::google::protobuf::uint32 tag; + // @@protoc_insertion_point(parse_start:agones.dev.sdk.Empty) + for (;;) { + ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); + tag = p.first; + if (!p.second) goto handle_unusual; + handle_unusual: + if (tag == 0) { + goto success; + } + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, _internal_metadata_.mutable_unknown_fields())); + } +success: + // @@protoc_insertion_point(parse_success:agones.dev.sdk.Empty) + return true; failure: - ptr = nullptr; - goto success; -#undef CHK_ + // @@protoc_insertion_point(parse_failure:agones.dev.sdk.Empty) + return false; +#undef DO_ +} +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + +void Empty::SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const { + // @@protoc_insertion_point(serialize_start:agones.dev.sdk.Empty) + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + if (_internal_metadata_.have_unknown_fields()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + _internal_metadata_.unknown_fields(), output); + } + // @@protoc_insertion_point(serialize_end:agones.dev.sdk.Empty) } -::PROTOBUF_NAMESPACE_ID::uint8* Empty::InternalSerializeWithCachedSizesToArray( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +::google::protobuf::uint8* Empty::InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { // @@protoc_insertion_point(serialize_to_array_start:agones.dev.sdk.Empty) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; - if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::InternalSerializeUnknownFieldsToArray( - _internal_metadata_.unknown_fields(), target, stream); + if (_internal_metadata_.have_unknown_fields()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields(), target); } // @@protoc_insertion_point(serialize_to_array_end:agones.dev.sdk.Empty) return target; @@ -539,28 +595,29 @@ size_t Empty::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:agones.dev.sdk.Empty) size_t total_size = 0; - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + _internal_metadata_.unknown_fields()); + } + ::google::protobuf::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - return ::PROTOBUF_NAMESPACE_ID::internal::ComputeUnknownFieldsSize( - _internal_metadata_, total_size, &_cached_size_); - } - int cached_size = ::PROTOBUF_NAMESPACE_ID::internal::ToCachedSize(total_size); + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); SetCachedSize(cached_size); return total_size; } -void Empty::MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) { +void Empty::MergeFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:agones.dev.sdk.Empty) GOOGLE_DCHECK_NE(&from, this); const Empty* source = - ::PROTOBUF_NAMESPACE_ID::DynamicCastToGenerated( + ::google::protobuf::DynamicCastToGenerated( &from); if (source == nullptr) { // @@protoc_insertion_point(generalized_merge_from_cast_fail:agones.dev.sdk.Empty) - ::PROTOBUF_NAMESPACE_ID::internal::ReflectionOps::Merge(from, this); + ::google::protobuf::internal::ReflectionOps::Merge(from, this); } else { // @@protoc_insertion_point(generalized_merge_from_cast_success:agones.dev.sdk.Empty) MergeFrom(*source); @@ -571,12 +628,12 @@ void Empty::MergeFrom(const Empty& from) { // @@protoc_insertion_point(class_specific_merge_from_start:agones.dev.sdk.Empty) GOOGLE_DCHECK_NE(&from, this); _internal_metadata_.MergeFrom(from._internal_metadata_); - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; } -void Empty::CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) { +void Empty::CopyFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_copy_from_start:agones.dev.sdk.Empty) if (&from == this) return; Clear(); @@ -594,13 +651,18 @@ bool Empty::IsInitialized() const { return true; } +void Empty::Swap(Empty* other) { + if (other == this) return; + InternalSwap(other); +} void Empty::InternalSwap(Empty* other) { using std::swap; _internal_metadata_.Swap(&other->_internal_metadata_); } -::PROTOBUF_NAMESPACE_ID::Metadata Empty::GetMetadata() const { - return GetMetadataStatic(); +::google::protobuf::Metadata Empty::GetMetadata() const { + ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_sdk_2eproto); + return ::file_level_metadata_sdk_2eproto[kIndexInFileMessages]; } @@ -608,34 +670,40 @@ ::PROTOBUF_NAMESPACE_ID::Metadata Empty::GetMetadata() const { void KeyValue::InitAsDefaultInstance() { } -class KeyValue::_Internal { +class KeyValue::HasBitSetters { public: }; +#if !defined(_MSC_VER) || _MSC_VER >= 1900 +const int KeyValue::kKeyFieldNumber; +const int KeyValue::kValueFieldNumber; +#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 + KeyValue::KeyValue() - : ::PROTOBUF_NAMESPACE_ID::Message(), _internal_metadata_(nullptr) { + : ::google::protobuf::Message(), _internal_metadata_(nullptr) { SharedCtor(); // @@protoc_insertion_point(constructor:agones.dev.sdk.KeyValue) } KeyValue::KeyValue(const KeyValue& from) - : ::PROTOBUF_NAMESPACE_ID::Message(), + : ::google::protobuf::Message(), _internal_metadata_(nullptr) { _internal_metadata_.MergeFrom(from._internal_metadata_); - key_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); - if (!from._internal_key().empty()) { - key_.AssignWithDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from.key_); + key_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.key().size() > 0) { + key_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.key_); } - value_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); - if (!from._internal_value().empty()) { - value_.AssignWithDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from.value_); + value_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.value().size() > 0) { + value_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.value_); } // @@protoc_insertion_point(copy_constructor:agones.dev.sdk.KeyValue) } void KeyValue::SharedCtor() { - ::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&scc_info_KeyValue_sdk_2eproto.base); - key_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); - value_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + ::google::protobuf::internal::InitSCC( + &scc_info_KeyValue_sdk_2eproto.base); + key_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + value_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } KeyValue::~KeyValue() { @@ -644,100 +712,224 @@ KeyValue::~KeyValue() { } void KeyValue::SharedDtor() { - key_.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); - value_.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + key_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + value_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } void KeyValue::SetCachedSize(int size) const { _cached_size_.Set(size); } const KeyValue& KeyValue::default_instance() { - ::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&::scc_info_KeyValue_sdk_2eproto.base); + ::google::protobuf::internal::InitSCC(&::scc_info_KeyValue_sdk_2eproto.base); return *internal_default_instance(); } void KeyValue::Clear() { // @@protoc_insertion_point(message_clear_start:agones.dev.sdk.KeyValue) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + ::google::protobuf::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - key_.ClearToEmptyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); - value_.ClearToEmptyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + key_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + value_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); _internal_metadata_.Clear(); } -const char* KeyValue::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) { -#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure - while (!ctx->Done(&ptr)) { - ::PROTOBUF_NAMESPACE_ID::uint32 tag; - ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); - CHK_(ptr); +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +const char* KeyValue::_InternalParse(const char* begin, const char* end, void* object, + ::google::protobuf::internal::ParseContext* ctx) { + auto msg = static_cast(object); + ::google::protobuf::int32 size; (void)size; + int depth; (void)depth; + ::google::protobuf::uint32 tag; + ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; + auto ptr = begin; + while (ptr < end) { + ptr = ::google::protobuf::io::Parse32(ptr, &tag); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); switch (tag >> 3) { // string key = 1; - case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 10)) { - ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParserUTF8(_internal_mutable_key(), ptr, ctx, "agones.dev.sdk.KeyValue.key"); - CHK_(ptr); - } else goto handle_unusual; - continue; + case 1: { + if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + ctx->extra_parse_data().SetFieldName("agones.dev.sdk.KeyValue.key"); + object = msg->mutable_key(); + if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { + parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; + goto string_till_end; + } + GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); + ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); + ptr += size; + break; + } // string value = 2; - case 2: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 18)) { - ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParserUTF8(_internal_mutable_value(), ptr, ctx, "agones.dev.sdk.KeyValue.value"); - CHK_(ptr); - } else goto handle_unusual; - continue; + case 2: { + if (static_cast<::google::protobuf::uint8>(tag) != 18) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + ctx->extra_parse_data().SetFieldName("agones.dev.sdk.KeyValue.value"); + object = msg->mutable_value(); + if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { + parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; + goto string_till_end; + } + GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); + ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); + ptr += size; + break; + } default: { handle_unusual: if ((tag & 7) == 4 || tag == 0) { - ctx->SetLastTag(tag); - goto success; + ctx->EndGroup(tag); + return ptr; } - ptr = UnknownFieldParse(tag, &_internal_metadata_, ptr, ctx); - CHK_(ptr != nullptr); - continue; + auto res = UnknownFieldParse(tag, {_InternalParse, msg}, + ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); + ptr = res.first; + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); + if (res.second) return ptr; } } // switch } // while -success: return ptr; +string_till_end: + static_cast<::std::string*>(object)->clear(); + static_cast<::std::string*>(object)->reserve(size); + goto len_delim_till_end; +len_delim_till_end: + return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg}, + {parser_till_end, object}, size); +} +#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +bool KeyValue::MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure + ::google::protobuf::uint32 tag; + // @@protoc_insertion_point(parse_start:agones.dev.sdk.KeyValue) + for (;;) { + ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); + tag = p.first; + if (!p.second) goto handle_unusual; + switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { + // string key = 1; + case 1: { + if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadString( + input, this->mutable_key())); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->key().data(), static_cast(this->key().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "agones.dev.sdk.KeyValue.key")); + } else { + goto handle_unusual; + } + break; + } + + // string value = 2; + case 2: { + if (static_cast< ::google::protobuf::uint8>(tag) == (18 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadString( + input, this->mutable_value())); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->value().data(), static_cast(this->value().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "agones.dev.sdk.KeyValue.value")); + } else { + goto handle_unusual; + } + break; + } + + default: { + handle_unusual: + if (tag == 0) { + goto success; + } + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, _internal_metadata_.mutable_unknown_fields())); + break; + } + } + } +success: + // @@protoc_insertion_point(parse_success:agones.dev.sdk.KeyValue) + return true; failure: - ptr = nullptr; - goto success; -#undef CHK_ + // @@protoc_insertion_point(parse_failure:agones.dev.sdk.KeyValue) + return false; +#undef DO_ +} +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + +void KeyValue::SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const { + // @@protoc_insertion_point(serialize_start:agones.dev.sdk.KeyValue) + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + // string key = 1; + if (this->key().size() > 0) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->key().data(), static_cast(this->key().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "agones.dev.sdk.KeyValue.key"); + ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( + 1, this->key(), output); + } + + // string value = 2; + if (this->value().size() > 0) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->value().data(), static_cast(this->value().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "agones.dev.sdk.KeyValue.value"); + ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( + 2, this->value(), output); + } + + if (_internal_metadata_.have_unknown_fields()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + _internal_metadata_.unknown_fields(), output); + } + // @@protoc_insertion_point(serialize_end:agones.dev.sdk.KeyValue) } -::PROTOBUF_NAMESPACE_ID::uint8* KeyValue::InternalSerializeWithCachedSizesToArray( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +::google::protobuf::uint8* KeyValue::InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { // @@protoc_insertion_point(serialize_to_array_start:agones.dev.sdk.KeyValue) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; // string key = 1; if (this->key().size() > 0) { - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( - this->_internal_key().data(), static_cast(this->_internal_key().length()), - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->key().data(), static_cast(this->key().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "agones.dev.sdk.KeyValue.key"); - target = stream->WriteStringMaybeAliased( - 1, this->_internal_key(), target); + target = + ::google::protobuf::internal::WireFormatLite::WriteStringToArray( + 1, this->key(), target); } // string value = 2; if (this->value().size() > 0) { - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( - this->_internal_value().data(), static_cast(this->_internal_value().length()), - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->value().data(), static_cast(this->value().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "agones.dev.sdk.KeyValue.value"); - target = stream->WriteStringMaybeAliased( - 2, this->_internal_value(), target); + target = + ::google::protobuf::internal::WireFormatLite::WriteStringToArray( + 2, this->value(), target); } - if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::InternalSerializeUnknownFieldsToArray( - _internal_metadata_.unknown_fields(), target, stream); + if (_internal_metadata_.have_unknown_fields()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields(), target); } // @@protoc_insertion_point(serialize_to_array_end:agones.dev.sdk.KeyValue) return target; @@ -747,42 +939,43 @@ size_t KeyValue::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:agones.dev.sdk.KeyValue) size_t total_size = 0; - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + _internal_metadata_.unknown_fields()); + } + ::google::protobuf::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; // string key = 1; if (this->key().size() > 0) { total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( - this->_internal_key()); + ::google::protobuf::internal::WireFormatLite::StringSize( + this->key()); } // string value = 2; if (this->value().size() > 0) { total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( - this->_internal_value()); + ::google::protobuf::internal::WireFormatLite::StringSize( + this->value()); } - if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - return ::PROTOBUF_NAMESPACE_ID::internal::ComputeUnknownFieldsSize( - _internal_metadata_, total_size, &_cached_size_); - } - int cached_size = ::PROTOBUF_NAMESPACE_ID::internal::ToCachedSize(total_size); + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); SetCachedSize(cached_size); return total_size; } -void KeyValue::MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) { +void KeyValue::MergeFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:agones.dev.sdk.KeyValue) GOOGLE_DCHECK_NE(&from, this); const KeyValue* source = - ::PROTOBUF_NAMESPACE_ID::DynamicCastToGenerated( + ::google::protobuf::DynamicCastToGenerated( &from); if (source == nullptr) { // @@protoc_insertion_point(generalized_merge_from_cast_fail:agones.dev.sdk.KeyValue) - ::PROTOBUF_NAMESPACE_ID::internal::ReflectionOps::Merge(from, this); + ::google::protobuf::internal::ReflectionOps::Merge(from, this); } else { // @@protoc_insertion_point(generalized_merge_from_cast_success:agones.dev.sdk.KeyValue) MergeFrom(*source); @@ -793,20 +986,20 @@ void KeyValue::MergeFrom(const KeyValue& from) { // @@protoc_insertion_point(class_specific_merge_from_start:agones.dev.sdk.KeyValue) GOOGLE_DCHECK_NE(&from, this); _internal_metadata_.MergeFrom(from._internal_metadata_); - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; if (from.key().size() > 0) { - key_.AssignWithDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from.key_); + key_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.key_); } if (from.value().size() > 0) { - value_.AssignWithDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from.value_); + value_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.value_); } } -void KeyValue::CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) { +void KeyValue::CopyFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_copy_from_start:agones.dev.sdk.KeyValue) if (&from == this) return; Clear(); @@ -824,17 +1017,22 @@ bool KeyValue::IsInitialized() const { return true; } +void KeyValue::Swap(KeyValue* other) { + if (other == this) return; + InternalSwap(other); +} void KeyValue::InternalSwap(KeyValue* other) { using std::swap; _internal_metadata_.Swap(&other->_internal_metadata_); - key_.Swap(&other->key_, &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + key_.Swap(&other->key_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); - value_.Swap(&other->value_, &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + value_.Swap(&other->value_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } -::PROTOBUF_NAMESPACE_ID::Metadata KeyValue::GetMetadata() const { - return GetMetadataStatic(); +::google::protobuf::Metadata KeyValue::GetMetadata() const { + ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_sdk_2eproto); + return ::file_level_metadata_sdk_2eproto[kIndexInFileMessages]; } @@ -842,17 +1040,21 @@ ::PROTOBUF_NAMESPACE_ID::Metadata KeyValue::GetMetadata() const { void Duration::InitAsDefaultInstance() { } -class Duration::_Internal { +class Duration::HasBitSetters { public: }; +#if !defined(_MSC_VER) || _MSC_VER >= 1900 +const int Duration::kSecondsFieldNumber; +#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 + Duration::Duration() - : ::PROTOBUF_NAMESPACE_ID::Message(), _internal_metadata_(nullptr) { + : ::google::protobuf::Message(), _internal_metadata_(nullptr) { SharedCtor(); // @@protoc_insertion_point(constructor:agones.dev.sdk.Duration) } Duration::Duration(const Duration& from) - : ::PROTOBUF_NAMESPACE_ID::Message(), + : ::google::protobuf::Message(), _internal_metadata_(nullptr) { _internal_metadata_.MergeFrom(from._internal_metadata_); seconds_ = from.seconds_; @@ -875,14 +1077,14 @@ void Duration::SetCachedSize(int size) const { _cached_size_.Set(size); } const Duration& Duration::default_instance() { - ::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&::scc_info_Duration_sdk_2eproto.base); + ::google::protobuf::internal::InitSCC(&::scc_info_Duration_sdk_2eproto.base); return *internal_default_instance(); } void Duration::Clear() { // @@protoc_insertion_point(message_clear_start:agones.dev.sdk.Duration) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + ::google::protobuf::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -890,55 +1092,119 @@ void Duration::Clear() { _internal_metadata_.Clear(); } -const char* Duration::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) { -#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure - while (!ctx->Done(&ptr)) { - ::PROTOBUF_NAMESPACE_ID::uint32 tag; - ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); - CHK_(ptr); +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +const char* Duration::_InternalParse(const char* begin, const char* end, void* object, + ::google::protobuf::internal::ParseContext* ctx) { + auto msg = static_cast(object); + ::google::protobuf::int32 size; (void)size; + int depth; (void)depth; + ::google::protobuf::uint32 tag; + ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; + auto ptr = begin; + while (ptr < end) { + ptr = ::google::protobuf::io::Parse32(ptr, &tag); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); switch (tag >> 3) { // int64 seconds = 1; - case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) { - seconds_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint(&ptr); - CHK_(ptr); - } else goto handle_unusual; - continue; + case 1: { + if (static_cast<::google::protobuf::uint8>(tag) != 8) goto handle_unusual; + msg->set_seconds(::google::protobuf::internal::ReadVarint(&ptr)); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + break; + } default: { handle_unusual: if ((tag & 7) == 4 || tag == 0) { - ctx->SetLastTag(tag); - goto success; + ctx->EndGroup(tag); + return ptr; } - ptr = UnknownFieldParse(tag, &_internal_metadata_, ptr, ctx); - CHK_(ptr != nullptr); - continue; + auto res = UnknownFieldParse(tag, {_InternalParse, msg}, + ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); + ptr = res.first; + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); + if (res.second) return ptr; } } // switch } // while -success: return ptr; +} +#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +bool Duration::MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure + ::google::protobuf::uint32 tag; + // @@protoc_insertion_point(parse_start:agones.dev.sdk.Duration) + for (;;) { + ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); + tag = p.first; + if (!p.second) goto handle_unusual; + switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { + // int64 seconds = 1; + case 1: { + if (static_cast< ::google::protobuf::uint8>(tag) == (8 & 0xFF)) { + + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + ::google::protobuf::int64, ::google::protobuf::internal::WireFormatLite::TYPE_INT64>( + input, &seconds_))); + } else { + goto handle_unusual; + } + break; + } + + default: { + handle_unusual: + if (tag == 0) { + goto success; + } + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, _internal_metadata_.mutable_unknown_fields())); + break; + } + } + } +success: + // @@protoc_insertion_point(parse_success:agones.dev.sdk.Duration) + return true; failure: - ptr = nullptr; - goto success; -#undef CHK_ + // @@protoc_insertion_point(parse_failure:agones.dev.sdk.Duration) + return false; +#undef DO_ +} +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + +void Duration::SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const { + // @@protoc_insertion_point(serialize_start:agones.dev.sdk.Duration) + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + // int64 seconds = 1; + if (this->seconds() != 0) { + ::google::protobuf::internal::WireFormatLite::WriteInt64(1, this->seconds(), output); + } + + if (_internal_metadata_.have_unknown_fields()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + _internal_metadata_.unknown_fields(), output); + } + // @@protoc_insertion_point(serialize_end:agones.dev.sdk.Duration) } -::PROTOBUF_NAMESPACE_ID::uint8* Duration::InternalSerializeWithCachedSizesToArray( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +::google::protobuf::uint8* Duration::InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { // @@protoc_insertion_point(serialize_to_array_start:agones.dev.sdk.Duration) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; // int64 seconds = 1; if (this->seconds() != 0) { - stream->EnsureSpace(&target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64ToArray(1, this->_internal_seconds(), target); + target = ::google::protobuf::internal::WireFormatLite::WriteInt64ToArray(1, this->seconds(), target); } - if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::InternalSerializeUnknownFieldsToArray( - _internal_metadata_.unknown_fields(), target, stream); + if (_internal_metadata_.have_unknown_fields()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields(), target); } // @@protoc_insertion_point(serialize_to_array_end:agones.dev.sdk.Duration) return target; @@ -948,35 +1214,36 @@ size_t Duration::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:agones.dev.sdk.Duration) size_t total_size = 0; - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + _internal_metadata_.unknown_fields()); + } + ::google::protobuf::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; // int64 seconds = 1; if (this->seconds() != 0) { total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int64Size( - this->_internal_seconds()); + ::google::protobuf::internal::WireFormatLite::Int64Size( + this->seconds()); } - if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - return ::PROTOBUF_NAMESPACE_ID::internal::ComputeUnknownFieldsSize( - _internal_metadata_, total_size, &_cached_size_); - } - int cached_size = ::PROTOBUF_NAMESPACE_ID::internal::ToCachedSize(total_size); + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); SetCachedSize(cached_size); return total_size; } -void Duration::MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) { +void Duration::MergeFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:agones.dev.sdk.Duration) GOOGLE_DCHECK_NE(&from, this); const Duration* source = - ::PROTOBUF_NAMESPACE_ID::DynamicCastToGenerated( + ::google::protobuf::DynamicCastToGenerated( &from); if (source == nullptr) { // @@protoc_insertion_point(generalized_merge_from_cast_fail:agones.dev.sdk.Duration) - ::PROTOBUF_NAMESPACE_ID::internal::ReflectionOps::Merge(from, this); + ::google::protobuf::internal::ReflectionOps::Merge(from, this); } else { // @@protoc_insertion_point(generalized_merge_from_cast_success:agones.dev.sdk.Duration) MergeFrom(*source); @@ -987,15 +1254,15 @@ void Duration::MergeFrom(const Duration& from) { // @@protoc_insertion_point(class_specific_merge_from_start:agones.dev.sdk.Duration) GOOGLE_DCHECK_NE(&from, this); _internal_metadata_.MergeFrom(from._internal_metadata_); - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; if (from.seconds() != 0) { - _internal_set_seconds(from._internal_seconds()); + set_seconds(from.seconds()); } } -void Duration::CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) { +void Duration::CopyFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_copy_from_start:agones.dev.sdk.Duration) if (&from == this) return; Clear(); @@ -1013,85 +1280,150 @@ bool Duration::IsInitialized() const { return true; } +void Duration::Swap(Duration* other) { + if (other == this) return; + InternalSwap(other); +} void Duration::InternalSwap(Duration* other) { using std::swap; _internal_metadata_.Swap(&other->_internal_metadata_); swap(seconds_, other->seconds_); } -::PROTOBUF_NAMESPACE_ID::Metadata Duration::GetMetadata() const { - return GetMetadataStatic(); +::google::protobuf::Metadata Duration::GetMetadata() const { + ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_sdk_2eproto); + return ::file_level_metadata_sdk_2eproto[kIndexInFileMessages]; } // =================================================================== GameServer_ObjectMeta_AnnotationsEntry_DoNotUse::GameServer_ObjectMeta_AnnotationsEntry_DoNotUse() {} -GameServer_ObjectMeta_AnnotationsEntry_DoNotUse::GameServer_ObjectMeta_AnnotationsEntry_DoNotUse(::PROTOBUF_NAMESPACE_ID::Arena* arena) +GameServer_ObjectMeta_AnnotationsEntry_DoNotUse::GameServer_ObjectMeta_AnnotationsEntry_DoNotUse(::google::protobuf::Arena* arena) : SuperType(arena) {} void GameServer_ObjectMeta_AnnotationsEntry_DoNotUse::MergeFrom(const GameServer_ObjectMeta_AnnotationsEntry_DoNotUse& other) { MergeFromInternal(other); } -::PROTOBUF_NAMESPACE_ID::Metadata GameServer_ObjectMeta_AnnotationsEntry_DoNotUse::GetMetadata() const { - return GetMetadataStatic(); +::google::protobuf::Metadata GameServer_ObjectMeta_AnnotationsEntry_DoNotUse::GetMetadata() const { + ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_sdk_2eproto); + return ::file_level_metadata_sdk_2eproto[3]; } void GameServer_ObjectMeta_AnnotationsEntry_DoNotUse::MergeFrom( - const ::PROTOBUF_NAMESPACE_ID::Message& other) { - ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom(other); + const ::google::protobuf::Message& other) { + ::google::protobuf::Message::MergeFrom(other); +} + +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +bool GameServer_ObjectMeta_AnnotationsEntry_DoNotUse::_ParseMap(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx) { + using MF = ::google::protobuf::internal::MapField< + GameServer_ObjectMeta_AnnotationsEntry_DoNotUse, EntryKeyType, EntryValueType, + kEntryKeyFieldType, kEntryValueFieldType, + kEntryDefaultEnumValue>; + auto mf = static_cast(object); + Parser> parser(mf); +#define DO_(x) if (!(x)) return false + DO_(parser.ParseMap(begin, end)); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + parser.key().data(), static_cast(parser.key().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "agones.dev.sdk.GameServer.ObjectMeta.AnnotationsEntry.key")); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + parser.value().data(), static_cast(parser.value().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "agones.dev.sdk.GameServer.ObjectMeta.AnnotationsEntry.value")); +#undef DO_ + return true; } +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER // =================================================================== GameServer_ObjectMeta_LabelsEntry_DoNotUse::GameServer_ObjectMeta_LabelsEntry_DoNotUse() {} -GameServer_ObjectMeta_LabelsEntry_DoNotUse::GameServer_ObjectMeta_LabelsEntry_DoNotUse(::PROTOBUF_NAMESPACE_ID::Arena* arena) +GameServer_ObjectMeta_LabelsEntry_DoNotUse::GameServer_ObjectMeta_LabelsEntry_DoNotUse(::google::protobuf::Arena* arena) : SuperType(arena) {} void GameServer_ObjectMeta_LabelsEntry_DoNotUse::MergeFrom(const GameServer_ObjectMeta_LabelsEntry_DoNotUse& other) { MergeFromInternal(other); } -::PROTOBUF_NAMESPACE_ID::Metadata GameServer_ObjectMeta_LabelsEntry_DoNotUse::GetMetadata() const { - return GetMetadataStatic(); +::google::protobuf::Metadata GameServer_ObjectMeta_LabelsEntry_DoNotUse::GetMetadata() const { + ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_sdk_2eproto); + return ::file_level_metadata_sdk_2eproto[4]; } void GameServer_ObjectMeta_LabelsEntry_DoNotUse::MergeFrom( - const ::PROTOBUF_NAMESPACE_ID::Message& other) { - ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom(other); + const ::google::protobuf::Message& other) { + ::google::protobuf::Message::MergeFrom(other); +} + +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +bool GameServer_ObjectMeta_LabelsEntry_DoNotUse::_ParseMap(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx) { + using MF = ::google::protobuf::internal::MapField< + GameServer_ObjectMeta_LabelsEntry_DoNotUse, EntryKeyType, EntryValueType, + kEntryKeyFieldType, kEntryValueFieldType, + kEntryDefaultEnumValue>; + auto mf = static_cast(object); + Parser> parser(mf); +#define DO_(x) if (!(x)) return false + DO_(parser.ParseMap(begin, end)); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + parser.key().data(), static_cast(parser.key().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "agones.dev.sdk.GameServer.ObjectMeta.LabelsEntry.key")); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + parser.value().data(), static_cast(parser.value().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "agones.dev.sdk.GameServer.ObjectMeta.LabelsEntry.value")); +#undef DO_ + return true; } +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER // =================================================================== void GameServer_ObjectMeta::InitAsDefaultInstance() { } -class GameServer_ObjectMeta::_Internal { +class GameServer_ObjectMeta::HasBitSetters { public: }; +#if !defined(_MSC_VER) || _MSC_VER >= 1900 +const int GameServer_ObjectMeta::kNameFieldNumber; +const int GameServer_ObjectMeta::kNamespaceFieldNumber; +const int GameServer_ObjectMeta::kUidFieldNumber; +const int GameServer_ObjectMeta::kResourceVersionFieldNumber; +const int GameServer_ObjectMeta::kGenerationFieldNumber; +const int GameServer_ObjectMeta::kCreationTimestampFieldNumber; +const int GameServer_ObjectMeta::kDeletionTimestampFieldNumber; +const int GameServer_ObjectMeta::kAnnotationsFieldNumber; +const int GameServer_ObjectMeta::kLabelsFieldNumber; +#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 + GameServer_ObjectMeta::GameServer_ObjectMeta() - : ::PROTOBUF_NAMESPACE_ID::Message(), _internal_metadata_(nullptr) { + : ::google::protobuf::Message(), _internal_metadata_(nullptr) { SharedCtor(); // @@protoc_insertion_point(constructor:agones.dev.sdk.GameServer.ObjectMeta) } GameServer_ObjectMeta::GameServer_ObjectMeta(const GameServer_ObjectMeta& from) - : ::PROTOBUF_NAMESPACE_ID::Message(), + : ::google::protobuf::Message(), _internal_metadata_(nullptr) { _internal_metadata_.MergeFrom(from._internal_metadata_); annotations_.MergeFrom(from.annotations_); labels_.MergeFrom(from.labels_); - name_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); - if (!from._internal_name().empty()) { - name_.AssignWithDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from.name_); + name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.name().size() > 0) { + name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); } - namespace__.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); - if (!from._internal_namespace_().empty()) { - namespace__.AssignWithDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from.namespace__); + namespace__.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.namespace_().size() > 0) { + namespace__.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.namespace__); } - uid_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); - if (!from._internal_uid().empty()) { - uid_.AssignWithDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from.uid_); + uid_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.uid().size() > 0) { + uid_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.uid_); } - resource_version_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); - if (!from._internal_resource_version().empty()) { - resource_version_.AssignWithDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from.resource_version_); + resource_version_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.resource_version().size() > 0) { + resource_version_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.resource_version_); } ::memcpy(&generation_, &from.generation_, static_cast(reinterpret_cast(&deletion_timestamp_) - @@ -1100,11 +1432,12 @@ GameServer_ObjectMeta::GameServer_ObjectMeta(const GameServer_ObjectMeta& from) } void GameServer_ObjectMeta::SharedCtor() { - ::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&scc_info_GameServer_ObjectMeta_sdk_2eproto.base); - name_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); - namespace__.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); - uid_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); - resource_version_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + ::google::protobuf::internal::InitSCC( + &scc_info_GameServer_ObjectMeta_sdk_2eproto.base); + name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + namespace__.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + uid_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + resource_version_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); ::memset(&generation_, 0, static_cast( reinterpret_cast(&deletion_timestamp_) - reinterpret_cast(&generation_)) + sizeof(deletion_timestamp_)); @@ -1116,296 +1449,713 @@ GameServer_ObjectMeta::~GameServer_ObjectMeta() { } void GameServer_ObjectMeta::SharedDtor() { - name_.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); - namespace__.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); - uid_.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); - resource_version_.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + namespace__.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + uid_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + resource_version_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } void GameServer_ObjectMeta::SetCachedSize(int size) const { _cached_size_.Set(size); } const GameServer_ObjectMeta& GameServer_ObjectMeta::default_instance() { - ::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&::scc_info_GameServer_ObjectMeta_sdk_2eproto.base); + ::google::protobuf::internal::InitSCC(&::scc_info_GameServer_ObjectMeta_sdk_2eproto.base); return *internal_default_instance(); } void GameServer_ObjectMeta::Clear() { // @@protoc_insertion_point(message_clear_start:agones.dev.sdk.GameServer.ObjectMeta) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + ::google::protobuf::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; annotations_.Clear(); labels_.Clear(); - name_.ClearToEmptyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); - namespace__.ClearToEmptyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); - uid_.ClearToEmptyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); - resource_version_.ClearToEmptyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + namespace__.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + uid_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + resource_version_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); ::memset(&generation_, 0, static_cast( reinterpret_cast(&deletion_timestamp_) - reinterpret_cast(&generation_)) + sizeof(deletion_timestamp_)); _internal_metadata_.Clear(); } -const char* GameServer_ObjectMeta::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) { -#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure - while (!ctx->Done(&ptr)) { - ::PROTOBUF_NAMESPACE_ID::uint32 tag; - ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); - CHK_(ptr); +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +const char* GameServer_ObjectMeta::_InternalParse(const char* begin, const char* end, void* object, + ::google::protobuf::internal::ParseContext* ctx) { + auto msg = static_cast(object); + ::google::protobuf::int32 size; (void)size; + int depth; (void)depth; + ::google::protobuf::uint32 tag; + ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; + auto ptr = begin; + while (ptr < end) { + ptr = ::google::protobuf::io::Parse32(ptr, &tag); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); switch (tag >> 3) { // string name = 1; - case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 10)) { - ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParserUTF8(_internal_mutable_name(), ptr, ctx, "agones.dev.sdk.GameServer.ObjectMeta.name"); - CHK_(ptr); - } else goto handle_unusual; - continue; + case 1: { + if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + ctx->extra_parse_data().SetFieldName("agones.dev.sdk.GameServer.ObjectMeta.name"); + object = msg->mutable_name(); + if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { + parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; + goto string_till_end; + } + GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); + ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); + ptr += size; + break; + } // string namespace = 2; - case 2: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 18)) { - ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParserUTF8(_internal_mutable_namespace_(), ptr, ctx, "agones.dev.sdk.GameServer.ObjectMeta.namespace"); - CHK_(ptr); - } else goto handle_unusual; - continue; + case 2: { + if (static_cast<::google::protobuf::uint8>(tag) != 18) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + ctx->extra_parse_data().SetFieldName("agones.dev.sdk.GameServer.ObjectMeta.namespace"); + object = msg->mutable_namespace_(); + if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { + parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; + goto string_till_end; + } + GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); + ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); + ptr += size; + break; + } // string uid = 3; - case 3: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 26)) { - ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParserUTF8(_internal_mutable_uid(), ptr, ctx, "agones.dev.sdk.GameServer.ObjectMeta.uid"); - CHK_(ptr); - } else goto handle_unusual; - continue; + case 3: { + if (static_cast<::google::protobuf::uint8>(tag) != 26) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + ctx->extra_parse_data().SetFieldName("agones.dev.sdk.GameServer.ObjectMeta.uid"); + object = msg->mutable_uid(); + if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { + parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; + goto string_till_end; + } + GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); + ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); + ptr += size; + break; + } // string resource_version = 4; - case 4: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 34)) { - ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParserUTF8(_internal_mutable_resource_version(), ptr, ctx, "agones.dev.sdk.GameServer.ObjectMeta.resource_version"); - CHK_(ptr); - } else goto handle_unusual; - continue; + case 4: { + if (static_cast<::google::protobuf::uint8>(tag) != 34) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + ctx->extra_parse_data().SetFieldName("agones.dev.sdk.GameServer.ObjectMeta.resource_version"); + object = msg->mutable_resource_version(); + if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { + parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; + goto string_till_end; + } + GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); + ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); + ptr += size; + break; + } // int64 generation = 5; - case 5: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 40)) { - generation_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint(&ptr); - CHK_(ptr); - } else goto handle_unusual; - continue; + case 5: { + if (static_cast<::google::protobuf::uint8>(tag) != 40) goto handle_unusual; + msg->set_generation(::google::protobuf::internal::ReadVarint(&ptr)); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + break; + } // int64 creation_timestamp = 6; - case 6: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 48)) { - creation_timestamp_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint(&ptr); - CHK_(ptr); - } else goto handle_unusual; - continue; + case 6: { + if (static_cast<::google::protobuf::uint8>(tag) != 48) goto handle_unusual; + msg->set_creation_timestamp(::google::protobuf::internal::ReadVarint(&ptr)); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + break; + } // int64 deletion_timestamp = 7; - case 7: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 56)) { - deletion_timestamp_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint(&ptr); - CHK_(ptr); - } else goto handle_unusual; - continue; + case 7: { + if (static_cast<::google::protobuf::uint8>(tag) != 56) goto handle_unusual; + msg->set_deletion_timestamp(::google::protobuf::internal::ReadVarint(&ptr)); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + break; + } // map annotations = 8; - case 8: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 66)) { - ptr -= 1; - do { - ptr += 1; - ptr = ctx->ParseMessage(&annotations_, ptr); - CHK_(ptr); - if (!ctx->DataAvailable(ptr)) break; - } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<66>(ptr)); - } else goto handle_unusual; - continue; + case 8: { + if (static_cast<::google::protobuf::uint8>(tag) != 66) goto handle_unusual; + do { + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + parser_till_end = ::google::protobuf::internal::SlowMapEntryParser; + auto parse_map = ::agones::dev::sdk::GameServer_ObjectMeta_AnnotationsEntry_DoNotUse::_ParseMap; + ctx->extra_parse_data().payload.clear(); + ctx->extra_parse_data().parse_map = parse_map; + object = &msg->annotations_; + if (size > end - ptr) goto len_delim_till_end; + auto newend = ptr + size; + GOOGLE_PROTOBUF_PARSER_ASSERT(parse_map(ptr, newend, object, ctx)); + ptr = newend; + if (ptr >= end) break; + } while ((::google::protobuf::io::UnalignedLoad<::google::protobuf::uint64>(ptr) & 255) == 66 && (ptr += 1)); + break; + } // map labels = 9; - case 9: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 74)) { - ptr -= 1; - do { - ptr += 1; - ptr = ctx->ParseMessage(&labels_, ptr); - CHK_(ptr); - if (!ctx->DataAvailable(ptr)) break; - } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<74>(ptr)); - } else goto handle_unusual; - continue; + case 9: { + if (static_cast<::google::protobuf::uint8>(tag) != 74) goto handle_unusual; + do { + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + parser_till_end = ::google::protobuf::internal::SlowMapEntryParser; + auto parse_map = ::agones::dev::sdk::GameServer_ObjectMeta_LabelsEntry_DoNotUse::_ParseMap; + ctx->extra_parse_data().payload.clear(); + ctx->extra_parse_data().parse_map = parse_map; + object = &msg->labels_; + if (size > end - ptr) goto len_delim_till_end; + auto newend = ptr + size; + GOOGLE_PROTOBUF_PARSER_ASSERT(parse_map(ptr, newend, object, ctx)); + ptr = newend; + if (ptr >= end) break; + } while ((::google::protobuf::io::UnalignedLoad<::google::protobuf::uint64>(ptr) & 255) == 74 && (ptr += 1)); + break; + } default: { handle_unusual: if ((tag & 7) == 4 || tag == 0) { - ctx->SetLastTag(tag); - goto success; + ctx->EndGroup(tag); + return ptr; } - ptr = UnknownFieldParse(tag, &_internal_metadata_, ptr, ctx); - CHK_(ptr != nullptr); - continue; + auto res = UnknownFieldParse(tag, {_InternalParse, msg}, + ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); + ptr = res.first; + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); + if (res.second) return ptr; } } // switch } // while -success: return ptr; +string_till_end: + static_cast<::std::string*>(object)->clear(); + static_cast<::std::string*>(object)->reserve(size); + goto len_delim_till_end; +len_delim_till_end: + return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg}, + {parser_till_end, object}, size); +} +#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +bool GameServer_ObjectMeta::MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure + ::google::protobuf::uint32 tag; + // @@protoc_insertion_point(parse_start:agones.dev.sdk.GameServer.ObjectMeta) + for (;;) { + ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); + tag = p.first; + if (!p.second) goto handle_unusual; + switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { + // string name = 1; + case 1: { + if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadString( + input, this->mutable_name())); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->name().data(), static_cast(this->name().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "agones.dev.sdk.GameServer.ObjectMeta.name")); + } else { + goto handle_unusual; + } + break; + } + + // string namespace = 2; + case 2: { + if (static_cast< ::google::protobuf::uint8>(tag) == (18 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadString( + input, this->mutable_namespace_())); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->namespace_().data(), static_cast(this->namespace_().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "agones.dev.sdk.GameServer.ObjectMeta.namespace")); + } else { + goto handle_unusual; + } + break; + } + + // string uid = 3; + case 3: { + if (static_cast< ::google::protobuf::uint8>(tag) == (26 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadString( + input, this->mutable_uid())); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->uid().data(), static_cast(this->uid().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "agones.dev.sdk.GameServer.ObjectMeta.uid")); + } else { + goto handle_unusual; + } + break; + } + + // string resource_version = 4; + case 4: { + if (static_cast< ::google::protobuf::uint8>(tag) == (34 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadString( + input, this->mutable_resource_version())); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->resource_version().data(), static_cast(this->resource_version().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "agones.dev.sdk.GameServer.ObjectMeta.resource_version")); + } else { + goto handle_unusual; + } + break; + } + + // int64 generation = 5; + case 5: { + if (static_cast< ::google::protobuf::uint8>(tag) == (40 & 0xFF)) { + + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + ::google::protobuf::int64, ::google::protobuf::internal::WireFormatLite::TYPE_INT64>( + input, &generation_))); + } else { + goto handle_unusual; + } + break; + } + + // int64 creation_timestamp = 6; + case 6: { + if (static_cast< ::google::protobuf::uint8>(tag) == (48 & 0xFF)) { + + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + ::google::protobuf::int64, ::google::protobuf::internal::WireFormatLite::TYPE_INT64>( + input, &creation_timestamp_))); + } else { + goto handle_unusual; + } + break; + } + + // int64 deletion_timestamp = 7; + case 7: { + if (static_cast< ::google::protobuf::uint8>(tag) == (56 & 0xFF)) { + + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + ::google::protobuf::int64, ::google::protobuf::internal::WireFormatLite::TYPE_INT64>( + input, &deletion_timestamp_))); + } else { + goto handle_unusual; + } + break; + } + + // map annotations = 8; + case 8: { + if (static_cast< ::google::protobuf::uint8>(tag) == (66 & 0xFF)) { + GameServer_ObjectMeta_AnnotationsEntry_DoNotUse::Parser< ::google::protobuf::internal::MapField< + GameServer_ObjectMeta_AnnotationsEntry_DoNotUse, + ::std::string, ::std::string, + ::google::protobuf::internal::WireFormatLite::TYPE_STRING, + ::google::protobuf::internal::WireFormatLite::TYPE_STRING, + 0 >, + ::google::protobuf::Map< ::std::string, ::std::string > > parser(&annotations_); + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( + input, &parser)); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + parser.key().data(), static_cast(parser.key().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "agones.dev.sdk.GameServer.ObjectMeta.AnnotationsEntry.key")); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + parser.value().data(), static_cast(parser.value().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "agones.dev.sdk.GameServer.ObjectMeta.AnnotationsEntry.value")); + } else { + goto handle_unusual; + } + break; + } + + // map labels = 9; + case 9: { + if (static_cast< ::google::protobuf::uint8>(tag) == (74 & 0xFF)) { + GameServer_ObjectMeta_LabelsEntry_DoNotUse::Parser< ::google::protobuf::internal::MapField< + GameServer_ObjectMeta_LabelsEntry_DoNotUse, + ::std::string, ::std::string, + ::google::protobuf::internal::WireFormatLite::TYPE_STRING, + ::google::protobuf::internal::WireFormatLite::TYPE_STRING, + 0 >, + ::google::protobuf::Map< ::std::string, ::std::string > > parser(&labels_); + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( + input, &parser)); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + parser.key().data(), static_cast(parser.key().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "agones.dev.sdk.GameServer.ObjectMeta.LabelsEntry.key")); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + parser.value().data(), static_cast(parser.value().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "agones.dev.sdk.GameServer.ObjectMeta.LabelsEntry.value")); + } else { + goto handle_unusual; + } + break; + } + + default: { + handle_unusual: + if (tag == 0) { + goto success; + } + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, _internal_metadata_.mutable_unknown_fields())); + break; + } + } + } +success: + // @@protoc_insertion_point(parse_success:agones.dev.sdk.GameServer.ObjectMeta) + return true; failure: - ptr = nullptr; - goto success; -#undef CHK_ + // @@protoc_insertion_point(parse_failure:agones.dev.sdk.GameServer.ObjectMeta) + return false; +#undef DO_ +} +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + +void GameServer_ObjectMeta::SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const { + // @@protoc_insertion_point(serialize_start:agones.dev.sdk.GameServer.ObjectMeta) + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + // string name = 1; + if (this->name().size() > 0) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->name().data(), static_cast(this->name().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "agones.dev.sdk.GameServer.ObjectMeta.name"); + ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( + 1, this->name(), output); + } + + // string namespace = 2; + if (this->namespace_().size() > 0) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->namespace_().data(), static_cast(this->namespace_().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "agones.dev.sdk.GameServer.ObjectMeta.namespace"); + ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( + 2, this->namespace_(), output); + } + + // string uid = 3; + if (this->uid().size() > 0) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->uid().data(), static_cast(this->uid().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "agones.dev.sdk.GameServer.ObjectMeta.uid"); + ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( + 3, this->uid(), output); + } + + // string resource_version = 4; + if (this->resource_version().size() > 0) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->resource_version().data(), static_cast(this->resource_version().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "agones.dev.sdk.GameServer.ObjectMeta.resource_version"); + ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( + 4, this->resource_version(), output); + } + + // int64 generation = 5; + if (this->generation() != 0) { + ::google::protobuf::internal::WireFormatLite::WriteInt64(5, this->generation(), output); + } + + // int64 creation_timestamp = 6; + if (this->creation_timestamp() != 0) { + ::google::protobuf::internal::WireFormatLite::WriteInt64(6, this->creation_timestamp(), output); + } + + // int64 deletion_timestamp = 7; + if (this->deletion_timestamp() != 0) { + ::google::protobuf::internal::WireFormatLite::WriteInt64(7, this->deletion_timestamp(), output); + } + + // map annotations = 8; + if (!this->annotations().empty()) { + typedef ::google::protobuf::Map< ::std::string, ::std::string >::const_pointer + ConstPtr; + typedef ConstPtr SortItem; + typedef ::google::protobuf::internal::CompareByDerefFirst Less; + struct Utf8Check { + static void Check(ConstPtr p) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + p->first.data(), static_cast(p->first.length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "agones.dev.sdk.GameServer.ObjectMeta.AnnotationsEntry.key"); + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + p->second.data(), static_cast(p->second.length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "agones.dev.sdk.GameServer.ObjectMeta.AnnotationsEntry.value"); + } + }; + + if (output->IsSerializationDeterministic() && + this->annotations().size() > 1) { + ::std::unique_ptr items( + new SortItem[this->annotations().size()]); + typedef ::google::protobuf::Map< ::std::string, ::std::string >::size_type size_type; + size_type n = 0; + for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator + it = this->annotations().begin(); + it != this->annotations().end(); ++it, ++n) { + items[static_cast(n)] = SortItem(&*it); + } + ::std::sort(&items[0], &items[static_cast(n)], Less()); + ::std::unique_ptr entry; + for (size_type i = 0; i < n; i++) { + entry.reset(annotations_.NewEntryWrapper(items[static_cast(i)]->first, items[static_cast(i)]->second)); + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(8, *entry, output); + Utf8Check::Check(&(*items[static_cast(i)])); + } + } else { + ::std::unique_ptr entry; + for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator + it = this->annotations().begin(); + it != this->annotations().end(); ++it) { + entry.reset(annotations_.NewEntryWrapper(it->first, it->second)); + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(8, *entry, output); + Utf8Check::Check(&(*it)); + } + } + } + + // map labels = 9; + if (!this->labels().empty()) { + typedef ::google::protobuf::Map< ::std::string, ::std::string >::const_pointer + ConstPtr; + typedef ConstPtr SortItem; + typedef ::google::protobuf::internal::CompareByDerefFirst Less; + struct Utf8Check { + static void Check(ConstPtr p) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + p->first.data(), static_cast(p->first.length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "agones.dev.sdk.GameServer.ObjectMeta.LabelsEntry.key"); + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + p->second.data(), static_cast(p->second.length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "agones.dev.sdk.GameServer.ObjectMeta.LabelsEntry.value"); + } + }; + + if (output->IsSerializationDeterministic() && + this->labels().size() > 1) { + ::std::unique_ptr items( + new SortItem[this->labels().size()]); + typedef ::google::protobuf::Map< ::std::string, ::std::string >::size_type size_type; + size_type n = 0; + for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator + it = this->labels().begin(); + it != this->labels().end(); ++it, ++n) { + items[static_cast(n)] = SortItem(&*it); + } + ::std::sort(&items[0], &items[static_cast(n)], Less()); + ::std::unique_ptr entry; + for (size_type i = 0; i < n; i++) { + entry.reset(labels_.NewEntryWrapper(items[static_cast(i)]->first, items[static_cast(i)]->second)); + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(9, *entry, output); + Utf8Check::Check(&(*items[static_cast(i)])); + } + } else { + ::std::unique_ptr entry; + for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator + it = this->labels().begin(); + it != this->labels().end(); ++it) { + entry.reset(labels_.NewEntryWrapper(it->first, it->second)); + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(9, *entry, output); + Utf8Check::Check(&(*it)); + } + } + } + + if (_internal_metadata_.have_unknown_fields()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + _internal_metadata_.unknown_fields(), output); + } + // @@protoc_insertion_point(serialize_end:agones.dev.sdk.GameServer.ObjectMeta) } -::PROTOBUF_NAMESPACE_ID::uint8* GameServer_ObjectMeta::InternalSerializeWithCachedSizesToArray( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +::google::protobuf::uint8* GameServer_ObjectMeta::InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { // @@protoc_insertion_point(serialize_to_array_start:agones.dev.sdk.GameServer.ObjectMeta) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; // string name = 1; if (this->name().size() > 0) { - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( - this->_internal_name().data(), static_cast(this->_internal_name().length()), - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->name().data(), static_cast(this->name().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "agones.dev.sdk.GameServer.ObjectMeta.name"); - target = stream->WriteStringMaybeAliased( - 1, this->_internal_name(), target); + target = + ::google::protobuf::internal::WireFormatLite::WriteStringToArray( + 1, this->name(), target); } // string namespace = 2; if (this->namespace_().size() > 0) { - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( - this->_internal_namespace_().data(), static_cast(this->_internal_namespace_().length()), - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->namespace_().data(), static_cast(this->namespace_().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "agones.dev.sdk.GameServer.ObjectMeta.namespace"); - target = stream->WriteStringMaybeAliased( - 2, this->_internal_namespace_(), target); + target = + ::google::protobuf::internal::WireFormatLite::WriteStringToArray( + 2, this->namespace_(), target); } // string uid = 3; if (this->uid().size() > 0) { - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( - this->_internal_uid().data(), static_cast(this->_internal_uid().length()), - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->uid().data(), static_cast(this->uid().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "agones.dev.sdk.GameServer.ObjectMeta.uid"); - target = stream->WriteStringMaybeAliased( - 3, this->_internal_uid(), target); + target = + ::google::protobuf::internal::WireFormatLite::WriteStringToArray( + 3, this->uid(), target); } // string resource_version = 4; if (this->resource_version().size() > 0) { - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( - this->_internal_resource_version().data(), static_cast(this->_internal_resource_version().length()), - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->resource_version().data(), static_cast(this->resource_version().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "agones.dev.sdk.GameServer.ObjectMeta.resource_version"); - target = stream->WriteStringMaybeAliased( - 4, this->_internal_resource_version(), target); + target = + ::google::protobuf::internal::WireFormatLite::WriteStringToArray( + 4, this->resource_version(), target); } // int64 generation = 5; if (this->generation() != 0) { - stream->EnsureSpace(&target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64ToArray(5, this->_internal_generation(), target); + target = ::google::protobuf::internal::WireFormatLite::WriteInt64ToArray(5, this->generation(), target); } // int64 creation_timestamp = 6; if (this->creation_timestamp() != 0) { - stream->EnsureSpace(&target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64ToArray(6, this->_internal_creation_timestamp(), target); + target = ::google::protobuf::internal::WireFormatLite::WriteInt64ToArray(6, this->creation_timestamp(), target); } // int64 deletion_timestamp = 7; if (this->deletion_timestamp() != 0) { - stream->EnsureSpace(&target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64ToArray(7, this->_internal_deletion_timestamp(), target); + target = ::google::protobuf::internal::WireFormatLite::WriteInt64ToArray(7, this->deletion_timestamp(), target); } // map annotations = 8; - if (!this->_internal_annotations().empty()) { - typedef ::PROTOBUF_NAMESPACE_ID::Map< std::string, std::string >::const_pointer + if (!this->annotations().empty()) { + typedef ::google::protobuf::Map< ::std::string, ::std::string >::const_pointer ConstPtr; typedef ConstPtr SortItem; - typedef ::PROTOBUF_NAMESPACE_ID::internal::CompareByDerefFirst Less; + typedef ::google::protobuf::internal::CompareByDerefFirst Less; struct Utf8Check { static void Check(ConstPtr p) { - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( p->first.data(), static_cast(p->first.length()), - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "agones.dev.sdk.GameServer.ObjectMeta.AnnotationsEntry.key"); - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( p->second.data(), static_cast(p->second.length()), - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "agones.dev.sdk.GameServer.ObjectMeta.AnnotationsEntry.value"); } }; - if (stream->IsSerializationDeterministic() && - this->_internal_annotations().size() > 1) { + if (false && + this->annotations().size() > 1) { ::std::unique_ptr items( - new SortItem[this->_internal_annotations().size()]); - typedef ::PROTOBUF_NAMESPACE_ID::Map< std::string, std::string >::size_type size_type; + new SortItem[this->annotations().size()]); + typedef ::google::protobuf::Map< ::std::string, ::std::string >::size_type size_type; size_type n = 0; - for (::PROTOBUF_NAMESPACE_ID::Map< std::string, std::string >::const_iterator - it = this->_internal_annotations().begin(); - it != this->_internal_annotations().end(); ++it, ++n) { + for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator + it = this->annotations().begin(); + it != this->annotations().end(); ++it, ++n) { items[static_cast(n)] = SortItem(&*it); } ::std::sort(&items[0], &items[static_cast(n)], Less()); + ::std::unique_ptr entry; for (size_type i = 0; i < n; i++) { - target = GameServer_ObjectMeta_AnnotationsEntry_DoNotUse::Funcs::InternalSerialize(8, items[static_cast(i)]->first, items[static_cast(i)]->second, target, stream); + entry.reset(annotations_.NewEntryWrapper(items[static_cast(i)]->first, items[static_cast(i)]->second)); + target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessageNoVirtualToArray(8, *entry, target); Utf8Check::Check(&(*items[static_cast(i)])); } } else { - for (::PROTOBUF_NAMESPACE_ID::Map< std::string, std::string >::const_iterator - it = this->_internal_annotations().begin(); - it != this->_internal_annotations().end(); ++it) { - target = GameServer_ObjectMeta_AnnotationsEntry_DoNotUse::Funcs::InternalSerialize(8, it->first, it->second, target, stream); + ::std::unique_ptr entry; + for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator + it = this->annotations().begin(); + it != this->annotations().end(); ++it) { + entry.reset(annotations_.NewEntryWrapper(it->first, it->second)); + target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessageNoVirtualToArray(8, *entry, target); Utf8Check::Check(&(*it)); } } } // map labels = 9; - if (!this->_internal_labels().empty()) { - typedef ::PROTOBUF_NAMESPACE_ID::Map< std::string, std::string >::const_pointer + if (!this->labels().empty()) { + typedef ::google::protobuf::Map< ::std::string, ::std::string >::const_pointer ConstPtr; typedef ConstPtr SortItem; - typedef ::PROTOBUF_NAMESPACE_ID::internal::CompareByDerefFirst Less; + typedef ::google::protobuf::internal::CompareByDerefFirst Less; struct Utf8Check { static void Check(ConstPtr p) { - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( p->first.data(), static_cast(p->first.length()), - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "agones.dev.sdk.GameServer.ObjectMeta.LabelsEntry.key"); - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( p->second.data(), static_cast(p->second.length()), - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "agones.dev.sdk.GameServer.ObjectMeta.LabelsEntry.value"); } }; - if (stream->IsSerializationDeterministic() && - this->_internal_labels().size() > 1) { + if (false && + this->labels().size() > 1) { ::std::unique_ptr items( - new SortItem[this->_internal_labels().size()]); - typedef ::PROTOBUF_NAMESPACE_ID::Map< std::string, std::string >::size_type size_type; + new SortItem[this->labels().size()]); + typedef ::google::protobuf::Map< ::std::string, ::std::string >::size_type size_type; size_type n = 0; - for (::PROTOBUF_NAMESPACE_ID::Map< std::string, std::string >::const_iterator - it = this->_internal_labels().begin(); - it != this->_internal_labels().end(); ++it, ++n) { + for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator + it = this->labels().begin(); + it != this->labels().end(); ++it, ++n) { items[static_cast(n)] = SortItem(&*it); } ::std::sort(&items[0], &items[static_cast(n)], Less()); + ::std::unique_ptr entry; for (size_type i = 0; i < n; i++) { - target = GameServer_ObjectMeta_LabelsEntry_DoNotUse::Funcs::InternalSerialize(9, items[static_cast(i)]->first, items[static_cast(i)]->second, target, stream); + entry.reset(labels_.NewEntryWrapper(items[static_cast(i)]->first, items[static_cast(i)]->second)); + target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessageNoVirtualToArray(9, *entry, target); Utf8Check::Check(&(*items[static_cast(i)])); } } else { - for (::PROTOBUF_NAMESPACE_ID::Map< std::string, std::string >::const_iterator - it = this->_internal_labels().begin(); - it != this->_internal_labels().end(); ++it) { - target = GameServer_ObjectMeta_LabelsEntry_DoNotUse::Funcs::InternalSerialize(9, it->first, it->second, target, stream); + ::std::unique_ptr entry; + for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator + it = this->labels().begin(); + it != this->labels().end(); ++it) { + entry.reset(labels_.NewEntryWrapper(it->first, it->second)); + target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessageNoVirtualToArray(9, *entry, target); Utf8Check::Check(&(*it)); } } } - if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::InternalSerializeUnknownFieldsToArray( - _internal_metadata_.unknown_fields(), target, stream); + if (_internal_metadata_.have_unknown_fields()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields(), target); } // @@protoc_insertion_point(serialize_to_array_end:agones.dev.sdk.GameServer.ObjectMeta) return target; @@ -1415,95 +2165,106 @@ size_t GameServer_ObjectMeta::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:agones.dev.sdk.GameServer.ObjectMeta) size_t total_size = 0; - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + _internal_metadata_.unknown_fields()); + } + ::google::protobuf::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; // map annotations = 8; total_size += 1 * - ::PROTOBUF_NAMESPACE_ID::internal::FromIntSize(this->_internal_annotations_size()); - for (::PROTOBUF_NAMESPACE_ID::Map< std::string, std::string >::const_iterator - it = this->_internal_annotations().begin(); - it != this->_internal_annotations().end(); ++it) { - total_size += GameServer_ObjectMeta_AnnotationsEntry_DoNotUse::Funcs::ByteSizeLong(it->first, it->second); + ::google::protobuf::internal::FromIntSize(this->annotations_size()); + { + ::std::unique_ptr entry; + for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator + it = this->annotations().begin(); + it != this->annotations().end(); ++it) { + entry.reset(annotations_.NewEntryWrapper(it->first, it->second)); + total_size += ::google::protobuf::internal::WireFormatLite:: + MessageSizeNoVirtual(*entry); + } } // map labels = 9; total_size += 1 * - ::PROTOBUF_NAMESPACE_ID::internal::FromIntSize(this->_internal_labels_size()); - for (::PROTOBUF_NAMESPACE_ID::Map< std::string, std::string >::const_iterator - it = this->_internal_labels().begin(); - it != this->_internal_labels().end(); ++it) { - total_size += GameServer_ObjectMeta_LabelsEntry_DoNotUse::Funcs::ByteSizeLong(it->first, it->second); + ::google::protobuf::internal::FromIntSize(this->labels_size()); + { + ::std::unique_ptr entry; + for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator + it = this->labels().begin(); + it != this->labels().end(); ++it) { + entry.reset(labels_.NewEntryWrapper(it->first, it->second)); + total_size += ::google::protobuf::internal::WireFormatLite:: + MessageSizeNoVirtual(*entry); + } } // string name = 1; if (this->name().size() > 0) { total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( - this->_internal_name()); + ::google::protobuf::internal::WireFormatLite::StringSize( + this->name()); } // string namespace = 2; if (this->namespace_().size() > 0) { total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( - this->_internal_namespace_()); + ::google::protobuf::internal::WireFormatLite::StringSize( + this->namespace_()); } // string uid = 3; if (this->uid().size() > 0) { total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( - this->_internal_uid()); + ::google::protobuf::internal::WireFormatLite::StringSize( + this->uid()); } // string resource_version = 4; if (this->resource_version().size() > 0) { total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( - this->_internal_resource_version()); + ::google::protobuf::internal::WireFormatLite::StringSize( + this->resource_version()); } // int64 generation = 5; if (this->generation() != 0) { total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int64Size( - this->_internal_generation()); + ::google::protobuf::internal::WireFormatLite::Int64Size( + this->generation()); } // int64 creation_timestamp = 6; if (this->creation_timestamp() != 0) { total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int64Size( - this->_internal_creation_timestamp()); + ::google::protobuf::internal::WireFormatLite::Int64Size( + this->creation_timestamp()); } // int64 deletion_timestamp = 7; if (this->deletion_timestamp() != 0) { total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int64Size( - this->_internal_deletion_timestamp()); + ::google::protobuf::internal::WireFormatLite::Int64Size( + this->deletion_timestamp()); } - if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - return ::PROTOBUF_NAMESPACE_ID::internal::ComputeUnknownFieldsSize( - _internal_metadata_, total_size, &_cached_size_); - } - int cached_size = ::PROTOBUF_NAMESPACE_ID::internal::ToCachedSize(total_size); + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); SetCachedSize(cached_size); return total_size; } -void GameServer_ObjectMeta::MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) { +void GameServer_ObjectMeta::MergeFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:agones.dev.sdk.GameServer.ObjectMeta) GOOGLE_DCHECK_NE(&from, this); const GameServer_ObjectMeta* source = - ::PROTOBUF_NAMESPACE_ID::DynamicCastToGenerated( + ::google::protobuf::DynamicCastToGenerated( &from); if (source == nullptr) { // @@protoc_insertion_point(generalized_merge_from_cast_fail:agones.dev.sdk.GameServer.ObjectMeta) - ::PROTOBUF_NAMESPACE_ID::internal::ReflectionOps::Merge(from, this); + ::google::protobuf::internal::ReflectionOps::Merge(from, this); } else { // @@protoc_insertion_point(generalized_merge_from_cast_success:agones.dev.sdk.GameServer.ObjectMeta) MergeFrom(*source); @@ -1514,39 +2275,39 @@ void GameServer_ObjectMeta::MergeFrom(const GameServer_ObjectMeta& from) { // @@protoc_insertion_point(class_specific_merge_from_start:agones.dev.sdk.GameServer.ObjectMeta) GOOGLE_DCHECK_NE(&from, this); _internal_metadata_.MergeFrom(from._internal_metadata_); - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; annotations_.MergeFrom(from.annotations_); labels_.MergeFrom(from.labels_); if (from.name().size() > 0) { - name_.AssignWithDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from.name_); + name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); } if (from.namespace_().size() > 0) { - namespace__.AssignWithDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from.namespace__); + namespace__.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.namespace__); } if (from.uid().size() > 0) { - uid_.AssignWithDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from.uid_); + uid_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.uid_); } if (from.resource_version().size() > 0) { - resource_version_.AssignWithDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from.resource_version_); + resource_version_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.resource_version_); } if (from.generation() != 0) { - _internal_set_generation(from._internal_generation()); + set_generation(from.generation()); } if (from.creation_timestamp() != 0) { - _internal_set_creation_timestamp(from._internal_creation_timestamp()); + set_creation_timestamp(from.creation_timestamp()); } if (from.deletion_timestamp() != 0) { - _internal_set_deletion_timestamp(from._internal_deletion_timestamp()); + set_deletion_timestamp(from.deletion_timestamp()); } } -void GameServer_ObjectMeta::CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) { +void GameServer_ObjectMeta::CopyFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_copy_from_start:agones.dev.sdk.GameServer.ObjectMeta) if (&from == this) return; Clear(); @@ -1564,26 +2325,31 @@ bool GameServer_ObjectMeta::IsInitialized() const { return true; } +void GameServer_ObjectMeta::Swap(GameServer_ObjectMeta* other) { + if (other == this) return; + InternalSwap(other); +} void GameServer_ObjectMeta::InternalSwap(GameServer_ObjectMeta* other) { using std::swap; _internal_metadata_.Swap(&other->_internal_metadata_); annotations_.Swap(&other->annotations_); labels_.Swap(&other->labels_); - name_.Swap(&other->name_, &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + name_.Swap(&other->name_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); - namespace__.Swap(&other->namespace__, &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + namespace__.Swap(&other->namespace__, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); - uid_.Swap(&other->uid_, &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + uid_.Swap(&other->uid_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); - resource_version_.Swap(&other->resource_version_, &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + resource_version_.Swap(&other->resource_version_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); swap(generation_, other->generation_); swap(creation_timestamp_, other->creation_timestamp_); swap(deletion_timestamp_, other->deletion_timestamp_); } -::PROTOBUF_NAMESPACE_ID::Metadata GameServer_ObjectMeta::GetMetadata() const { - return GetMetadataStatic(); +::google::protobuf::Metadata GameServer_ObjectMeta::GetMetadata() const { + ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_sdk_2eproto); + return ::file_level_metadata_sdk_2eproto[kIndexInFileMessages]; } @@ -1591,17 +2357,24 @@ ::PROTOBUF_NAMESPACE_ID::Metadata GameServer_ObjectMeta::GetMetadata() const { void GameServer_Spec_Health::InitAsDefaultInstance() { } -class GameServer_Spec_Health::_Internal { +class GameServer_Spec_Health::HasBitSetters { public: }; +#if !defined(_MSC_VER) || _MSC_VER >= 1900 +const int GameServer_Spec_Health::kDisabledFieldNumber; +const int GameServer_Spec_Health::kPeriodSecondsFieldNumber; +const int GameServer_Spec_Health::kFailureThresholdFieldNumber; +const int GameServer_Spec_Health::kInitialDelaySecondsFieldNumber; +#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 + GameServer_Spec_Health::GameServer_Spec_Health() - : ::PROTOBUF_NAMESPACE_ID::Message(), _internal_metadata_(nullptr) { + : ::google::protobuf::Message(), _internal_metadata_(nullptr) { SharedCtor(); // @@protoc_insertion_point(constructor:agones.dev.sdk.GameServer.Spec.Health) } GameServer_Spec_Health::GameServer_Spec_Health(const GameServer_Spec_Health& from) - : ::PROTOBUF_NAMESPACE_ID::Message(), + : ::google::protobuf::Message(), _internal_metadata_(nullptr) { _internal_metadata_.MergeFrom(from._internal_metadata_); ::memcpy(&disabled_, &from.disabled_, @@ -1628,14 +2401,14 @@ void GameServer_Spec_Health::SetCachedSize(int size) const { _cached_size_.Set(size); } const GameServer_Spec_Health& GameServer_Spec_Health::default_instance() { - ::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&::scc_info_GameServer_Spec_Health_sdk_2eproto.base); + ::google::protobuf::internal::InitSCC(&::scc_info_GameServer_Spec_Health_sdk_2eproto.base); return *internal_default_instance(); } void GameServer_Spec_Health::Clear() { // @@protoc_insertion_point(message_clear_start:agones.dev.sdk.GameServer.Spec.Health) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + ::google::protobuf::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -1645,94 +2418,209 @@ void GameServer_Spec_Health::Clear() { _internal_metadata_.Clear(); } -const char* GameServer_Spec_Health::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) { -#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure - while (!ctx->Done(&ptr)) { - ::PROTOBUF_NAMESPACE_ID::uint32 tag; - ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); - CHK_(ptr); +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +const char* GameServer_Spec_Health::_InternalParse(const char* begin, const char* end, void* object, + ::google::protobuf::internal::ParseContext* ctx) { + auto msg = static_cast(object); + ::google::protobuf::int32 size; (void)size; + int depth; (void)depth; + ::google::protobuf::uint32 tag; + ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; + auto ptr = begin; + while (ptr < end) { + ptr = ::google::protobuf::io::Parse32(ptr, &tag); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); switch (tag >> 3) { // bool disabled = 1; - case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) { - disabled_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint(&ptr); - CHK_(ptr); - } else goto handle_unusual; - continue; + case 1: { + if (static_cast<::google::protobuf::uint8>(tag) != 8) goto handle_unusual; + msg->set_disabled(::google::protobuf::internal::ReadVarint(&ptr)); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + break; + } // int32 period_seconds = 2; - case 2: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 16)) { - period_seconds_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint(&ptr); - CHK_(ptr); - } else goto handle_unusual; - continue; + case 2: { + if (static_cast<::google::protobuf::uint8>(tag) != 16) goto handle_unusual; + msg->set_period_seconds(::google::protobuf::internal::ReadVarint(&ptr)); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + break; + } // int32 failure_threshold = 3; - case 3: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 24)) { - failure_threshold_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint(&ptr); - CHK_(ptr); - } else goto handle_unusual; - continue; + case 3: { + if (static_cast<::google::protobuf::uint8>(tag) != 24) goto handle_unusual; + msg->set_failure_threshold(::google::protobuf::internal::ReadVarint(&ptr)); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + break; + } // int32 initial_delay_seconds = 4; - case 4: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 32)) { - initial_delay_seconds_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint(&ptr); - CHK_(ptr); - } else goto handle_unusual; - continue; + case 4: { + if (static_cast<::google::protobuf::uint8>(tag) != 32) goto handle_unusual; + msg->set_initial_delay_seconds(::google::protobuf::internal::ReadVarint(&ptr)); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + break; + } default: { handle_unusual: if ((tag & 7) == 4 || tag == 0) { - ctx->SetLastTag(tag); - goto success; + ctx->EndGroup(tag); + return ptr; } - ptr = UnknownFieldParse(tag, &_internal_metadata_, ptr, ctx); - CHK_(ptr != nullptr); - continue; + auto res = UnknownFieldParse(tag, {_InternalParse, msg}, + ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); + ptr = res.first; + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); + if (res.second) return ptr; } } // switch } // while -success: return ptr; +} +#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +bool GameServer_Spec_Health::MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure + ::google::protobuf::uint32 tag; + // @@protoc_insertion_point(parse_start:agones.dev.sdk.GameServer.Spec.Health) + for (;;) { + ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); + tag = p.first; + if (!p.second) goto handle_unusual; + switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { + // bool disabled = 1; + case 1: { + if (static_cast< ::google::protobuf::uint8>(tag) == (8 & 0xFF)) { + + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( + input, &disabled_))); + } else { + goto handle_unusual; + } + break; + } + + // int32 period_seconds = 2; + case 2: { + if (static_cast< ::google::protobuf::uint8>(tag) == (16 & 0xFF)) { + + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( + input, &period_seconds_))); + } else { + goto handle_unusual; + } + break; + } + + // int32 failure_threshold = 3; + case 3: { + if (static_cast< ::google::protobuf::uint8>(tag) == (24 & 0xFF)) { + + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( + input, &failure_threshold_))); + } else { + goto handle_unusual; + } + break; + } + + // int32 initial_delay_seconds = 4; + case 4: { + if (static_cast< ::google::protobuf::uint8>(tag) == (32 & 0xFF)) { + + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( + input, &initial_delay_seconds_))); + } else { + goto handle_unusual; + } + break; + } + + default: { + handle_unusual: + if (tag == 0) { + goto success; + } + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, _internal_metadata_.mutable_unknown_fields())); + break; + } + } + } +success: + // @@protoc_insertion_point(parse_success:agones.dev.sdk.GameServer.Spec.Health) + return true; failure: - ptr = nullptr; - goto success; -#undef CHK_ + // @@protoc_insertion_point(parse_failure:agones.dev.sdk.GameServer.Spec.Health) + return false; +#undef DO_ +} +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + +void GameServer_Spec_Health::SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const { + // @@protoc_insertion_point(serialize_start:agones.dev.sdk.GameServer.Spec.Health) + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + // bool disabled = 1; + if (this->disabled() != 0) { + ::google::protobuf::internal::WireFormatLite::WriteBool(1, this->disabled(), output); + } + + // int32 period_seconds = 2; + if (this->period_seconds() != 0) { + ::google::protobuf::internal::WireFormatLite::WriteInt32(2, this->period_seconds(), output); + } + + // int32 failure_threshold = 3; + if (this->failure_threshold() != 0) { + ::google::protobuf::internal::WireFormatLite::WriteInt32(3, this->failure_threshold(), output); + } + + // int32 initial_delay_seconds = 4; + if (this->initial_delay_seconds() != 0) { + ::google::protobuf::internal::WireFormatLite::WriteInt32(4, this->initial_delay_seconds(), output); + } + + if (_internal_metadata_.have_unknown_fields()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + _internal_metadata_.unknown_fields(), output); + } + // @@protoc_insertion_point(serialize_end:agones.dev.sdk.GameServer.Spec.Health) } -::PROTOBUF_NAMESPACE_ID::uint8* GameServer_Spec_Health::InternalSerializeWithCachedSizesToArray( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +::google::protobuf::uint8* GameServer_Spec_Health::InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { // @@protoc_insertion_point(serialize_to_array_start:agones.dev.sdk.GameServer.Spec.Health) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; // bool disabled = 1; if (this->disabled() != 0) { - stream->EnsureSpace(&target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteBoolToArray(1, this->_internal_disabled(), target); + target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(1, this->disabled(), target); } // int32 period_seconds = 2; if (this->period_seconds() != 0) { - stream->EnsureSpace(&target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt32ToArray(2, this->_internal_period_seconds(), target); + target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(2, this->period_seconds(), target); } // int32 failure_threshold = 3; if (this->failure_threshold() != 0) { - stream->EnsureSpace(&target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt32ToArray(3, this->_internal_failure_threshold(), target); + target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(3, this->failure_threshold(), target); } // int32 initial_delay_seconds = 4; if (this->initial_delay_seconds() != 0) { - stream->EnsureSpace(&target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt32ToArray(4, this->_internal_initial_delay_seconds(), target); + target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(4, this->initial_delay_seconds(), target); } - if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::InternalSerializeUnknownFieldsToArray( - _internal_metadata_.unknown_fields(), target, stream); + if (_internal_metadata_.have_unknown_fields()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields(), target); } // @@protoc_insertion_point(serialize_to_array_end:agones.dev.sdk.GameServer.Spec.Health) return target; @@ -1742,7 +2630,12 @@ size_t GameServer_Spec_Health::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:agones.dev.sdk.GameServer.Spec.Health) size_t total_size = 0; - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + _internal_metadata_.unknown_fields()); + } + ::google::protobuf::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -1754,42 +2647,38 @@ size_t GameServer_Spec_Health::ByteSizeLong() const { // int32 period_seconds = 2; if (this->period_seconds() != 0) { total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int32Size( - this->_internal_period_seconds()); + ::google::protobuf::internal::WireFormatLite::Int32Size( + this->period_seconds()); } // int32 failure_threshold = 3; if (this->failure_threshold() != 0) { total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int32Size( - this->_internal_failure_threshold()); + ::google::protobuf::internal::WireFormatLite::Int32Size( + this->failure_threshold()); } // int32 initial_delay_seconds = 4; if (this->initial_delay_seconds() != 0) { total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int32Size( - this->_internal_initial_delay_seconds()); + ::google::protobuf::internal::WireFormatLite::Int32Size( + this->initial_delay_seconds()); } - if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - return ::PROTOBUF_NAMESPACE_ID::internal::ComputeUnknownFieldsSize( - _internal_metadata_, total_size, &_cached_size_); - } - int cached_size = ::PROTOBUF_NAMESPACE_ID::internal::ToCachedSize(total_size); + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); SetCachedSize(cached_size); return total_size; } -void GameServer_Spec_Health::MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) { +void GameServer_Spec_Health::MergeFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:agones.dev.sdk.GameServer.Spec.Health) GOOGLE_DCHECK_NE(&from, this); const GameServer_Spec_Health* source = - ::PROTOBUF_NAMESPACE_ID::DynamicCastToGenerated( + ::google::protobuf::DynamicCastToGenerated( &from); if (source == nullptr) { // @@protoc_insertion_point(generalized_merge_from_cast_fail:agones.dev.sdk.GameServer.Spec.Health) - ::PROTOBUF_NAMESPACE_ID::internal::ReflectionOps::Merge(from, this); + ::google::protobuf::internal::ReflectionOps::Merge(from, this); } else { // @@protoc_insertion_point(generalized_merge_from_cast_success:agones.dev.sdk.GameServer.Spec.Health) MergeFrom(*source); @@ -1800,24 +2689,24 @@ void GameServer_Spec_Health::MergeFrom(const GameServer_Spec_Health& from) { // @@protoc_insertion_point(class_specific_merge_from_start:agones.dev.sdk.GameServer.Spec.Health) GOOGLE_DCHECK_NE(&from, this); _internal_metadata_.MergeFrom(from._internal_metadata_); - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; if (from.disabled() != 0) { - _internal_set_disabled(from._internal_disabled()); + set_disabled(from.disabled()); } if (from.period_seconds() != 0) { - _internal_set_period_seconds(from._internal_period_seconds()); + set_period_seconds(from.period_seconds()); } if (from.failure_threshold() != 0) { - _internal_set_failure_threshold(from._internal_failure_threshold()); + set_failure_threshold(from.failure_threshold()); } if (from.initial_delay_seconds() != 0) { - _internal_set_initial_delay_seconds(from._internal_initial_delay_seconds()); + set_initial_delay_seconds(from.initial_delay_seconds()); } } -void GameServer_Spec_Health::CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) { +void GameServer_Spec_Health::CopyFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_copy_from_start:agones.dev.sdk.GameServer.Spec.Health) if (&from == this) return; Clear(); @@ -1835,6 +2724,10 @@ bool GameServer_Spec_Health::IsInitialized() const { return true; } +void GameServer_Spec_Health::Swap(GameServer_Spec_Health* other) { + if (other == this) return; + InternalSwap(other); +} void GameServer_Spec_Health::InternalSwap(GameServer_Spec_Health* other) { using std::swap; _internal_metadata_.Swap(&other->_internal_metadata_); @@ -1844,8 +2737,9 @@ void GameServer_Spec_Health::InternalSwap(GameServer_Spec_Health* other) { swap(initial_delay_seconds_, other->initial_delay_seconds_); } -::PROTOBUF_NAMESPACE_ID::Metadata GameServer_Spec_Health::GetMetadata() const { - return GetMetadataStatic(); +::google::protobuf::Metadata GameServer_Spec_Health::GetMetadata() const { + ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_sdk_2eproto); + return ::file_level_metadata_sdk_2eproto[kIndexInFileMessages]; } @@ -1855,25 +2749,29 @@ void GameServer_Spec::InitAsDefaultInstance() { ::agones::dev::sdk::_GameServer_Spec_default_instance_._instance.get_mutable()->health_ = const_cast< ::agones::dev::sdk::GameServer_Spec_Health*>( ::agones::dev::sdk::GameServer_Spec_Health::internal_default_instance()); } -class GameServer_Spec::_Internal { +class GameServer_Spec::HasBitSetters { public: static const ::agones::dev::sdk::GameServer_Spec_Health& health(const GameServer_Spec* msg); }; const ::agones::dev::sdk::GameServer_Spec_Health& -GameServer_Spec::_Internal::health(const GameServer_Spec* msg) { +GameServer_Spec::HasBitSetters::health(const GameServer_Spec* msg) { return *msg->health_; } +#if !defined(_MSC_VER) || _MSC_VER >= 1900 +const int GameServer_Spec::kHealthFieldNumber; +#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 + GameServer_Spec::GameServer_Spec() - : ::PROTOBUF_NAMESPACE_ID::Message(), _internal_metadata_(nullptr) { + : ::google::protobuf::Message(), _internal_metadata_(nullptr) { SharedCtor(); // @@protoc_insertion_point(constructor:agones.dev.sdk.GameServer.Spec) } GameServer_Spec::GameServer_Spec(const GameServer_Spec& from) - : ::PROTOBUF_NAMESPACE_ID::Message(), + : ::google::protobuf::Message(), _internal_metadata_(nullptr) { _internal_metadata_.MergeFrom(from._internal_metadata_); - if (from._internal_has_health()) { + if (from.has_health()) { health_ = new ::agones::dev::sdk::GameServer_Spec_Health(*from.health_); } else { health_ = nullptr; @@ -1882,7 +2780,8 @@ GameServer_Spec::GameServer_Spec(const GameServer_Spec& from) } void GameServer_Spec::SharedCtor() { - ::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&scc_info_GameServer_Spec_sdk_2eproto.base); + ::google::protobuf::internal::InitSCC( + &scc_info_GameServer_Spec_sdk_2eproto.base); health_ = nullptr; } @@ -1899,14 +2798,14 @@ void GameServer_Spec::SetCachedSize(int size) const { _cached_size_.Set(size); } const GameServer_Spec& GameServer_Spec::default_instance() { - ::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&::scc_info_GameServer_Spec_sdk_2eproto.base); + ::google::protobuf::internal::InitSCC(&::scc_info_GameServer_Spec_sdk_2eproto.base); return *internal_default_instance(); } void GameServer_Spec::Clear() { // @@protoc_insertion_point(message_clear_start:agones.dev.sdk.GameServer.Spec) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + ::google::protobuf::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -1917,57 +2816,129 @@ void GameServer_Spec::Clear() { _internal_metadata_.Clear(); } -const char* GameServer_Spec::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) { -#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure - while (!ctx->Done(&ptr)) { - ::PROTOBUF_NAMESPACE_ID::uint32 tag; - ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); - CHK_(ptr); +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +const char* GameServer_Spec::_InternalParse(const char* begin, const char* end, void* object, + ::google::protobuf::internal::ParseContext* ctx) { + auto msg = static_cast(object); + ::google::protobuf::int32 size; (void)size; + int depth; (void)depth; + ::google::protobuf::uint32 tag; + ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; + auto ptr = begin; + while (ptr < end) { + ptr = ::google::protobuf::io::Parse32(ptr, &tag); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); switch (tag >> 3) { // .agones.dev.sdk.GameServer.Spec.Health health = 1; - case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 10)) { - ptr = ctx->ParseMessage(_internal_mutable_health(), ptr); - CHK_(ptr); - } else goto handle_unusual; - continue; + case 1: { + if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + parser_till_end = ::agones::dev::sdk::GameServer_Spec_Health::_InternalParse; + object = msg->mutable_health(); + if (size > end - ptr) goto len_delim_till_end; + ptr += size; + GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange( + {parser_till_end, object}, ptr - size, ptr)); + break; + } default: { handle_unusual: if ((tag & 7) == 4 || tag == 0) { - ctx->SetLastTag(tag); - goto success; + ctx->EndGroup(tag); + return ptr; } - ptr = UnknownFieldParse(tag, &_internal_metadata_, ptr, ctx); - CHK_(ptr != nullptr); - continue; + auto res = UnknownFieldParse(tag, {_InternalParse, msg}, + ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); + ptr = res.first; + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); + if (res.second) return ptr; } } // switch } // while -success: return ptr; +len_delim_till_end: + return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg}, + {parser_till_end, object}, size); +} +#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +bool GameServer_Spec::MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure + ::google::protobuf::uint32 tag; + // @@protoc_insertion_point(parse_start:agones.dev.sdk.GameServer.Spec) + for (;;) { + ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); + tag = p.first; + if (!p.second) goto handle_unusual; + switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { + // .agones.dev.sdk.GameServer.Spec.Health health = 1; + case 1: { + if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( + input, mutable_health())); + } else { + goto handle_unusual; + } + break; + } + + default: { + handle_unusual: + if (tag == 0) { + goto success; + } + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, _internal_metadata_.mutable_unknown_fields())); + break; + } + } + } +success: + // @@protoc_insertion_point(parse_success:agones.dev.sdk.GameServer.Spec) + return true; failure: - ptr = nullptr; - goto success; -#undef CHK_ + // @@protoc_insertion_point(parse_failure:agones.dev.sdk.GameServer.Spec) + return false; +#undef DO_ +} +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + +void GameServer_Spec::SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const { + // @@protoc_insertion_point(serialize_start:agones.dev.sdk.GameServer.Spec) + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + // .agones.dev.sdk.GameServer.Spec.Health health = 1; + if (this->has_health()) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 1, HasBitSetters::health(this), output); + } + + if (_internal_metadata_.have_unknown_fields()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + _internal_metadata_.unknown_fields(), output); + } + // @@protoc_insertion_point(serialize_end:agones.dev.sdk.GameServer.Spec) } -::PROTOBUF_NAMESPACE_ID::uint8* GameServer_Spec::InternalSerializeWithCachedSizesToArray( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +::google::protobuf::uint8* GameServer_Spec::InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { // @@protoc_insertion_point(serialize_to_array_start:agones.dev.sdk.GameServer.Spec) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; // .agones.dev.sdk.GameServer.Spec.Health health = 1; if (this->has_health()) { - stream->EnsureSpace(&target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: + target = ::google::protobuf::internal::WireFormatLite:: InternalWriteMessageToArray( - 1, _Internal::health(this), target, stream); + 1, HasBitSetters::health(this), target); } - if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::InternalSerializeUnknownFieldsToArray( - _internal_metadata_.unknown_fields(), target, stream); + if (_internal_metadata_.have_unknown_fields()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields(), target); } // @@protoc_insertion_point(serialize_to_array_end:agones.dev.sdk.GameServer.Spec) return target; @@ -1977,35 +2948,36 @@ size_t GameServer_Spec::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:agones.dev.sdk.GameServer.Spec) size_t total_size = 0; - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + _internal_metadata_.unknown_fields()); + } + ::google::protobuf::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; // .agones.dev.sdk.GameServer.Spec.Health health = 1; if (this->has_health()) { total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize( + ::google::protobuf::internal::WireFormatLite::MessageSize( *health_); } - if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - return ::PROTOBUF_NAMESPACE_ID::internal::ComputeUnknownFieldsSize( - _internal_metadata_, total_size, &_cached_size_); - } - int cached_size = ::PROTOBUF_NAMESPACE_ID::internal::ToCachedSize(total_size); + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); SetCachedSize(cached_size); return total_size; } -void GameServer_Spec::MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) { +void GameServer_Spec::MergeFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:agones.dev.sdk.GameServer.Spec) GOOGLE_DCHECK_NE(&from, this); const GameServer_Spec* source = - ::PROTOBUF_NAMESPACE_ID::DynamicCastToGenerated( + ::google::protobuf::DynamicCastToGenerated( &from); if (source == nullptr) { // @@protoc_insertion_point(generalized_merge_from_cast_fail:agones.dev.sdk.GameServer.Spec) - ::PROTOBUF_NAMESPACE_ID::internal::ReflectionOps::Merge(from, this); + ::google::protobuf::internal::ReflectionOps::Merge(from, this); } else { // @@protoc_insertion_point(generalized_merge_from_cast_success:agones.dev.sdk.GameServer.Spec) MergeFrom(*source); @@ -2016,15 +2988,15 @@ void GameServer_Spec::MergeFrom(const GameServer_Spec& from) { // @@protoc_insertion_point(class_specific_merge_from_start:agones.dev.sdk.GameServer.Spec) GOOGLE_DCHECK_NE(&from, this); _internal_metadata_.MergeFrom(from._internal_metadata_); - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; if (from.has_health()) { - _internal_mutable_health()->::agones::dev::sdk::GameServer_Spec_Health::MergeFrom(from._internal_health()); + mutable_health()->::agones::dev::sdk::GameServer_Spec_Health::MergeFrom(from.health()); } } -void GameServer_Spec::CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) { +void GameServer_Spec::CopyFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_copy_from_start:agones.dev.sdk.GameServer.Spec) if (&from == this) return; Clear(); @@ -2042,14 +3014,19 @@ bool GameServer_Spec::IsInitialized() const { return true; } +void GameServer_Spec::Swap(GameServer_Spec* other) { + if (other == this) return; + InternalSwap(other); +} void GameServer_Spec::InternalSwap(GameServer_Spec* other) { using std::swap; _internal_metadata_.Swap(&other->_internal_metadata_); swap(health_, other->health_); } -::PROTOBUF_NAMESPACE_ID::Metadata GameServer_Spec::GetMetadata() const { - return GetMetadataStatic(); +::google::protobuf::Metadata GameServer_Spec::GetMetadata() const { + ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_sdk_2eproto); + return ::file_level_metadata_sdk_2eproto[kIndexInFileMessages]; } @@ -2057,30 +3034,36 @@ ::PROTOBUF_NAMESPACE_ID::Metadata GameServer_Spec::GetMetadata() const { void GameServer_Status_Port::InitAsDefaultInstance() { } -class GameServer_Status_Port::_Internal { +class GameServer_Status_Port::HasBitSetters { public: }; +#if !defined(_MSC_VER) || _MSC_VER >= 1900 +const int GameServer_Status_Port::kNameFieldNumber; +const int GameServer_Status_Port::kPortFieldNumber; +#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 + GameServer_Status_Port::GameServer_Status_Port() - : ::PROTOBUF_NAMESPACE_ID::Message(), _internal_metadata_(nullptr) { + : ::google::protobuf::Message(), _internal_metadata_(nullptr) { SharedCtor(); // @@protoc_insertion_point(constructor:agones.dev.sdk.GameServer.Status.Port) } GameServer_Status_Port::GameServer_Status_Port(const GameServer_Status_Port& from) - : ::PROTOBUF_NAMESPACE_ID::Message(), + : ::google::protobuf::Message(), _internal_metadata_(nullptr) { _internal_metadata_.MergeFrom(from._internal_metadata_); - name_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); - if (!from._internal_name().empty()) { - name_.AssignWithDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from.name_); + name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.name().size() > 0) { + name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); } port_ = from.port_; // @@protoc_insertion_point(copy_constructor:agones.dev.sdk.GameServer.Status.Port) } void GameServer_Status_Port::SharedCtor() { - ::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&scc_info_GameServer_Status_Port_sdk_2eproto.base); - name_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + ::google::protobuf::internal::InitSCC( + &scc_info_GameServer_Status_Port_sdk_2eproto.base); + name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); port_ = 0; } @@ -2090,95 +3073,201 @@ GameServer_Status_Port::~GameServer_Status_Port() { } void GameServer_Status_Port::SharedDtor() { - name_.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } void GameServer_Status_Port::SetCachedSize(int size) const { _cached_size_.Set(size); } const GameServer_Status_Port& GameServer_Status_Port::default_instance() { - ::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&::scc_info_GameServer_Status_Port_sdk_2eproto.base); + ::google::protobuf::internal::InitSCC(&::scc_info_GameServer_Status_Port_sdk_2eproto.base); return *internal_default_instance(); } void GameServer_Status_Port::Clear() { // @@protoc_insertion_point(message_clear_start:agones.dev.sdk.GameServer.Status.Port) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + ::google::protobuf::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - name_.ClearToEmptyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); port_ = 0; _internal_metadata_.Clear(); } -const char* GameServer_Status_Port::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) { -#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure - while (!ctx->Done(&ptr)) { - ::PROTOBUF_NAMESPACE_ID::uint32 tag; - ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); - CHK_(ptr); +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +const char* GameServer_Status_Port::_InternalParse(const char* begin, const char* end, void* object, + ::google::protobuf::internal::ParseContext* ctx) { + auto msg = static_cast(object); + ::google::protobuf::int32 size; (void)size; + int depth; (void)depth; + ::google::protobuf::uint32 tag; + ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; + auto ptr = begin; + while (ptr < end) { + ptr = ::google::protobuf::io::Parse32(ptr, &tag); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); switch (tag >> 3) { // string name = 1; - case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 10)) { - ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParserUTF8(_internal_mutable_name(), ptr, ctx, "agones.dev.sdk.GameServer.Status.Port.name"); - CHK_(ptr); - } else goto handle_unusual; - continue; + case 1: { + if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + ctx->extra_parse_data().SetFieldName("agones.dev.sdk.GameServer.Status.Port.name"); + object = msg->mutable_name(); + if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { + parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; + goto string_till_end; + } + GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); + ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); + ptr += size; + break; + } // int32 port = 2; - case 2: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 16)) { - port_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint(&ptr); - CHK_(ptr); - } else goto handle_unusual; - continue; + case 2: { + if (static_cast<::google::protobuf::uint8>(tag) != 16) goto handle_unusual; + msg->set_port(::google::protobuf::internal::ReadVarint(&ptr)); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + break; + } default: { handle_unusual: if ((tag & 7) == 4 || tag == 0) { - ctx->SetLastTag(tag); - goto success; + ctx->EndGroup(tag); + return ptr; } - ptr = UnknownFieldParse(tag, &_internal_metadata_, ptr, ctx); - CHK_(ptr != nullptr); - continue; + auto res = UnknownFieldParse(tag, {_InternalParse, msg}, + ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); + ptr = res.first; + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); + if (res.second) return ptr; } } // switch } // while -success: return ptr; +string_till_end: + static_cast<::std::string*>(object)->clear(); + static_cast<::std::string*>(object)->reserve(size); + goto len_delim_till_end; +len_delim_till_end: + return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg}, + {parser_till_end, object}, size); +} +#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +bool GameServer_Status_Port::MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure + ::google::protobuf::uint32 tag; + // @@protoc_insertion_point(parse_start:agones.dev.sdk.GameServer.Status.Port) + for (;;) { + ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); + tag = p.first; + if (!p.second) goto handle_unusual; + switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { + // string name = 1; + case 1: { + if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadString( + input, this->mutable_name())); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->name().data(), static_cast(this->name().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "agones.dev.sdk.GameServer.Status.Port.name")); + } else { + goto handle_unusual; + } + break; + } + + // int32 port = 2; + case 2: { + if (static_cast< ::google::protobuf::uint8>(tag) == (16 & 0xFF)) { + + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( + input, &port_))); + } else { + goto handle_unusual; + } + break; + } + + default: { + handle_unusual: + if (tag == 0) { + goto success; + } + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, _internal_metadata_.mutable_unknown_fields())); + break; + } + } + } +success: + // @@protoc_insertion_point(parse_success:agones.dev.sdk.GameServer.Status.Port) + return true; failure: - ptr = nullptr; - goto success; -#undef CHK_ + // @@protoc_insertion_point(parse_failure:agones.dev.sdk.GameServer.Status.Port) + return false; +#undef DO_ +} +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + +void GameServer_Status_Port::SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const { + // @@protoc_insertion_point(serialize_start:agones.dev.sdk.GameServer.Status.Port) + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + // string name = 1; + if (this->name().size() > 0) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->name().data(), static_cast(this->name().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "agones.dev.sdk.GameServer.Status.Port.name"); + ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( + 1, this->name(), output); + } + + // int32 port = 2; + if (this->port() != 0) { + ::google::protobuf::internal::WireFormatLite::WriteInt32(2, this->port(), output); + } + + if (_internal_metadata_.have_unknown_fields()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + _internal_metadata_.unknown_fields(), output); + } + // @@protoc_insertion_point(serialize_end:agones.dev.sdk.GameServer.Status.Port) } -::PROTOBUF_NAMESPACE_ID::uint8* GameServer_Status_Port::InternalSerializeWithCachedSizesToArray( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +::google::protobuf::uint8* GameServer_Status_Port::InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { // @@protoc_insertion_point(serialize_to_array_start:agones.dev.sdk.GameServer.Status.Port) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; // string name = 1; if (this->name().size() > 0) { - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( - this->_internal_name().data(), static_cast(this->_internal_name().length()), - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->name().data(), static_cast(this->name().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "agones.dev.sdk.GameServer.Status.Port.name"); - target = stream->WriteStringMaybeAliased( - 1, this->_internal_name(), target); + target = + ::google::protobuf::internal::WireFormatLite::WriteStringToArray( + 1, this->name(), target); } // int32 port = 2; if (this->port() != 0) { - stream->EnsureSpace(&target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt32ToArray(2, this->_internal_port(), target); + target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(2, this->port(), target); } - if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::InternalSerializeUnknownFieldsToArray( - _internal_metadata_.unknown_fields(), target, stream); + if (_internal_metadata_.have_unknown_fields()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields(), target); } // @@protoc_insertion_point(serialize_to_array_end:agones.dev.sdk.GameServer.Status.Port) return target; @@ -2188,42 +3277,43 @@ size_t GameServer_Status_Port::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:agones.dev.sdk.GameServer.Status.Port) size_t total_size = 0; - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + _internal_metadata_.unknown_fields()); + } + ::google::protobuf::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; // string name = 1; if (this->name().size() > 0) { total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( - this->_internal_name()); + ::google::protobuf::internal::WireFormatLite::StringSize( + this->name()); } // int32 port = 2; if (this->port() != 0) { total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int32Size( - this->_internal_port()); + ::google::protobuf::internal::WireFormatLite::Int32Size( + this->port()); } - if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - return ::PROTOBUF_NAMESPACE_ID::internal::ComputeUnknownFieldsSize( - _internal_metadata_, total_size, &_cached_size_); - } - int cached_size = ::PROTOBUF_NAMESPACE_ID::internal::ToCachedSize(total_size); + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); SetCachedSize(cached_size); return total_size; } -void GameServer_Status_Port::MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) { +void GameServer_Status_Port::MergeFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:agones.dev.sdk.GameServer.Status.Port) GOOGLE_DCHECK_NE(&from, this); const GameServer_Status_Port* source = - ::PROTOBUF_NAMESPACE_ID::DynamicCastToGenerated( + ::google::protobuf::DynamicCastToGenerated( &from); if (source == nullptr) { // @@protoc_insertion_point(generalized_merge_from_cast_fail:agones.dev.sdk.GameServer.Status.Port) - ::PROTOBUF_NAMESPACE_ID::internal::ReflectionOps::Merge(from, this); + ::google::protobuf::internal::ReflectionOps::Merge(from, this); } else { // @@protoc_insertion_point(generalized_merge_from_cast_success:agones.dev.sdk.GameServer.Status.Port) MergeFrom(*source); @@ -2234,19 +3324,19 @@ void GameServer_Status_Port::MergeFrom(const GameServer_Status_Port& from) { // @@protoc_insertion_point(class_specific_merge_from_start:agones.dev.sdk.GameServer.Status.Port) GOOGLE_DCHECK_NE(&from, this); _internal_metadata_.MergeFrom(from._internal_metadata_); - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; if (from.name().size() > 0) { - name_.AssignWithDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from.name_); + name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); } if (from.port() != 0) { - _internal_set_port(from._internal_port()); + set_port(from.port()); } } -void GameServer_Status_Port::CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) { +void GameServer_Status_Port::CopyFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_copy_from_start:agones.dev.sdk.GameServer.Status.Port) if (&from == this) return; Clear(); @@ -2264,16 +3354,21 @@ bool GameServer_Status_Port::IsInitialized() const { return true; } +void GameServer_Status_Port::Swap(GameServer_Status_Port* other) { + if (other == this) return; + InternalSwap(other); +} void GameServer_Status_Port::InternalSwap(GameServer_Status_Port* other) { using std::swap; _internal_metadata_.Swap(&other->_internal_metadata_); - name_.Swap(&other->name_, &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + name_.Swap(&other->name_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); swap(port_, other->port_); } -::PROTOBUF_NAMESPACE_ID::Metadata GameServer_Status_Port::GetMetadata() const { - return GetMetadataStatic(); +::google::protobuf::Metadata GameServer_Status_Port::GetMetadata() const { + ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_sdk_2eproto); + return ::file_level_metadata_sdk_2eproto[kIndexInFileMessages]; } @@ -2281,35 +3376,42 @@ ::PROTOBUF_NAMESPACE_ID::Metadata GameServer_Status_Port::GetMetadata() const { void GameServer_Status::InitAsDefaultInstance() { } -class GameServer_Status::_Internal { +class GameServer_Status::HasBitSetters { public: }; +#if !defined(_MSC_VER) || _MSC_VER >= 1900 +const int GameServer_Status::kStateFieldNumber; +const int GameServer_Status::kAddressFieldNumber; +const int GameServer_Status::kPortsFieldNumber; +#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 + GameServer_Status::GameServer_Status() - : ::PROTOBUF_NAMESPACE_ID::Message(), _internal_metadata_(nullptr) { + : ::google::protobuf::Message(), _internal_metadata_(nullptr) { SharedCtor(); // @@protoc_insertion_point(constructor:agones.dev.sdk.GameServer.Status) } GameServer_Status::GameServer_Status(const GameServer_Status& from) - : ::PROTOBUF_NAMESPACE_ID::Message(), + : ::google::protobuf::Message(), _internal_metadata_(nullptr), ports_(from.ports_) { _internal_metadata_.MergeFrom(from._internal_metadata_); - state_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); - if (!from._internal_state().empty()) { - state_.AssignWithDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from.state_); + state_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.state().size() > 0) { + state_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.state_); } - address_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); - if (!from._internal_address().empty()) { - address_.AssignWithDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from.address_); + address_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.address().size() > 0) { + address_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.address_); } // @@protoc_insertion_point(copy_constructor:agones.dev.sdk.GameServer.Status) } void GameServer_Status::SharedCtor() { - ::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&scc_info_GameServer_Status_sdk_2eproto.base); - state_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); - address_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + ::google::protobuf::internal::InitSCC( + &scc_info_GameServer_Status_sdk_2eproto.base); + state_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + address_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } GameServer_Status::~GameServer_Status() { @@ -2318,121 +3420,269 @@ GameServer_Status::~GameServer_Status() { } void GameServer_Status::SharedDtor() { - state_.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); - address_.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + state_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + address_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } void GameServer_Status::SetCachedSize(int size) const { _cached_size_.Set(size); } const GameServer_Status& GameServer_Status::default_instance() { - ::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&::scc_info_GameServer_Status_sdk_2eproto.base); + ::google::protobuf::internal::InitSCC(&::scc_info_GameServer_Status_sdk_2eproto.base); return *internal_default_instance(); } void GameServer_Status::Clear() { // @@protoc_insertion_point(message_clear_start:agones.dev.sdk.GameServer.Status) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + ::google::protobuf::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; ports_.Clear(); - state_.ClearToEmptyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); - address_.ClearToEmptyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + state_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + address_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); _internal_metadata_.Clear(); } -const char* GameServer_Status::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) { -#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure - while (!ctx->Done(&ptr)) { - ::PROTOBUF_NAMESPACE_ID::uint32 tag; - ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); - CHK_(ptr); +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +const char* GameServer_Status::_InternalParse(const char* begin, const char* end, void* object, + ::google::protobuf::internal::ParseContext* ctx) { + auto msg = static_cast(object); + ::google::protobuf::int32 size; (void)size; + int depth; (void)depth; + ::google::protobuf::uint32 tag; + ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; + auto ptr = begin; + while (ptr < end) { + ptr = ::google::protobuf::io::Parse32(ptr, &tag); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); switch (tag >> 3) { // string state = 1; - case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 10)) { - ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParserUTF8(_internal_mutable_state(), ptr, ctx, "agones.dev.sdk.GameServer.Status.state"); - CHK_(ptr); - } else goto handle_unusual; - continue; + case 1: { + if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + ctx->extra_parse_data().SetFieldName("agones.dev.sdk.GameServer.Status.state"); + object = msg->mutable_state(); + if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { + parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; + goto string_till_end; + } + GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); + ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); + ptr += size; + break; + } // string address = 2; - case 2: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 18)) { - ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParserUTF8(_internal_mutable_address(), ptr, ctx, "agones.dev.sdk.GameServer.Status.address"); - CHK_(ptr); - } else goto handle_unusual; - continue; + case 2: { + if (static_cast<::google::protobuf::uint8>(tag) != 18) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + ctx->extra_parse_data().SetFieldName("agones.dev.sdk.GameServer.Status.address"); + object = msg->mutable_address(); + if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { + parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; + goto string_till_end; + } + GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); + ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); + ptr += size; + break; + } // repeated .agones.dev.sdk.GameServer.Status.Port ports = 3; - case 3: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 26)) { - ptr -= 1; - do { - ptr += 1; - ptr = ctx->ParseMessage(_internal_add_ports(), ptr); - CHK_(ptr); - if (!ctx->DataAvailable(ptr)) break; - } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<26>(ptr)); - } else goto handle_unusual; - continue; + case 3: { + if (static_cast<::google::protobuf::uint8>(tag) != 26) goto handle_unusual; + do { + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + parser_till_end = ::agones::dev::sdk::GameServer_Status_Port::_InternalParse; + object = msg->add_ports(); + if (size > end - ptr) goto len_delim_till_end; + ptr += size; + GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange( + {parser_till_end, object}, ptr - size, ptr)); + if (ptr >= end) break; + } while ((::google::protobuf::io::UnalignedLoad<::google::protobuf::uint64>(ptr) & 255) == 26 && (ptr += 1)); + break; + } default: { handle_unusual: if ((tag & 7) == 4 || tag == 0) { - ctx->SetLastTag(tag); - goto success; + ctx->EndGroup(tag); + return ptr; } - ptr = UnknownFieldParse(tag, &_internal_metadata_, ptr, ctx); - CHK_(ptr != nullptr); - continue; + auto res = UnknownFieldParse(tag, {_InternalParse, msg}, + ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); + ptr = res.first; + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); + if (res.second) return ptr; } } // switch } // while -success: return ptr; +string_till_end: + static_cast<::std::string*>(object)->clear(); + static_cast<::std::string*>(object)->reserve(size); + goto len_delim_till_end; +len_delim_till_end: + return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg}, + {parser_till_end, object}, size); +} +#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +bool GameServer_Status::MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure + ::google::protobuf::uint32 tag; + // @@protoc_insertion_point(parse_start:agones.dev.sdk.GameServer.Status) + for (;;) { + ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); + tag = p.first; + if (!p.second) goto handle_unusual; + switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { + // string state = 1; + case 1: { + if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadString( + input, this->mutable_state())); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->state().data(), static_cast(this->state().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "agones.dev.sdk.GameServer.Status.state")); + } else { + goto handle_unusual; + } + break; + } + + // string address = 2; + case 2: { + if (static_cast< ::google::protobuf::uint8>(tag) == (18 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadString( + input, this->mutable_address())); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->address().data(), static_cast(this->address().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "agones.dev.sdk.GameServer.Status.address")); + } else { + goto handle_unusual; + } + break; + } + + // repeated .agones.dev.sdk.GameServer.Status.Port ports = 3; + case 3: { + if (static_cast< ::google::protobuf::uint8>(tag) == (26 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( + input, add_ports())); + } else { + goto handle_unusual; + } + break; + } + + default: { + handle_unusual: + if (tag == 0) { + goto success; + } + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, _internal_metadata_.mutable_unknown_fields())); + break; + } + } + } +success: + // @@protoc_insertion_point(parse_success:agones.dev.sdk.GameServer.Status) + return true; failure: - ptr = nullptr; - goto success; -#undef CHK_ + // @@protoc_insertion_point(parse_failure:agones.dev.sdk.GameServer.Status) + return false; +#undef DO_ +} +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + +void GameServer_Status::SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const { + // @@protoc_insertion_point(serialize_start:agones.dev.sdk.GameServer.Status) + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + // string state = 1; + if (this->state().size() > 0) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->state().data(), static_cast(this->state().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "agones.dev.sdk.GameServer.Status.state"); + ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( + 1, this->state(), output); + } + + // string address = 2; + if (this->address().size() > 0) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->address().data(), static_cast(this->address().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "agones.dev.sdk.GameServer.Status.address"); + ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( + 2, this->address(), output); + } + + // repeated .agones.dev.sdk.GameServer.Status.Port ports = 3; + for (unsigned int i = 0, + n = static_cast(this->ports_size()); i < n; i++) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 3, + this->ports(static_cast(i)), + output); + } + + if (_internal_metadata_.have_unknown_fields()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + _internal_metadata_.unknown_fields(), output); + } + // @@protoc_insertion_point(serialize_end:agones.dev.sdk.GameServer.Status) } -::PROTOBUF_NAMESPACE_ID::uint8* GameServer_Status::InternalSerializeWithCachedSizesToArray( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +::google::protobuf::uint8* GameServer_Status::InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { // @@protoc_insertion_point(serialize_to_array_start:agones.dev.sdk.GameServer.Status) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; // string state = 1; if (this->state().size() > 0) { - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( - this->_internal_state().data(), static_cast(this->_internal_state().length()), - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->state().data(), static_cast(this->state().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "agones.dev.sdk.GameServer.Status.state"); - target = stream->WriteStringMaybeAliased( - 1, this->_internal_state(), target); + target = + ::google::protobuf::internal::WireFormatLite::WriteStringToArray( + 1, this->state(), target); } // string address = 2; if (this->address().size() > 0) { - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( - this->_internal_address().data(), static_cast(this->_internal_address().length()), - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->address().data(), static_cast(this->address().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "agones.dev.sdk.GameServer.Status.address"); - target = stream->WriteStringMaybeAliased( - 2, this->_internal_address(), target); + target = + ::google::protobuf::internal::WireFormatLite::WriteStringToArray( + 2, this->address(), target); } // repeated .agones.dev.sdk.GameServer.Status.Port ports = 3; for (unsigned int i = 0, - n = static_cast(this->_internal_ports_size()); i < n; i++) { - stream->EnsureSpace(&target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: - InternalWriteMessageToArray(3, this->_internal_ports(i), target, stream); + n = static_cast(this->ports_size()); i < n; i++) { + target = ::google::protobuf::internal::WireFormatLite:: + InternalWriteMessageToArray( + 3, this->ports(static_cast(i)), target); } - if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::InternalSerializeUnknownFieldsToArray( - _internal_metadata_.unknown_fields(), target, stream); + if (_internal_metadata_.have_unknown_fields()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields(), target); } // @@protoc_insertion_point(serialize_to_array_end:agones.dev.sdk.GameServer.Status) return target; @@ -2442,49 +3692,54 @@ size_t GameServer_Status::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:agones.dev.sdk.GameServer.Status) size_t total_size = 0; - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + _internal_metadata_.unknown_fields()); + } + ::google::protobuf::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; // repeated .agones.dev.sdk.GameServer.Status.Port ports = 3; - total_size += 1UL * this->_internal_ports_size(); - for (const auto& msg : this->ports_) { - total_size += - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg); + { + unsigned int count = static_cast(this->ports_size()); + total_size += 1UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSize( + this->ports(static_cast(i))); + } } // string state = 1; if (this->state().size() > 0) { total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( - this->_internal_state()); + ::google::protobuf::internal::WireFormatLite::StringSize( + this->state()); } // string address = 2; if (this->address().size() > 0) { total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( - this->_internal_address()); + ::google::protobuf::internal::WireFormatLite::StringSize( + this->address()); } - if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - return ::PROTOBUF_NAMESPACE_ID::internal::ComputeUnknownFieldsSize( - _internal_metadata_, total_size, &_cached_size_); - } - int cached_size = ::PROTOBUF_NAMESPACE_ID::internal::ToCachedSize(total_size); + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); SetCachedSize(cached_size); return total_size; } -void GameServer_Status::MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) { +void GameServer_Status::MergeFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:agones.dev.sdk.GameServer.Status) GOOGLE_DCHECK_NE(&from, this); const GameServer_Status* source = - ::PROTOBUF_NAMESPACE_ID::DynamicCastToGenerated( + ::google::protobuf::DynamicCastToGenerated( &from); if (source == nullptr) { // @@protoc_insertion_point(generalized_merge_from_cast_fail:agones.dev.sdk.GameServer.Status) - ::PROTOBUF_NAMESPACE_ID::internal::ReflectionOps::Merge(from, this); + ::google::protobuf::internal::ReflectionOps::Merge(from, this); } else { // @@protoc_insertion_point(generalized_merge_from_cast_success:agones.dev.sdk.GameServer.Status) MergeFrom(*source); @@ -2495,21 +3750,21 @@ void GameServer_Status::MergeFrom(const GameServer_Status& from) { // @@protoc_insertion_point(class_specific_merge_from_start:agones.dev.sdk.GameServer.Status) GOOGLE_DCHECK_NE(&from, this); _internal_metadata_.MergeFrom(from._internal_metadata_); - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; ports_.MergeFrom(from.ports_); if (from.state().size() > 0) { - state_.AssignWithDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from.state_); + state_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.state_); } if (from.address().size() > 0) { - address_.AssignWithDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from.address_); + address_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.address_); } } -void GameServer_Status::CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) { +void GameServer_Status::CopyFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_copy_from_start:agones.dev.sdk.GameServer.Status) if (&from == this) return; Clear(); @@ -2527,18 +3782,23 @@ bool GameServer_Status::IsInitialized() const { return true; } +void GameServer_Status::Swap(GameServer_Status* other) { + if (other == this) return; + InternalSwap(other); +} void GameServer_Status::InternalSwap(GameServer_Status* other) { using std::swap; _internal_metadata_.Swap(&other->_internal_metadata_); - ports_.InternalSwap(&other->ports_); - state_.Swap(&other->state_, &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + CastToBase(&ports_)->InternalSwap(CastToBase(&other->ports_)); + state_.Swap(&other->state_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); - address_.Swap(&other->address_, &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + address_.Swap(&other->address_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } -::PROTOBUF_NAMESPACE_ID::Metadata GameServer_Status::GetMetadata() const { - return GetMetadataStatic(); +::google::protobuf::Metadata GameServer_Status::GetMetadata() const { + ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_sdk_2eproto); + return ::file_level_metadata_sdk_2eproto[kIndexInFileMessages]; } @@ -2552,7 +3812,7 @@ void GameServer::InitAsDefaultInstance() { ::agones::dev::sdk::_GameServer_default_instance_._instance.get_mutable()->status_ = const_cast< ::agones::dev::sdk::GameServer_Status*>( ::agones::dev::sdk::GameServer_Status::internal_default_instance()); } -class GameServer::_Internal { +class GameServer::HasBitSetters { public: static const ::agones::dev::sdk::GameServer_ObjectMeta& object_meta(const GameServer* msg); static const ::agones::dev::sdk::GameServer_Spec& spec(const GameServer* msg); @@ -2560,37 +3820,43 @@ class GameServer::_Internal { }; const ::agones::dev::sdk::GameServer_ObjectMeta& -GameServer::_Internal::object_meta(const GameServer* msg) { +GameServer::HasBitSetters::object_meta(const GameServer* msg) { return *msg->object_meta_; } const ::agones::dev::sdk::GameServer_Spec& -GameServer::_Internal::spec(const GameServer* msg) { +GameServer::HasBitSetters::spec(const GameServer* msg) { return *msg->spec_; } const ::agones::dev::sdk::GameServer_Status& -GameServer::_Internal::status(const GameServer* msg) { +GameServer::HasBitSetters::status(const GameServer* msg) { return *msg->status_; } +#if !defined(_MSC_VER) || _MSC_VER >= 1900 +const int GameServer::kObjectMetaFieldNumber; +const int GameServer::kSpecFieldNumber; +const int GameServer::kStatusFieldNumber; +#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 + GameServer::GameServer() - : ::PROTOBUF_NAMESPACE_ID::Message(), _internal_metadata_(nullptr) { + : ::google::protobuf::Message(), _internal_metadata_(nullptr) { SharedCtor(); // @@protoc_insertion_point(constructor:agones.dev.sdk.GameServer) } GameServer::GameServer(const GameServer& from) - : ::PROTOBUF_NAMESPACE_ID::Message(), + : ::google::protobuf::Message(), _internal_metadata_(nullptr) { _internal_metadata_.MergeFrom(from._internal_metadata_); - if (from._internal_has_object_meta()) { + if (from.has_object_meta()) { object_meta_ = new ::agones::dev::sdk::GameServer_ObjectMeta(*from.object_meta_); } else { object_meta_ = nullptr; } - if (from._internal_has_spec()) { + if (from.has_spec()) { spec_ = new ::agones::dev::sdk::GameServer_Spec(*from.spec_); } else { spec_ = nullptr; } - if (from._internal_has_status()) { + if (from.has_status()) { status_ = new ::agones::dev::sdk::GameServer_Status(*from.status_); } else { status_ = nullptr; @@ -2599,7 +3865,8 @@ GameServer::GameServer(const GameServer& from) } void GameServer::SharedCtor() { - ::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&scc_info_GameServer_sdk_2eproto.base); + ::google::protobuf::internal::InitSCC( + &scc_info_GameServer_sdk_2eproto.base); ::memset(&object_meta_, 0, static_cast( reinterpret_cast(&status_) - reinterpret_cast(&object_meta_)) + sizeof(status_)); @@ -2620,14 +3887,14 @@ void GameServer::SetCachedSize(int size) const { _cached_size_.Set(size); } const GameServer& GameServer::default_instance() { - ::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&::scc_info_GameServer_sdk_2eproto.base); + ::google::protobuf::internal::InitSCC(&::scc_info_GameServer_sdk_2eproto.base); return *internal_default_instance(); } void GameServer::Clear() { // @@protoc_insertion_point(message_clear_start:agones.dev.sdk.GameServer) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + ::google::protobuf::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -2646,87 +3913,203 @@ void GameServer::Clear() { _internal_metadata_.Clear(); } -const char* GameServer::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) { -#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure - while (!ctx->Done(&ptr)) { - ::PROTOBUF_NAMESPACE_ID::uint32 tag; - ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); - CHK_(ptr); +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +const char* GameServer::_InternalParse(const char* begin, const char* end, void* object, + ::google::protobuf::internal::ParseContext* ctx) { + auto msg = static_cast(object); + ::google::protobuf::int32 size; (void)size; + int depth; (void)depth; + ::google::protobuf::uint32 tag; + ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; + auto ptr = begin; + while (ptr < end) { + ptr = ::google::protobuf::io::Parse32(ptr, &tag); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); switch (tag >> 3) { // .agones.dev.sdk.GameServer.ObjectMeta object_meta = 1; - case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 10)) { - ptr = ctx->ParseMessage(_internal_mutable_object_meta(), ptr); - CHK_(ptr); - } else goto handle_unusual; - continue; + case 1: { + if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + parser_till_end = ::agones::dev::sdk::GameServer_ObjectMeta::_InternalParse; + object = msg->mutable_object_meta(); + if (size > end - ptr) goto len_delim_till_end; + ptr += size; + GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange( + {parser_till_end, object}, ptr - size, ptr)); + break; + } // .agones.dev.sdk.GameServer.Spec spec = 2; - case 2: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 18)) { - ptr = ctx->ParseMessage(_internal_mutable_spec(), ptr); - CHK_(ptr); - } else goto handle_unusual; - continue; + case 2: { + if (static_cast<::google::protobuf::uint8>(tag) != 18) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + parser_till_end = ::agones::dev::sdk::GameServer_Spec::_InternalParse; + object = msg->mutable_spec(); + if (size > end - ptr) goto len_delim_till_end; + ptr += size; + GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange( + {parser_till_end, object}, ptr - size, ptr)); + break; + } // .agones.dev.sdk.GameServer.Status status = 3; - case 3: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 26)) { - ptr = ctx->ParseMessage(_internal_mutable_status(), ptr); - CHK_(ptr); - } else goto handle_unusual; - continue; + case 3: { + if (static_cast<::google::protobuf::uint8>(tag) != 26) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + parser_till_end = ::agones::dev::sdk::GameServer_Status::_InternalParse; + object = msg->mutable_status(); + if (size > end - ptr) goto len_delim_till_end; + ptr += size; + GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange( + {parser_till_end, object}, ptr - size, ptr)); + break; + } default: { handle_unusual: if ((tag & 7) == 4 || tag == 0) { - ctx->SetLastTag(tag); - goto success; + ctx->EndGroup(tag); + return ptr; } - ptr = UnknownFieldParse(tag, &_internal_metadata_, ptr, ctx); - CHK_(ptr != nullptr); - continue; + auto res = UnknownFieldParse(tag, {_InternalParse, msg}, + ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); + ptr = res.first; + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); + if (res.second) return ptr; } } // switch } // while -success: return ptr; +len_delim_till_end: + return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg}, + {parser_till_end, object}, size); +} +#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +bool GameServer::MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure + ::google::protobuf::uint32 tag; + // @@protoc_insertion_point(parse_start:agones.dev.sdk.GameServer) + for (;;) { + ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); + tag = p.first; + if (!p.second) goto handle_unusual; + switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { + // .agones.dev.sdk.GameServer.ObjectMeta object_meta = 1; + case 1: { + if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( + input, mutable_object_meta())); + } else { + goto handle_unusual; + } + break; + } + + // .agones.dev.sdk.GameServer.Spec spec = 2; + case 2: { + if (static_cast< ::google::protobuf::uint8>(tag) == (18 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( + input, mutable_spec())); + } else { + goto handle_unusual; + } + break; + } + + // .agones.dev.sdk.GameServer.Status status = 3; + case 3: { + if (static_cast< ::google::protobuf::uint8>(tag) == (26 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( + input, mutable_status())); + } else { + goto handle_unusual; + } + break; + } + + default: { + handle_unusual: + if (tag == 0) { + goto success; + } + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, _internal_metadata_.mutable_unknown_fields())); + break; + } + } + } +success: + // @@protoc_insertion_point(parse_success:agones.dev.sdk.GameServer) + return true; failure: - ptr = nullptr; - goto success; -#undef CHK_ + // @@protoc_insertion_point(parse_failure:agones.dev.sdk.GameServer) + return false; +#undef DO_ +} +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + +void GameServer::SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const { + // @@protoc_insertion_point(serialize_start:agones.dev.sdk.GameServer) + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + // .agones.dev.sdk.GameServer.ObjectMeta object_meta = 1; + if (this->has_object_meta()) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 1, HasBitSetters::object_meta(this), output); + } + + // .agones.dev.sdk.GameServer.Spec spec = 2; + if (this->has_spec()) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 2, HasBitSetters::spec(this), output); + } + + // .agones.dev.sdk.GameServer.Status status = 3; + if (this->has_status()) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 3, HasBitSetters::status(this), output); + } + + if (_internal_metadata_.have_unknown_fields()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + _internal_metadata_.unknown_fields(), output); + } + // @@protoc_insertion_point(serialize_end:agones.dev.sdk.GameServer) } -::PROTOBUF_NAMESPACE_ID::uint8* GameServer::InternalSerializeWithCachedSizesToArray( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +::google::protobuf::uint8* GameServer::InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { // @@protoc_insertion_point(serialize_to_array_start:agones.dev.sdk.GameServer) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; // .agones.dev.sdk.GameServer.ObjectMeta object_meta = 1; if (this->has_object_meta()) { - stream->EnsureSpace(&target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: + target = ::google::protobuf::internal::WireFormatLite:: InternalWriteMessageToArray( - 1, _Internal::object_meta(this), target, stream); + 1, HasBitSetters::object_meta(this), target); } // .agones.dev.sdk.GameServer.Spec spec = 2; if (this->has_spec()) { - stream->EnsureSpace(&target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: + target = ::google::protobuf::internal::WireFormatLite:: InternalWriteMessageToArray( - 2, _Internal::spec(this), target, stream); + 2, HasBitSetters::spec(this), target); } // .agones.dev.sdk.GameServer.Status status = 3; if (this->has_status()) { - stream->EnsureSpace(&target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: + target = ::google::protobuf::internal::WireFormatLite:: InternalWriteMessageToArray( - 3, _Internal::status(this), target, stream); + 3, HasBitSetters::status(this), target); } - if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::InternalSerializeUnknownFieldsToArray( - _internal_metadata_.unknown_fields(), target, stream); + if (_internal_metadata_.have_unknown_fields()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields(), target); } // @@protoc_insertion_point(serialize_to_array_end:agones.dev.sdk.GameServer) return target; @@ -2736,49 +4119,50 @@ size_t GameServer::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:agones.dev.sdk.GameServer) size_t total_size = 0; - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + _internal_metadata_.unknown_fields()); + } + ::google::protobuf::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; // .agones.dev.sdk.GameServer.ObjectMeta object_meta = 1; if (this->has_object_meta()) { total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize( + ::google::protobuf::internal::WireFormatLite::MessageSize( *object_meta_); } // .agones.dev.sdk.GameServer.Spec spec = 2; if (this->has_spec()) { total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize( + ::google::protobuf::internal::WireFormatLite::MessageSize( *spec_); } // .agones.dev.sdk.GameServer.Status status = 3; if (this->has_status()) { total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize( + ::google::protobuf::internal::WireFormatLite::MessageSize( *status_); } - if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - return ::PROTOBUF_NAMESPACE_ID::internal::ComputeUnknownFieldsSize( - _internal_metadata_, total_size, &_cached_size_); - } - int cached_size = ::PROTOBUF_NAMESPACE_ID::internal::ToCachedSize(total_size); + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); SetCachedSize(cached_size); return total_size; } -void GameServer::MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) { +void GameServer::MergeFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:agones.dev.sdk.GameServer) GOOGLE_DCHECK_NE(&from, this); const GameServer* source = - ::PROTOBUF_NAMESPACE_ID::DynamicCastToGenerated( + ::google::protobuf::DynamicCastToGenerated( &from); if (source == nullptr) { // @@protoc_insertion_point(generalized_merge_from_cast_fail:agones.dev.sdk.GameServer) - ::PROTOBUF_NAMESPACE_ID::internal::ReflectionOps::Merge(from, this); + ::google::protobuf::internal::ReflectionOps::Merge(from, this); } else { // @@protoc_insertion_point(generalized_merge_from_cast_success:agones.dev.sdk.GameServer) MergeFrom(*source); @@ -2789,21 +4173,21 @@ void GameServer::MergeFrom(const GameServer& from) { // @@protoc_insertion_point(class_specific_merge_from_start:agones.dev.sdk.GameServer) GOOGLE_DCHECK_NE(&from, this); _internal_metadata_.MergeFrom(from._internal_metadata_); - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; if (from.has_object_meta()) { - _internal_mutable_object_meta()->::agones::dev::sdk::GameServer_ObjectMeta::MergeFrom(from._internal_object_meta()); + mutable_object_meta()->::agones::dev::sdk::GameServer_ObjectMeta::MergeFrom(from.object_meta()); } if (from.has_spec()) { - _internal_mutable_spec()->::agones::dev::sdk::GameServer_Spec::MergeFrom(from._internal_spec()); + mutable_spec()->::agones::dev::sdk::GameServer_Spec::MergeFrom(from.spec()); } if (from.has_status()) { - _internal_mutable_status()->::agones::dev::sdk::GameServer_Status::MergeFrom(from._internal_status()); + mutable_status()->::agones::dev::sdk::GameServer_Status::MergeFrom(from.status()); } } -void GameServer::CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) { +void GameServer::CopyFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_copy_from_start:agones.dev.sdk.GameServer) if (&from == this) return; Clear(); @@ -2821,6 +4205,10 @@ bool GameServer::IsInitialized() const { return true; } +void GameServer::Swap(GameServer* other) { + if (other == this) return; + InternalSwap(other); +} void GameServer::InternalSwap(GameServer* other) { using std::swap; _internal_metadata_.Swap(&other->_internal_metadata_); @@ -2829,8 +4217,9 @@ void GameServer::InternalSwap(GameServer* other) { swap(status_, other->status_); } -::PROTOBUF_NAMESPACE_ID::Metadata GameServer::GetMetadata() const { - return GetMetadataStatic(); +::google::protobuf::Metadata GameServer::GetMetadata() const { + ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_sdk_2eproto); + return ::file_level_metadata_sdk_2eproto[kIndexInFileMessages]; } @@ -2838,7 +4227,8 @@ ::PROTOBUF_NAMESPACE_ID::Metadata GameServer::GetMetadata() const { } // namespace sdk } // namespace dev } // namespace agones -PROTOBUF_NAMESPACE_OPEN +namespace google { +namespace protobuf { template<> PROTOBUF_NOINLINE ::agones::dev::sdk::Empty* Arena::CreateMaybeMessage< ::agones::dev::sdk::Empty >(Arena* arena) { return Arena::CreateInternal< ::agones::dev::sdk::Empty >(arena); } @@ -2872,7 +4262,8 @@ template<> PROTOBUF_NOINLINE ::agones::dev::sdk::GameServer_Status* Arena::Creat template<> PROTOBUF_NOINLINE ::agones::dev::sdk::GameServer* Arena::CreateMaybeMessage< ::agones::dev::sdk::GameServer >(Arena* arena) { return Arena::CreateInternal< ::agones::dev::sdk::GameServer >(arena); } -PROTOBUF_NAMESPACE_CLOSE +} // namespace protobuf +} // namespace google // @@protoc_insertion_point(global_scope) #include diff --git a/sdks/cpp/src/google/annotations.pb.cc b/sdks/cpp/src/google/annotations.pb.cc index 9f06fd0f76..fbd5deced2 100644 --- a/sdks/cpp/src/google/annotations.pb.cc +++ b/sdks/cpp/src/google/annotations.pb.cc @@ -20,28 +20,39 @@ #include +#include #include #include -#include +#include #include #include #include #include // @@protoc_insertion_point(includes) #include -extern PROTOBUF_INTERNAL_EXPORT_google_2fapi_2fhttp_2eproto ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<1> scc_info_HttpRule_google_2fapi_2fhttp_2eproto; + +extern PROTOBUF_INTERNAL_EXPORT_google_2fapi_2fhttp_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_HttpRule_google_2fapi_2fhttp_2eproto; namespace google { namespace api { } // namespace api } // namespace google -static constexpr ::PROTOBUF_NAMESPACE_ID::Metadata* file_level_metadata_google_2fapi_2fannotations_2eproto = nullptr; -static constexpr ::PROTOBUF_NAMESPACE_ID::EnumDescriptor const** file_level_enum_descriptors_google_2fapi_2fannotations_2eproto = nullptr; -static constexpr ::PROTOBUF_NAMESPACE_ID::ServiceDescriptor const** file_level_service_descriptors_google_2fapi_2fannotations_2eproto = nullptr; -const ::PROTOBUF_NAMESPACE_ID::uint32 TableStruct_google_2fapi_2fannotations_2eproto::offsets[1] = {}; -static constexpr ::PROTOBUF_NAMESPACE_ID::internal::MigrationSchema* schemas = nullptr; -static constexpr ::PROTOBUF_NAMESPACE_ID::Message* const* file_default_instances = nullptr; +void InitDefaults_google_2fapi_2fannotations_2eproto() { +} + +constexpr ::google::protobuf::Metadata* file_level_metadata_google_2fapi_2fannotations_2eproto = nullptr; +constexpr ::google::protobuf::EnumDescriptor const** file_level_enum_descriptors_google_2fapi_2fannotations_2eproto = nullptr; +constexpr ::google::protobuf::ServiceDescriptor const** file_level_service_descriptors_google_2fapi_2fannotations_2eproto = nullptr; +const ::google::protobuf::uint32 TableStruct_google_2fapi_2fannotations_2eproto::offsets[1] = {}; +static constexpr ::google::protobuf::internal::MigrationSchema* schemas = nullptr; +static constexpr ::google::protobuf::Message* const* file_default_instances = nullptr; + +::google::protobuf::internal::AssignDescriptorsTable assign_descriptors_table_google_2fapi_2fannotations_2eproto = { + {}, AddDescriptors_google_2fapi_2fannotations_2eproto, "google/api/annotations.proto", schemas, + file_default_instances, TableStruct_google_2fapi_2fannotations_2eproto::offsets, + file_level_metadata_google_2fapi_2fannotations_2eproto, 0, file_level_enum_descriptors_google_2fapi_2fannotations_2eproto, file_level_service_descriptors_google_2fapi_2fannotations_2eproto, +}; -const char descriptor_table_protodef_google_2fapi_2fannotations_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = +const char descriptor_table_protodef_google_2fapi_2fannotations_2eproto[] = "\n\034google/api/annotations.proto\022\ngoogle.a" "pi\032\025google/api/http.proto\032 google/protob" "uf/descriptor.proto:E\n\004http\022\036.google.pro" @@ -51,34 +62,36 @@ const char descriptor_table_protodef_google_2fapi_2fannotations_2eproto[] PROTOB "gleapis/api/annotations;annotations\242\002\004GA" "PIb\006proto3" ; -static const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable*const descriptor_table_google_2fapi_2fannotations_2eproto_deps[2] = { - &::descriptor_table_google_2fapi_2fhttp_2eproto, - &::descriptor_table_google_2fprotobuf_2fdescriptor_2eproto, -}; -static ::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase*const descriptor_table_google_2fapi_2fannotations_2eproto_sccs[1] = { -}; -static ::PROTOBUF_NAMESPACE_ID::internal::once_flag descriptor_table_google_2fapi_2fannotations_2eproto_once; -static bool descriptor_table_google_2fapi_2fannotations_2eproto_initialized = false; -const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_google_2fapi_2fannotations_2eproto = { - &descriptor_table_google_2fapi_2fannotations_2eproto_initialized, descriptor_table_protodef_google_2fapi_2fannotations_2eproto, "google/api/annotations.proto", 290, - &descriptor_table_google_2fapi_2fannotations_2eproto_once, descriptor_table_google_2fapi_2fannotations_2eproto_sccs, descriptor_table_google_2fapi_2fannotations_2eproto_deps, 0, 2, - schemas, file_default_instances, TableStruct_google_2fapi_2fannotations_2eproto::offsets, - file_level_metadata_google_2fapi_2fannotations_2eproto, 0, file_level_enum_descriptors_google_2fapi_2fannotations_2eproto, file_level_service_descriptors_google_2fapi_2fannotations_2eproto, +::google::protobuf::internal::DescriptorTable descriptor_table_google_2fapi_2fannotations_2eproto = { + false, InitDefaults_google_2fapi_2fannotations_2eproto, + descriptor_table_protodef_google_2fapi_2fannotations_2eproto, + "google/api/annotations.proto", &assign_descriptors_table_google_2fapi_2fannotations_2eproto, 290, }; +void AddDescriptors_google_2fapi_2fannotations_2eproto() { + static constexpr ::google::protobuf::internal::InitFunc deps[2] = + { + ::AddDescriptors_google_2fapi_2fhttp_2eproto, + ::AddDescriptors_google_2fprotobuf_2fdescriptor_2eproto, + }; + ::google::protobuf::internal::AddDescriptors(&descriptor_table_google_2fapi_2fannotations_2eproto, deps, 2); +} + // Force running AddDescriptors() at dynamic initialization time. -static bool dynamic_init_dummy_google_2fapi_2fannotations_2eproto = ( ::PROTOBUF_NAMESPACE_ID::internal::AddDescriptors(&descriptor_table_google_2fapi_2fannotations_2eproto), true); +static bool dynamic_init_dummy_google_2fapi_2fannotations_2eproto = []() { AddDescriptors_google_2fapi_2fannotations_2eproto(); return true; }(); namespace google { namespace api { -::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier< ::google::protobuf::MethodOptions, - ::PROTOBUF_NAMESPACE_ID::internal::MessageTypeTraits< ::google::api::HttpRule >, 11, false > +::google::protobuf::internal::ExtensionIdentifier< ::google::protobuf::MethodOptions, + ::google::protobuf::internal::MessageTypeTraits< ::google::api::HttpRule >, 11, false > http(kHttpFieldNumber, *::google::api::HttpRule::internal_default_instance()); // @@protoc_insertion_point(namespace_scope) } // namespace api } // namespace google -PROTOBUF_NAMESPACE_OPEN -PROTOBUF_NAMESPACE_CLOSE +namespace google { +namespace protobuf { +} // namespace protobuf +} // namespace google // @@protoc_insertion_point(global_scope) #include diff --git a/sdks/cpp/src/google/http.pb.cc b/sdks/cpp/src/google/http.pb.cc index 1e398e2c01..d34aa7252a 100644 --- a/sdks/cpp/src/google/http.pb.cc +++ b/sdks/cpp/src/google/http.pb.cc @@ -20,88 +20,96 @@ #include +#include #include #include -#include +#include #include #include #include #include // @@protoc_insertion_point(includes) #include -extern PROTOBUF_INTERNAL_EXPORT_google_2fapi_2fhttp_2eproto ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<0> scc_info_CustomHttpPattern_google_2fapi_2fhttp_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_google_2fapi_2fhttp_2eproto ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<1> scc_info_HttpRule_google_2fapi_2fhttp_2eproto; + +extern PROTOBUF_INTERNAL_EXPORT_google_2fapi_2fhttp_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_CustomHttpPattern_google_2fapi_2fhttp_2eproto; +extern PROTOBUF_INTERNAL_EXPORT_google_2fapi_2fhttp_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_HttpRule_google_2fapi_2fhttp_2eproto; namespace google { namespace api { class HttpDefaultTypeInternal { public: - ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed _instance; + ::google::protobuf::internal::ExplicitlyConstructed _instance; } _Http_default_instance_; class HttpRuleDefaultTypeInternal { public: - ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed _instance; - ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr get_; - ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr put_; - ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr post_; - ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr delete__; - ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr patch_; + ::google::protobuf::internal::ExplicitlyConstructed _instance; + ::google::protobuf::internal::ArenaStringPtr get_; + ::google::protobuf::internal::ArenaStringPtr put_; + ::google::protobuf::internal::ArenaStringPtr post_; + ::google::protobuf::internal::ArenaStringPtr delete__; + ::google::protobuf::internal::ArenaStringPtr patch_; const ::google::api::CustomHttpPattern* custom_; } _HttpRule_default_instance_; class CustomHttpPatternDefaultTypeInternal { public: - ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed _instance; + ::google::protobuf::internal::ExplicitlyConstructed _instance; } _CustomHttpPattern_default_instance_; } // namespace api } // namespace google -static void InitDefaultsscc_info_CustomHttpPattern_google_2fapi_2fhttp_2eproto() { - GOOGLE_PROTOBUF_VERIFY_VERSION; - - { - void* ptr = &::google::api::_CustomHttpPattern_default_instance_; - new (ptr) ::google::api::CustomHttpPattern(); - ::PROTOBUF_NAMESPACE_ID::internal::OnShutdownDestroyMessage(ptr); - } - ::google::api::CustomHttpPattern::InitAsDefaultInstance(); -} - -AGONES_EXPORT ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<0> scc_info_CustomHttpPattern_google_2fapi_2fhttp_2eproto = - {{ATOMIC_VAR_INIT(::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase::kUninitialized), 0, 0, InitDefaultsscc_info_CustomHttpPattern_google_2fapi_2fhttp_2eproto}, {}}; - -static void InitDefaultsscc_info_Http_google_2fapi_2fhttp_2eproto() { +static void InitDefaultsHttp_google_2fapi_2fhttp_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; { void* ptr = &::google::api::_Http_default_instance_; new (ptr) ::google::api::Http(); - ::PROTOBUF_NAMESPACE_ID::internal::OnShutdownDestroyMessage(ptr); + ::google::protobuf::internal::OnShutdownDestroyMessage(ptr); } ::google::api::Http::InitAsDefaultInstance(); } -AGONES_EXPORT ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<1> scc_info_Http_google_2fapi_2fhttp_2eproto = - {{ATOMIC_VAR_INIT(::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase::kUninitialized), 1, 0, InitDefaultsscc_info_Http_google_2fapi_2fhttp_2eproto}, { +AGONES_EXPORT ::google::protobuf::internal::SCCInfo<1> scc_info_Http_google_2fapi_2fhttp_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsHttp_google_2fapi_2fhttp_2eproto}, { &scc_info_HttpRule_google_2fapi_2fhttp_2eproto.base,}}; -static void InitDefaultsscc_info_HttpRule_google_2fapi_2fhttp_2eproto() { +static void InitDefaultsHttpRule_google_2fapi_2fhttp_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; { void* ptr = &::google::api::_HttpRule_default_instance_; new (ptr) ::google::api::HttpRule(); - ::PROTOBUF_NAMESPACE_ID::internal::OnShutdownDestroyMessage(ptr); + ::google::protobuf::internal::OnShutdownDestroyMessage(ptr); } ::google::api::HttpRule::InitAsDefaultInstance(); } -AGONES_EXPORT ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<1> scc_info_HttpRule_google_2fapi_2fhttp_2eproto = - {{ATOMIC_VAR_INIT(::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase::kUninitialized), 1, 0, InitDefaultsscc_info_HttpRule_google_2fapi_2fhttp_2eproto}, { +AGONES_EXPORT ::google::protobuf::internal::SCCInfo<1> scc_info_HttpRule_google_2fapi_2fhttp_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsHttpRule_google_2fapi_2fhttp_2eproto}, { &scc_info_CustomHttpPattern_google_2fapi_2fhttp_2eproto.base,}}; -static ::PROTOBUF_NAMESPACE_ID::Metadata file_level_metadata_google_2fapi_2fhttp_2eproto[3]; -static constexpr ::PROTOBUF_NAMESPACE_ID::EnumDescriptor const** file_level_enum_descriptors_google_2fapi_2fhttp_2eproto = nullptr; -static constexpr ::PROTOBUF_NAMESPACE_ID::ServiceDescriptor const** file_level_service_descriptors_google_2fapi_2fhttp_2eproto = nullptr; +static void InitDefaultsCustomHttpPattern_google_2fapi_2fhttp_2eproto() { + GOOGLE_PROTOBUF_VERIFY_VERSION; -const ::PROTOBUF_NAMESPACE_ID::uint32 TableStruct_google_2fapi_2fhttp_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { + { + void* ptr = &::google::api::_CustomHttpPattern_default_instance_; + new (ptr) ::google::api::CustomHttpPattern(); + ::google::protobuf::internal::OnShutdownDestroyMessage(ptr); + } + ::google::api::CustomHttpPattern::InitAsDefaultInstance(); +} + +AGONES_EXPORT ::google::protobuf::internal::SCCInfo<0> scc_info_CustomHttpPattern_google_2fapi_2fhttp_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsCustomHttpPattern_google_2fapi_2fhttp_2eproto}, {}}; + +void InitDefaults_google_2fapi_2fhttp_2eproto() { + ::google::protobuf::internal::InitSCC(&scc_info_Http_google_2fapi_2fhttp_2eproto.base); + ::google::protobuf::internal::InitSCC(&scc_info_HttpRule_google_2fapi_2fhttp_2eproto.base); + ::google::protobuf::internal::InitSCC(&scc_info_CustomHttpPattern_google_2fapi_2fhttp_2eproto.base); +} + +::google::protobuf::Metadata file_level_metadata_google_2fapi_2fhttp_2eproto[3]; +constexpr ::google::protobuf::EnumDescriptor const** file_level_enum_descriptors_google_2fapi_2fhttp_2eproto = nullptr; +constexpr ::google::protobuf::ServiceDescriptor const** file_level_service_descriptors_google_2fapi_2fhttp_2eproto = nullptr; + +const ::google::protobuf::uint32 TableStruct_google_2fapi_2fhttp_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::google::api::Http, _internal_metadata_), ~0u, // no _extensions_ @@ -133,19 +141,25 @@ const ::PROTOBUF_NAMESPACE_ID::uint32 TableStruct_google_2fapi_2fhttp_2eproto::o PROTOBUF_FIELD_OFFSET(::google::api::CustomHttpPattern, kind_), PROTOBUF_FIELD_OFFSET(::google::api::CustomHttpPattern, path_), }; -static const ::PROTOBUF_NAMESPACE_ID::internal::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { +static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { { 0, -1, sizeof(::google::api::Http)}, { 7, -1, sizeof(::google::api::HttpRule)}, { 23, -1, sizeof(::google::api::CustomHttpPattern)}, }; -static ::PROTOBUF_NAMESPACE_ID::Message const * const file_default_instances[] = { - reinterpret_cast(&::google::api::_Http_default_instance_), - reinterpret_cast(&::google::api::_HttpRule_default_instance_), - reinterpret_cast(&::google::api::_CustomHttpPattern_default_instance_), +static ::google::protobuf::Message const * const file_default_instances[] = { + reinterpret_cast(&::google::api::_Http_default_instance_), + reinterpret_cast(&::google::api::_HttpRule_default_instance_), + reinterpret_cast(&::google::api::_CustomHttpPattern_default_instance_), +}; + +::google::protobuf::internal::AssignDescriptorsTable assign_descriptors_table_google_2fapi_2fhttp_2eproto = { + {}, AddDescriptors_google_2fapi_2fhttp_2eproto, "google/api/http.proto", schemas, + file_default_instances, TableStruct_google_2fapi_2fhttp_2eproto::offsets, + file_level_metadata_google_2fapi_2fhttp_2eproto, 3, file_level_enum_descriptors_google_2fapi_2fhttp_2eproto, file_level_service_descriptors_google_2fapi_2fhttp_2eproto, }; -const char descriptor_table_protodef_google_2fapi_2fhttp_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = +const char descriptor_table_protodef_google_2fapi_2fhttp_2eproto[] = "\n\025google/api/http.proto\022\ngoogle.api\"T\n\004H" "ttp\022#\n\005rules\030\001 \003(\0132\024.google.api.HttpRule" "\022\'\n\037fully_decode_reserved_expansion\030\002 \001(" @@ -161,24 +175,21 @@ const char descriptor_table_protodef_google_2fapi_2fhttp_2eproto[] PROTOBUF_SECT "/genproto/googleapis/api/annotations;ann" "otations\370\001\001\242\002\004GAPIb\006proto3" ; -static const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable*const descriptor_table_google_2fapi_2fhttp_2eproto_deps[1] = { -}; -static ::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase*const descriptor_table_google_2fapi_2fhttp_2eproto_sccs[3] = { - &scc_info_CustomHttpPattern_google_2fapi_2fhttp_2eproto.base, - &scc_info_Http_google_2fapi_2fhttp_2eproto.base, - &scc_info_HttpRule_google_2fapi_2fhttp_2eproto.base, -}; -static ::PROTOBUF_NAMESPACE_ID::internal::once_flag descriptor_table_google_2fapi_2fhttp_2eproto_once; -static bool descriptor_table_google_2fapi_2fhttp_2eproto_initialized = false; -const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_google_2fapi_2fhttp_2eproto = { - &descriptor_table_google_2fapi_2fhttp_2eproto_initialized, descriptor_table_protodef_google_2fapi_2fhttp_2eproto, "google/api/http.proto", 546, - &descriptor_table_google_2fapi_2fhttp_2eproto_once, descriptor_table_google_2fapi_2fhttp_2eproto_sccs, descriptor_table_google_2fapi_2fhttp_2eproto_deps, 3, 0, - schemas, file_default_instances, TableStruct_google_2fapi_2fhttp_2eproto::offsets, - file_level_metadata_google_2fapi_2fhttp_2eproto, 3, file_level_enum_descriptors_google_2fapi_2fhttp_2eproto, file_level_service_descriptors_google_2fapi_2fhttp_2eproto, +::google::protobuf::internal::DescriptorTable descriptor_table_google_2fapi_2fhttp_2eproto = { + false, InitDefaults_google_2fapi_2fhttp_2eproto, + descriptor_table_protodef_google_2fapi_2fhttp_2eproto, + "google/api/http.proto", &assign_descriptors_table_google_2fapi_2fhttp_2eproto, 546, }; +void AddDescriptors_google_2fapi_2fhttp_2eproto() { + static constexpr ::google::protobuf::internal::InitFunc deps[1] = + { + }; + ::google::protobuf::internal::AddDescriptors(&descriptor_table_google_2fapi_2fhttp_2eproto, deps, 0); +} + // Force running AddDescriptors() at dynamic initialization time. -static bool dynamic_init_dummy_google_2fapi_2fhttp_2eproto = ( ::PROTOBUF_NAMESPACE_ID::internal::AddDescriptors(&descriptor_table_google_2fapi_2fhttp_2eproto), true); +static bool dynamic_init_dummy_google_2fapi_2fhttp_2eproto = []() { AddDescriptors_google_2fapi_2fhttp_2eproto(); return true; }(); namespace google { namespace api { @@ -186,17 +197,22 @@ namespace api { void Http::InitAsDefaultInstance() { } -class Http::_Internal { +class Http::HasBitSetters { public: }; +#if !defined(_MSC_VER) || _MSC_VER >= 1900 +const int Http::kRulesFieldNumber; +const int Http::kFullyDecodeReservedExpansionFieldNumber; +#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 + Http::Http() - : ::PROTOBUF_NAMESPACE_ID::Message(), _internal_metadata_(nullptr) { + : ::google::protobuf::Message(), _internal_metadata_(nullptr) { SharedCtor(); // @@protoc_insertion_point(constructor:google.api.Http) } -Http::Http(::PROTOBUF_NAMESPACE_ID::Arena* arena) - : ::PROTOBUF_NAMESPACE_ID::Message(), +Http::Http(::google::protobuf::Arena* arena) + : ::google::protobuf::Message(), _internal_metadata_(arena), rules_(arena) { SharedCtor(); @@ -204,7 +220,7 @@ Http::Http(::PROTOBUF_NAMESPACE_ID::Arena* arena) // @@protoc_insertion_point(arena_constructor:google.api.Http) } Http::Http(const Http& from) - : ::PROTOBUF_NAMESPACE_ID::Message(), + : ::google::protobuf::Message(), _internal_metadata_(nullptr), rules_(from.rules_) { _internal_metadata_.MergeFrom(from._internal_metadata_); @@ -213,7 +229,8 @@ Http::Http(const Http& from) } void Http::SharedCtor() { - ::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&scc_info_Http_google_2fapi_2fhttp_2eproto.base); + ::google::protobuf::internal::InitSCC( + &scc_info_Http_google_2fapi_2fhttp_2eproto.base); fully_decode_reserved_expansion_ = false; } @@ -230,20 +247,20 @@ void Http::ArenaDtor(void* object) { Http* _this = reinterpret_cast< Http* >(object); (void)_this; } -void Http::RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena*) { +void Http::RegisterArenaDtor(::google::protobuf::Arena*) { } void Http::SetCachedSize(int size) const { _cached_size_.Set(size); } const Http& Http::default_instance() { - ::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&::scc_info_Http_google_2fapi_2fhttp_2eproto.base); + ::google::protobuf::internal::InitSCC(&::scc_info_Http_google_2fapi_2fhttp_2eproto.base); return *internal_default_instance(); } void Http::Clear() { // @@protoc_insertion_point(message_clear_start:google.api.Http) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + ::google::protobuf::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; @@ -252,76 +269,166 @@ void Http::Clear() { _internal_metadata_.Clear(); } -const char* Http::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) { -#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure - ::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArenaNoVirtual(); (void)arena; - while (!ctx->Done(&ptr)) { - ::PROTOBUF_NAMESPACE_ID::uint32 tag; - ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); - CHK_(ptr); +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +const char* Http::_InternalParse(const char* begin, const char* end, void* object, + ::google::protobuf::internal::ParseContext* ctx) { + auto msg = static_cast(object); + ::google::protobuf::int32 size; (void)size; + int depth; (void)depth; + ::google::protobuf::uint32 tag; + ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; + auto ptr = begin; + while (ptr < end) { + ptr = ::google::protobuf::io::Parse32(ptr, &tag); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); switch (tag >> 3) { // repeated .google.api.HttpRule rules = 1; - case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 10)) { - ptr -= 1; - do { - ptr += 1; - ptr = ctx->ParseMessage(_internal_add_rules(), ptr); - CHK_(ptr); - if (!ctx->DataAvailable(ptr)) break; - } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<10>(ptr)); - } else goto handle_unusual; - continue; + case 1: { + if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual; + do { + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + parser_till_end = ::google::api::HttpRule::_InternalParse; + object = msg->add_rules(); + if (size > end - ptr) goto len_delim_till_end; + ptr += size; + GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange( + {parser_till_end, object}, ptr - size, ptr)); + if (ptr >= end) break; + } while ((::google::protobuf::io::UnalignedLoad<::google::protobuf::uint64>(ptr) & 255) == 10 && (ptr += 1)); + break; + } // bool fully_decode_reserved_expansion = 2; - case 2: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 16)) { - fully_decode_reserved_expansion_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint(&ptr); - CHK_(ptr); - } else goto handle_unusual; - continue; + case 2: { + if (static_cast<::google::protobuf::uint8>(tag) != 16) goto handle_unusual; + msg->set_fully_decode_reserved_expansion(::google::protobuf::internal::ReadVarint(&ptr)); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + break; + } default: { handle_unusual: if ((tag & 7) == 4 || tag == 0) { - ctx->SetLastTag(tag); - goto success; + ctx->EndGroup(tag); + return ptr; } - ptr = UnknownFieldParse(tag, &_internal_metadata_, ptr, ctx); - CHK_(ptr != nullptr); - continue; + auto res = UnknownFieldParse(tag, {_InternalParse, msg}, + ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); + ptr = res.first; + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); + if (res.second) return ptr; } } // switch } // while -success: return ptr; +len_delim_till_end: + return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg}, + {parser_till_end, object}, size); +} +#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +bool Http::MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure + ::google::protobuf::uint32 tag; + // @@protoc_insertion_point(parse_start:google.api.Http) + for (;;) { + ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); + tag = p.first; + if (!p.second) goto handle_unusual; + switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { + // repeated .google.api.HttpRule rules = 1; + case 1: { + if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( + input, add_rules())); + } else { + goto handle_unusual; + } + break; + } + + // bool fully_decode_reserved_expansion = 2; + case 2: { + if (static_cast< ::google::protobuf::uint8>(tag) == (16 & 0xFF)) { + + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( + input, &fully_decode_reserved_expansion_))); + } else { + goto handle_unusual; + } + break; + } + + default: { + handle_unusual: + if (tag == 0) { + goto success; + } + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, _internal_metadata_.mutable_unknown_fields())); + break; + } + } + } +success: + // @@protoc_insertion_point(parse_success:google.api.Http) + return true; failure: - ptr = nullptr; - goto success; -#undef CHK_ + // @@protoc_insertion_point(parse_failure:google.api.Http) + return false; +#undef DO_ } +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + +void Http::SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const { + // @@protoc_insertion_point(serialize_start:google.api.Http) + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + // repeated .google.api.HttpRule rules = 1; + for (unsigned int i = 0, + n = static_cast(this->rules_size()); i < n; i++) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 1, + this->rules(static_cast(i)), + output); + } + + // bool fully_decode_reserved_expansion = 2; + if (this->fully_decode_reserved_expansion() != 0) { + ::google::protobuf::internal::WireFormatLite::WriteBool(2, this->fully_decode_reserved_expansion(), output); + } -::PROTOBUF_NAMESPACE_ID::uint8* Http::InternalSerializeWithCachedSizesToArray( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { + if (_internal_metadata_.have_unknown_fields()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + _internal_metadata_.unknown_fields(), output); + } + // @@protoc_insertion_point(serialize_end:google.api.Http) +} + +::google::protobuf::uint8* Http::InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { // @@protoc_insertion_point(serialize_to_array_start:google.api.Http) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; // repeated .google.api.HttpRule rules = 1; for (unsigned int i = 0, - n = static_cast(this->_internal_rules_size()); i < n; i++) { - stream->EnsureSpace(&target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: - InternalWriteMessageToArray(1, this->_internal_rules(i), target, stream); + n = static_cast(this->rules_size()); i < n; i++) { + target = ::google::protobuf::internal::WireFormatLite:: + InternalWriteMessageToArray( + 1, this->rules(static_cast(i)), target); } // bool fully_decode_reserved_expansion = 2; if (this->fully_decode_reserved_expansion() != 0) { - stream->EnsureSpace(&target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteBoolToArray(2, this->_internal_fully_decode_reserved_expansion(), target); + target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(2, this->fully_decode_reserved_expansion(), target); } - if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::InternalSerializeUnknownFieldsToArray( - _internal_metadata_.unknown_fields(), target, stream); + if (_internal_metadata_.have_unknown_fields()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields(), target); } // @@protoc_insertion_point(serialize_to_array_end:google.api.Http) return target; @@ -331,15 +438,24 @@ size_t Http::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:google.api.Http) size_t total_size = 0; - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + _internal_metadata_.unknown_fields()); + } + ::google::protobuf::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; // repeated .google.api.HttpRule rules = 1; - total_size += 1UL * this->_internal_rules_size(); - for (const auto& msg : this->rules_) { - total_size += - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg); + { + unsigned int count = static_cast(this->rules_size()); + total_size += 1UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSize( + this->rules(static_cast(i))); + } } // bool fully_decode_reserved_expansion = 2; @@ -347,24 +463,20 @@ size_t Http::ByteSizeLong() const { total_size += 1 + 1; } - if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - return ::PROTOBUF_NAMESPACE_ID::internal::ComputeUnknownFieldsSize( - _internal_metadata_, total_size, &_cached_size_); - } - int cached_size = ::PROTOBUF_NAMESPACE_ID::internal::ToCachedSize(total_size); + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); SetCachedSize(cached_size); return total_size; } -void Http::MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) { +void Http::MergeFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:google.api.Http) GOOGLE_DCHECK_NE(&from, this); const Http* source = - ::PROTOBUF_NAMESPACE_ID::DynamicCastToGenerated( + ::google::protobuf::DynamicCastToGenerated( &from); if (source == nullptr) { // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.api.Http) - ::PROTOBUF_NAMESPACE_ID::internal::ReflectionOps::Merge(from, this); + ::google::protobuf::internal::ReflectionOps::Merge(from, this); } else { // @@protoc_insertion_point(generalized_merge_from_cast_success:google.api.Http) MergeFrom(*source); @@ -375,16 +487,16 @@ void Http::MergeFrom(const Http& from) { // @@protoc_insertion_point(class_specific_merge_from_start:google.api.Http) GOOGLE_DCHECK_NE(&from, this); _internal_metadata_.MergeFrom(from._internal_metadata_); - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; rules_.MergeFrom(from.rules_); if (from.fully_decode_reserved_expansion() != 0) { - _internal_set_fully_decode_reserved_expansion(from._internal_fully_decode_reserved_expansion()); + set_fully_decode_reserved_expansion(from.fully_decode_reserved_expansion()); } } -void Http::CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) { +void Http::CopyFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_copy_from_start:google.api.Http) if (&from == this) return; Clear(); @@ -402,15 +514,35 @@ bool Http::IsInitialized() const { return true; } +void Http::Swap(Http* other) { + if (other == this) return; + if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) { + InternalSwap(other); + } else { + Http* temp = New(GetArenaNoVirtual()); + temp->MergeFrom(*other); + other->CopyFrom(*this); + InternalSwap(temp); + if (GetArenaNoVirtual() == nullptr) { + delete temp; + } + } +} +void Http::UnsafeArenaSwap(Http* other) { + if (other == this) return; + GOOGLE_DCHECK(GetArenaNoVirtual() == other->GetArenaNoVirtual()); + InternalSwap(other); +} void Http::InternalSwap(Http* other) { using std::swap; _internal_metadata_.Swap(&other->_internal_metadata_); - rules_.InternalSwap(&other->rules_); + CastToBase(&rules_)->InternalSwap(CastToBase(&other->rules_)); swap(fully_decode_reserved_expansion_, other->fully_decode_reserved_expansion_); } -::PROTOBUF_NAMESPACE_ID::Metadata Http::GetMetadata() const { - return GetMetadataStatic(); +::google::protobuf::Metadata Http::GetMetadata() const { + ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_google_2fapi_2fhttp_2eproto); + return ::file_level_metadata_google_2fapi_2fhttp_2eproto[kIndexInFileMessages]; } @@ -418,35 +550,35 @@ ::PROTOBUF_NAMESPACE_ID::Metadata Http::GetMetadata() const { void HttpRule::InitAsDefaultInstance() { ::google::api::_HttpRule_default_instance_.get_.UnsafeSetDefault( - &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + &::google::protobuf::internal::GetEmptyStringAlreadyInited()); ::google::api::_HttpRule_default_instance_.put_.UnsafeSetDefault( - &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + &::google::protobuf::internal::GetEmptyStringAlreadyInited()); ::google::api::_HttpRule_default_instance_.post_.UnsafeSetDefault( - &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + &::google::protobuf::internal::GetEmptyStringAlreadyInited()); ::google::api::_HttpRule_default_instance_.delete__.UnsafeSetDefault( - &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + &::google::protobuf::internal::GetEmptyStringAlreadyInited()); ::google::api::_HttpRule_default_instance_.patch_.UnsafeSetDefault( - &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + &::google::protobuf::internal::GetEmptyStringAlreadyInited()); ::google::api::_HttpRule_default_instance_.custom_ = const_cast< ::google::api::CustomHttpPattern*>( ::google::api::CustomHttpPattern::internal_default_instance()); } -class HttpRule::_Internal { +class HttpRule::HasBitSetters { public: static const ::google::api::CustomHttpPattern& custom(const HttpRule* msg); }; const ::google::api::CustomHttpPattern& -HttpRule::_Internal::custom(const HttpRule* msg) { +HttpRule::HasBitSetters::custom(const HttpRule* msg) { return *msg->pattern_.custom_; } void HttpRule::set_allocated_custom(::google::api::CustomHttpPattern* custom) { - ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaNoVirtual(); + ::google::protobuf::Arena* message_arena = GetArenaNoVirtual(); clear_pattern(); if (custom) { - ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena = - ::PROTOBUF_NAMESPACE_ID::Arena::GetArena(custom); + ::google::protobuf::Arena* submessage_arena = + ::google::protobuf::Arena::GetArena(custom); if (message_arena != submessage_arena) { - custom = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage( + custom = ::google::protobuf::internal::GetOwnedMessage( message_arena, custom, submessage_arena); } set_has_custom(); @@ -454,13 +586,26 @@ void HttpRule::set_allocated_custom(::google::api::CustomHttpPattern* custom) { } // @@protoc_insertion_point(field_set_allocated:google.api.HttpRule.custom) } +#if !defined(_MSC_VER) || _MSC_VER >= 1900 +const int HttpRule::kSelectorFieldNumber; +const int HttpRule::kGetFieldNumber; +const int HttpRule::kPutFieldNumber; +const int HttpRule::kPostFieldNumber; +const int HttpRule::kDeleteFieldNumber; +const int HttpRule::kPatchFieldNumber; +const int HttpRule::kCustomFieldNumber; +const int HttpRule::kBodyFieldNumber; +const int HttpRule::kResponseBodyFieldNumber; +const int HttpRule::kAdditionalBindingsFieldNumber; +#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 + HttpRule::HttpRule() - : ::PROTOBUF_NAMESPACE_ID::Message(), _internal_metadata_(nullptr) { + : ::google::protobuf::Message(), _internal_metadata_(nullptr) { SharedCtor(); // @@protoc_insertion_point(constructor:google.api.HttpRule) } -HttpRule::HttpRule(::PROTOBUF_NAMESPACE_ID::Arena* arena) - : ::PROTOBUF_NAMESPACE_ID::Message(), +HttpRule::HttpRule(::google::protobuf::Arena* arena) + : ::google::protobuf::Message(), _internal_metadata_(arena), additional_bindings_(arena) { SharedCtor(); @@ -468,49 +613,49 @@ HttpRule::HttpRule(::PROTOBUF_NAMESPACE_ID::Arena* arena) // @@protoc_insertion_point(arena_constructor:google.api.HttpRule) } HttpRule::HttpRule(const HttpRule& from) - : ::PROTOBUF_NAMESPACE_ID::Message(), + : ::google::protobuf::Message(), _internal_metadata_(nullptr), additional_bindings_(from.additional_bindings_) { _internal_metadata_.MergeFrom(from._internal_metadata_); - selector_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); - if (!from._internal_selector().empty()) { - selector_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from._internal_selector(), + selector_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.selector().size() > 0) { + selector_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.selector(), GetArenaNoVirtual()); } - body_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); - if (!from._internal_body().empty()) { - body_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from._internal_body(), + body_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.body().size() > 0) { + body_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.body(), GetArenaNoVirtual()); } - response_body_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); - if (!from._internal_response_body().empty()) { - response_body_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from._internal_response_body(), + response_body_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.response_body().size() > 0) { + response_body_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.response_body(), GetArenaNoVirtual()); } clear_has_pattern(); switch (from.pattern_case()) { case kGet: { - _internal_set_get(from._internal_get()); + set_get(from.get()); break; } case kPut: { - _internal_set_put(from._internal_put()); + set_put(from.put()); break; } case kPost: { - _internal_set_post(from._internal_post()); + set_post(from.post()); break; } case kDelete: { - _internal_set_delete_(from._internal_delete_()); + set_delete_(from.delete_()); break; } case kPatch: { - _internal_set_patch(from._internal_patch()); + set_patch(from.patch()); break; } case kCustom: { - _internal_mutable_custom()->::google::api::CustomHttpPattern::MergeFrom(from._internal_custom()); + mutable_custom()->::google::api::CustomHttpPattern::MergeFrom(from.custom()); break; } case PATTERN_NOT_SET: { @@ -521,10 +666,11 @@ HttpRule::HttpRule(const HttpRule& from) } void HttpRule::SharedCtor() { - ::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&scc_info_HttpRule_google_2fapi_2fhttp_2eproto.base); - selector_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); - body_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); - response_body_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + ::google::protobuf::internal::InitSCC( + &scc_info_HttpRule_google_2fapi_2fhttp_2eproto.base); + selector_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + body_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + response_body_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); clear_has_pattern(); } @@ -535,9 +681,9 @@ HttpRule::~HttpRule() { void HttpRule::SharedDtor() { GOOGLE_DCHECK(GetArenaNoVirtual() == nullptr); - selector_.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); - body_.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); - response_body_.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + selector_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + body_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + response_body_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); if (has_pattern()) { clear_pattern(); } @@ -547,13 +693,13 @@ void HttpRule::ArenaDtor(void* object) { HttpRule* _this = reinterpret_cast< HttpRule* >(object); (void)_this; } -void HttpRule::RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena*) { +void HttpRule::RegisterArenaDtor(::google::protobuf::Arena*) { } void HttpRule::SetCachedSize(int size) const { _cached_size_.Set(size); } const HttpRule& HttpRule::default_instance() { - ::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&::scc_info_HttpRule_google_2fapi_2fhttp_2eproto.base); + ::google::protobuf::internal::InitSCC(&::scc_info_HttpRule_google_2fapi_2fhttp_2eproto.base); return *internal_default_instance(); } @@ -562,27 +708,27 @@ void HttpRule::clear_pattern() { // @@protoc_insertion_point(one_of_clear_start:google.api.HttpRule) switch (pattern_case()) { case kGet: { - pattern_.get_.Destroy(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + pattern_.get_.Destroy(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); break; } case kPut: { - pattern_.put_.Destroy(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + pattern_.put_.Destroy(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); break; } case kPost: { - pattern_.post_.Destroy(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + pattern_.post_.Destroy(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); break; } case kDelete: { - pattern_.delete__.Destroy(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + pattern_.delete__.Destroy(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); break; } case kPatch: { - pattern_.patch_.Destroy(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + pattern_.patch_.Destroy(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); break; } @@ -602,226 +748,605 @@ void HttpRule::clear_pattern() { void HttpRule::Clear() { // @@protoc_insertion_point(message_clear_start:google.api.HttpRule) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + ::google::protobuf::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; additional_bindings_.Clear(); - selector_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); - body_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); - response_body_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + selector_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + body_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + response_body_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); clear_pattern(); _internal_metadata_.Clear(); } -const char* HttpRule::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) { -#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure - ::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArenaNoVirtual(); (void)arena; - while (!ctx->Done(&ptr)) { - ::PROTOBUF_NAMESPACE_ID::uint32 tag; - ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); - CHK_(ptr); +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +const char* HttpRule::_InternalParse(const char* begin, const char* end, void* object, + ::google::protobuf::internal::ParseContext* ctx) { + auto msg = static_cast(object); + ::google::protobuf::int32 size; (void)size; + int depth; (void)depth; + ::google::protobuf::uint32 tag; + ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; + auto ptr = begin; + while (ptr < end) { + ptr = ::google::protobuf::io::Parse32(ptr, &tag); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); switch (tag >> 3) { // string selector = 1; - case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 10)) { - ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParserUTF8(_internal_mutable_selector(), ptr, ctx, "google.api.HttpRule.selector"); - CHK_(ptr); - } else goto handle_unusual; - continue; + case 1: { + if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + ctx->extra_parse_data().SetFieldName("google.api.HttpRule.selector"); + object = msg->mutable_selector(); + if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { + parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; + goto string_till_end; + } + GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); + ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); + ptr += size; + break; + } // string get = 2; - case 2: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 18)) { - ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParserUTF8(_internal_mutable_get(), ptr, ctx, "google.api.HttpRule.get"); - CHK_(ptr); - } else goto handle_unusual; - continue; + case 2: { + if (static_cast<::google::protobuf::uint8>(tag) != 18) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + ctx->extra_parse_data().SetFieldName("google.api.HttpRule.get"); + object = msg->mutable_get(); + if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { + parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; + goto string_till_end; + } + GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); + ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); + ptr += size; + break; + } // string put = 3; - case 3: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 26)) { - ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParserUTF8(_internal_mutable_put(), ptr, ctx, "google.api.HttpRule.put"); - CHK_(ptr); - } else goto handle_unusual; - continue; + case 3: { + if (static_cast<::google::protobuf::uint8>(tag) != 26) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + ctx->extra_parse_data().SetFieldName("google.api.HttpRule.put"); + object = msg->mutable_put(); + if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { + parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; + goto string_till_end; + } + GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); + ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); + ptr += size; + break; + } // string post = 4; - case 4: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 34)) { - ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParserUTF8(_internal_mutable_post(), ptr, ctx, "google.api.HttpRule.post"); - CHK_(ptr); - } else goto handle_unusual; - continue; + case 4: { + if (static_cast<::google::protobuf::uint8>(tag) != 34) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + ctx->extra_parse_data().SetFieldName("google.api.HttpRule.post"); + object = msg->mutable_post(); + if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { + parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; + goto string_till_end; + } + GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); + ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); + ptr += size; + break; + } // string delete = 5; - case 5: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 42)) { - ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParserUTF8(_internal_mutable_delete_(), ptr, ctx, "google.api.HttpRule.delete"); - CHK_(ptr); - } else goto handle_unusual; - continue; + case 5: { + if (static_cast<::google::protobuf::uint8>(tag) != 42) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + ctx->extra_parse_data().SetFieldName("google.api.HttpRule.delete"); + object = msg->mutable_delete_(); + if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { + parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; + goto string_till_end; + } + GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); + ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); + ptr += size; + break; + } // string patch = 6; - case 6: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 50)) { - ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParserUTF8(_internal_mutable_patch(), ptr, ctx, "google.api.HttpRule.patch"); - CHK_(ptr); - } else goto handle_unusual; - continue; + case 6: { + if (static_cast<::google::protobuf::uint8>(tag) != 50) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + ctx->extra_parse_data().SetFieldName("google.api.HttpRule.patch"); + object = msg->mutable_patch(); + if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { + parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; + goto string_till_end; + } + GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); + ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); + ptr += size; + break; + } // string body = 7; - case 7: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 58)) { - ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParserUTF8(_internal_mutable_body(), ptr, ctx, "google.api.HttpRule.body"); - CHK_(ptr); - } else goto handle_unusual; - continue; + case 7: { + if (static_cast<::google::protobuf::uint8>(tag) != 58) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + ctx->extra_parse_data().SetFieldName("google.api.HttpRule.body"); + object = msg->mutable_body(); + if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { + parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; + goto string_till_end; + } + GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); + ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); + ptr += size; + break; + } // .google.api.CustomHttpPattern custom = 8; - case 8: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 66)) { - ptr = ctx->ParseMessage(_internal_mutable_custom(), ptr); - CHK_(ptr); - } else goto handle_unusual; - continue; + case 8: { + if (static_cast<::google::protobuf::uint8>(tag) != 66) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + parser_till_end = ::google::api::CustomHttpPattern::_InternalParse; + object = msg->mutable_custom(); + if (size > end - ptr) goto len_delim_till_end; + ptr += size; + GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange( + {parser_till_end, object}, ptr - size, ptr)); + break; + } // repeated .google.api.HttpRule additional_bindings = 11; - case 11: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 90)) { - ptr -= 1; - do { - ptr += 1; - ptr = ctx->ParseMessage(_internal_add_additional_bindings(), ptr); - CHK_(ptr); - if (!ctx->DataAvailable(ptr)) break; - } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<90>(ptr)); - } else goto handle_unusual; - continue; + case 11: { + if (static_cast<::google::protobuf::uint8>(tag) != 90) goto handle_unusual; + do { + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + parser_till_end = ::google::api::HttpRule::_InternalParse; + object = msg->add_additional_bindings(); + if (size > end - ptr) goto len_delim_till_end; + ptr += size; + GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange( + {parser_till_end, object}, ptr - size, ptr)); + if (ptr >= end) break; + } while ((::google::protobuf::io::UnalignedLoad<::google::protobuf::uint64>(ptr) & 255) == 90 && (ptr += 1)); + break; + } // string response_body = 12; - case 12: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 98)) { - ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParserUTF8(_internal_mutable_response_body(), ptr, ctx, "google.api.HttpRule.response_body"); - CHK_(ptr); - } else goto handle_unusual; - continue; + case 12: { + if (static_cast<::google::protobuf::uint8>(tag) != 98) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + ctx->extra_parse_data().SetFieldName("google.api.HttpRule.response_body"); + object = msg->mutable_response_body(); + if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { + parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; + goto string_till_end; + } + GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); + ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); + ptr += size; + break; + } default: { handle_unusual: if ((tag & 7) == 4 || tag == 0) { - ctx->SetLastTag(tag); - goto success; + ctx->EndGroup(tag); + return ptr; } - ptr = UnknownFieldParse(tag, &_internal_metadata_, ptr, ctx); - CHK_(ptr != nullptr); - continue; + auto res = UnknownFieldParse(tag, {_InternalParse, msg}, + ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); + ptr = res.first; + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); + if (res.second) return ptr; } } // switch } // while -success: return ptr; +string_till_end: + static_cast<::std::string*>(object)->clear(); + static_cast<::std::string*>(object)->reserve(size); + goto len_delim_till_end; +len_delim_till_end: + return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg}, + {parser_till_end, object}, size); +} +#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +bool HttpRule::MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure + ::google::protobuf::uint32 tag; + // @@protoc_insertion_point(parse_start:google.api.HttpRule) + for (;;) { + ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); + tag = p.first; + if (!p.second) goto handle_unusual; + switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { + // string selector = 1; + case 1: { + if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadString( + input, this->mutable_selector())); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->selector().data(), static_cast(this->selector().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "google.api.HttpRule.selector")); + } else { + goto handle_unusual; + } + break; + } + + // string get = 2; + case 2: { + if (static_cast< ::google::protobuf::uint8>(tag) == (18 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadString( + input, this->mutable_get())); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->get().data(), static_cast(this->get().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "google.api.HttpRule.get")); + } else { + goto handle_unusual; + } + break; + } + + // string put = 3; + case 3: { + if (static_cast< ::google::protobuf::uint8>(tag) == (26 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadString( + input, this->mutable_put())); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->put().data(), static_cast(this->put().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "google.api.HttpRule.put")); + } else { + goto handle_unusual; + } + break; + } + + // string post = 4; + case 4: { + if (static_cast< ::google::protobuf::uint8>(tag) == (34 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadString( + input, this->mutable_post())); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->post().data(), static_cast(this->post().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "google.api.HttpRule.post")); + } else { + goto handle_unusual; + } + break; + } + + // string delete = 5; + case 5: { + if (static_cast< ::google::protobuf::uint8>(tag) == (42 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadString( + input, this->mutable_delete_())); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->delete_().data(), static_cast(this->delete_().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "google.api.HttpRule.delete")); + } else { + goto handle_unusual; + } + break; + } + + // string patch = 6; + case 6: { + if (static_cast< ::google::protobuf::uint8>(tag) == (50 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadString( + input, this->mutable_patch())); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->patch().data(), static_cast(this->patch().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "google.api.HttpRule.patch")); + } else { + goto handle_unusual; + } + break; + } + + // string body = 7; + case 7: { + if (static_cast< ::google::protobuf::uint8>(tag) == (58 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadString( + input, this->mutable_body())); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->body().data(), static_cast(this->body().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "google.api.HttpRule.body")); + } else { + goto handle_unusual; + } + break; + } + + // .google.api.CustomHttpPattern custom = 8; + case 8: { + if (static_cast< ::google::protobuf::uint8>(tag) == (66 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( + input, mutable_custom())); + } else { + goto handle_unusual; + } + break; + } + + // repeated .google.api.HttpRule additional_bindings = 11; + case 11: { + if (static_cast< ::google::protobuf::uint8>(tag) == (90 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( + input, add_additional_bindings())); + } else { + goto handle_unusual; + } + break; + } + + // string response_body = 12; + case 12: { + if (static_cast< ::google::protobuf::uint8>(tag) == (98 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadString( + input, this->mutable_response_body())); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->response_body().data(), static_cast(this->response_body().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "google.api.HttpRule.response_body")); + } else { + goto handle_unusual; + } + break; + } + + default: { + handle_unusual: + if (tag == 0) { + goto success; + } + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, _internal_metadata_.mutable_unknown_fields())); + break; + } + } + } +success: + // @@protoc_insertion_point(parse_success:google.api.HttpRule) + return true; failure: - ptr = nullptr; - goto success; -#undef CHK_ + // @@protoc_insertion_point(parse_failure:google.api.HttpRule) + return false; +#undef DO_ } +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + +void HttpRule::SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const { + // @@protoc_insertion_point(serialize_start:google.api.HttpRule) + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + // string selector = 1; + if (this->selector().size() > 0) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->selector().data(), static_cast(this->selector().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "google.api.HttpRule.selector"); + ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( + 1, this->selector(), output); + } + + // string get = 2; + if (has_get()) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->get().data(), static_cast(this->get().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "google.api.HttpRule.get"); + ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( + 2, this->get(), output); + } + + // string put = 3; + if (has_put()) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->put().data(), static_cast(this->put().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "google.api.HttpRule.put"); + ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( + 3, this->put(), output); + } -::PROTOBUF_NAMESPACE_ID::uint8* HttpRule::InternalSerializeWithCachedSizesToArray( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { + // string post = 4; + if (has_post()) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->post().data(), static_cast(this->post().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "google.api.HttpRule.post"); + ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( + 4, this->post(), output); + } + + // string delete = 5; + if (has_delete_()) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->delete_().data(), static_cast(this->delete_().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "google.api.HttpRule.delete"); + ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( + 5, this->delete_(), output); + } + + // string patch = 6; + if (has_patch()) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->patch().data(), static_cast(this->patch().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "google.api.HttpRule.patch"); + ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( + 6, this->patch(), output); + } + + // string body = 7; + if (this->body().size() > 0) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->body().data(), static_cast(this->body().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "google.api.HttpRule.body"); + ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( + 7, this->body(), output); + } + + // .google.api.CustomHttpPattern custom = 8; + if (has_custom()) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 8, HasBitSetters::custom(this), output); + } + + // repeated .google.api.HttpRule additional_bindings = 11; + for (unsigned int i = 0, + n = static_cast(this->additional_bindings_size()); i < n; i++) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 11, + this->additional_bindings(static_cast(i)), + output); + } + + // string response_body = 12; + if (this->response_body().size() > 0) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->response_body().data(), static_cast(this->response_body().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "google.api.HttpRule.response_body"); + ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( + 12, this->response_body(), output); + } + + if (_internal_metadata_.have_unknown_fields()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + _internal_metadata_.unknown_fields(), output); + } + // @@protoc_insertion_point(serialize_end:google.api.HttpRule) +} + +::google::protobuf::uint8* HttpRule::InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { // @@protoc_insertion_point(serialize_to_array_start:google.api.HttpRule) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; // string selector = 1; if (this->selector().size() > 0) { - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( - this->_internal_selector().data(), static_cast(this->_internal_selector().length()), - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->selector().data(), static_cast(this->selector().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.api.HttpRule.selector"); - target = stream->WriteStringMaybeAliased( - 1, this->_internal_selector(), target); + target = + ::google::protobuf::internal::WireFormatLite::WriteStringToArray( + 1, this->selector(), target); } // string get = 2; - if (_internal_has_get()) { - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( - this->_internal_get().data(), static_cast(this->_internal_get().length()), - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, + if (has_get()) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->get().data(), static_cast(this->get().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.api.HttpRule.get"); - target = stream->WriteStringMaybeAliased( - 2, this->_internal_get(), target); + target = + ::google::protobuf::internal::WireFormatLite::WriteStringToArray( + 2, this->get(), target); } // string put = 3; - if (_internal_has_put()) { - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( - this->_internal_put().data(), static_cast(this->_internal_put().length()), - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, + if (has_put()) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->put().data(), static_cast(this->put().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.api.HttpRule.put"); - target = stream->WriteStringMaybeAliased( - 3, this->_internal_put(), target); + target = + ::google::protobuf::internal::WireFormatLite::WriteStringToArray( + 3, this->put(), target); } // string post = 4; - if (_internal_has_post()) { - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( - this->_internal_post().data(), static_cast(this->_internal_post().length()), - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, + if (has_post()) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->post().data(), static_cast(this->post().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.api.HttpRule.post"); - target = stream->WriteStringMaybeAliased( - 4, this->_internal_post(), target); + target = + ::google::protobuf::internal::WireFormatLite::WriteStringToArray( + 4, this->post(), target); } // string delete = 5; - if (_internal_has_delete_()) { - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( - this->_internal_delete_().data(), static_cast(this->_internal_delete_().length()), - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, + if (has_delete_()) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->delete_().data(), static_cast(this->delete_().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.api.HttpRule.delete"); - target = stream->WriteStringMaybeAliased( - 5, this->_internal_delete_(), target); + target = + ::google::protobuf::internal::WireFormatLite::WriteStringToArray( + 5, this->delete_(), target); } // string patch = 6; - if (_internal_has_patch()) { - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( - this->_internal_patch().data(), static_cast(this->_internal_patch().length()), - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, + if (has_patch()) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->patch().data(), static_cast(this->patch().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.api.HttpRule.patch"); - target = stream->WriteStringMaybeAliased( - 6, this->_internal_patch(), target); + target = + ::google::protobuf::internal::WireFormatLite::WriteStringToArray( + 6, this->patch(), target); } // string body = 7; if (this->body().size() > 0) { - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( - this->_internal_body().data(), static_cast(this->_internal_body().length()), - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->body().data(), static_cast(this->body().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.api.HttpRule.body"); - target = stream->WriteStringMaybeAliased( - 7, this->_internal_body(), target); + target = + ::google::protobuf::internal::WireFormatLite::WriteStringToArray( + 7, this->body(), target); } // .google.api.CustomHttpPattern custom = 8; - if (_internal_has_custom()) { - stream->EnsureSpace(&target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: + if (has_custom()) { + target = ::google::protobuf::internal::WireFormatLite:: InternalWriteMessageToArray( - 8, _Internal::custom(this), target, stream); + 8, HasBitSetters::custom(this), target); } // repeated .google.api.HttpRule additional_bindings = 11; for (unsigned int i = 0, - n = static_cast(this->_internal_additional_bindings_size()); i < n; i++) { - stream->EnsureSpace(&target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: - InternalWriteMessageToArray(11, this->_internal_additional_bindings(i), target, stream); + n = static_cast(this->additional_bindings_size()); i < n; i++) { + target = ::google::protobuf::internal::WireFormatLite:: + InternalWriteMessageToArray( + 11, this->additional_bindings(static_cast(i)), target); } // string response_body = 12; if (this->response_body().size() > 0) { - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( - this->_internal_response_body().data(), static_cast(this->_internal_response_body().length()), - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->response_body().data(), static_cast(this->response_body().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.api.HttpRule.response_body"); - target = stream->WriteStringMaybeAliased( - 12, this->_internal_response_body(), target); + target = + ::google::protobuf::internal::WireFormatLite::WriteStringToArray( + 12, this->response_body(), target); } - if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::InternalSerializeUnknownFieldsToArray( - _internal_metadata_.unknown_fields(), target, stream); + if (_internal_metadata_.have_unknown_fields()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields(), target); } // @@protoc_insertion_point(serialize_to_array_end:google.api.HttpRule) return target; @@ -831,78 +1356,87 @@ size_t HttpRule::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:google.api.HttpRule) size_t total_size = 0; - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + _internal_metadata_.unknown_fields()); + } + ::google::protobuf::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; // repeated .google.api.HttpRule additional_bindings = 11; - total_size += 1UL * this->_internal_additional_bindings_size(); - for (const auto& msg : this->additional_bindings_) { - total_size += - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg); + { + unsigned int count = static_cast(this->additional_bindings_size()); + total_size += 1UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSize( + this->additional_bindings(static_cast(i))); + } } // string selector = 1; if (this->selector().size() > 0) { total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( - this->_internal_selector()); + ::google::protobuf::internal::WireFormatLite::StringSize( + this->selector()); } // string body = 7; if (this->body().size() > 0) { total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( - this->_internal_body()); + ::google::protobuf::internal::WireFormatLite::StringSize( + this->body()); } // string response_body = 12; if (this->response_body().size() > 0) { total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( - this->_internal_response_body()); + ::google::protobuf::internal::WireFormatLite::StringSize( + this->response_body()); } switch (pattern_case()) { // string get = 2; case kGet: { total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( - this->_internal_get()); + ::google::protobuf::internal::WireFormatLite::StringSize( + this->get()); break; } // string put = 3; case kPut: { total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( - this->_internal_put()); + ::google::protobuf::internal::WireFormatLite::StringSize( + this->put()); break; } // string post = 4; case kPost: { total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( - this->_internal_post()); + ::google::protobuf::internal::WireFormatLite::StringSize( + this->post()); break; } // string delete = 5; case kDelete: { total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( - this->_internal_delete_()); + ::google::protobuf::internal::WireFormatLite::StringSize( + this->delete_()); break; } // string patch = 6; case kPatch: { total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( - this->_internal_patch()); + ::google::protobuf::internal::WireFormatLite::StringSize( + this->patch()); break; } // .google.api.CustomHttpPattern custom = 8; case kCustom: { total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize( + ::google::protobuf::internal::WireFormatLite::MessageSize( *pattern_.custom_); break; } @@ -910,24 +1444,20 @@ size_t HttpRule::ByteSizeLong() const { break; } } - if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - return ::PROTOBUF_NAMESPACE_ID::internal::ComputeUnknownFieldsSize( - _internal_metadata_, total_size, &_cached_size_); - } - int cached_size = ::PROTOBUF_NAMESPACE_ID::internal::ToCachedSize(total_size); + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); SetCachedSize(cached_size); return total_size; } -void HttpRule::MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) { +void HttpRule::MergeFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:google.api.HttpRule) GOOGLE_DCHECK_NE(&from, this); const HttpRule* source = - ::PROTOBUF_NAMESPACE_ID::DynamicCastToGenerated( + ::google::protobuf::DynamicCastToGenerated( &from); if (source == nullptr) { // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.api.HttpRule) - ::PROTOBUF_NAMESPACE_ID::internal::ReflectionOps::Merge(from, this); + ::google::protobuf::internal::ReflectionOps::Merge(from, this); } else { // @@protoc_insertion_point(generalized_merge_from_cast_success:google.api.HttpRule) MergeFrom(*source); @@ -938,42 +1468,42 @@ void HttpRule::MergeFrom(const HttpRule& from) { // @@protoc_insertion_point(class_specific_merge_from_start:google.api.HttpRule) GOOGLE_DCHECK_NE(&from, this); _internal_metadata_.MergeFrom(from._internal_metadata_); - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; additional_bindings_.MergeFrom(from.additional_bindings_); if (from.selector().size() > 0) { - _internal_set_selector(from._internal_selector()); + set_selector(from.selector()); } if (from.body().size() > 0) { - _internal_set_body(from._internal_body()); + set_body(from.body()); } if (from.response_body().size() > 0) { - _internal_set_response_body(from._internal_response_body()); + set_response_body(from.response_body()); } switch (from.pattern_case()) { case kGet: { - _internal_set_get(from._internal_get()); + set_get(from.get()); break; } case kPut: { - _internal_set_put(from._internal_put()); + set_put(from.put()); break; } case kPost: { - _internal_set_post(from._internal_post()); + set_post(from.post()); break; } case kDelete: { - _internal_set_delete_(from._internal_delete_()); + set_delete_(from.delete_()); break; } case kPatch: { - _internal_set_patch(from._internal_patch()); + set_patch(from.patch()); break; } case kCustom: { - _internal_mutable_custom()->::google::api::CustomHttpPattern::MergeFrom(from._internal_custom()); + mutable_custom()->::google::api::CustomHttpPattern::MergeFrom(from.custom()); break; } case PATTERN_NOT_SET: { @@ -982,7 +1512,7 @@ void HttpRule::MergeFrom(const HttpRule& from) { } } -void HttpRule::CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) { +void HttpRule::CopyFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_copy_from_start:google.api.HttpRule) if (&from == this) return; Clear(); @@ -1000,22 +1530,42 @@ bool HttpRule::IsInitialized() const { return true; } +void HttpRule::Swap(HttpRule* other) { + if (other == this) return; + if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) { + InternalSwap(other); + } else { + HttpRule* temp = New(GetArenaNoVirtual()); + temp->MergeFrom(*other); + other->CopyFrom(*this); + InternalSwap(temp); + if (GetArenaNoVirtual() == nullptr) { + delete temp; + } + } +} +void HttpRule::UnsafeArenaSwap(HttpRule* other) { + if (other == this) return; + GOOGLE_DCHECK(GetArenaNoVirtual() == other->GetArenaNoVirtual()); + InternalSwap(other); +} void HttpRule::InternalSwap(HttpRule* other) { using std::swap; _internal_metadata_.Swap(&other->_internal_metadata_); - additional_bindings_.InternalSwap(&other->additional_bindings_); - selector_.Swap(&other->selector_, &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + CastToBase(&additional_bindings_)->InternalSwap(CastToBase(&other->additional_bindings_)); + selector_.Swap(&other->selector_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); - body_.Swap(&other->body_, &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + body_.Swap(&other->body_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); - response_body_.Swap(&other->response_body_, &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + response_body_.Swap(&other->response_body_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); swap(pattern_, other->pattern_); swap(_oneof_case_[0], other->_oneof_case_[0]); } -::PROTOBUF_NAMESPACE_ID::Metadata HttpRule::GetMetadata() const { - return GetMetadataStatic(); +::google::protobuf::Metadata HttpRule::GetMetadata() const { + ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_google_2fapi_2fhttp_2eproto); + return ::file_level_metadata_google_2fapi_2fhttp_2eproto[kIndexInFileMessages]; } @@ -1023,43 +1573,49 @@ ::PROTOBUF_NAMESPACE_ID::Metadata HttpRule::GetMetadata() const { void CustomHttpPattern::InitAsDefaultInstance() { } -class CustomHttpPattern::_Internal { +class CustomHttpPattern::HasBitSetters { public: }; +#if !defined(_MSC_VER) || _MSC_VER >= 1900 +const int CustomHttpPattern::kKindFieldNumber; +const int CustomHttpPattern::kPathFieldNumber; +#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 + CustomHttpPattern::CustomHttpPattern() - : ::PROTOBUF_NAMESPACE_ID::Message(), _internal_metadata_(nullptr) { + : ::google::protobuf::Message(), _internal_metadata_(nullptr) { SharedCtor(); // @@protoc_insertion_point(constructor:google.api.CustomHttpPattern) } -CustomHttpPattern::CustomHttpPattern(::PROTOBUF_NAMESPACE_ID::Arena* arena) - : ::PROTOBUF_NAMESPACE_ID::Message(), +CustomHttpPattern::CustomHttpPattern(::google::protobuf::Arena* arena) + : ::google::protobuf::Message(), _internal_metadata_(arena) { SharedCtor(); RegisterArenaDtor(arena); // @@protoc_insertion_point(arena_constructor:google.api.CustomHttpPattern) } CustomHttpPattern::CustomHttpPattern(const CustomHttpPattern& from) - : ::PROTOBUF_NAMESPACE_ID::Message(), + : ::google::protobuf::Message(), _internal_metadata_(nullptr) { _internal_metadata_.MergeFrom(from._internal_metadata_); - kind_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); - if (!from._internal_kind().empty()) { - kind_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from._internal_kind(), + kind_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.kind().size() > 0) { + kind_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.kind(), GetArenaNoVirtual()); } - path_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); - if (!from._internal_path().empty()) { - path_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from._internal_path(), + path_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.path().size() > 0) { + path_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.path(), GetArenaNoVirtual()); } // @@protoc_insertion_point(copy_constructor:google.api.CustomHttpPattern) } void CustomHttpPattern::SharedCtor() { - ::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&scc_info_CustomHttpPattern_google_2fapi_2fhttp_2eproto.base); - kind_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); - path_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + ::google::protobuf::internal::InitSCC( + &scc_info_CustomHttpPattern_google_2fapi_2fhttp_2eproto.base); + kind_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + path_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } CustomHttpPattern::~CustomHttpPattern() { @@ -1069,107 +1625,230 @@ CustomHttpPattern::~CustomHttpPattern() { void CustomHttpPattern::SharedDtor() { GOOGLE_DCHECK(GetArenaNoVirtual() == nullptr); - kind_.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); - path_.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); + kind_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + path_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } void CustomHttpPattern::ArenaDtor(void* object) { CustomHttpPattern* _this = reinterpret_cast< CustomHttpPattern* >(object); (void)_this; } -void CustomHttpPattern::RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena*) { +void CustomHttpPattern::RegisterArenaDtor(::google::protobuf::Arena*) { } void CustomHttpPattern::SetCachedSize(int size) const { _cached_size_.Set(size); } const CustomHttpPattern& CustomHttpPattern::default_instance() { - ::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&::scc_info_CustomHttpPattern_google_2fapi_2fhttp_2eproto.base); + ::google::protobuf::internal::InitSCC(&::scc_info_CustomHttpPattern_google_2fapi_2fhttp_2eproto.base); return *internal_default_instance(); } void CustomHttpPattern::Clear() { // @@protoc_insertion_point(message_clear_start:google.api.CustomHttpPattern) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + ::google::protobuf::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - kind_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); - path_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + kind_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + path_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); _internal_metadata_.Clear(); } -const char* CustomHttpPattern::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) { -#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure - ::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArenaNoVirtual(); (void)arena; - while (!ctx->Done(&ptr)) { - ::PROTOBUF_NAMESPACE_ID::uint32 tag; - ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag); - CHK_(ptr); +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +const char* CustomHttpPattern::_InternalParse(const char* begin, const char* end, void* object, + ::google::protobuf::internal::ParseContext* ctx) { + auto msg = static_cast(object); + ::google::protobuf::int32 size; (void)size; + int depth; (void)depth; + ::google::protobuf::uint32 tag; + ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end; + auto ptr = begin; + while (ptr < end) { + ptr = ::google::protobuf::io::Parse32(ptr, &tag); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); switch (tag >> 3) { // string kind = 1; - case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 10)) { - ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParserUTF8(_internal_mutable_kind(), ptr, ctx, "google.api.CustomHttpPattern.kind"); - CHK_(ptr); - } else goto handle_unusual; - continue; + case 1: { + if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + ctx->extra_parse_data().SetFieldName("google.api.CustomHttpPattern.kind"); + object = msg->mutable_kind(); + if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { + parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; + goto string_till_end; + } + GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); + ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); + ptr += size; + break; + } // string path = 2; - case 2: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 18)) { - ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParserUTF8(_internal_mutable_path(), ptr, ctx, "google.api.CustomHttpPattern.path"); - CHK_(ptr); - } else goto handle_unusual; - continue; + case 2: { + if (static_cast<::google::protobuf::uint8>(tag) != 18) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + ctx->extra_parse_data().SetFieldName("google.api.CustomHttpPattern.path"); + object = msg->mutable_path(); + if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) { + parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8; + goto string_till_end; + } + GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx)); + ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx); + ptr += size; + break; + } default: { handle_unusual: if ((tag & 7) == 4 || tag == 0) { - ctx->SetLastTag(tag); - goto success; + ctx->EndGroup(tag); + return ptr; } - ptr = UnknownFieldParse(tag, &_internal_metadata_, ptr, ctx); - CHK_(ptr != nullptr); - continue; + auto res = UnknownFieldParse(tag, {_InternalParse, msg}, + ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx); + ptr = res.first; + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr); + if (res.second) return ptr; } } // switch } // while -success: return ptr; +string_till_end: + static_cast<::std::string*>(object)->clear(); + static_cast<::std::string*>(object)->reserve(size); + goto len_delim_till_end; +len_delim_till_end: + return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg}, + {parser_till_end, object}, size); +} +#else // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +bool CustomHttpPattern::MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure + ::google::protobuf::uint32 tag; + // @@protoc_insertion_point(parse_start:google.api.CustomHttpPattern) + for (;;) { + ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); + tag = p.first; + if (!p.second) goto handle_unusual; + switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { + // string kind = 1; + case 1: { + if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadString( + input, this->mutable_kind())); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->kind().data(), static_cast(this->kind().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "google.api.CustomHttpPattern.kind")); + } else { + goto handle_unusual; + } + break; + } + + // string path = 2; + case 2: { + if (static_cast< ::google::protobuf::uint8>(tag) == (18 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadString( + input, this->mutable_path())); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->path().data(), static_cast(this->path().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "google.api.CustomHttpPattern.path")); + } else { + goto handle_unusual; + } + break; + } + + default: { + handle_unusual: + if (tag == 0) { + goto success; + } + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, _internal_metadata_.mutable_unknown_fields())); + break; + } + } + } +success: + // @@protoc_insertion_point(parse_success:google.api.CustomHttpPattern) + return true; failure: - ptr = nullptr; - goto success; -#undef CHK_ + // @@protoc_insertion_point(parse_failure:google.api.CustomHttpPattern) + return false; +#undef DO_ +} +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + +void CustomHttpPattern::SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const { + // @@protoc_insertion_point(serialize_start:google.api.CustomHttpPattern) + ::google::protobuf::uint32 cached_has_bits = 0; + (void) cached_has_bits; + + // string kind = 1; + if (this->kind().size() > 0) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->kind().data(), static_cast(this->kind().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "google.api.CustomHttpPattern.kind"); + ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( + 1, this->kind(), output); + } + + // string path = 2; + if (this->path().size() > 0) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->path().data(), static_cast(this->path().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "google.api.CustomHttpPattern.path"); + ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( + 2, this->path(), output); + } + + if (_internal_metadata_.have_unknown_fields()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + _internal_metadata_.unknown_fields(), output); + } + // @@protoc_insertion_point(serialize_end:google.api.CustomHttpPattern) } -::PROTOBUF_NAMESPACE_ID::uint8* CustomHttpPattern::InternalSerializeWithCachedSizesToArray( - ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { +::google::protobuf::uint8* CustomHttpPattern::InternalSerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { // @@protoc_insertion_point(serialize_to_array_start:google.api.CustomHttpPattern) - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; // string kind = 1; if (this->kind().size() > 0) { - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( - this->_internal_kind().data(), static_cast(this->_internal_kind().length()), - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->kind().data(), static_cast(this->kind().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.api.CustomHttpPattern.kind"); - target = stream->WriteStringMaybeAliased( - 1, this->_internal_kind(), target); + target = + ::google::protobuf::internal::WireFormatLite::WriteStringToArray( + 1, this->kind(), target); } // string path = 2; if (this->path().size() > 0) { - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( - this->_internal_path().data(), static_cast(this->_internal_path().length()), - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->path().data(), static_cast(this->path().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.api.CustomHttpPattern.path"); - target = stream->WriteStringMaybeAliased( - 2, this->_internal_path(), target); + target = + ::google::protobuf::internal::WireFormatLite::WriteStringToArray( + 2, this->path(), target); } - if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::InternalSerializeUnknownFieldsToArray( - _internal_metadata_.unknown_fields(), target, stream); + if (_internal_metadata_.have_unknown_fields()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields(), target); } // @@protoc_insertion_point(serialize_to_array_end:google.api.CustomHttpPattern) return target; @@ -1179,42 +1858,43 @@ size_t CustomHttpPattern::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:google.api.CustomHttpPattern) size_t total_size = 0; - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + _internal_metadata_.unknown_fields()); + } + ::google::protobuf::uint32 cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; // string kind = 1; if (this->kind().size() > 0) { total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( - this->_internal_kind()); + ::google::protobuf::internal::WireFormatLite::StringSize( + this->kind()); } // string path = 2; if (this->path().size() > 0) { total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( - this->_internal_path()); + ::google::protobuf::internal::WireFormatLite::StringSize( + this->path()); } - if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - return ::PROTOBUF_NAMESPACE_ID::internal::ComputeUnknownFieldsSize( - _internal_metadata_, total_size, &_cached_size_); - } - int cached_size = ::PROTOBUF_NAMESPACE_ID::internal::ToCachedSize(total_size); + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); SetCachedSize(cached_size); return total_size; } -void CustomHttpPattern::MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) { +void CustomHttpPattern::MergeFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:google.api.CustomHttpPattern) GOOGLE_DCHECK_NE(&from, this); const CustomHttpPattern* source = - ::PROTOBUF_NAMESPACE_ID::DynamicCastToGenerated( + ::google::protobuf::DynamicCastToGenerated( &from); if (source == nullptr) { // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.api.CustomHttpPattern) - ::PROTOBUF_NAMESPACE_ID::internal::ReflectionOps::Merge(from, this); + ::google::protobuf::internal::ReflectionOps::Merge(from, this); } else { // @@protoc_insertion_point(generalized_merge_from_cast_success:google.api.CustomHttpPattern) MergeFrom(*source); @@ -1225,18 +1905,18 @@ void CustomHttpPattern::MergeFrom(const CustomHttpPattern& from) { // @@protoc_insertion_point(class_specific_merge_from_start:google.api.CustomHttpPattern) GOOGLE_DCHECK_NE(&from, this); _internal_metadata_.MergeFrom(from._internal_metadata_); - ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0; + ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; if (from.kind().size() > 0) { - _internal_set_kind(from._internal_kind()); + set_kind(from.kind()); } if (from.path().size() > 0) { - _internal_set_path(from._internal_path()); + set_path(from.path()); } } -void CustomHttpPattern::CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) { +void CustomHttpPattern::CopyFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_copy_from_start:google.api.CustomHttpPattern) if (&from == this) return; Clear(); @@ -1254,24 +1934,45 @@ bool CustomHttpPattern::IsInitialized() const { return true; } +void CustomHttpPattern::Swap(CustomHttpPattern* other) { + if (other == this) return; + if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) { + InternalSwap(other); + } else { + CustomHttpPattern* temp = New(GetArenaNoVirtual()); + temp->MergeFrom(*other); + other->CopyFrom(*this); + InternalSwap(temp); + if (GetArenaNoVirtual() == nullptr) { + delete temp; + } + } +} +void CustomHttpPattern::UnsafeArenaSwap(CustomHttpPattern* other) { + if (other == this) return; + GOOGLE_DCHECK(GetArenaNoVirtual() == other->GetArenaNoVirtual()); + InternalSwap(other); +} void CustomHttpPattern::InternalSwap(CustomHttpPattern* other) { using std::swap; _internal_metadata_.Swap(&other->_internal_metadata_); - kind_.Swap(&other->kind_, &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + kind_.Swap(&other->kind_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); - path_.Swap(&other->path_, &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + path_.Swap(&other->path_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); } -::PROTOBUF_NAMESPACE_ID::Metadata CustomHttpPattern::GetMetadata() const { - return GetMetadataStatic(); +::google::protobuf::Metadata CustomHttpPattern::GetMetadata() const { + ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_google_2fapi_2fhttp_2eproto); + return ::file_level_metadata_google_2fapi_2fhttp_2eproto[kIndexInFileMessages]; } // @@protoc_insertion_point(namespace_scope) } // namespace api } // namespace google -PROTOBUF_NAMESPACE_OPEN +namespace google { +namespace protobuf { template<> PROTOBUF_NOINLINE ::google::api::Http* Arena::CreateMaybeMessage< ::google::api::Http >(Arena* arena) { return Arena::CreateMessageInternal< ::google::api::Http >(arena); } @@ -1281,7 +1982,8 @@ template<> PROTOBUF_NOINLINE ::google::api::HttpRule* Arena::CreateMaybeMessage< template<> PROTOBUF_NOINLINE ::google::api::CustomHttpPattern* Arena::CreateMaybeMessage< ::google::api::CustomHttpPattern >(Arena* arena) { return Arena::CreateMessageInternal< ::google::api::CustomHttpPattern >(arena); } -PROTOBUF_NAMESPACE_CLOSE +} // namespace protobuf +} // namespace google // @@protoc_insertion_point(global_scope) #include diff --git a/sdks/nodejs/lib/google/api/annotations_pb.js b/sdks/nodejs/lib/google/api/annotations_pb.js index d27ae4840e..c61ca0bc86 100644 --- a/sdks/nodejs/lib/google/api/annotations_pb.js +++ b/sdks/nodejs/lib/google/api/annotations_pb.js @@ -13,7 +13,6 @@ // limitations under the License. // This code was autogenerated. Do not edit directly. -// source: google/api/annotations.proto /** * @fileoverview * @enhanceable diff --git a/sdks/nodejs/lib/google/api/http_pb.js b/sdks/nodejs/lib/google/api/http_pb.js index acc6be5c6f..f678c5b5c4 100644 --- a/sdks/nodejs/lib/google/api/http_pb.js +++ b/sdks/nodejs/lib/google/api/http_pb.js @@ -13,7 +13,6 @@ // limitations under the License. // This code was autogenerated. Do not edit directly. -// source: google/api/http.proto /** * @fileoverview * @enhanceable @@ -30,7 +29,6 @@ var global = Function('return this')(); goog.exportSymbol('proto.google.api.CustomHttpPattern', null, global); goog.exportSymbol('proto.google.api.Http', null, global); goog.exportSymbol('proto.google.api.HttpRule', null, global); -goog.exportSymbol('proto.google.api.HttpRule.PatternCase', null, global); /** * Generated by JsPbCodeGenerator. * @param {Array=} opt_data Optional initial data array, typically from a @@ -106,15 +104,13 @@ proto.google.api.Http.repeatedFields_ = [1]; if (jspb.Message.GENERATE_TO_OBJECT) { /** - * Creates an object representation of this proto. + * Creates an object representation of this proto suitable for use in Soy templates. * Field names that are reserved in JavaScript and will be renamed to pb_name. - * Optional fields that are not set will be set to undefined. * To access a reserved field use, foo.pb_, eg, foo.pb_default. * For the list of reserved names please see: - * net/proto2/compiler/js/internal/generator.cc#kKeyword. - * @param {boolean=} opt_includeInstance Deprecated. whether to include the - * JSPB instance for transitional soy proto support: - * http://goto/soy-param-migration + * com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS. + * @param {boolean=} opt_includeInstance Whether to include the JSPB instance + * for transitional soy proto support: http://goto/soy-param-migration * @return {!Object} */ proto.google.api.Http.prototype.toObject = function(opt_includeInstance) { @@ -124,18 +120,18 @@ proto.google.api.Http.prototype.toObject = function(opt_includeInstance) { /** * Static version of the {@see toObject} method. - * @param {boolean|undefined} includeInstance Deprecated. Whether to include - * the JSPB instance for transitional soy proto support: + * @param {boolean|undefined} includeInstance Whether to include the JSPB + * instance for transitional soy proto support: * http://goto/soy-param-migration * @param {!proto.google.api.Http} msg The msg instance to transform. * @return {!Object} * @suppress {unusedLocalVariables} f is only used for nested messages */ proto.google.api.Http.toObject = function(includeInstance, msg) { - var f, obj = { + var obj = { rulesList: jspb.Message.toObjectList(msg.getRulesList(), proto.google.api.HttpRule.toObject, includeInstance), - fullyDecodeReservedExpansion: jspb.Message.getBooleanFieldWithDefault(msg, 2, false) + fullyDecodeReservedExpansion: jspb.Message.getFieldWithDefault(msg, 2, false) }; if (includeInstance) { @@ -238,12 +234,9 @@ proto.google.api.Http.prototype.getRulesList = function() { }; -/** - * @param {!Array} value - * @return {!proto.google.api.Http} returns this -*/ +/** @param {!Array} value */ proto.google.api.Http.prototype.setRulesList = function(value) { - return jspb.Message.setRepeatedWrapperField(this, 1, value); + jspb.Message.setRepeatedWrapperField(this, 1, value); }; @@ -259,28 +252,26 @@ proto.google.api.Http.prototype.addRules = function(opt_value, opt_index) { /** * Clears the list making it empty but non-null. - * @return {!proto.google.api.Http} returns this */ proto.google.api.Http.prototype.clearRulesList = function() { - return this.setRulesList([]); + this.setRulesList([]); }; /** * optional bool fully_decode_reserved_expansion = 2; + * Note that Boolean fields may be set to 0/1 when serialized from a Java server. + * You should avoid comparisons like {@code val === true/false} in those cases. * @return {boolean} */ proto.google.api.Http.prototype.getFullyDecodeReservedExpansion = function() { - return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 2, false)); + return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 2, false)); }; -/** - * @param {boolean} value - * @return {!proto.google.api.Http} returns this - */ +/** @param {boolean} value */ proto.google.api.Http.prototype.setFullyDecodeReservedExpansion = function(value) { - return jspb.Message.setProto3BooleanField(this, 2, value); + jspb.Message.setProto3BooleanField(this, 2, value); }; @@ -326,15 +317,13 @@ proto.google.api.HttpRule.prototype.getPatternCase = function() { if (jspb.Message.GENERATE_TO_OBJECT) { /** - * Creates an object representation of this proto. + * Creates an object representation of this proto suitable for use in Soy templates. * Field names that are reserved in JavaScript and will be renamed to pb_name. - * Optional fields that are not set will be set to undefined. * To access a reserved field use, foo.pb_, eg, foo.pb_default. * For the list of reserved names please see: - * net/proto2/compiler/js/internal/generator.cc#kKeyword. - * @param {boolean=} opt_includeInstance Deprecated. whether to include the - * JSPB instance for transitional soy proto support: - * http://goto/soy-param-migration + * com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS. + * @param {boolean=} opt_includeInstance Whether to include the JSPB instance + * for transitional soy proto support: http://goto/soy-param-migration * @return {!Object} */ proto.google.api.HttpRule.prototype.toObject = function(opt_includeInstance) { @@ -344,15 +333,15 @@ proto.google.api.HttpRule.prototype.toObject = function(opt_includeInstance) { /** * Static version of the {@see toObject} method. - * @param {boolean|undefined} includeInstance Deprecated. Whether to include - * the JSPB instance for transitional soy proto support: + * @param {boolean|undefined} includeInstance Whether to include the JSPB + * instance for transitional soy proto support: * http://goto/soy-param-migration * @param {!proto.google.api.HttpRule} msg The msg instance to transform. * @return {!Object} * @suppress {unusedLocalVariables} f is only used for nested messages */ proto.google.api.HttpRule.toObject = function(includeInstance, msg) { - var f, obj = { + var obj = { selector: jspb.Message.getFieldWithDefault(msg, 1, ""), get: jspb.Message.getFieldWithDefault(msg, 2, ""), put: jspb.Message.getFieldWithDefault(msg, 3, ""), @@ -555,12 +544,9 @@ proto.google.api.HttpRule.prototype.getSelector = function() { }; -/** - * @param {string} value - * @return {!proto.google.api.HttpRule} returns this - */ +/** @param {string} value */ proto.google.api.HttpRule.prototype.setSelector = function(value) { - return jspb.Message.setProto3StringField(this, 1, value); + jspb.Message.setProto3StringField(this, 1, value); }; @@ -573,21 +559,17 @@ proto.google.api.HttpRule.prototype.getGet = function() { }; -/** - * @param {string} value - * @return {!proto.google.api.HttpRule} returns this - */ +/** @param {string} value */ proto.google.api.HttpRule.prototype.setGet = function(value) { - return jspb.Message.setOneofField(this, 2, proto.google.api.HttpRule.oneofGroups_[0], value); + jspb.Message.setOneofField(this, 2, proto.google.api.HttpRule.oneofGroups_[0], value); }; /** * Clears the field making it undefined. - * @return {!proto.google.api.HttpRule} returns this */ proto.google.api.HttpRule.prototype.clearGet = function() { - return jspb.Message.setOneofField(this, 2, proto.google.api.HttpRule.oneofGroups_[0], undefined); + jspb.Message.setOneofField(this, 2, proto.google.api.HttpRule.oneofGroups_[0], undefined); }; @@ -609,21 +591,17 @@ proto.google.api.HttpRule.prototype.getPut = function() { }; -/** - * @param {string} value - * @return {!proto.google.api.HttpRule} returns this - */ +/** @param {string} value */ proto.google.api.HttpRule.prototype.setPut = function(value) { - return jspb.Message.setOneofField(this, 3, proto.google.api.HttpRule.oneofGroups_[0], value); + jspb.Message.setOneofField(this, 3, proto.google.api.HttpRule.oneofGroups_[0], value); }; /** * Clears the field making it undefined. - * @return {!proto.google.api.HttpRule} returns this */ proto.google.api.HttpRule.prototype.clearPut = function() { - return jspb.Message.setOneofField(this, 3, proto.google.api.HttpRule.oneofGroups_[0], undefined); + jspb.Message.setOneofField(this, 3, proto.google.api.HttpRule.oneofGroups_[0], undefined); }; @@ -645,21 +623,17 @@ proto.google.api.HttpRule.prototype.getPost = function() { }; -/** - * @param {string} value - * @return {!proto.google.api.HttpRule} returns this - */ +/** @param {string} value */ proto.google.api.HttpRule.prototype.setPost = function(value) { - return jspb.Message.setOneofField(this, 4, proto.google.api.HttpRule.oneofGroups_[0], value); + jspb.Message.setOneofField(this, 4, proto.google.api.HttpRule.oneofGroups_[0], value); }; /** * Clears the field making it undefined. - * @return {!proto.google.api.HttpRule} returns this */ proto.google.api.HttpRule.prototype.clearPost = function() { - return jspb.Message.setOneofField(this, 4, proto.google.api.HttpRule.oneofGroups_[0], undefined); + jspb.Message.setOneofField(this, 4, proto.google.api.HttpRule.oneofGroups_[0], undefined); }; @@ -681,21 +655,17 @@ proto.google.api.HttpRule.prototype.getDelete = function() { }; -/** - * @param {string} value - * @return {!proto.google.api.HttpRule} returns this - */ +/** @param {string} value */ proto.google.api.HttpRule.prototype.setDelete = function(value) { - return jspb.Message.setOneofField(this, 5, proto.google.api.HttpRule.oneofGroups_[0], value); + jspb.Message.setOneofField(this, 5, proto.google.api.HttpRule.oneofGroups_[0], value); }; /** * Clears the field making it undefined. - * @return {!proto.google.api.HttpRule} returns this */ proto.google.api.HttpRule.prototype.clearDelete = function() { - return jspb.Message.setOneofField(this, 5, proto.google.api.HttpRule.oneofGroups_[0], undefined); + jspb.Message.setOneofField(this, 5, proto.google.api.HttpRule.oneofGroups_[0], undefined); }; @@ -717,21 +687,17 @@ proto.google.api.HttpRule.prototype.getPatch = function() { }; -/** - * @param {string} value - * @return {!proto.google.api.HttpRule} returns this - */ +/** @param {string} value */ proto.google.api.HttpRule.prototype.setPatch = function(value) { - return jspb.Message.setOneofField(this, 6, proto.google.api.HttpRule.oneofGroups_[0], value); + jspb.Message.setOneofField(this, 6, proto.google.api.HttpRule.oneofGroups_[0], value); }; /** * Clears the field making it undefined. - * @return {!proto.google.api.HttpRule} returns this */ proto.google.api.HttpRule.prototype.clearPatch = function() { - return jspb.Message.setOneofField(this, 6, proto.google.api.HttpRule.oneofGroups_[0], undefined); + jspb.Message.setOneofField(this, 6, proto.google.api.HttpRule.oneofGroups_[0], undefined); }; @@ -754,21 +720,17 @@ proto.google.api.HttpRule.prototype.getCustom = function() { }; -/** - * @param {?proto.google.api.CustomHttpPattern|undefined} value - * @return {!proto.google.api.HttpRule} returns this -*/ +/** @param {?proto.google.api.CustomHttpPattern|undefined} value */ proto.google.api.HttpRule.prototype.setCustom = function(value) { - return jspb.Message.setOneofWrapperField(this, 8, proto.google.api.HttpRule.oneofGroups_[0], value); + jspb.Message.setOneofWrapperField(this, 8, proto.google.api.HttpRule.oneofGroups_[0], value); }; /** * Clears the message field making it undefined. - * @return {!proto.google.api.HttpRule} returns this */ proto.google.api.HttpRule.prototype.clearCustom = function() { - return this.setCustom(undefined); + this.setCustom(undefined); }; @@ -790,12 +752,9 @@ proto.google.api.HttpRule.prototype.getBody = function() { }; -/** - * @param {string} value - * @return {!proto.google.api.HttpRule} returns this - */ +/** @param {string} value */ proto.google.api.HttpRule.prototype.setBody = function(value) { - return jspb.Message.setProto3StringField(this, 7, value); + jspb.Message.setProto3StringField(this, 7, value); }; @@ -808,12 +767,9 @@ proto.google.api.HttpRule.prototype.getResponseBody = function() { }; -/** - * @param {string} value - * @return {!proto.google.api.HttpRule} returns this - */ +/** @param {string} value */ proto.google.api.HttpRule.prototype.setResponseBody = function(value) { - return jspb.Message.setProto3StringField(this, 12, value); + jspb.Message.setProto3StringField(this, 12, value); }; @@ -827,12 +783,9 @@ proto.google.api.HttpRule.prototype.getAdditionalBindingsList = function() { }; -/** - * @param {!Array} value - * @return {!proto.google.api.HttpRule} returns this -*/ +/** @param {!Array} value */ proto.google.api.HttpRule.prototype.setAdditionalBindingsList = function(value) { - return jspb.Message.setRepeatedWrapperField(this, 11, value); + jspb.Message.setRepeatedWrapperField(this, 11, value); }; @@ -848,10 +801,9 @@ proto.google.api.HttpRule.prototype.addAdditionalBindings = function(opt_value, /** * Clears the list making it empty but non-null. - * @return {!proto.google.api.HttpRule} returns this */ proto.google.api.HttpRule.prototype.clearAdditionalBindingsList = function() { - return this.setAdditionalBindingsList([]); + this.setAdditionalBindingsList([]); }; @@ -860,15 +812,13 @@ proto.google.api.HttpRule.prototype.clearAdditionalBindingsList = function() { if (jspb.Message.GENERATE_TO_OBJECT) { /** - * Creates an object representation of this proto. + * Creates an object representation of this proto suitable for use in Soy templates. * Field names that are reserved in JavaScript and will be renamed to pb_name. - * Optional fields that are not set will be set to undefined. * To access a reserved field use, foo.pb_, eg, foo.pb_default. * For the list of reserved names please see: - * net/proto2/compiler/js/internal/generator.cc#kKeyword. - * @param {boolean=} opt_includeInstance Deprecated. whether to include the - * JSPB instance for transitional soy proto support: - * http://goto/soy-param-migration + * com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS. + * @param {boolean=} opt_includeInstance Whether to include the JSPB instance + * for transitional soy proto support: http://goto/soy-param-migration * @return {!Object} */ proto.google.api.CustomHttpPattern.prototype.toObject = function(opt_includeInstance) { @@ -878,15 +828,15 @@ proto.google.api.CustomHttpPattern.prototype.toObject = function(opt_includeInst /** * Static version of the {@see toObject} method. - * @param {boolean|undefined} includeInstance Deprecated. Whether to include - * the JSPB instance for transitional soy proto support: + * @param {boolean|undefined} includeInstance Whether to include the JSPB + * instance for transitional soy proto support: * http://goto/soy-param-migration * @param {!proto.google.api.CustomHttpPattern} msg The msg instance to transform. * @return {!Object} * @suppress {unusedLocalVariables} f is only used for nested messages */ proto.google.api.CustomHttpPattern.toObject = function(includeInstance, msg) { - var f, obj = { + var obj = { kind: jspb.Message.getFieldWithDefault(msg, 1, ""), path: jspb.Message.getFieldWithDefault(msg, 2, "") }; @@ -988,12 +938,9 @@ proto.google.api.CustomHttpPattern.prototype.getKind = function() { }; -/** - * @param {string} value - * @return {!proto.google.api.CustomHttpPattern} returns this - */ +/** @param {string} value */ proto.google.api.CustomHttpPattern.prototype.setKind = function(value) { - return jspb.Message.setProto3StringField(this, 1, value); + jspb.Message.setProto3StringField(this, 1, value); }; @@ -1006,12 +953,9 @@ proto.google.api.CustomHttpPattern.prototype.getPath = function() { }; -/** - * @param {string} value - * @return {!proto.google.api.CustomHttpPattern} returns this - */ +/** @param {string} value */ proto.google.api.CustomHttpPattern.prototype.setPath = function(value) { - return jspb.Message.setProto3StringField(this, 2, value); + jspb.Message.setProto3StringField(this, 2, value); }; diff --git a/sdks/nodejs/lib/sdk_pb.js b/sdks/nodejs/lib/sdk_pb.js index 4e3c9bb70d..f221e0e577 100644 --- a/sdks/nodejs/lib/sdk_pb.js +++ b/sdks/nodejs/lib/sdk_pb.js @@ -13,7 +13,6 @@ // limitations under the License. // This code was autogenerated. Do not edit directly. -// source: sdk.proto /** * @fileoverview * @enhanceable @@ -232,15 +231,13 @@ if (goog.DEBUG && !COMPILED) { if (jspb.Message.GENERATE_TO_OBJECT) { /** - * Creates an object representation of this proto. + * Creates an object representation of this proto suitable for use in Soy templates. * Field names that are reserved in JavaScript and will be renamed to pb_name. - * Optional fields that are not set will be set to undefined. * To access a reserved field use, foo.pb_, eg, foo.pb_default. * For the list of reserved names please see: - * net/proto2/compiler/js/internal/generator.cc#kKeyword. - * @param {boolean=} opt_includeInstance Deprecated. whether to include the - * JSPB instance for transitional soy proto support: - * http://goto/soy-param-migration + * com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS. + * @param {boolean=} opt_includeInstance Whether to include the JSPB instance + * for transitional soy proto support: http://goto/soy-param-migration * @return {!Object} */ proto.agones.dev.sdk.Empty.prototype.toObject = function(opt_includeInstance) { @@ -250,15 +247,15 @@ proto.agones.dev.sdk.Empty.prototype.toObject = function(opt_includeInstance) { /** * Static version of the {@see toObject} method. - * @param {boolean|undefined} includeInstance Deprecated. Whether to include - * the JSPB instance for transitional soy proto support: + * @param {boolean|undefined} includeInstance Whether to include the JSPB + * instance for transitional soy proto support: * http://goto/soy-param-migration * @param {!proto.agones.dev.sdk.Empty} msg The msg instance to transform. * @return {!Object} * @suppress {unusedLocalVariables} f is only used for nested messages */ proto.agones.dev.sdk.Empty.toObject = function(includeInstance, msg) { - var f, obj = { + var obj = { }; @@ -333,15 +330,13 @@ proto.agones.dev.sdk.Empty.serializeBinaryToWriter = function(message, writer) { if (jspb.Message.GENERATE_TO_OBJECT) { /** - * Creates an object representation of this proto. + * Creates an object representation of this proto suitable for use in Soy templates. * Field names that are reserved in JavaScript and will be renamed to pb_name. - * Optional fields that are not set will be set to undefined. * To access a reserved field use, foo.pb_, eg, foo.pb_default. * For the list of reserved names please see: - * net/proto2/compiler/js/internal/generator.cc#kKeyword. - * @param {boolean=} opt_includeInstance Deprecated. whether to include the - * JSPB instance for transitional soy proto support: - * http://goto/soy-param-migration + * com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS. + * @param {boolean=} opt_includeInstance Whether to include the JSPB instance + * for transitional soy proto support: http://goto/soy-param-migration * @return {!Object} */ proto.agones.dev.sdk.KeyValue.prototype.toObject = function(opt_includeInstance) { @@ -351,15 +346,15 @@ proto.agones.dev.sdk.KeyValue.prototype.toObject = function(opt_includeInstance) /** * Static version of the {@see toObject} method. - * @param {boolean|undefined} includeInstance Deprecated. Whether to include - * the JSPB instance for transitional soy proto support: + * @param {boolean|undefined} includeInstance Whether to include the JSPB + * instance for transitional soy proto support: * http://goto/soy-param-migration * @param {!proto.agones.dev.sdk.KeyValue} msg The msg instance to transform. * @return {!Object} * @suppress {unusedLocalVariables} f is only used for nested messages */ proto.agones.dev.sdk.KeyValue.toObject = function(includeInstance, msg) { - var f, obj = { + var obj = { key: jspb.Message.getFieldWithDefault(msg, 1, ""), value: jspb.Message.getFieldWithDefault(msg, 2, "") }; @@ -461,12 +456,9 @@ proto.agones.dev.sdk.KeyValue.prototype.getKey = function() { }; -/** - * @param {string} value - * @return {!proto.agones.dev.sdk.KeyValue} returns this - */ +/** @param {string} value */ proto.agones.dev.sdk.KeyValue.prototype.setKey = function(value) { - return jspb.Message.setProto3StringField(this, 1, value); + jspb.Message.setProto3StringField(this, 1, value); }; @@ -479,12 +471,9 @@ proto.agones.dev.sdk.KeyValue.prototype.getValue = function() { }; -/** - * @param {string} value - * @return {!proto.agones.dev.sdk.KeyValue} returns this - */ +/** @param {string} value */ proto.agones.dev.sdk.KeyValue.prototype.setValue = function(value) { - return jspb.Message.setProto3StringField(this, 2, value); + jspb.Message.setProto3StringField(this, 2, value); }; @@ -493,15 +482,13 @@ proto.agones.dev.sdk.KeyValue.prototype.setValue = function(value) { if (jspb.Message.GENERATE_TO_OBJECT) { /** - * Creates an object representation of this proto. + * Creates an object representation of this proto suitable for use in Soy templates. * Field names that are reserved in JavaScript and will be renamed to pb_name. - * Optional fields that are not set will be set to undefined. * To access a reserved field use, foo.pb_, eg, foo.pb_default. * For the list of reserved names please see: - * net/proto2/compiler/js/internal/generator.cc#kKeyword. - * @param {boolean=} opt_includeInstance Deprecated. whether to include the - * JSPB instance for transitional soy proto support: - * http://goto/soy-param-migration + * com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS. + * @param {boolean=} opt_includeInstance Whether to include the JSPB instance + * for transitional soy proto support: http://goto/soy-param-migration * @return {!Object} */ proto.agones.dev.sdk.Duration.prototype.toObject = function(opt_includeInstance) { @@ -511,15 +498,15 @@ proto.agones.dev.sdk.Duration.prototype.toObject = function(opt_includeInstance) /** * Static version of the {@see toObject} method. - * @param {boolean|undefined} includeInstance Deprecated. Whether to include - * the JSPB instance for transitional soy proto support: + * @param {boolean|undefined} includeInstance Whether to include the JSPB + * instance for transitional soy proto support: * http://goto/soy-param-migration * @param {!proto.agones.dev.sdk.Duration} msg The msg instance to transform. * @return {!Object} * @suppress {unusedLocalVariables} f is only used for nested messages */ proto.agones.dev.sdk.Duration.toObject = function(includeInstance, msg) { - var f, obj = { + var obj = { seconds: jspb.Message.getFieldWithDefault(msg, 1, 0) }; @@ -609,12 +596,9 @@ proto.agones.dev.sdk.Duration.prototype.getSeconds = function() { }; -/** - * @param {number} value - * @return {!proto.agones.dev.sdk.Duration} returns this - */ +/** @param {number} value */ proto.agones.dev.sdk.Duration.prototype.setSeconds = function(value) { - return jspb.Message.setProto3IntField(this, 1, value); + jspb.Message.setProto3IntField(this, 1, value); }; @@ -623,15 +607,13 @@ proto.agones.dev.sdk.Duration.prototype.setSeconds = function(value) { if (jspb.Message.GENERATE_TO_OBJECT) { /** - * Creates an object representation of this proto. + * Creates an object representation of this proto suitable for use in Soy templates. * Field names that are reserved in JavaScript and will be renamed to pb_name. - * Optional fields that are not set will be set to undefined. * To access a reserved field use, foo.pb_, eg, foo.pb_default. * For the list of reserved names please see: - * net/proto2/compiler/js/internal/generator.cc#kKeyword. - * @param {boolean=} opt_includeInstance Deprecated. whether to include the - * JSPB instance for transitional soy proto support: - * http://goto/soy-param-migration + * com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS. + * @param {boolean=} opt_includeInstance Whether to include the JSPB instance + * for transitional soy proto support: http://goto/soy-param-migration * @return {!Object} */ proto.agones.dev.sdk.GameServer.prototype.toObject = function(opt_includeInstance) { @@ -641,15 +623,15 @@ proto.agones.dev.sdk.GameServer.prototype.toObject = function(opt_includeInstanc /** * Static version of the {@see toObject} method. - * @param {boolean|undefined} includeInstance Deprecated. Whether to include - * the JSPB instance for transitional soy proto support: + * @param {boolean|undefined} includeInstance Whether to include the JSPB + * instance for transitional soy proto support: * http://goto/soy-param-migration * @param {!proto.agones.dev.sdk.GameServer} msg The msg instance to transform. * @return {!Object} * @suppress {unusedLocalVariables} f is only used for nested messages */ proto.agones.dev.sdk.GameServer.toObject = function(includeInstance, msg) { - var f, obj = { + var obj = { objectMeta: (f = msg.getObjectMeta()) && proto.agones.dev.sdk.GameServer.ObjectMeta.toObject(includeInstance, f), spec: (f = msg.getSpec()) && proto.agones.dev.sdk.GameServer.Spec.toObject(includeInstance, f), status: (f = msg.getStatus()) && proto.agones.dev.sdk.GameServer.Status.toObject(includeInstance, f) @@ -765,15 +747,13 @@ proto.agones.dev.sdk.GameServer.serializeBinaryToWriter = function(message, writ if (jspb.Message.GENERATE_TO_OBJECT) { /** - * Creates an object representation of this proto. + * Creates an object representation of this proto suitable for use in Soy templates. * Field names that are reserved in JavaScript and will be renamed to pb_name. - * Optional fields that are not set will be set to undefined. * To access a reserved field use, foo.pb_, eg, foo.pb_default. * For the list of reserved names please see: - * net/proto2/compiler/js/internal/generator.cc#kKeyword. - * @param {boolean=} opt_includeInstance Deprecated. whether to include the - * JSPB instance for transitional soy proto support: - * http://goto/soy-param-migration + * com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS. + * @param {boolean=} opt_includeInstance Whether to include the JSPB instance + * for transitional soy proto support: http://goto/soy-param-migration * @return {!Object} */ proto.agones.dev.sdk.GameServer.ObjectMeta.prototype.toObject = function(opt_includeInstance) { @@ -783,15 +763,15 @@ proto.agones.dev.sdk.GameServer.ObjectMeta.prototype.toObject = function(opt_inc /** * Static version of the {@see toObject} method. - * @param {boolean|undefined} includeInstance Deprecated. Whether to include - * the JSPB instance for transitional soy proto support: + * @param {boolean|undefined} includeInstance Whether to include the JSPB + * instance for transitional soy proto support: * http://goto/soy-param-migration * @param {!proto.agones.dev.sdk.GameServer.ObjectMeta} msg The msg instance to transform. * @return {!Object} * @suppress {unusedLocalVariables} f is only used for nested messages */ proto.agones.dev.sdk.GameServer.ObjectMeta.toObject = function(includeInstance, msg) { - var f, obj = { + var obj = { name: jspb.Message.getFieldWithDefault(msg, 1, ""), namespace: jspb.Message.getFieldWithDefault(msg, 2, ""), uid: jspb.Message.getFieldWithDefault(msg, 3, ""), @@ -868,13 +848,13 @@ proto.agones.dev.sdk.GameServer.ObjectMeta.deserializeBinaryFromReader = functio case 8: var value = msg.getAnnotationsMap(); reader.readMessage(value, function(message, reader) { - jspb.Map.deserializeBinary(message, reader, jspb.BinaryReader.prototype.readString, jspb.BinaryReader.prototype.readString, null, "", ""); + jspb.Map.deserializeBinary(message, reader, jspb.BinaryReader.prototype.readString, jspb.BinaryReader.prototype.readString, null, ""); }); break; case 9: var value = msg.getLabelsMap(); reader.readMessage(value, function(message, reader) { - jspb.Map.deserializeBinary(message, reader, jspb.BinaryReader.prototype.readString, jspb.BinaryReader.prototype.readString, null, "", ""); + jspb.Map.deserializeBinary(message, reader, jspb.BinaryReader.prototype.readString, jspb.BinaryReader.prototype.readString, null, ""); }); break; default: @@ -975,12 +955,9 @@ proto.agones.dev.sdk.GameServer.ObjectMeta.prototype.getName = function() { }; -/** - * @param {string} value - * @return {!proto.agones.dev.sdk.GameServer.ObjectMeta} returns this - */ +/** @param {string} value */ proto.agones.dev.sdk.GameServer.ObjectMeta.prototype.setName = function(value) { - return jspb.Message.setProto3StringField(this, 1, value); + jspb.Message.setProto3StringField(this, 1, value); }; @@ -993,12 +970,9 @@ proto.agones.dev.sdk.GameServer.ObjectMeta.prototype.getNamespace = function() { }; -/** - * @param {string} value - * @return {!proto.agones.dev.sdk.GameServer.ObjectMeta} returns this - */ +/** @param {string} value */ proto.agones.dev.sdk.GameServer.ObjectMeta.prototype.setNamespace = function(value) { - return jspb.Message.setProto3StringField(this, 2, value); + jspb.Message.setProto3StringField(this, 2, value); }; @@ -1011,12 +985,9 @@ proto.agones.dev.sdk.GameServer.ObjectMeta.prototype.getUid = function() { }; -/** - * @param {string} value - * @return {!proto.agones.dev.sdk.GameServer.ObjectMeta} returns this - */ +/** @param {string} value */ proto.agones.dev.sdk.GameServer.ObjectMeta.prototype.setUid = function(value) { - return jspb.Message.setProto3StringField(this, 3, value); + jspb.Message.setProto3StringField(this, 3, value); }; @@ -1029,12 +1000,9 @@ proto.agones.dev.sdk.GameServer.ObjectMeta.prototype.getResourceVersion = functi }; -/** - * @param {string} value - * @return {!proto.agones.dev.sdk.GameServer.ObjectMeta} returns this - */ +/** @param {string} value */ proto.agones.dev.sdk.GameServer.ObjectMeta.prototype.setResourceVersion = function(value) { - return jspb.Message.setProto3StringField(this, 4, value); + jspb.Message.setProto3StringField(this, 4, value); }; @@ -1047,12 +1015,9 @@ proto.agones.dev.sdk.GameServer.ObjectMeta.prototype.getGeneration = function() }; -/** - * @param {number} value - * @return {!proto.agones.dev.sdk.GameServer.ObjectMeta} returns this - */ +/** @param {number} value */ proto.agones.dev.sdk.GameServer.ObjectMeta.prototype.setGeneration = function(value) { - return jspb.Message.setProto3IntField(this, 5, value); + jspb.Message.setProto3IntField(this, 5, value); }; @@ -1065,12 +1030,9 @@ proto.agones.dev.sdk.GameServer.ObjectMeta.prototype.getCreationTimestamp = func }; -/** - * @param {number} value - * @return {!proto.agones.dev.sdk.GameServer.ObjectMeta} returns this - */ +/** @param {number} value */ proto.agones.dev.sdk.GameServer.ObjectMeta.prototype.setCreationTimestamp = function(value) { - return jspb.Message.setProto3IntField(this, 6, value); + jspb.Message.setProto3IntField(this, 6, value); }; @@ -1083,12 +1045,9 @@ proto.agones.dev.sdk.GameServer.ObjectMeta.prototype.getDeletionTimestamp = func }; -/** - * @param {number} value - * @return {!proto.agones.dev.sdk.GameServer.ObjectMeta} returns this - */ +/** @param {number} value */ proto.agones.dev.sdk.GameServer.ObjectMeta.prototype.setDeletionTimestamp = function(value) { - return jspb.Message.setProto3IntField(this, 7, value); + jspb.Message.setProto3IntField(this, 7, value); }; @@ -1107,11 +1066,10 @@ proto.agones.dev.sdk.GameServer.ObjectMeta.prototype.getAnnotationsMap = functio /** * Clears values from the map. The map will be non-null. - * @return {!proto.agones.dev.sdk.GameServer.ObjectMeta} returns this */ proto.agones.dev.sdk.GameServer.ObjectMeta.prototype.clearAnnotationsMap = function() { this.getAnnotationsMap().clear(); - return this;}; +}; /** @@ -1129,11 +1087,10 @@ proto.agones.dev.sdk.GameServer.ObjectMeta.prototype.getLabelsMap = function(opt /** * Clears values from the map. The map will be non-null. - * @return {!proto.agones.dev.sdk.GameServer.ObjectMeta} returns this */ proto.agones.dev.sdk.GameServer.ObjectMeta.prototype.clearLabelsMap = function() { this.getLabelsMap().clear(); - return this;}; +}; @@ -1141,15 +1098,13 @@ proto.agones.dev.sdk.GameServer.ObjectMeta.prototype.clearLabelsMap = function() if (jspb.Message.GENERATE_TO_OBJECT) { /** - * Creates an object representation of this proto. + * Creates an object representation of this proto suitable for use in Soy templates. * Field names that are reserved in JavaScript and will be renamed to pb_name. - * Optional fields that are not set will be set to undefined. * To access a reserved field use, foo.pb_, eg, foo.pb_default. * For the list of reserved names please see: - * net/proto2/compiler/js/internal/generator.cc#kKeyword. - * @param {boolean=} opt_includeInstance Deprecated. whether to include the - * JSPB instance for transitional soy proto support: - * http://goto/soy-param-migration + * com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS. + * @param {boolean=} opt_includeInstance Whether to include the JSPB instance + * for transitional soy proto support: http://goto/soy-param-migration * @return {!Object} */ proto.agones.dev.sdk.GameServer.Spec.prototype.toObject = function(opt_includeInstance) { @@ -1159,15 +1114,15 @@ proto.agones.dev.sdk.GameServer.Spec.prototype.toObject = function(opt_includeIn /** * Static version of the {@see toObject} method. - * @param {boolean|undefined} includeInstance Deprecated. Whether to include - * the JSPB instance for transitional soy proto support: + * @param {boolean|undefined} includeInstance Whether to include the JSPB + * instance for transitional soy proto support: * http://goto/soy-param-migration * @param {!proto.agones.dev.sdk.GameServer.Spec} msg The msg instance to transform. * @return {!Object} * @suppress {unusedLocalVariables} f is only used for nested messages */ proto.agones.dev.sdk.GameServer.Spec.toObject = function(includeInstance, msg) { - var f, obj = { + var obj = { health: (f = msg.getHealth()) && proto.agones.dev.sdk.GameServer.Spec.Health.toObject(includeInstance, f) }; @@ -1255,15 +1210,13 @@ proto.agones.dev.sdk.GameServer.Spec.serializeBinaryToWriter = function(message, if (jspb.Message.GENERATE_TO_OBJECT) { /** - * Creates an object representation of this proto. + * Creates an object representation of this proto suitable for use in Soy templates. * Field names that are reserved in JavaScript and will be renamed to pb_name. - * Optional fields that are not set will be set to undefined. * To access a reserved field use, foo.pb_, eg, foo.pb_default. * For the list of reserved names please see: - * net/proto2/compiler/js/internal/generator.cc#kKeyword. - * @param {boolean=} opt_includeInstance Deprecated. whether to include the - * JSPB instance for transitional soy proto support: - * http://goto/soy-param-migration + * com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS. + * @param {boolean=} opt_includeInstance Whether to include the JSPB instance + * for transitional soy proto support: http://goto/soy-param-migration * @return {!Object} */ proto.agones.dev.sdk.GameServer.Spec.Health.prototype.toObject = function(opt_includeInstance) { @@ -1273,16 +1226,16 @@ proto.agones.dev.sdk.GameServer.Spec.Health.prototype.toObject = function(opt_in /** * Static version of the {@see toObject} method. - * @param {boolean|undefined} includeInstance Deprecated. Whether to include - * the JSPB instance for transitional soy proto support: + * @param {boolean|undefined} includeInstance Whether to include the JSPB + * instance for transitional soy proto support: * http://goto/soy-param-migration * @param {!proto.agones.dev.sdk.GameServer.Spec.Health} msg The msg instance to transform. * @return {!Object} * @suppress {unusedLocalVariables} f is only used for nested messages */ proto.agones.dev.sdk.GameServer.Spec.Health.toObject = function(includeInstance, msg) { - var f, obj = { - disabled: jspb.Message.getBooleanFieldWithDefault(msg, 1, false), + var obj = { + disabled: jspb.Message.getFieldWithDefault(msg, 1, false), periodSeconds: jspb.Message.getFieldWithDefault(msg, 2, 0), failureThreshold: jspb.Message.getFieldWithDefault(msg, 3, 0), initialDelaySeconds: jspb.Message.getFieldWithDefault(msg, 4, 0) @@ -1400,19 +1353,18 @@ proto.agones.dev.sdk.GameServer.Spec.Health.serializeBinaryToWriter = function(m /** * optional bool disabled = 1; + * Note that Boolean fields may be set to 0/1 when serialized from a Java server. + * You should avoid comparisons like {@code val === true/false} in those cases. * @return {boolean} */ proto.agones.dev.sdk.GameServer.Spec.Health.prototype.getDisabled = function() { - return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 1, false)); + return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 1, false)); }; -/** - * @param {boolean} value - * @return {!proto.agones.dev.sdk.GameServer.Spec.Health} returns this - */ +/** @param {boolean} value */ proto.agones.dev.sdk.GameServer.Spec.Health.prototype.setDisabled = function(value) { - return jspb.Message.setProto3BooleanField(this, 1, value); + jspb.Message.setProto3BooleanField(this, 1, value); }; @@ -1425,12 +1377,9 @@ proto.agones.dev.sdk.GameServer.Spec.Health.prototype.getPeriodSeconds = functio }; -/** - * @param {number} value - * @return {!proto.agones.dev.sdk.GameServer.Spec.Health} returns this - */ +/** @param {number} value */ proto.agones.dev.sdk.GameServer.Spec.Health.prototype.setPeriodSeconds = function(value) { - return jspb.Message.setProto3IntField(this, 2, value); + jspb.Message.setProto3IntField(this, 2, value); }; @@ -1443,12 +1392,9 @@ proto.agones.dev.sdk.GameServer.Spec.Health.prototype.getFailureThreshold = func }; -/** - * @param {number} value - * @return {!proto.agones.dev.sdk.GameServer.Spec.Health} returns this - */ +/** @param {number} value */ proto.agones.dev.sdk.GameServer.Spec.Health.prototype.setFailureThreshold = function(value) { - return jspb.Message.setProto3IntField(this, 3, value); + jspb.Message.setProto3IntField(this, 3, value); }; @@ -1461,12 +1407,9 @@ proto.agones.dev.sdk.GameServer.Spec.Health.prototype.getInitialDelaySeconds = f }; -/** - * @param {number} value - * @return {!proto.agones.dev.sdk.GameServer.Spec.Health} returns this - */ +/** @param {number} value */ proto.agones.dev.sdk.GameServer.Spec.Health.prototype.setInitialDelaySeconds = function(value) { - return jspb.Message.setProto3IntField(this, 4, value); + jspb.Message.setProto3IntField(this, 4, value); }; @@ -1480,21 +1423,17 @@ proto.agones.dev.sdk.GameServer.Spec.prototype.getHealth = function() { }; -/** - * @param {?proto.agones.dev.sdk.GameServer.Spec.Health|undefined} value - * @return {!proto.agones.dev.sdk.GameServer.Spec} returns this -*/ +/** @param {?proto.agones.dev.sdk.GameServer.Spec.Health|undefined} value */ proto.agones.dev.sdk.GameServer.Spec.prototype.setHealth = function(value) { - return jspb.Message.setWrapperField(this, 1, value); + jspb.Message.setWrapperField(this, 1, value); }; /** * Clears the message field making it undefined. - * @return {!proto.agones.dev.sdk.GameServer.Spec} returns this */ proto.agones.dev.sdk.GameServer.Spec.prototype.clearHealth = function() { - return this.setHealth(undefined); + this.setHealth(undefined); }; @@ -1519,15 +1458,13 @@ proto.agones.dev.sdk.GameServer.Status.repeatedFields_ = [3]; if (jspb.Message.GENERATE_TO_OBJECT) { /** - * Creates an object representation of this proto. + * Creates an object representation of this proto suitable for use in Soy templates. * Field names that are reserved in JavaScript and will be renamed to pb_name. - * Optional fields that are not set will be set to undefined. * To access a reserved field use, foo.pb_, eg, foo.pb_default. * For the list of reserved names please see: - * net/proto2/compiler/js/internal/generator.cc#kKeyword. - * @param {boolean=} opt_includeInstance Deprecated. whether to include the - * JSPB instance for transitional soy proto support: - * http://goto/soy-param-migration + * com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS. + * @param {boolean=} opt_includeInstance Whether to include the JSPB instance + * for transitional soy proto support: http://goto/soy-param-migration * @return {!Object} */ proto.agones.dev.sdk.GameServer.Status.prototype.toObject = function(opt_includeInstance) { @@ -1537,15 +1474,15 @@ proto.agones.dev.sdk.GameServer.Status.prototype.toObject = function(opt_include /** * Static version of the {@see toObject} method. - * @param {boolean|undefined} includeInstance Deprecated. Whether to include - * the JSPB instance for transitional soy proto support: + * @param {boolean|undefined} includeInstance Whether to include the JSPB + * instance for transitional soy proto support: * http://goto/soy-param-migration * @param {!proto.agones.dev.sdk.GameServer.Status} msg The msg instance to transform. * @return {!Object} * @suppress {unusedLocalVariables} f is only used for nested messages */ proto.agones.dev.sdk.GameServer.Status.toObject = function(includeInstance, msg) { - var f, obj = { + var obj = { state: jspb.Message.getFieldWithDefault(msg, 1, ""), address: jspb.Message.getFieldWithDefault(msg, 2, ""), portsList: jspb.Message.toObjectList(msg.getPortsList(), @@ -1658,15 +1595,13 @@ proto.agones.dev.sdk.GameServer.Status.serializeBinaryToWriter = function(messag if (jspb.Message.GENERATE_TO_OBJECT) { /** - * Creates an object representation of this proto. + * Creates an object representation of this proto suitable for use in Soy templates. * Field names that are reserved in JavaScript and will be renamed to pb_name. - * Optional fields that are not set will be set to undefined. * To access a reserved field use, foo.pb_, eg, foo.pb_default. * For the list of reserved names please see: - * net/proto2/compiler/js/internal/generator.cc#kKeyword. - * @param {boolean=} opt_includeInstance Deprecated. whether to include the - * JSPB instance for transitional soy proto support: - * http://goto/soy-param-migration + * com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS. + * @param {boolean=} opt_includeInstance Whether to include the JSPB instance + * for transitional soy proto support: http://goto/soy-param-migration * @return {!Object} */ proto.agones.dev.sdk.GameServer.Status.Port.prototype.toObject = function(opt_includeInstance) { @@ -1676,15 +1611,15 @@ proto.agones.dev.sdk.GameServer.Status.Port.prototype.toObject = function(opt_in /** * Static version of the {@see toObject} method. - * @param {boolean|undefined} includeInstance Deprecated. Whether to include - * the JSPB instance for transitional soy proto support: + * @param {boolean|undefined} includeInstance Whether to include the JSPB + * instance for transitional soy proto support: * http://goto/soy-param-migration * @param {!proto.agones.dev.sdk.GameServer.Status.Port} msg The msg instance to transform. * @return {!Object} * @suppress {unusedLocalVariables} f is only used for nested messages */ proto.agones.dev.sdk.GameServer.Status.Port.toObject = function(includeInstance, msg) { - var f, obj = { + var obj = { name: jspb.Message.getFieldWithDefault(msg, 1, ""), port: jspb.Message.getFieldWithDefault(msg, 2, 0) }; @@ -1786,12 +1721,9 @@ proto.agones.dev.sdk.GameServer.Status.Port.prototype.getName = function() { }; -/** - * @param {string} value - * @return {!proto.agones.dev.sdk.GameServer.Status.Port} returns this - */ +/** @param {string} value */ proto.agones.dev.sdk.GameServer.Status.Port.prototype.setName = function(value) { - return jspb.Message.setProto3StringField(this, 1, value); + jspb.Message.setProto3StringField(this, 1, value); }; @@ -1804,12 +1736,9 @@ proto.agones.dev.sdk.GameServer.Status.Port.prototype.getPort = function() { }; -/** - * @param {number} value - * @return {!proto.agones.dev.sdk.GameServer.Status.Port} returns this - */ +/** @param {number} value */ proto.agones.dev.sdk.GameServer.Status.Port.prototype.setPort = function(value) { - return jspb.Message.setProto3IntField(this, 2, value); + jspb.Message.setProto3IntField(this, 2, value); }; @@ -1822,12 +1751,9 @@ proto.agones.dev.sdk.GameServer.Status.prototype.getState = function() { }; -/** - * @param {string} value - * @return {!proto.agones.dev.sdk.GameServer.Status} returns this - */ +/** @param {string} value */ proto.agones.dev.sdk.GameServer.Status.prototype.setState = function(value) { - return jspb.Message.setProto3StringField(this, 1, value); + jspb.Message.setProto3StringField(this, 1, value); }; @@ -1840,12 +1766,9 @@ proto.agones.dev.sdk.GameServer.Status.prototype.getAddress = function() { }; -/** - * @param {string} value - * @return {!proto.agones.dev.sdk.GameServer.Status} returns this - */ +/** @param {string} value */ proto.agones.dev.sdk.GameServer.Status.prototype.setAddress = function(value) { - return jspb.Message.setProto3StringField(this, 2, value); + jspb.Message.setProto3StringField(this, 2, value); }; @@ -1859,12 +1782,9 @@ proto.agones.dev.sdk.GameServer.Status.prototype.getPortsList = function() { }; -/** - * @param {!Array} value - * @return {!proto.agones.dev.sdk.GameServer.Status} returns this -*/ +/** @param {!Array} value */ proto.agones.dev.sdk.GameServer.Status.prototype.setPortsList = function(value) { - return jspb.Message.setRepeatedWrapperField(this, 3, value); + jspb.Message.setRepeatedWrapperField(this, 3, value); }; @@ -1880,10 +1800,9 @@ proto.agones.dev.sdk.GameServer.Status.prototype.addPorts = function(opt_value, /** * Clears the list making it empty but non-null. - * @return {!proto.agones.dev.sdk.GameServer.Status} returns this */ proto.agones.dev.sdk.GameServer.Status.prototype.clearPortsList = function() { - return this.setPortsList([]); + this.setPortsList([]); }; @@ -1897,21 +1816,17 @@ proto.agones.dev.sdk.GameServer.prototype.getObjectMeta = function() { }; -/** - * @param {?proto.agones.dev.sdk.GameServer.ObjectMeta|undefined} value - * @return {!proto.agones.dev.sdk.GameServer} returns this -*/ +/** @param {?proto.agones.dev.sdk.GameServer.ObjectMeta|undefined} value */ proto.agones.dev.sdk.GameServer.prototype.setObjectMeta = function(value) { - return jspb.Message.setWrapperField(this, 1, value); + jspb.Message.setWrapperField(this, 1, value); }; /** * Clears the message field making it undefined. - * @return {!proto.agones.dev.sdk.GameServer} returns this */ proto.agones.dev.sdk.GameServer.prototype.clearObjectMeta = function() { - return this.setObjectMeta(undefined); + this.setObjectMeta(undefined); }; @@ -1934,21 +1849,17 @@ proto.agones.dev.sdk.GameServer.prototype.getSpec = function() { }; -/** - * @param {?proto.agones.dev.sdk.GameServer.Spec|undefined} value - * @return {!proto.agones.dev.sdk.GameServer} returns this -*/ +/** @param {?proto.agones.dev.sdk.GameServer.Spec|undefined} value */ proto.agones.dev.sdk.GameServer.prototype.setSpec = function(value) { - return jspb.Message.setWrapperField(this, 2, value); + jspb.Message.setWrapperField(this, 2, value); }; /** * Clears the message field making it undefined. - * @return {!proto.agones.dev.sdk.GameServer} returns this */ proto.agones.dev.sdk.GameServer.prototype.clearSpec = function() { - return this.setSpec(undefined); + this.setSpec(undefined); }; @@ -1971,21 +1882,17 @@ proto.agones.dev.sdk.GameServer.prototype.getStatus = function() { }; -/** - * @param {?proto.agones.dev.sdk.GameServer.Status|undefined} value - * @return {!proto.agones.dev.sdk.GameServer} returns this -*/ +/** @param {?proto.agones.dev.sdk.GameServer.Status|undefined} value */ proto.agones.dev.sdk.GameServer.prototype.setStatus = function(value) { - return jspb.Message.setWrapperField(this, 3, value); + jspb.Message.setWrapperField(this, 3, value); }; /** * Clears the message field making it undefined. - * @return {!proto.agones.dev.sdk.GameServer} returns this */ proto.agones.dev.sdk.GameServer.prototype.clearStatus = function() { - return this.setStatus(undefined); + this.setStatus(undefined); }; diff --git a/sdks/rust/src/grpc/sdk.rs b/sdks/rust/src/grpc/sdk.rs index 353f43a003..0e7f4760d9 100644 --- a/sdks/rust/src/grpc/sdk.rs +++ b/sdks/rust/src/grpc/sdk.rs @@ -2216,7 +2216,7 @@ static file_descriptor_proto_data: &'static [u8] = b"\ \x12\x18.agones.dev.sdk.KeyValue\x1a\x15.agones.dev.sdk.Empty\"\x1f\x82\ \xd3\xe4\x93\x02\x19\x1a\x14/metadata/annotation:\x01*\x12O\n\x07Reserve\ \x12\x18.agones.dev.sdk.Duration\x1a\x15.agones.dev.sdk.Empty\"\x13\x82\ - \xd3\xe4\x93\x02\r\"\x08/reserve:\x01*B\x05Z\x03sdkJ\xd4!\n\x07\x12\x05\ + \xd3\xe4\x93\x02\r\"\x08/reserve:\x01*B\x05Z\x03sdkJ\xfe$\n\x07\x12\x05\ \x0e\0\x96\x01\x01\n\xd1\x04\n\x01\x0c\x12\x03\x0e\0\x122\xc6\x04\x20Cop\ yright\x202017\x20Google\x20LLC\x20All\x20Rights\x20Reserved.\n\n\x20Lic\ ensed\x20under\x20the\x20Apache\x20License,\x20Version\x202.0\x20(the\ @@ -2285,103 +2285,124 @@ static file_descriptor_proto_data: &'static [u8] = b"\ \x04\0\x12\x04\\\0]\x01\x1a\x0c\x20I\x20am\x20Empty\n\n\n\n\x03\x04\0\ \x01\x12\x03\\\x08\r\n\x1e\n\x02\x04\x01\x12\x04`\0c\x01\x1a\x12\x20Key,\ \x20Value\x20entry\n\n\n\n\x03\x04\x01\x01\x12\x03`\x08\x10\n\x0b\n\x04\ - \x04\x01\x02\0\x12\x03a\x04\x13\n\x0c\n\x05\x04\x01\x02\0\x05\x12\x03a\ - \x04\n\n\x0c\n\x05\x04\x01\x02\0\x01\x12\x03a\x0b\x0e\n\x0c\n\x05\x04\ - \x01\x02\0\x03\x12\x03a\x11\x12\n\x0b\n\x04\x04\x01\x02\x01\x12\x03b\x04\ - \x15\n\x0c\n\x05\x04\x01\x02\x01\x05\x12\x03b\x04\n\n\x0c\n\x05\x04\x01\ - \x02\x01\x01\x12\x03b\x0b\x10\n\x0c\n\x05\x04\x01\x02\x01\x03\x12\x03b\ - \x13\x14\n'\n\x02\x04\x02\x12\x04f\0h\x01\x1a\x1b\x20time\x20duration,\ - \x20in\x20seconds\n\n\n\n\x03\x04\x02\x01\x12\x03f\x08\x10\n\x0b\n\x04\ - \x04\x02\x02\0\x12\x03g\x04\x16\n\x0c\n\x05\x04\x02\x02\0\x05\x12\x03g\ - \x04\t\n\x0c\n\x05\x04\x02\x02\0\x01\x12\x03g\n\x11\n\x0c\n\x05\x04\x02\ - \x02\0\x03\x12\x03g\x14\x15\n\xa3\x01\n\x02\x04\x03\x12\x05m\0\x96\x01\ - \x01\x1a\x95\x01\x20A\x20GameServer\x20Custom\x20Resource\x20Definition\ - \x20object\n\x20We\x20will\x20only\x20export\x20those\x20resources\x20th\ - at\x20make\x20the\x20most\n\x20sense.\x20Can\x20always\x20expand\x20to\ - \x20more\x20as\x20needed.\n\n\n\n\x03\x04\x03\x01\x12\x03m\x08\x12\n\x0b\ - \n\x04\x04\x03\x02\0\x12\x03n\x04\x1f\n\x0c\n\x05\x04\x03\x02\0\x06\x12\ - \x03n\x04\x0e\n\x0c\n\x05\x04\x03\x02\0\x01\x12\x03n\x0f\x1a\n\x0c\n\x05\ - \x04\x03\x02\0\x03\x12\x03n\x1d\x1e\n\x0b\n\x04\x04\x03\x02\x01\x12\x03o\ - \x04\x12\n\x0c\n\x05\x04\x03\x02\x01\x06\x12\x03o\x04\x08\n\x0c\n\x05\ - \x04\x03\x02\x01\x01\x12\x03o\t\r\n\x0c\n\x05\x04\x03\x02\x01\x03\x12\ - \x03o\x10\x11\n\x0b\n\x04\x04\x03\x02\x02\x12\x03p\x04\x16\n\x0c\n\x05\ - \x04\x03\x02\x02\x06\x12\x03p\x04\n\n\x0c\n\x05\x04\x03\x02\x02\x01\x12\ - \x03p\x0b\x11\n\x0c\n\x05\x04\x03\x02\x02\x03\x12\x03p\x14\x15\n=\n\x04\ - \x04\x03\x03\0\x12\x04s\x04\x7f\x05\x1a/\x20representation\x20of\x20the\ - \x20K8s\x20ObjectMeta\x20resource\n\n\x0c\n\x05\x04\x03\x03\0\x01\x12\ - \x03s\x0c\x16\n\r\n\x06\x04\x03\x03\0\x02\0\x12\x03t\x08\x18\n\x0e\n\x07\ - \x04\x03\x03\0\x02\0\x05\x12\x03t\x08\x0e\n\x0e\n\x07\x04\x03\x03\0\x02\ - \0\x01\x12\x03t\x0f\x13\n\x0e\n\x07\x04\x03\x03\0\x02\0\x03\x12\x03t\x16\ - \x17\n\r\n\x06\x04\x03\x03\0\x02\x01\x12\x03u\x08\x1d\n\x0e\n\x07\x04\ - \x03\x03\0\x02\x01\x05\x12\x03u\x08\x0e\n\x0e\n\x07\x04\x03\x03\0\x02\ - \x01\x01\x12\x03u\x0f\x18\n\x0e\n\x07\x04\x03\x03\0\x02\x01\x03\x12\x03u\ - \x1b\x1c\n\r\n\x06\x04\x03\x03\0\x02\x02\x12\x03v\x08\x17\n\x0e\n\x07\ - \x04\x03\x03\0\x02\x02\x05\x12\x03v\x08\x0e\n\x0e\n\x07\x04\x03\x03\0\ - \x02\x02\x01\x12\x03v\x0f\x12\n\x0e\n\x07\x04\x03\x03\0\x02\x02\x03\x12\ - \x03v\x15\x16\n\r\n\x06\x04\x03\x03\0\x02\x03\x12\x03w\x08$\n\x0e\n\x07\ - \x04\x03\x03\0\x02\x03\x05\x12\x03w\x08\x0e\n\x0e\n\x07\x04\x03\x03\0\ - \x02\x03\x01\x12\x03w\x0f\x1f\n\x0e\n\x07\x04\x03\x03\0\x02\x03\x03\x12\ - \x03w\"#\n\r\n\x06\x04\x03\x03\0\x02\x04\x12\x03x\x08\x1d\n\x0e\n\x07\ - \x04\x03\x03\0\x02\x04\x05\x12\x03x\x08\r\n\x0e\n\x07\x04\x03\x03\0\x02\ - \x04\x01\x12\x03x\x0e\x18\n\x0e\n\x07\x04\x03\x03\0\x02\x04\x03\x12\x03x\ - \x1b\x1c\n<\n\x06\x04\x03\x03\0\x02\x05\x12\x03z\x08%\x1a-\x20timestamp\ - \x20is\x20in\x20Epoch\x20format,\x20unit:\x20seconds\n\n\x0e\n\x07\x04\ - \x03\x03\0\x02\x05\x05\x12\x03z\x08\r\n\x0e\n\x07\x04\x03\x03\0\x02\x05\ - \x01\x12\x03z\x0e\x20\n\x0e\n\x07\x04\x03\x03\0\x02\x05\x03\x12\x03z#$\n\ - K\n\x06\x04\x03\x03\0\x02\x06\x12\x03|\x08%\x1a<\x20optional\x20deletion\ - \x20timestamp\x20in\x20Epoch\x20format,\x20unit:\x20seconds\n\n\x0e\n\ - \x07\x04\x03\x03\0\x02\x06\x05\x12\x03|\x08\r\n\x0e\n\x07\x04\x03\x03\0\ - \x02\x06\x01\x12\x03|\x0e\x20\n\x0e\n\x07\x04\x03\x03\0\x02\x06\x03\x12\ - \x03|#$\n\r\n\x06\x04\x03\x03\0\x02\x07\x12\x03}\x08,\n\x0e\n\x07\x04\ - \x03\x03\0\x02\x07\x06\x12\x03}\x08\x1b\n\x0e\n\x07\x04\x03\x03\0\x02\ - \x07\x01\x12\x03}\x1c'\n\x0e\n\x07\x04\x03\x03\0\x02\x07\x03\x12\x03}*+\ - \n\r\n\x06\x04\x03\x03\0\x02\x08\x12\x03~\x08'\n\x0e\n\x07\x04\x03\x03\0\ - \x02\x08\x06\x12\x03~\x08\x1b\n\x0e\n\x07\x04\x03\x03\0\x02\x08\x01\x12\ - \x03~\x1c\"\n\x0e\n\x07\x04\x03\x03\0\x02\x08\x03\x12\x03~%&\n\x0e\n\x04\ - \x04\x03\x03\x01\x12\x06\x81\x01\x04\x8a\x01\x05\n\r\n\x05\x04\x03\x03\ - \x01\x01\x12\x04\x81\x01\x0c\x10\n\x0e\n\x06\x04\x03\x03\x01\x02\0\x12\ - \x04\x82\x01\x08\x1a\n\x0f\n\x07\x04\x03\x03\x01\x02\0\x06\x12\x04\x82\ - \x01\x08\x0e\n\x0f\n\x07\x04\x03\x03\x01\x02\0\x01\x12\x04\x82\x01\x0f\ - \x15\n\x0f\n\x07\x04\x03\x03\x01\x02\0\x03\x12\x04\x82\x01\x18\x19\n\x10\ - \n\x06\x04\x03\x03\x01\x03\0\x12\x06\x84\x01\x08\x89\x01\t\n\x0f\n\x07\ - \x04\x03\x03\x01\x03\0\x01\x12\x04\x84\x01\x10\x16\n\x10\n\x08\x04\x03\ - \x03\x01\x03\0\x02\0\x12\x04\x85\x01\x0c\x1e\n\x11\n\t\x04\x03\x03\x01\ - \x03\0\x02\0\x05\x12\x04\x85\x01\x0c\x10\n\x11\n\t\x04\x03\x03\x01\x03\0\ - \x02\0\x01\x12\x04\x85\x01\x11\x19\n\x11\n\t\x04\x03\x03\x01\x03\0\x02\0\ - \x03\x12\x04\x85\x01\x1c\x1d\n\x10\n\x08\x04\x03\x03\x01\x03\0\x02\x01\ - \x12\x04\x86\x01\x0c%\n\x11\n\t\x04\x03\x03\x01\x03\0\x02\x01\x05\x12\ - \x04\x86\x01\x0c\x11\n\x11\n\t\x04\x03\x03\x01\x03\0\x02\x01\x01\x12\x04\ - \x86\x01\x12\x20\n\x11\n\t\x04\x03\x03\x01\x03\0\x02\x01\x03\x12\x04\x86\ - \x01#$\n\x10\n\x08\x04\x03\x03\x01\x03\0\x02\x02\x12\x04\x87\x01\x0c(\n\ + \x04\x01\x02\0\x12\x03a\x04\x13\n\r\n\x05\x04\x01\x02\0\x04\x12\x04a\x04\ + `\x12\n\x0c\n\x05\x04\x01\x02\0\x05\x12\x03a\x04\n\n\x0c\n\x05\x04\x01\ + \x02\0\x01\x12\x03a\x0b\x0e\n\x0c\n\x05\x04\x01\x02\0\x03\x12\x03a\x11\ + \x12\n\x0b\n\x04\x04\x01\x02\x01\x12\x03b\x04\x15\n\r\n\x05\x04\x01\x02\ + \x01\x04\x12\x04b\x04a\x13\n\x0c\n\x05\x04\x01\x02\x01\x05\x12\x03b\x04\ + \n\n\x0c\n\x05\x04\x01\x02\x01\x01\x12\x03b\x0b\x10\n\x0c\n\x05\x04\x01\ + \x02\x01\x03\x12\x03b\x13\x14\n'\n\x02\x04\x02\x12\x04f\0h\x01\x1a\x1b\ + \x20time\x20duration,\x20in\x20seconds\n\n\n\n\x03\x04\x02\x01\x12\x03f\ + \x08\x10\n\x0b\n\x04\x04\x02\x02\0\x12\x03g\x04\x16\n\r\n\x05\x04\x02\ + \x02\0\x04\x12\x04g\x04f\x12\n\x0c\n\x05\x04\x02\x02\0\x05\x12\x03g\x04\ + \t\n\x0c\n\x05\x04\x02\x02\0\x01\x12\x03g\n\x11\n\x0c\n\x05\x04\x02\x02\ + \0\x03\x12\x03g\x14\x15\n\xa3\x01\n\x02\x04\x03\x12\x05m\0\x96\x01\x01\ + \x1a\x95\x01\x20A\x20GameServer\x20Custom\x20Resource\x20Definition\x20o\ + bject\n\x20We\x20will\x20only\x20export\x20those\x20resources\x20that\ + \x20make\x20the\x20most\n\x20sense.\x20Can\x20always\x20expand\x20to\x20\ + more\x20as\x20needed.\n\n\n\n\x03\x04\x03\x01\x12\x03m\x08\x12\n\x0b\n\ + \x04\x04\x03\x02\0\x12\x03n\x04\x1f\n\r\n\x05\x04\x03\x02\0\x04\x12\x04n\ + \x04m\x14\n\x0c\n\x05\x04\x03\x02\0\x06\x12\x03n\x04\x0e\n\x0c\n\x05\x04\ + \x03\x02\0\x01\x12\x03n\x0f\x1a\n\x0c\n\x05\x04\x03\x02\0\x03\x12\x03n\ + \x1d\x1e\n\x0b\n\x04\x04\x03\x02\x01\x12\x03o\x04\x12\n\r\n\x05\x04\x03\ + \x02\x01\x04\x12\x04o\x04n\x1f\n\x0c\n\x05\x04\x03\x02\x01\x06\x12\x03o\ + \x04\x08\n\x0c\n\x05\x04\x03\x02\x01\x01\x12\x03o\t\r\n\x0c\n\x05\x04\ + \x03\x02\x01\x03\x12\x03o\x10\x11\n\x0b\n\x04\x04\x03\x02\x02\x12\x03p\ + \x04\x16\n\r\n\x05\x04\x03\x02\x02\x04\x12\x04p\x04o\x12\n\x0c\n\x05\x04\ + \x03\x02\x02\x06\x12\x03p\x04\n\n\x0c\n\x05\x04\x03\x02\x02\x01\x12\x03p\ + \x0b\x11\n\x0c\n\x05\x04\x03\x02\x02\x03\x12\x03p\x14\x15\n=\n\x04\x04\ + \x03\x03\0\x12\x04s\x04\x7f\x05\x1a/\x20representation\x20of\x20the\x20K\ + 8s\x20ObjectMeta\x20resource\n\n\x0c\n\x05\x04\x03\x03\0\x01\x12\x03s\ + \x0c\x16\n\r\n\x06\x04\x03\x03\0\x02\0\x12\x03t\x08\x18\n\x0f\n\x07\x04\ + \x03\x03\0\x02\0\x04\x12\x04t\x08s\x18\n\x0e\n\x07\x04\x03\x03\0\x02\0\ + \x05\x12\x03t\x08\x0e\n\x0e\n\x07\x04\x03\x03\0\x02\0\x01\x12\x03t\x0f\ + \x13\n\x0e\n\x07\x04\x03\x03\0\x02\0\x03\x12\x03t\x16\x17\n\r\n\x06\x04\ + \x03\x03\0\x02\x01\x12\x03u\x08\x1d\n\x0f\n\x07\x04\x03\x03\0\x02\x01\ + \x04\x12\x04u\x08t\x18\n\x0e\n\x07\x04\x03\x03\0\x02\x01\x05\x12\x03u\ + \x08\x0e\n\x0e\n\x07\x04\x03\x03\0\x02\x01\x01\x12\x03u\x0f\x18\n\x0e\n\ + \x07\x04\x03\x03\0\x02\x01\x03\x12\x03u\x1b\x1c\n\r\n\x06\x04\x03\x03\0\ + \x02\x02\x12\x03v\x08\x17\n\x0f\n\x07\x04\x03\x03\0\x02\x02\x04\x12\x04v\ + \x08u\x1d\n\x0e\n\x07\x04\x03\x03\0\x02\x02\x05\x12\x03v\x08\x0e\n\x0e\n\ + \x07\x04\x03\x03\0\x02\x02\x01\x12\x03v\x0f\x12\n\x0e\n\x07\x04\x03\x03\ + \0\x02\x02\x03\x12\x03v\x15\x16\n\r\n\x06\x04\x03\x03\0\x02\x03\x12\x03w\ + \x08$\n\x0f\n\x07\x04\x03\x03\0\x02\x03\x04\x12\x04w\x08v\x17\n\x0e\n\ + \x07\x04\x03\x03\0\x02\x03\x05\x12\x03w\x08\x0e\n\x0e\n\x07\x04\x03\x03\ + \0\x02\x03\x01\x12\x03w\x0f\x1f\n\x0e\n\x07\x04\x03\x03\0\x02\x03\x03\ + \x12\x03w\"#\n\r\n\x06\x04\x03\x03\0\x02\x04\x12\x03x\x08\x1d\n\x0f\n\ + \x07\x04\x03\x03\0\x02\x04\x04\x12\x04x\x08w$\n\x0e\n\x07\x04\x03\x03\0\ + \x02\x04\x05\x12\x03x\x08\r\n\x0e\n\x07\x04\x03\x03\0\x02\x04\x01\x12\ + \x03x\x0e\x18\n\x0e\n\x07\x04\x03\x03\0\x02\x04\x03\x12\x03x\x1b\x1c\n<\ + \n\x06\x04\x03\x03\0\x02\x05\x12\x03z\x08%\x1a-\x20timestamp\x20is\x20in\ + \x20Epoch\x20format,\x20unit:\x20seconds\n\n\x0f\n\x07\x04\x03\x03\0\x02\ + \x05\x04\x12\x04z\x08x\x1d\n\x0e\n\x07\x04\x03\x03\0\x02\x05\x05\x12\x03\ + z\x08\r\n\x0e\n\x07\x04\x03\x03\0\x02\x05\x01\x12\x03z\x0e\x20\n\x0e\n\ + \x07\x04\x03\x03\0\x02\x05\x03\x12\x03z#$\nK\n\x06\x04\x03\x03\0\x02\x06\ + \x12\x03|\x08%\x1a<\x20optional\x20deletion\x20timestamp\x20in\x20Epoch\ + \x20format,\x20unit:\x20seconds\n\n\x0f\n\x07\x04\x03\x03\0\x02\x06\x04\ + \x12\x04|\x08z%\n\x0e\n\x07\x04\x03\x03\0\x02\x06\x05\x12\x03|\x08\r\n\ + \x0e\n\x07\x04\x03\x03\0\x02\x06\x01\x12\x03|\x0e\x20\n\x0e\n\x07\x04\ + \x03\x03\0\x02\x06\x03\x12\x03|#$\n\r\n\x06\x04\x03\x03\0\x02\x07\x12\ + \x03}\x08,\n\x0f\n\x07\x04\x03\x03\0\x02\x07\x04\x12\x04}\x08|%\n\x0e\n\ + \x07\x04\x03\x03\0\x02\x07\x06\x12\x03}\x08\x1b\n\x0e\n\x07\x04\x03\x03\ + \0\x02\x07\x01\x12\x03}\x1c'\n\x0e\n\x07\x04\x03\x03\0\x02\x07\x03\x12\ + \x03}*+\n\r\n\x06\x04\x03\x03\0\x02\x08\x12\x03~\x08'\n\x0f\n\x07\x04\ + \x03\x03\0\x02\x08\x04\x12\x04~\x08},\n\x0e\n\x07\x04\x03\x03\0\x02\x08\ + \x06\x12\x03~\x08\x1b\n\x0e\n\x07\x04\x03\x03\0\x02\x08\x01\x12\x03~\x1c\ + \"\n\x0e\n\x07\x04\x03\x03\0\x02\x08\x03\x12\x03~%&\n\x0e\n\x04\x04\x03\ + \x03\x01\x12\x06\x81\x01\x04\x8a\x01\x05\n\r\n\x05\x04\x03\x03\x01\x01\ + \x12\x04\x81\x01\x0c\x10\n\x0e\n\x06\x04\x03\x03\x01\x02\0\x12\x04\x82\ + \x01\x08\x1a\n\x11\n\x07\x04\x03\x03\x01\x02\0\x04\x12\x06\x82\x01\x08\ + \x81\x01\x12\n\x0f\n\x07\x04\x03\x03\x01\x02\0\x06\x12\x04\x82\x01\x08\ + \x0e\n\x0f\n\x07\x04\x03\x03\x01\x02\0\x01\x12\x04\x82\x01\x0f\x15\n\x0f\ + \n\x07\x04\x03\x03\x01\x02\0\x03\x12\x04\x82\x01\x18\x19\n\x10\n\x06\x04\ + \x03\x03\x01\x03\0\x12\x06\x84\x01\x08\x89\x01\t\n\x0f\n\x07\x04\x03\x03\ + \x01\x03\0\x01\x12\x04\x84\x01\x10\x16\n\x10\n\x08\x04\x03\x03\x01\x03\0\ + \x02\0\x12\x04\x85\x01\x0c\x1e\n\x13\n\t\x04\x03\x03\x01\x03\0\x02\0\x04\ + \x12\x06\x85\x01\x0c\x84\x01\x18\n\x11\n\t\x04\x03\x03\x01\x03\0\x02\0\ + \x05\x12\x04\x85\x01\x0c\x10\n\x11\n\t\x04\x03\x03\x01\x03\0\x02\0\x01\ + \x12\x04\x85\x01\x11\x19\n\x11\n\t\x04\x03\x03\x01\x03\0\x02\0\x03\x12\ + \x04\x85\x01\x1c\x1d\n\x10\n\x08\x04\x03\x03\x01\x03\0\x02\x01\x12\x04\ + \x86\x01\x0c%\n\x13\n\t\x04\x03\x03\x01\x03\0\x02\x01\x04\x12\x06\x86\ + \x01\x0c\x85\x01\x1e\n\x11\n\t\x04\x03\x03\x01\x03\0\x02\x01\x05\x12\x04\ + \x86\x01\x0c\x11\n\x11\n\t\x04\x03\x03\x01\x03\0\x02\x01\x01\x12\x04\x86\ + \x01\x12\x20\n\x11\n\t\x04\x03\x03\x01\x03\0\x02\x01\x03\x12\x04\x86\x01\ + #$\n\x10\n\x08\x04\x03\x03\x01\x03\0\x02\x02\x12\x04\x87\x01\x0c(\n\x13\ + \n\t\x04\x03\x03\x01\x03\0\x02\x02\x04\x12\x06\x87\x01\x0c\x86\x01%\n\ \x11\n\t\x04\x03\x03\x01\x03\0\x02\x02\x05\x12\x04\x87\x01\x0c\x11\n\x11\ \n\t\x04\x03\x03\x01\x03\0\x02\x02\x01\x12\x04\x87\x01\x12#\n\x11\n\t\ \x04\x03\x03\x01\x03\0\x02\x02\x03\x12\x04\x87\x01&'\n\x10\n\x08\x04\x03\ - \x03\x01\x03\0\x02\x03\x12\x04\x88\x01\x0c,\n\x11\n\t\x04\x03\x03\x01\ - \x03\0\x02\x03\x05\x12\x04\x88\x01\x0c\x11\n\x11\n\t\x04\x03\x03\x01\x03\ - \0\x02\x03\x01\x12\x04\x88\x01\x12'\n\x11\n\t\x04\x03\x03\x01\x03\0\x02\ - \x03\x03\x12\x04\x88\x01*+\n\x0e\n\x04\x04\x03\x03\x02\x12\x06\x8c\x01\ - \x04\x95\x01\x05\n\r\n\x05\x04\x03\x03\x02\x01\x12\x04\x8c\x01\x0c\x12\n\ - \x10\n\x06\x04\x03\x03\x02\x03\0\x12\x06\x8d\x01\x08\x90\x01\t\n\x0f\n\ - \x07\x04\x03\x03\x02\x03\0\x01\x12\x04\x8d\x01\x10\x14\n\x10\n\x08\x04\ - \x03\x03\x02\x03\0\x02\0\x12\x04\x8e\x01\x0c\x1c\n\x11\n\t\x04\x03\x03\ - \x02\x03\0\x02\0\x05\x12\x04\x8e\x01\x0c\x12\n\x11\n\t\x04\x03\x03\x02\ - \x03\0\x02\0\x01\x12\x04\x8e\x01\x13\x17\n\x11\n\t\x04\x03\x03\x02\x03\0\ - \x02\0\x03\x12\x04\x8e\x01\x1a\x1b\n\x10\n\x08\x04\x03\x03\x02\x03\0\x02\ - \x01\x12\x04\x8f\x01\x0c\x1b\n\x11\n\t\x04\x03\x03\x02\x03\0\x02\x01\x05\ - \x12\x04\x8f\x01\x0c\x11\n\x11\n\t\x04\x03\x03\x02\x03\0\x02\x01\x01\x12\ - \x04\x8f\x01\x12\x16\n\x11\n\t\x04\x03\x03\x02\x03\0\x02\x01\x03\x12\x04\ - \x8f\x01\x19\x1a\n\x0e\n\x06\x04\x03\x03\x02\x02\0\x12\x04\x92\x01\x08\ - \x19\n\x0f\n\x07\x04\x03\x03\x02\x02\0\x05\x12\x04\x92\x01\x08\x0e\n\x0f\ - \n\x07\x04\x03\x03\x02\x02\0\x01\x12\x04\x92\x01\x0f\x14\n\x0f\n\x07\x04\ - \x03\x03\x02\x02\0\x03\x12\x04\x92\x01\x17\x18\n\x0e\n\x06\x04\x03\x03\ - \x02\x02\x01\x12\x04\x93\x01\x08\x1b\n\x0f\n\x07\x04\x03\x03\x02\x02\x01\ - \x05\x12\x04\x93\x01\x08\x0e\n\x0f\n\x07\x04\x03\x03\x02\x02\x01\x01\x12\ - \x04\x93\x01\x0f\x16\n\x0f\n\x07\x04\x03\x03\x02\x02\x01\x03\x12\x04\x93\ - \x01\x19\x1a\n\x0e\n\x06\x04\x03\x03\x02\x02\x02\x12\x04\x94\x01\x08\x20\ - \n\x0f\n\x07\x04\x03\x03\x02\x02\x02\x04\x12\x04\x94\x01\x08\x10\n\x0f\n\ - \x07\x04\x03\x03\x02\x02\x02\x06\x12\x04\x94\x01\x11\x15\n\x0f\n\x07\x04\ - \x03\x03\x02\x02\x02\x01\x12\x04\x94\x01\x16\x1b\n\x0f\n\x07\x04\x03\x03\ - \x02\x02\x02\x03\x12\x04\x94\x01\x1e\x1fb\x06proto3\ + \x03\x01\x03\0\x02\x03\x12\x04\x88\x01\x0c,\n\x13\n\t\x04\x03\x03\x01\ + \x03\0\x02\x03\x04\x12\x06\x88\x01\x0c\x87\x01(\n\x11\n\t\x04\x03\x03\ + \x01\x03\0\x02\x03\x05\x12\x04\x88\x01\x0c\x11\n\x11\n\t\x04\x03\x03\x01\ + \x03\0\x02\x03\x01\x12\x04\x88\x01\x12'\n\x11\n\t\x04\x03\x03\x01\x03\0\ + \x02\x03\x03\x12\x04\x88\x01*+\n\x0e\n\x04\x04\x03\x03\x02\x12\x06\x8c\ + \x01\x04\x95\x01\x05\n\r\n\x05\x04\x03\x03\x02\x01\x12\x04\x8c\x01\x0c\ + \x12\n\x10\n\x06\x04\x03\x03\x02\x03\0\x12\x06\x8d\x01\x08\x90\x01\t\n\ + \x0f\n\x07\x04\x03\x03\x02\x03\0\x01\x12\x04\x8d\x01\x10\x14\n\x10\n\x08\ + \x04\x03\x03\x02\x03\0\x02\0\x12\x04\x8e\x01\x0c\x1c\n\x13\n\t\x04\x03\ + \x03\x02\x03\0\x02\0\x04\x12\x06\x8e\x01\x0c\x8d\x01\x16\n\x11\n\t\x04\ + \x03\x03\x02\x03\0\x02\0\x05\x12\x04\x8e\x01\x0c\x12\n\x11\n\t\x04\x03\ + \x03\x02\x03\0\x02\0\x01\x12\x04\x8e\x01\x13\x17\n\x11\n\t\x04\x03\x03\ + \x02\x03\0\x02\0\x03\x12\x04\x8e\x01\x1a\x1b\n\x10\n\x08\x04\x03\x03\x02\ + \x03\0\x02\x01\x12\x04\x8f\x01\x0c\x1b\n\x13\n\t\x04\x03\x03\x02\x03\0\ + \x02\x01\x04\x12\x06\x8f\x01\x0c\x8e\x01\x1c\n\x11\n\t\x04\x03\x03\x02\ + \x03\0\x02\x01\x05\x12\x04\x8f\x01\x0c\x11\n\x11\n\t\x04\x03\x03\x02\x03\ + \0\x02\x01\x01\x12\x04\x8f\x01\x12\x16\n\x11\n\t\x04\x03\x03\x02\x03\0\ + \x02\x01\x03\x12\x04\x8f\x01\x19\x1a\n\x0e\n\x06\x04\x03\x03\x02\x02\0\ + \x12\x04\x92\x01\x08\x19\n\x11\n\x07\x04\x03\x03\x02\x02\0\x04\x12\x06\ + \x92\x01\x08\x90\x01\t\n\x0f\n\x07\x04\x03\x03\x02\x02\0\x05\x12\x04\x92\ + \x01\x08\x0e\n\x0f\n\x07\x04\x03\x03\x02\x02\0\x01\x12\x04\x92\x01\x0f\ + \x14\n\x0f\n\x07\x04\x03\x03\x02\x02\0\x03\x12\x04\x92\x01\x17\x18\n\x0e\ + \n\x06\x04\x03\x03\x02\x02\x01\x12\x04\x93\x01\x08\x1b\n\x11\n\x07\x04\ + \x03\x03\x02\x02\x01\x04\x12\x06\x93\x01\x08\x92\x01\x19\n\x0f\n\x07\x04\ + \x03\x03\x02\x02\x01\x05\x12\x04\x93\x01\x08\x0e\n\x0f\n\x07\x04\x03\x03\ + \x02\x02\x01\x01\x12\x04\x93\x01\x0f\x16\n\x0f\n\x07\x04\x03\x03\x02\x02\ + \x01\x03\x12\x04\x93\x01\x19\x1a\n\x0e\n\x06\x04\x03\x03\x02\x02\x02\x12\ + \x04\x94\x01\x08\x20\n\x0f\n\x07\x04\x03\x03\x02\x02\x02\x04\x12\x04\x94\ + \x01\x08\x10\n\x0f\n\x07\x04\x03\x03\x02\x02\x02\x06\x12\x04\x94\x01\x11\ + \x15\n\x0f\n\x07\x04\x03\x03\x02\x02\x02\x01\x12\x04\x94\x01\x16\x1b\n\ + \x0f\n\x07\x04\x03\x03\x02\x02\x02\x03\x12\x04\x94\x01\x1e\x1fb\x06proto\ + 3\ "; static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy { From fc401bde499c315fc80c6674e743e539f92f7821 Mon Sep 17 00:00:00 2001 From: Cyril Tovena Date: Fri, 6 Dec 2019 11:19:41 -0500 Subject: [PATCH 9/9] Attempt to remove the CI cache. Signed-off-by: Cyril Tovena --- cloudbuild.yaml | 6 +++--- sdks/cpp/CMakeLists.txt | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 3b0fdb77e7..65f7f4d3b0 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -277,12 +277,12 @@ steps: substitutions: _CACHE_BUCKET: agones-build-cache _HTMLTEST_CACHE_KEY: htmltest-0.10.1 - _CPP_SDK_BUILD_CACHE_KEY: cpp-sdk-build - _RUST_SDK_BUILD_CACHE_KEY: rust-sdk-build + _CPP_SDK_BUILD_CACHE_KEY: cpp-sdk-build-1 + _RUST_SDK_BUILD_CACHE_KEY: rust-sdk-build-1 tags: ['ci'] timeout: "1h" images: ['gcr.io/$PROJECT_ID/agones-controller', 'gcr.io/$PROJECT_ID/agones-sdk', 'gcr.io/$PROJECT_ID/agones-ping'] logsBucket: "gs://agones-build-logs" options: - machineType: 'N1_HIGHCPU_8' \ No newline at end of file + machineType: 'N1_HIGHCPU_8' diff --git a/sdks/cpp/CMakeLists.txt b/sdks/cpp/CMakeLists.txt index 46d37c41f6..88bcfc3c99 100644 --- a/sdks/cpp/CMakeLists.txt +++ b/sdks/cpp/CMakeLists.txt @@ -95,7 +95,7 @@ set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE ON) set(CMAKE_DEBUG_POSTFIX "d") -set(AGONES_GRPC_VERSION "1.16.1") +set(AGONES_GRPC_VERSION "1.20.1") # Platform specific stuff if (WIN32) @@ -203,13 +203,13 @@ if (NOT CLANG_FORMAT_APP) message(STATUS "clang-format not found.") else() message(STATUS "clang-format found: ${CLANG_FORMAT_APP}") - + set(CLANGFORMAT_INPUT) foreach(relpath ${SDK_FILES}) get_filename_component(fullpath "${CMAKE_CURRENT_LIST_DIR}/${relpath}" ABSOLUTE) list(APPEND CLANGFORMAT_INPUT ${fullpath}) endforeach() - + # format add_custom_target( clang-format-apply @@ -219,7 +219,7 @@ else() if (${AGONES_CLANG_FORMAT}) add_dependencies(${PROJECT_NAME} "clang-format-apply") endif() - + # verification set(CLANGFORMAT_WORKING_DIR ${CMAKE_CURRENT_SOURCE_DIR}) get_filename_component(AGONES_ROOT "${CMAKE_CURRENT_LIST_DIR}/../.." ABSOLUTE) @@ -229,5 +229,5 @@ else() clang-format-verify COMMAND ${CMAKE_COMMAND} . WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/clang-format" - ) + ) endif()